fenix
/
Simple-Gallery
mirror of https://github.com/SimpleMobileTools/Simple-Gallery.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

move the "Use english" button further in settings

This commit is contained in:
tibbi 2018-01-06 13:20:30 +01:00
parent 1204eea382
commit ad1a787a15
2 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,7 +39,7 @@ class SettingsActivity : SimpleActivity() {
setupManageIncludedFolders()
setupManageExcludedFolders()
setupManageHiddenFolders()
setupShowHiddenFolders()
setupShowHiddenItems()
setupAutoplayVideos()
setupLoopVideos()
setupAnimateGifs()
@ -96,22 +96,22 @@ class SettingsActivity : SimpleActivity() {
}
}
private fun setupShowHiddenFolders() {
settings_show_hidden_folders.isChecked = config.showHiddenMedia
settings_show_hidden_folders_holder.setOnClickListener {
private fun setupShowHiddenItems() {
settings_show_hidden_items.isChecked = config.showHiddenMedia
settings_show_hidden_items_holder.setOnClickListener {
if (config.showHiddenMedia) {
toggleHiddenFolders()
toggleHiddenItems()
} else {
handleHiddenFolderPasswordProtection {
toggleHiddenFolders()
toggleHiddenItems()
}
}
}
}
private fun toggleHiddenFolders() {
settings_show_hidden_folders.toggle()
config.showHiddenMedia = settings_show_hidden_folders.isChecked
private fun toggleHiddenItems() {
settings_show_hidden_items.toggle()
config.showHiddenMedia = settings_show_hidden_items.isChecked
}
private fun setupAutoplayVideos() {

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

@ -68,6 +68,25 @@
</RelativeLayout>
<RelativeLayout
android:id="@+id/settings_manage_hidden_folders_holder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/medium_margin"
android:background="?attr/selectableItemBackground"
android:padding="@dimen/activity_margin">
<com.simplemobiletools.commons.views.MyTextView
android:id="@+id/settings_manage_hidden_folders"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:paddingLeft="@dimen/medium_margin"
android:paddingStart="@dimen/medium_margin"
android:text="@string/manage_hidden_folders"/>
</RelativeLayout>
<RelativeLayout
android:id="@+id/settings_use_english_holder"
android:layout_width="match_parent"
@ -89,26 +108,7 @@
</RelativeLayout>
<RelativeLayout
android:id="@+id/settings_manage_hidden_folders_holder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/medium_margin"
android:background="?attr/selectableItemBackground"
android:padding="@dimen/activity_margin">
<com.simplemobiletools.commons.views.MyTextView
android:id="@+id/settings_manage_hidden_folders"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:paddingLeft="@dimen/medium_margin"
android:paddingStart="@dimen/medium_margin"
android:text="@string/manage_hidden_folders"/>
</RelativeLayout>
<RelativeLayout
android:id="@+id/settings_show_hidden_folders_holder"
android:id="@+id/settings_show_hidden_items_holder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/medium_margin"
@ -116,7 +116,7 @@
android:padding="@dimen/activity_margin">
<com.simplemobiletools.commons.views.MySwitchCompat
android:id="@+id/settings_show_hidden_folders"
android:id="@+id/settings_show_hidden_items"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"