From e631c1d7dd22063016ad93a766082d144e665ae4 Mon Sep 17 00:00:00 2001 From: Tangem Date: Tue, 9 Apr 2019 16:55:39 +0300 Subject: [PATCH] Updated on 2026-08-14 --- app/build.gradle | 3 +- app/src/main/AndroidManifest.xml | 5 +++ app/src/main/java/com/tangem/di/Navigator.kt | 4 +++ .../main/java/com/tangem/di/ToastHelper.kt | 1 - .../com/tangem/ui/activity/MainActivity.kt | 5 +++ .../tangem/ui/activity/SettingsActivity.kt | 31 +++++++++++++++++++ .../java/com/tangem/ui/fragment/Settings.kt | 15 +++++++++ app/src/main/res/layout/activity_settings.xml | 29 +++++++++++++++++ app/src/main/res/layout/toolbar.xml | 10 ++++++ app/src/main/res/menu/menu_main.xml | 22 ++++++------- app/src/main/res/values/strings.xml | 15 +++++++++ app/src/main/res/xml/pref_main.xml | 20 ++++++++++++ 12 files changed, 144 insertions(+), 16 deletions(-) create mode 100644 app/src/main/java/com/tangem/ui/activity/SettingsActivity.kt create mode 100644 app/src/main/java/com/tangem/ui/fragment/Settings.kt create mode 100644 app/src/main/res/layout/activity_settings.xml create mode 100644 app/src/main/res/layout/toolbar.xml create mode 100644 app/src/main/res/xml/pref_main.xml diff --git a/app/build.gradle b/app/build.gradle index b6688d00ce..b0b5705caf 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -67,8 +67,7 @@ dependencies { // implementation 'com.github.TangemCash:card-common:0.1.2' // implementation 'com.github.TangemCash:card-android:0.1.3' // implementation 'com.github.TangemCash:server-android:0.1.4' - implementation 'androidx.appcompat:appcompat:1.1.0-alpha03' - implementation 'androidx.appcompat:appcompat:1.1.0-alpha01' + implementation 'androidx.appcompat:appcompat:1.1.0-alpha04' implementation 'androidx.constraintlayout:constraintlayout:1.1.3' implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0' implementation 'androidx.biometric:biometric:1.0.0-alpha04' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ea530e48e4..eb065936b9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -68,6 +68,11 @@ android:resource="@xml/nfc_tech_filter" /> + + { + navigator.showSettings(this) + return true + } + R.id.about -> { navigator.showLogo(this, false) return true diff --git a/app/src/main/java/com/tangem/ui/activity/SettingsActivity.kt b/app/src/main/java/com/tangem/ui/activity/SettingsActivity.kt new file mode 100644 index 0000000000..46d52e2600 --- /dev/null +++ b/app/src/main/java/com/tangem/ui/activity/SettingsActivity.kt @@ -0,0 +1,31 @@ +package com.tangem.ui.activity + +import android.content.Context +import android.content.Intent +import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity +import androidx.appcompat.widget.Toolbar +import com.tangem.wallet.R + +class SettingsActivity : AppCompatActivity() { + + companion object { + fun callingIntent(context: Context) = Intent(context, SettingsActivity::class.java) + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_settings) + + initToolbar() + } + + private fun initToolbar() { + val toolbar = findViewById(R.id.toolbar) + toolbar.setTitle(R.string.settings) + toolbar.setNavigationIcon(android.R.drawable.ic_menu_close_clear_cancel) + setSupportActionBar(toolbar) + toolbar.setNavigationOnClickListener { finish() } + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/tangem/ui/fragment/Settings.kt b/app/src/main/java/com/tangem/ui/fragment/Settings.kt new file mode 100644 index 0000000000..e9c0e86d69 --- /dev/null +++ b/app/src/main/java/com/tangem/ui/fragment/Settings.kt @@ -0,0 +1,15 @@ +package com.tangem.ui.fragment + +import android.os.Bundle +import android.preference.PreferenceFragment + +import com.tangem.wallet.R + +class Settings : PreferenceFragment() { + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + addPreferencesFromResource(R.xml.pref_main) + } + +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml new file mode 100644 index 0000000000..0ba5ab7527 --- /dev/null +++ b/app/src/main/res/layout/activity_settings.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/toolbar.xml b/app/src/main/res/layout/toolbar.xml new file mode 100644 index 0000000000..13ba0bdc2b --- /dev/null +++ b/app/src/main/res/layout/toolbar.xml @@ -0,0 +1,10 @@ + + + \ No newline at end of file diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml index 1690a37722..aab64fe9e6 100644 --- a/app/src/main/res/menu/menu_main.xml +++ b/app/src/main/res/menu/menu_main.xml @@ -1,28 +1,24 @@ - - - - + + + android:title="@string/manage_user_pin_1" /> + android:title="@string/manage_user_pin_2" /> + android:visible="false" /> - - - - + + android:title="@string/about" /> \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 572c502794..4f1870fb91 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -57,6 +57,21 @@ BETA Cardano + + Settings + Encryption modes + + None + Fast + Strong + + + 0 + 1 + 2 + + Select nodes + Your Android device is rooted. Security at risk! Got it diff --git a/app/src/main/res/xml/pref_main.xml b/app/src/main/res/xml/pref_main.xml new file mode 100644 index 0000000000..ff16adfc67 --- /dev/null +++ b/app/src/main/res/xml/pref_main.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + \ No newline at end of file