Updated on 2026-08-14
This commit is contained in:
parent
f686ddd1e1
commit
121dcff70e
11 changed files with 73 additions and 46 deletions
4
.idea/encodings.xml
generated
Normal file
4
.idea/encodings.xml
generated
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="Encoding" addBOMForNewFiles="with NO BOM" />
|
||||
</project>
|
||||
4
.idea/navEditor.xml
generated
4
.idea/navEditor.xml
generated
|
|
@ -13,8 +13,8 @@
|
|||
<LayoutPositions>
|
||||
<option name="myPosition">
|
||||
<Point>
|
||||
<option name="x" value="-141" />
|
||||
<option name="y" value="-166" />
|
||||
<option name="x" value="-203" />
|
||||
<option name="y" value="-292" />
|
||||
</Point>
|
||||
</option>
|
||||
</LayoutPositions>
|
||||
|
|
|
|||
|
|
@ -246,7 +246,7 @@ class PinRequestActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, Finge
|
|||
|
||||
@SuppressLint("NewApi")
|
||||
private fun testFingerPrintSettings(): Boolean {
|
||||
LOG.i(TAG, "Testing Fingerprint Settings")
|
||||
LOG.i(TAG, "Testing Fingerprint SettingsFragment")
|
||||
|
||||
val keyguardManager = getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager
|
||||
fingerprintManager = getSystemService(Context.FINGERPRINT_SERVICE) as FingerprintManager
|
||||
|
|
|
|||
|
|
@ -344,7 +344,6 @@ class MainFragment : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific
|
|||
popup.menu.findItem(R.id.managePIN).isEnabled = true
|
||||
popup.menu.findItem(R.id.managePIN2).isEnabled = true
|
||||
popup.menu.findItem(R.id.sendLogs).isVisible = true
|
||||
popup.menu.findItem(R.id.settings).isVisible = true
|
||||
}
|
||||
|
||||
popup.setOnMenuItemClickListener(this)
|
||||
|
|
|
|||
|
|
@ -1,12 +0,0 @@
|
|||
package com.tangem.ui.fragment
|
||||
|
||||
import android.os.Bundle
|
||||
import androidx.preference.PreferenceFragmentCompat
|
||||
import com.tangem.wallet.R
|
||||
|
||||
class Settings : PreferenceFragmentCompat() {
|
||||
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
|
||||
addPreferencesFromResource(R.xml.pref_main)
|
||||
}
|
||||
|
||||
}
|
||||
25
app/src/main/java/com/tangem/ui/fragment/SettingsFragment.kt
Normal file
25
app/src/main/java/com/tangem/ui/fragment/SettingsFragment.kt
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
package com.tangem.ui.fragment
|
||||
|
||||
import android.os.Bundle
|
||||
import androidx.preference.ListPreference
|
||||
import androidx.preference.Preference
|
||||
import androidx.preference.PreferenceCategory
|
||||
import androidx.preference.PreferenceFragmentCompat
|
||||
import com.tangem.wallet.BuildConfig
|
||||
import com.tangem.wallet.R
|
||||
|
||||
class SettingsFragment : PreferenceFragmentCompat() {
|
||||
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
|
||||
addPreferencesFromResource(R.xml.pref_main)
|
||||
|
||||
val categoryCommon = findPreference<PreferenceCategory>(getString(R.string.pref_category_common))
|
||||
val selectNodes = findPreference<Preference>(getString(R.string.pref_select_nodes))
|
||||
val encryptionModes = findPreference<ListPreference>(getString(R.string.pref_encryption_modes))
|
||||
|
||||
if (!BuildConfig.DEBUG) {
|
||||
categoryCommon?.removePreference(selectNodes)
|
||||
categoryCommon?.removePreference(encryptionModes)
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
<fragment
|
||||
android:id="@+id/thanks_fragment"
|
||||
android:name="com.tangem.ui.fragment.Settings"
|
||||
android:name="com.tangem.ui.fragment.SettingsFragment"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_below="@+id/abl"
|
||||
|
|
|
|||
|
|
@ -1,25 +1,24 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<menu xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<item
|
||||
android:id="@+id/managePIN"
|
||||
android:enabled="false"
|
||||
android:title="@string/manage_user_pin_1" />
|
||||
<item
|
||||
android:id="@+id/managePIN2"
|
||||
android:enabled="false"
|
||||
android:title="@string/manage_user_pin_2" />
|
||||
<item
|
||||
android:id="@+id/sendLogs"
|
||||
android:title="@string/send_logs"
|
||||
android:visible="false" />
|
||||
|
||||
<item
|
||||
android:id="@+id/settings"
|
||||
android:visible="false"
|
||||
android:title="@string/settings" />
|
||||
|
||||
<item
|
||||
android:id="@+id/about"
|
||||
android:title="@string/about" />
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<menu xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<item
|
||||
android:id="@+id/managePIN"
|
||||
android:enabled="false"
|
||||
android:title="@string/manage_user_pin_1" />
|
||||
<item
|
||||
android:id="@+id/managePIN2"
|
||||
android:enabled="false"
|
||||
android:title="@string/manage_user_pin_2" />
|
||||
<item
|
||||
android:id="@+id/sendLogs"
|
||||
android:title="@string/send_logs"
|
||||
android:visible="false" />
|
||||
|
||||
<item
|
||||
android:id="@+id/settings"
|
||||
android:title="@string/settings" />
|
||||
|
||||
<item
|
||||
android:id="@+id/about"
|
||||
android:title="@string/about" />
|
||||
</menu>
|
||||
|
|
@ -58,6 +58,8 @@
|
|||
<string name="cardano">Cardano</string>
|
||||
|
||||
<!-- SettingsActivity -->
|
||||
<string name="сommon">Common</string>
|
||||
<string name="manual_editing_fee">Manual editing Fee</string>
|
||||
<string name="settings">Settings</string>
|
||||
<string name="encryption_modes">Encryption modes</string>
|
||||
<string-array name="encryption_modes_entries">
|
||||
|
|
|
|||
|
|
@ -23,4 +23,9 @@
|
|||
<string name="log_file_provider_authorities">com.tangem.data.LogFileProvider</string>
|
||||
<string name="ex_cant_create_coinEngine">Can\'t create CoinEngine!</string>
|
||||
|
||||
<string name="pref_category_common">category_common</string>
|
||||
<string name="pref_manual_editing_fee">manual_editing_fee</string>
|
||||
<string name="pref_select_nodes">select_nodes</string>
|
||||
<string name="pref_encryption_modes">encryption_modes</string>
|
||||
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -1,20 +1,25 @@
|
|||
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<PreferenceCategory android:title="Common">
|
||||
<PreferenceCategory
|
||||
android:key="@string/pref_category_common"
|
||||
android:title="@string/сommon">
|
||||
|
||||
<CheckBoxPreference
|
||||
android:defaultValue="false"
|
||||
android:key="@string/pref_manual_editing_fee"
|
||||
android:title="@string/manual_editing_fee" />
|
||||
|
||||
<Preference
|
||||
android:defaultValue="true"
|
||||
android:key="select_nodes"
|
||||
android:key="@string/pref_select_nodes"
|
||||
android:title="@string/select_nodes" />
|
||||
|
||||
<ListPreference
|
||||
android:defaultValue="0"
|
||||
android:entries="@array/encryption_modes_entries"
|
||||
android:entryValues="@array/encryption_mode_values"
|
||||
android:key="encryption_modes"
|
||||
android:key="@string/pref_encryption_modes"
|
||||
android:title="@string/encryption_modes" />
|
||||
|
||||
</PreferenceCategory>
|
||||
|
||||
|
||||
</PreferenceScreen>
|
||||
Loading…
Add table
Add a link
Reference in a new issue