diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index fc9c18e2..36aab248 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -37,5 +37,10 @@ android:name=".activities.SettingsActivity" android:label="@string/settings" android:parentActivityName=".activities.MainActivity"/> + + diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/SettingsActivity.kt index 82e1fc6c..794e62fe 100644 --- a/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/SettingsActivity.kt @@ -1,6 +1,7 @@ package com.simplemobiletools.filemanager.activities import android.os.Bundle +import com.simplemobiletools.commons.extensions.updateTextColors import com.simplemobiletools.filemanager.R import com.simplemobiletools.filemanager.extensions.config import kotlinx.android.synthetic.main.activity_settings.* @@ -9,8 +10,20 @@ class SettingsActivity : SimpleActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_settings) + } + override fun onResume() { + super.onResume() + + setupCustomizeColors() setupShowHidden() + updateTextColors(settings_holder) + } + + private fun setupCustomizeColors() { + settings_customize_colors_holder.setOnClickListener { + startCustomizationActivity() + } } private fun setupShowHidden() { diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 53e96caa..4cad7614 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -12,28 +12,41 @@ android:orientation="vertical"> - + android:paddingLeft="@dimen/medium_margin" + android:paddingStart="@dimen/medium_margin" + android:text="@string/customize_colors"/> - + + + + + android:clickable="false" + android:paddingLeft="@dimen/medium_margin" + android:paddingStart="@dimen/medium_margin" + android:text="@string/show_hidden"/>