fenix/Simple-Gallery
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Gallery.git synced 2025-06-05 21:59:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

renaming some hidden item password protection related items

Browse Source
This commit is contained in:
tibbi
2018-10-30 22:20:07 +01:00
parent e63393cbd0
commit ca85e8a3df
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@@ -48,7 +48,7 @@ android {
}
dependencies {
implementation 'com.simplemobiletools:commons:5.2.14'
implementation 'com.simplemobiletools:commons:5.2.15'
implementation 'com.theartofdev.edmodo:android-image-cropper:2.7.0'
implementation 'androidx.multidex:multidex:2.0.0'
implementation 'it.sephiroth.android.exif:library:1.0.1'

10
app/src/main/kotlin/com/simplemobiletools/gallery/activities/SettingsActivity.kt
View File

@@ -53,7 +53,7 @@ class SettingsActivity : SimpleActivity() {
setupScrollHorizontally()
setupScreenRotation()
setupHideSystemUI()
setupPasswordProtection()
setupHiddenItemPasswordProtection()
setupAppPasswordProtection()
setupDeleteEmptyFolders()
setupAllowPhotoGestures()
@@ -235,14 +235,14 @@ class SettingsActivity : SimpleActivity() {
}
}
private fun setupPasswordProtection() {
settings_password_protection.isChecked = config.isPasswordProtectionOn
settings_password_protection_holder.setOnClickListener {
private fun setupHiddenItemPasswordProtection() {
settings_hidden_item_password_protection.isChecked = config.isPasswordProtectionOn
settings_hidden_item_password_protection_holder.setOnClickListener {
val tabToShow = if (config.isPasswordProtectionOn) config.protectionType else SHOW_ALL_TABS
SecurityDialog(this, config.passwordHash, tabToShow) { hash, type, success ->
if (success) {
val hasPasswordProtection = config.isPasswordProtectionOn
settings_password_protection.isChecked = !hasPasswordProtection
settings_hidden_item_password_protection.isChecked = !hasPasswordProtection
config.isPasswordProtectionOn = !hasPasswordProtection
config.passwordHash = if (hasPasswordProtection) "" else hash
config.protectionType = type

4
app/src/main/res/layout/activity_settings.xml
View File

@@ -898,7 +898,7 @@
android:textSize="@dimen/smaller_text_size"/>
<RelativeLayout
android:id="@+id/settings_password_protection_holder"
android:id="@+id/settings_hidden_item_password_protection_holder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/medium_margin"
@@ -909,7 +909,7 @@
android:paddingBottom="@dimen/activity_margin">
<com.simplemobiletools.commons.views.MySwitchCompat
android:id="@+id/settings_password_protection"
android:id="@+id/settings_hidden_item_password_protection"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"