From 6afb4eceefd668cd0576280ea3fda37a35692ec8 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Wed, 21 Dec 2022 11:16:15 +0100
Subject: [PATCH] updating Settings style
---
.../calculator/activities/SettingsActivity.kt | 29 +-
app/src/main/res/layout/activity_settings.xml | 252 ++++++++----------
2 files changed, 121 insertions(+), 160 deletions(-)
diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/activities/SettingsActivity.kt
index 213d5e4a..d029315d 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calculator/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calculator/activities/SettingsActivity.kt
@@ -16,10 +16,13 @@ import java.util.*
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() {
@@ -36,32 +39,21 @@ class SettingsActivity : SimpleActivity() {
setupCustomizeWidgetColors()
updateTextColors(settings_nested_scrollview)
- 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()
}
}
@@ -79,11 +71,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_vibrate_holder.background = resources.getDrawable(R.drawable.ripple_top_corners, theme)
- }
-
settings_language_holder.setOnClickListener {
launchChangeAppLanguageIntent()
}
@@ -118,7 +105,7 @@ class SettingsActivity : SimpleActivity() {
}
private fun setupCustomizeWidgetColors() {
- settings_customize_widget_colors_holder.setOnClickListener {
+ settings_widget_color_customization_holder.setOnClickListener {
Intent(this, WidgetConfigureActivity::class.java).apply {
putExtra(IS_CUSTOMIZING_COLORS, true)
startActivity(this)
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 76ae88d6..08503998 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -6,29 +6,21 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
- <com.google.android.material.appbar.AppBarLayout
- android:id="@+id/settings_app_bar_layout"
+ <com.google.android.material.appbar.MaterialToolbar
+ android:id="@+id/settings_toolbar"
android:layout_width="match_parent"
- android:layout_height="wrap_content">
-
- <com.google.android.material.appbar.MaterialToolbar
- android:id="@+id/settings_toolbar"
- android:layout_width="match_parent"
- android:layout_height="?attr/actionBarSize"
- android:background="@color/color_primary"
- app:layout_scrollFlags="scroll|enterAlways"
- app:title="@string/settings"
- app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
-
- </com.google.android.material.appbar.AppBarLayout>
+ android:layout_height="?attr/actionBarSize"
+ android:background="@color/color_primary"
+ app:title="@string/settings"
+ app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
<androidx.core.widget.NestedScrollView
android:id="@+id/settings_nested_scrollview"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:layout_marginTop="?attr/actionBarSize"
android:fillViewport="true"
- android:scrollbars="none"
- app:layout_behavior="@string/appbar_scrolling_view_behavior">
+ android:scrollbars="none">
<LinearLayout
android:id="@+id/settings_holder"
@@ -37,52 +29,49 @@
android:orientation="vertical">
<TextView
- android:id="@+id/settings_color_customization_label"
+ android:id="@+id/settings_color_customization_section_label"
style="@style/SettingsSectionLabelStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/color_customization" />
- <LinearLayout
+ <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/settings_color_customization_holder"
+ style="@style/SettingsHolderTextViewOneLinerStyle"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_margin="@dimen/medium_margin"
- android:background="@drawable/section_holder_stroke"
- android:orientation="vertical">
+ android:layout_height="wrap_content">
- <RelativeLayout
- android:id="@+id/settings_customize_colors_holder"
- style="@style/SettingsHolderTextViewOneLinerStyle"
- android:layout_width="match_parent"
+ <com.simplemobiletools.commons.views.MyTextView
+ android:id="@+id/settings_color_customization_label"
+ style="@style/SettingsTextLabelStyle"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:background="@drawable/ripple_top_corners">
+ android:text="@string/customize_colors"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
- <com.simplemobiletools.commons.views.MyTextView
- android:id="@+id/settings_customize_colors_label"
- style="@style/SettingsTextLabelStyle"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/customize_colors" />
+ </androidx.constraintlayout.widget.ConstraintLayout>
- </RelativeLayout>
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:id="@+id/settings_widget_color_customization_holder"
+ style="@style/SettingsHolderTextViewOneLinerStyle"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
- <RelativeLayout
- android:id="@+id/settings_customize_widget_colors_holder"
- style="@style/SettingsHolderTextViewOneLinerStyle"
- android:layout_width="match_parent"
+ <com.simplemobiletools.commons.views.MyTextView
+ android:id="@+id/settings_widget_color_customization_label"
+ style="@style/SettingsTextLabelStyle"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:background="@drawable/ripple_bottom_corners">
+ android:text="@string/customize_widget_colors"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
- <com.simplemobiletools.commons.views.MyTextView
- android:id="@+id/settings_customize_widget_colors_label"
- style="@style/SettingsTextLabelStyle"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/customize_widget_colors" />
+ </androidx.constraintlayout.widget.ConstraintLayout>
- </RelativeLayout>
- </LinearLayout>
+ <include
+ android:id="@+id/settings_color_customization_divider"
+ layout="@layout/divider" />
<TextView
android:id="@+id/settings_general_settings_label"
@@ -91,118 +80,103 @@
android:layout_height="wrap_content"
android:text="@string/general_settings" />
- <LinearLayout
- android:id="@+id/settings_general_settings_holder"
+ <RelativeLayout
+ android:id="@+id/settings_purchase_thank_you_holder"
+ style="@style/SettingsHolderTextViewStyle"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_margin="@dimen/medium_margin"
- android:background="@drawable/section_holder_stroke"
- android:orientation="vertical">
+ android:layout_height="wrap_content">
- <RelativeLayout
- android:id="@+id/settings_purchase_thank_you_holder"
- style="@style/SettingsHolderTextViewOneLinerStyle"
+ <com.simplemobiletools.commons.views.MyTextView
+ android:id="@+id/settings_purchase_thank_you"
+ style="@style/SettingsTextLabelStyle"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/purchase_simple_thank_you" />
+
+ </RelativeLayout>
+
+ <RelativeLayout
+ android:id="@+id/settings_use_english_holder"
+ style="@style/SettingsHolderCheckboxStyle"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+
+ <com.simplemobiletools.commons.views.MyAppCompatCheckbox
+ android:id="@+id/settings_use_english"
+ style="@style/SettingsCheckboxStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@drawable/ripple_top_corners">
+ android:text="@string/use_english_language" />
- <com.simplemobiletools.commons.views.MyTextView
- android:id="@+id/settings_purchase_thank_you"
- style="@style/SettingsTextLabelStyle"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/purchase_simple_thank_you" />
+ </RelativeLayout>
- </RelativeLayout>
+ <RelativeLayout
+ android:id="@+id/settings_language_holder"
+ style="@style/SettingsHolderTextViewStyle"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
- <RelativeLayout
- android:id="@+id/settings_use_english_holder"
- style="@style/SettingsHolderCheckboxStyle"
+ <com.simplemobiletools.commons.views.MyTextView
+ android:id="@+id/settings_language_label"
+ style="@style/SettingsTextLabelStyle"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/language" />
+
+ <com.simplemobiletools.commons.views.MyTextView
+ android:id="@+id/settings_language"
+ style="@style/SettingsTextValueStyle"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/settings_language_label"
+ tools:text="English" />
+
+ </RelativeLayout>
+
+ <RelativeLayout
+ android:id="@+id/settings_vibrate_holder"
+ style="@style/SettingsHolderCheckboxStyle"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+
+ <com.simplemobiletools.commons.views.MyAppCompatCheckbox
+ android:id="@+id/settings_vibrate"
+ style="@style/SettingsCheckboxStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@drawable/ripple_background">
+ android:text="@string/vibrate_on_button_press" />
- <com.simplemobiletools.commons.views.MyAppCompatCheckbox
- android:id="@+id/settings_use_english"
- style="@style/SettingsCheckboxStyle"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/use_english_language" />
+ </RelativeLayout>
- </RelativeLayout>
+ <RelativeLayout
+ android:id="@+id/settings_prevent_phone_from_sleeping_holder"
+ style="@style/SettingsHolderCheckboxStyle"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
- <RelativeLayout
- android:id="@+id/settings_language_holder"
- style="@style/SettingsHolderTextViewStyle"
+ <com.simplemobiletools.commons.views.MyAppCompatCheckbox
+ android:id="@+id/settings_prevent_phone_from_sleeping"
+ style="@style/SettingsCheckboxStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@drawable/ripple_background">
+ android:text="@string/prevent_phone_from_sleeping" />
- <com.simplemobiletools.commons.views.MyTextView
- android:id="@+id/settings_language_label"
- style="@style/SettingsTextLabelStyle"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/language" />
+ </RelativeLayout>
- <com.simplemobiletools.commons.views.MyTextView
- android:id="@+id/settings_language"
- style="@style/SettingsTextValueStyle"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_below="@+id/settings_language_label"
- tools:text="English" />
+ <RelativeLayout
+ android:id="@+id/settings_use_comma_as_decimal_mark_holder"
+ style="@style/SettingsHolderCheckboxStyle"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
- </RelativeLayout>
-
- <RelativeLayout
- android:id="@+id/settings_vibrate_holder"
- style="@style/SettingsHolderCheckboxStyle"
+ <com.simplemobiletools.commons.views.MyAppCompatCheckbox
+ android:id="@+id/settings_use_comma_as_decimal_mark"
+ style="@style/SettingsCheckboxStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@drawable/ripple_background">
+ android:text="@string/use_comma_as_decimal_mark" />
- <com.simplemobiletools.commons.views.MyAppCompatCheckbox
- android:id="@+id/settings_vibrate"
- style="@style/SettingsCheckboxStyle"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/vibrate_on_button_press" />
-
- </RelativeLayout>
-
- <RelativeLayout
- android:id="@+id/settings_prevent_phone_from_sleeping_holder"
- style="@style/SettingsHolderCheckboxStyle"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="@drawable/ripple_background">
-
- <com.simplemobiletools.commons.views.MyAppCompatCheckbox
- android:id="@+id/settings_prevent_phone_from_sleeping"
- style="@style/SettingsCheckboxStyle"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/prevent_phone_from_sleeping" />
-
- </RelativeLayout>
-
- <RelativeLayout
- android:id="@+id/settings_use_comma_as_decimal_mark_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_use_comma_as_decimal_mark"
- style="@style/SettingsCheckboxStyle"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/use_comma_as_decimal_mark" />
-
- </RelativeLayout>
- </LinearLayout>
+ </RelativeLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</androidx.coordinatorlayout.widget.CoordinatorLayout>