remove keepSettingsVisible
This commit is contained in:
parent
2ebeb5a1e4
commit
e8744c93f6
|
@ -34,7 +34,6 @@ class SettingsActivity : SimpleActivity() {
|
||||||
setupSound()
|
setupSound()
|
||||||
setupVolumeButtonsAsShutter()
|
setupVolumeButtonsAsShutter()
|
||||||
setupFlipPhotos()
|
setupFlipPhotos()
|
||||||
setupKeepSettingsVisible()
|
|
||||||
setupSavePhotoMetadata()
|
setupSavePhotoMetadata()
|
||||||
setupSavePhotosFolder()
|
setupSavePhotosFolder()
|
||||||
setupPhotoQuality()
|
setupPhotoQuality()
|
||||||
|
@ -99,10 +98,6 @@ class SettingsActivity : SimpleActivity() {
|
||||||
settings_use_english_holder.beVisibleIf(config.wasUseEnglishToggled || Locale.getDefault().language != "en")
|
settings_use_english_holder.beVisibleIf(config.wasUseEnglishToggled || Locale.getDefault().language != "en")
|
||||||
settings_use_english.isChecked = config.useEnglish
|
settings_use_english.isChecked = config.useEnglish
|
||||||
|
|
||||||
if (settings_use_english_holder.isGone() && settings_purchase_thank_you_holder.isGone()) {
|
|
||||||
settings_keep_settings_visible_holder.background = ResourcesCompat.getDrawable(resources, R.drawable.ripple_all_corners, theme)
|
|
||||||
}
|
|
||||||
|
|
||||||
settings_use_english_holder.setOnClickListener {
|
settings_use_english_holder.setOnClickListener {
|
||||||
settings_use_english.toggle()
|
settings_use_english.toggle()
|
||||||
config.useEnglish = settings_use_english.isChecked
|
config.useEnglish = settings_use_english.isChecked
|
||||||
|
@ -154,14 +149,6 @@ class SettingsActivity : SimpleActivity() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun setupKeepSettingsVisible() {
|
|
||||||
settings_keep_settings_visible.isChecked = config.keepSettingsVisible
|
|
||||||
settings_keep_settings_visible_holder.setOnClickListener {
|
|
||||||
settings_keep_settings_visible.toggle()
|
|
||||||
config.keepSettingsVisible = settings_keep_settings_visible.isChecked
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun setupSavePhotoMetadata() {
|
private fun setupSavePhotoMetadata() {
|
||||||
settings_save_photo_metadata.isChecked = config.savePhotoMetadata
|
settings_save_photo_metadata.isChecked = config.savePhotoMetadata
|
||||||
settings_save_photo_metadata_holder.setOnClickListener {
|
settings_save_photo_metadata_holder.setOnClickListener {
|
||||||
|
|
|
@ -66,11 +66,6 @@ class Config(context: Context) : BaseConfig(context) {
|
||||||
get() = prefs.getInt(FRONT_VIDEO_RESOLUTION_INDEX, 0)
|
get() = prefs.getInt(FRONT_VIDEO_RESOLUTION_INDEX, 0)
|
||||||
set(frontVideoResIndex) = prefs.edit().putInt(FRONT_VIDEO_RESOLUTION_INDEX, frontVideoResIndex).apply()
|
set(frontVideoResIndex) = prefs.edit().putInt(FRONT_VIDEO_RESOLUTION_INDEX, frontVideoResIndex).apply()
|
||||||
|
|
||||||
//TODO: Remove keepSettingsVisible since the view has moved to the top
|
|
||||||
var keepSettingsVisible: Boolean
|
|
||||||
get() = prefs.getBoolean(KEEP_SETTINGS_VISIBLE, false)
|
|
||||||
set(keepSettingsVisible) = prefs.edit().putBoolean(KEEP_SETTINGS_VISIBLE, keepSettingsVisible).apply()
|
|
||||||
|
|
||||||
var savePhotoMetadata: Boolean
|
var savePhotoMetadata: Boolean
|
||||||
get() = prefs.getBoolean(SAVE_PHOTO_METADATA, true)
|
get() = prefs.getBoolean(SAVE_PHOTO_METADATA, true)
|
||||||
set(savePhotoMetadata) = prefs.edit().putBoolean(SAVE_PHOTO_METADATA, savePhotoMetadata).apply()
|
set(savePhotoMetadata) = prefs.edit().putBoolean(SAVE_PHOTO_METADATA, savePhotoMetadata).apply()
|
||||||
|
|
|
@ -116,21 +116,6 @@
|
||||||
|
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
|
|
||||||
<RelativeLayout
|
|
||||||
android:id="@+id/settings_keep_settings_visible_holder"
|
|
||||||
style="@style/SettingsHolderCheckboxStyle"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:background="@drawable/ripple_bottom_corners">
|
|
||||||
|
|
||||||
<com.simplemobiletools.commons.views.MyAppCompatCheckbox
|
|
||||||
android:id="@+id/settings_keep_settings_visible"
|
|
||||||
style="@style/SettingsCheckboxStyle"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/keep_settings_visible" />
|
|
||||||
|
|
||||||
</RelativeLayout>
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
|
|
Loading…
Reference in New Issue