From f82331559cb697d2dd604606f7fa72898f57d3dd Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 20 Dec 2022 19:20:45 +0100 Subject: [PATCH] redesigning some screens --- app/build.gradle | 2 +- .../flashlight/activities/MainActivity.kt | 4 + .../flashlight/activities/SettingsActivity.kt | 28 ++--- app/src/main/res/layout/activity_main.xml | 26 ++--- app/src/main/res/layout/activity_settings.xml | 109 +++++++----------- 5 files changed, 66 insertions(+), 103 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index cd1f4f5..b802653 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -62,7 +62,7 @@ android { } dependencies { - implementation 'com.github.SimpleMobileTools:Simple-Commons:31cb0b37cf' + implementation 'com.github.SimpleMobileTools:Simple-Commons:a6032f9c07' implementation 'org.greenrobot:eventbus:3.3.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' } diff --git a/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/MainActivity.kt index 370c3f5..4b8f495 100644 --- a/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/MainActivity.kt @@ -39,12 +39,16 @@ class MainActivity : SimpleActivity() { private var reTurnFlashlightOn = true override fun onCreate(savedInstanceState: Bundle?) { + isMaterialActivity = true super.onCreate(savedInstanceState) setContentView(R.layout.activity_main) appLaunched(BuildConfig.APPLICATION_ID) setupOptionsMenu() refreshMenuItems() + updateMaterialActivityViews(main_coordinator, main_holder) + setupMaterialScrollListener(main_nested_scrollview, main_toolbar) + mBus = EventBus.getDefault() changeIconColor(getContrastColor(), stroboscope_btn) diff --git a/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/SettingsActivity.kt index 7834995..3b30e07 100644 --- a/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/SettingsActivity.kt @@ -14,8 +14,12 @@ import kotlin.system.exitProcess class SettingsActivity : SimpleActivity() { override fun onCreate(savedInstanceState: Bundle?) { + isMaterialActivity = true super.onCreate(savedInstanceState) setContentView(R.layout.activity_settings) + + updateMaterialActivityViews(settings_coordinator, settings_holder) + setupMaterialScrollListener(settings_nested_scrollview, settings_toolbar) } override fun onResume() { @@ -34,38 +38,27 @@ class SettingsActivity : SimpleActivity() { setupForcePortrait() updateTextColors(settings_holder) - arrayOf(settings_color_customization_label, settings_general_settings_label).forEach { + arrayOf(settings_color_customization_section_label, settings_general_settings_label).forEach { it.setTextColor(getProperPrimaryColor()) } - - arrayOf(settings_color_customization_holder, settings_general_settings_holder).forEach { - it.background.applyColorFilter(getProperBackgroundColor().getContrastColor()) - } } private fun setupPurchaseThankYou() { settings_purchase_thank_you_holder.beGoneIf(isOrWasThankYouInstalled()) - - // make sure the corners at ripple fit the stroke rounded corners - if (settings_purchase_thank_you_holder.isGone()) { - settings_use_english_holder.background = resources.getDrawable(R.drawable.ripple_top_corners, theme) - settings_language_holder.background = resources.getDrawable(R.drawable.ripple_top_corners, theme) - } - settings_purchase_thank_you_holder.setOnClickListener { launchPurchaseThankYouIntent() } } private fun setupCustomizeColors() { - settings_customize_colors_label.text = getCustomizeColorsString() - settings_customize_colors_holder.setOnClickListener { + settings_color_customization_label.text = getCustomizeColorsString() + settings_color_customization_holder.setOnClickListener { handleCustomizeColorsClick() } } private fun setupCustomizeWidgetColors() { - settings_customize_widget_colors_holder.setOnClickListener { + settings_widget_color_customization_holder.setOnClickListener { Intent(this, WidgetTorchConfigureActivity::class.java).apply { putExtra(IS_CUSTOMIZING_COLORS, true) startActivity(this) @@ -86,11 +79,6 @@ class SettingsActivity : SimpleActivity() { private fun setupLanguage() { settings_language.text = Locale.getDefault().displayLanguage settings_language_holder.beVisibleIf(isTiramisuPlus()) - - if (settings_use_english_holder.isGone() && settings_language_holder.isGone() && settings_purchase_thank_you_holder.isGone()) { - settings_turn_flashlight_on_holder.background = resources.getDrawable(R.drawable.ripple_top_corners, theme) - } - settings_language_holder.setOnClickListener { launchChangeAppLanguageIntent() } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 263080f..51671f9 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -5,29 +5,21 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - - - + android:layout_height="?attr/actionBarSize" + android:background="@color/color_primary" + app:menu="@menu/menu" + app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" /> + android:scrollbars="none"> - - - - - + android:layout_height="?attr/actionBarSize" + android:background="@color/color_primary" + app:title="@string/settings" + app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" /> + android:scrollbars="none"> - + android:layout_height="wrap_content"> - + android:text="@string/customize_colors" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - + - + - + android:text="@string/customize_widget_colors" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - + - - + + android:layout_height="wrap_content"> + android:layout_height="wrap_content"> + android:layout_height="wrap_content"> + android:layout_height="wrap_content"> + android:layout_height="wrap_content"> + android:layout_height="wrap_content"> + android:layout_height="wrap_content"> + android:layout_height="wrap_content">