wbrawner/Simple-File-Manager
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add subsections to settings

Browse source
This commit is contained in:
tibbi 2018-01-29 15:28:45 +01:00
parent 3ba41af0c8
commit 872bc17f3f
2 changed files with 98 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/src/main/kotlin/com/simplemobiletools/filemanager/activities/SettingsActivity.kt
View file

@ -4,10 +4,7 @@ import android.content.Intent
import android.os.Bundle import android.os.Bundle
import com.simplemobiletools.commons.dialogs.ConfirmationDialog import com.simplemobiletools.commons.dialogs.ConfirmationDialog
import com.simplemobiletools.commons.dialogs.SecurityDialog import com.simplemobiletools.commons.dialogs.SecurityDialog
import com.simplemobiletools.commons.extensions.beVisibleIf import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.commons.extensions.handleHiddenFolderPasswordProtection
import com.simplemobiletools.commons.extensions.updateTextColors
import com.simplemobiletools.commons.extensions.useEnglishToggled
import com.simplemobiletools.commons.helpers.PROTECTION_FINGERPRINT import com.simplemobiletools.commons.helpers.PROTECTION_FINGERPRINT
import com.simplemobiletools.commons.helpers.SHOW_ALL_TABS import com.simplemobiletools.commons.helpers.SHOW_ALL_TABS
import com.simplemobiletools.filemanager.R import com.simplemobiletools.filemanager.R
@ -34,6 +31,14 @@ class SettingsActivity : SimpleActivity() {
setupShowInfoBubble() setupShowInfoBubble()
setupEnableRootAccess() setupEnableRootAccess()
updateTextColors(settings_holder) updateTextColors(settings_holder)
setupSectionColors()
}
private fun setupSectionColors() {
val adjustedPrimaryColor = getAdjustedPrimaryColor()
arrayListOf(visibility_label, file_operations_label, scrolling_label, security_label).forEach {
it.setTextColor(adjustedPrimaryColor)
}
} }
private fun setupCustomizeColors() { private fun setupCustomizeColors() {

104
app/src/main/res/layout/activity_settings.xml
View file

@ -69,6 +69,24 @@
</RelativeLayout> </RelativeLayout>
<View
android:id="@+id/visibility_divider"
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/divider_grey"
android:importantForAccessibility="no"/>
<com.simplemobiletools.commons.views.MyTextView
android:id="@+id/visibility_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/big_margin"
android:layout_marginStart="@dimen/big_margin"
android:layout_marginTop="@dimen/activity_margin"
android:text="@string/visibility"
android:textAllCaps="true"
android:textSize="@dimen/smaller_text_size"/>
<RelativeLayout <RelativeLayout
android:id="@+id/settings_show_hidden_holder" android:id="@+id/settings_show_hidden_holder"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -89,25 +107,23 @@
</RelativeLayout> </RelativeLayout>
<RelativeLayout <View
android:id="@+id/settings_password_protection_holder" android:id="@+id/file_operations_divider"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="1px"
android:layout_marginTop="@dimen/medium_margin" android:background="@color/divider_grey"
android:background="?attr/selectableItemBackground" android:importantForAccessibility="no"/>
android:padding="@dimen/activity_margin">
<com.simplemobiletools.commons.views.MySwitchCompat <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/settings_password_protection" android:id="@+id/file_operations_label"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@null" android:layout_marginLeft="@dimen/big_margin"
android:clickable="false" android:layout_marginStart="@dimen/big_margin"
android:paddingLeft="@dimen/medium_margin" android:layout_marginTop="@dimen/activity_margin"
android:paddingStart="@dimen/medium_margin" android:text="@string/file_operations"
android:text="@string/password_protect_hidden_items"/> android:textAllCaps="true"
android:textSize="@dimen/smaller_text_size"/>
</RelativeLayout>
<RelativeLayout <RelativeLayout
android:id="@+id/settings_keep_last_modified_holder" android:id="@+id/settings_keep_last_modified_holder"
@ -129,6 +145,24 @@
</RelativeLayout> </RelativeLayout>
<View
android:id="@+id/scrolling_divider"
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/divider_grey"
android:importantForAccessibility="no"/>
<com.simplemobiletools.commons.views.MyTextView
android:id="@+id/scrolling_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/big_margin"
android:layout_marginStart="@dimen/big_margin"
android:layout_marginTop="@dimen/activity_margin"
android:text="@string/scrolling"
android:textAllCaps="true"
android:textSize="@dimen/smaller_text_size"/>
<RelativeLayout <RelativeLayout
android:id="@+id/settings_show_info_bubble_holder" android:id="@+id/settings_show_info_bubble_holder"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -149,6 +183,44 @@
</RelativeLayout> </RelativeLayout>
<View
android:id="@+id/security_divider"
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/divider_grey"
android:importantForAccessibility="no"/>
<com.simplemobiletools.commons.views.MyTextView
android:id="@+id/security_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/big_margin"
android:layout_marginStart="@dimen/big_margin"
android:layout_marginTop="@dimen/activity_margin"
android:text="@string/security"
android:textAllCaps="true"
android:textSize="@dimen/smaller_text_size"/>
<RelativeLayout
android:id="@+id/settings_password_protection_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.MySwitchCompat
android:id="@+id/settings_password_protection"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
android:clickable="false"
android:paddingLeft="@dimen/medium_margin"
android:paddingStart="@dimen/medium_margin"
android:text="@string/password_protect_hidden_items"/>
</RelativeLayout>
<RelativeLayout <RelativeLayout
android:id="@+id/settings_enable_root_access_holder" android:id="@+id/settings_enable_root_access_holder"
android:layout_width="match_parent" android:layout_width="match_parent"