Skip to content

Commit 7b8a2de

Browse files
tibbitibbi
committed
redesigning the app settings
1 parent 8125a6e commit 7b8a2de

File tree

5 files changed

+104
-129
lines changed

5 files changed

+104
-129
lines changed

‎app/build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ android {
6363
}
6464

6565
dependencies {
66-
implementation 'com.github.SimpleMobileTools:Simple-Commons:0828fecd09'
66+
implementation 'com.github.SimpleMobileTools:Simple-Commons:c457573200'
6767

68-
kapt "androidx.room:room-compiler:2.4.3"
69-
implementation "androidx.room:room-runtime:2.4.3"
70-
annotationProcessor "androidx.room:room-compiler:2.4.3"
68+
kapt "androidx.room:room-compiler:2.5.0"
69+
implementation "androidx.room:room-runtime:2.5.0"
70+
annotationProcessor "androidx.room:room-compiler:2.5.0"
7171
}

‎app/src/main/kotlin/com/simplemobiletools/launcher/activities/MainActivity.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ class MainActivity : SimpleActivity(), FlingListener {
7777

7878
override fun onCreate(savedInstanceState: Bundle?) {
7979
useDynamicTheme = false
80-
showTransparentNavigation = true
8180

8281
super.onCreate(savedInstanceState)
8382
setContentView(R.layout.activity_main)

‎app/src/main/kotlin/com/simplemobiletools/launcher/activities/SettingsActivity.kt‎

Lines changed: 15 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,19 @@ import kotlin.system.exitProcess
1515

1616
class SettingsActivity : SimpleActivity() {
1717
override fun onCreate(savedInstanceState: Bundle?) {
18+
isMaterialActivity = true
1819
super.onCreate(savedInstanceState)
1920
setContentView(R.layout.activity_settings)
21+
22+
updateMaterialActivityViews(settings_coordinator, settings_holder, useTransparentNavigation = true, useTopSearchMenu = false)
23+
setupMaterialScrollListener(settings_nested_scrollview, settings_toolbar)
2024
setupOptionsMenu()
2125
}
2226

2327
override fun onResume() {
2428
super.onResume()
2529
setupToolbar(settings_toolbar, NavigationIcon.Arrow)
30+
refreshMenuItems()
2631

2732
setupPurchaseThankYou()
2833
setupCustomizeColors()
@@ -31,44 +36,38 @@ class SettingsActivity : SimpleActivity() {
3136
setupManageHiddenIcons()
3237
updateTextColors(settings_holder)
3338

34-
arrayOf(settings_color_customization_label, settings_general_settings_label).forEach {
39+
arrayOf(settings_color_customization_section_label, settings_general_settings_label).forEach {
3540
it.setTextColor(getProperPrimaryColor())
3641
}
37-
38-
arrayOf(
39-
settings_color_customization_holder,
40-
settings_general_settings_holder
41-
).forEach {
42-
it.background.applyColorFilter(getProperBackgroundColor().getContrastColor())
43-
}
4442
}
4543

4644
private fun setupOptionsMenu() {
4745
settings_toolbar.setOnMenuItemClickListener { menuItem ->
4846
when (menuItem.itemId) {
4947
R.id.about -> launchAbout()
48+
R.id.more_apps_from_us -> launchMoreAppsFromUsIntent()
5049
else -> return@setOnMenuItemClickListener false
5150
}
5251
return@setOnMenuItemClickListener true
5352
}
5453
}
5554

56-
private fun setupPurchaseThankYou() {
57-
settings_purchase_thank_you_holder.beGoneIf(isOrWasThankYouInstalled())
58-
59-
// make sure the corners at ripple fit the stroke rounded corners
60-
if (settings_purchase_thank_you_holder.isGone()) {
61-
settings_use_english_holder.background = resources.getDrawable(R.drawable.ripple_top_corners, theme)
62-
settings_language_holder.background = resources.getDrawable(R.drawable.ripple_top_corners, theme)
55+
private fun refreshMenuItems() {
56+
settings_toolbar.menu.apply {
57+
findItem(R.id.more_apps_from_us).isVisible = !resources.getBoolean(R.bool.hide_google_relations)
6358
}
59+
}
6460

61+
private fun setupPurchaseThankYou() {
62+
settings_purchase_thank_you_holder.beGoneIf(isOrWasThankYouInstalled())
6563
settings_purchase_thank_you_holder.setOnClickListener {
6664
launchPurchaseThankYouIntent()
6765
}
6866
}
6967

7068
private fun setupCustomizeColors() {
71-
settings_customize_colors_holder.setOnClickListener {
69+
settings_color_customization_label.text = getCustomizeColorsString()
70+
settings_color_customization_holder.setOnClickListener {
7271
startCustomizationActivity()
7372
}
7473
}
@@ -92,12 +91,6 @@ class SettingsActivity : SimpleActivity() {
9291
}
9392

9493
private fun setupManageHiddenIcons() {
95-
if (settings_purchase_thank_you_holder.isGone() && settings_use_english_holder.isGone() && settings_language_holder.isGone()) {
96-
settings_manage_hidden_icons_holder.background = resources.getDrawable(R.drawable.ripple_all_corners, theme)
97-
} else {
98-
settings_manage_hidden_icons_holder.background = resources.getDrawable(R.drawable.ripple_bottom_corners, theme)
99-
}
100-
10194
settings_manage_hidden_icons_holder.setOnClickListener {
10295
startActivity(Intent(this, HiddenIconsActivity::class.java))
10396
}

‎app/src/main/res/layout/activity_settings.xml‎

Lines changed: 80 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -6,30 +6,22 @@
66
android:layout_width="match_parent"
77
android:layout_height="match_parent">
88

9-
<com.google.android.material.appbar.AppBarLayout
10-
android:id="@+id/settings_app_bar_layout"
9+
<com.google.android.material.appbar.MaterialToolbar
10+
android:id="@+id/settings_toolbar"
1111
android:layout_width="match_parent"
12-
android:layout_height="wrap_content">
13-
14-
<com.google.android.material.appbar.MaterialToolbar
15-
android:id="@+id/settings_toolbar"
16-
android:layout_width="match_parent"
17-
android:layout_height="?attr/actionBarSize"
18-
android:background="@color/color_primary"
19-
app:layout_scrollFlags="scroll|enterAlways"
20-
app:menu="@menu/menu_settings"
21-
app:title="@string/settings"
22-
app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
23-
24-
</com.google.android.material.appbar.AppBarLayout>
12+
android:layout_height="?attr/actionBarSize"
13+
android:background="@color/color_primary"
14+
app:menu="@menu/menu_settings"
15+
app:title="@string/settings"
16+
app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
2517

2618
<androidx.core.widget.NestedScrollView
2719
android:id="@+id/settings_nested_scrollview"
2820
android:layout_width="match_parent"
29-
android:layout_height="match_parent"
21+
android:layout_height="wrap_content"
22+
android:layout_marginTop="?attr/actionBarSize"
3023
android:fillViewport="true"
31-
android:scrollbars="none"
32-
app:layout_behavior="@string/appbar_scrolling_view_behavior">
24+
android:scrollbars="none">
3325

3426
<LinearLayout
3527
android:id="@+id/settings_holder"
@@ -38,36 +30,32 @@
3830
android:orientation="vertical">
3931

4032
<TextView
41-
android:id="@+id/settings_color_customization_label"
33+
android:id="@+id/settings_color_customization_section_label"
4234
style="@style/SettingsSectionLabelStyle"
4335
android:layout_width="match_parent"
4436
android:layout_height="wrap_content"
4537
android:text="@string/color_customization" />
4638

47-
<LinearLayout
39+
<androidx.constraintlayout.widget.ConstraintLayout
4840
android:id="@+id/settings_color_customization_holder"
41+
style="@style/SettingsHolderTextViewOneLinerStyle"
4942
android:layout_width="match_parent"
50-
android:layout_height="wrap_content"
51-
android:layout_margin="@dimen/medium_margin"
52-
android:background="@drawable/section_holder_stroke"
53-
android:orientation="vertical">
43+
android:layout_height="wrap_content">
5444

55-
<RelativeLayout
56-
android:id="@+id/settings_customize_colors_holder"
57-
style="@style/SettingsHolderTextViewOneLinerStyle"
58-
android:layout_width="match_parent"
45+
<com.simplemobiletools.commons.views.MyTextView
46+
android:id="@+id/settings_color_customization_label"
47+
style="@style/SettingsTextLabelStyle"
48+
android:layout_width="wrap_content"
5949
android:layout_height="wrap_content"
60-
android:background="@drawable/ripple_all_corners">
50+
android:text="@string/customize_colors"
51+
app:layout_constraintStart_toStartOf="parent"
52+
app:layout_constraintTop_toTopOf="parent" />
6153

62-
<com.simplemobiletools.commons.views.MyTextView
63-
android:id="@+id/settings_customize_colors_label"
64-
style="@style/SettingsTextLabelStyle"
65-
android:layout_width="wrap_content"
66-
android:layout_height="wrap_content"
67-
android:text="@string/customize_colors" />
54+
</androidx.constraintlayout.widget.ConstraintLayout>
6855

69-
</RelativeLayout>
70-
</LinearLayout>
56+
<include
57+
android:id="@+id/settings_color_customization_divider"
58+
layout="@layout/divider" />
7159

7260
<TextView
7361
android:id="@+id/settings_general_settings_label"
@@ -76,86 +64,77 @@
7664
android:layout_height="wrap_content"
7765
android:text="@string/general_settings" />
7866

79-
<LinearLayout
80-
android:id="@+id/settings_general_settings_holder"
67+
<RelativeLayout
68+
android:id="@+id/settings_purchase_thank_you_holder"
69+
style="@style/SettingsHolderTextViewOneLinerStyle"
8170
android:layout_width="match_parent"
8271
android:layout_height="wrap_content"
83-
android:layout_margin="@dimen/medium_margin"
84-
android:background="@drawable/section_holder_stroke"
85-
android:orientation="vertical">
72+
android:background="@drawable/ripple_top_corners">
8673

87-
<RelativeLayout
88-
android:id="@+id/settings_purchase_thank_you_holder"
89-
style="@style/SettingsHolderTextViewOneLinerStyle"
90-
android:layout_width="match_parent"
74+
<com.simplemobiletools.commons.views.MyTextView
75+
android:id="@+id/settings_purchase_thank_you"
76+
style="@style/SettingsTextLabelStyle"
77+
android:layout_width="wrap_content"
9178
android:layout_height="wrap_content"
92-
android:background="@drawable/ripple_top_corners">
79+
android:text="@string/purchase_simple_thank_you" />
9380

94-
<com.simplemobiletools.commons.views.MyTextView
95-
android:id="@+id/settings_purchase_thank_you"
96-
style="@style/SettingsTextLabelStyle"
97-
android:layout_width="wrap_content"
98-
android:layout_height="wrap_content"
99-
android:text="@string/purchase_simple_thank_you" />
81+
</RelativeLayout>
10082

101-
</RelativeLayout>
83+
<RelativeLayout
84+
android:id="@+id/settings_use_english_holder"
85+
style="@style/SettingsHolderCheckboxStyle"
86+
android:layout_width="match_parent"
87+
android:layout_height="wrap_content"
88+
android:background="@drawable/ripple_bottom_corners">
10289

103-
<RelativeLayout
104-
android:id="@+id/settings_use_english_holder"
105-
style="@style/SettingsHolderCheckboxStyle"
90+
<com.simplemobiletools.commons.views.MyAppCompatCheckbox
91+
android:id="@+id/settings_use_english"
92+
style="@style/SettingsCheckboxStyle"
10693
android:layout_width="match_parent"
10794
android:layout_height="wrap_content"
108-
android:background="@drawable/ripple_bottom_corners">
95+
android:text="@string/use_english_language" />
10996

110-
<com.simplemobiletools.commons.views.MyAppCompatCheckbox
111-
android:id="@+id/settings_use_english"
112-
style="@style/SettingsCheckboxStyle"
113-
android:layout_width="match_parent"
114-
android:layout_height="wrap_content"
115-
android:text="@string/use_english_language" />
97+
</RelativeLayout>
11698

117-
</RelativeLayout>
99+
<RelativeLayout
100+
android:id="@+id/settings_language_holder"
101+
style="@style/SettingsHolderTextViewStyle"
102+
android:layout_width="match_parent"
103+
android:layout_height="wrap_content"
104+
android:background="@drawable/ripple_background">
118105

119-
<RelativeLayout
120-
android:id="@+id/settings_language_holder"
121-
style="@style/SettingsHolderTextViewStyle"
122-
android:layout_width="match_parent"
106+
<com.simplemobiletools.commons.views.MyTextView
107+
android:id="@+id/settings_language_label"
108+
style="@style/SettingsTextLabelStyle"
109+
android:layout_width="wrap_content"
123110
android:layout_height="wrap_content"
124-
android:background="@drawable/ripple_background">
125-
126-
<com.simplemobiletools.commons.views.MyTextView
127-
android:id="@+id/settings_language_label"
128-
style="@style/SettingsTextLabelStyle"
129-
android:layout_width="wrap_content"
130-
android:layout_height="wrap_content"
131-
android:text="@string/language" />
132-
133-
<com.simplemobiletools.commons.views.MyTextView
134-
android:id="@+id/settings_language"
135-
style="@style/SettingsTextValueStyle"
136-
android:layout_width="wrap_content"
137-
android:layout_height="wrap_content"
138-
android:layout_below="@+id/settings_language_label"
139-
tools:text="English" />
140-
141-
</RelativeLayout>
142-
143-
<RelativeLayout
144-
android:id="@+id/settings_manage_hidden_icons_holder"
145-
style="@style/SettingsHolderTextViewOneLinerStyle"
146-
android:layout_width="match_parent"
111+
android:text="@string/language" />
112+
113+
<com.simplemobiletools.commons.views.MyTextView
114+
android:id="@+id/settings_language"
115+
style="@style/SettingsTextValueStyle"
116+
android:layout_width="wrap_content"
147117
android:layout_height="wrap_content"
148-
android:background="@drawable/ripple_bottom_corners">
118+
android:layout_below="@+id/settings_language_label"
119+
tools:text="English" />
120+
121+
</RelativeLayout>
149122

150-
<com.simplemobiletools.commons.views.MyTextView
151-
android:id="@+id/settings_manage_hidden_icons"
152-
style="@style/SettingsTextLabelStyle"
153-
android:layout_width="wrap_content"
154-
android:layout_height="wrap_content"
155-
android:text="@string/manage_hidden_icons" />
123+
<RelativeLayout
124+
android:id="@+id/settings_manage_hidden_icons_holder"
125+
style="@style/SettingsHolderTextViewOneLinerStyle"
126+
android:layout_width="match_parent"
127+
android:layout_height="wrap_content"
128+
android:background="@drawable/ripple_bottom_corners">
129+
130+
<com.simplemobiletools.commons.views.MyTextView
131+
android:id="@+id/settings_manage_hidden_icons"
132+
style="@style/SettingsTextLabelStyle"
133+
android:layout_width="wrap_content"
134+
android:layout_height="wrap_content"
135+
android:text="@string/manage_hidden_icons" />
156136

157-
</RelativeLayout>
158-
</LinearLayout>
137+
</RelativeLayout>
159138
</LinearLayout>
160139
</androidx.core.widget.NestedScrollView>
161140
</androidx.coordinatorlayout.widget.CoordinatorLayout>

‎app/src/main/res/menu/menu_settings.xml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,14 @@
22
<menu xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:app="http://schemas.android.com/apk/res-auto"
44
xmlns:tools="http://schemas.android.com/tools"
5-
tools:ignore="AppCompatResource">
5+
tools:ignore="AppCompatResource,AlwaysShowAction">
66
<item
77
android:id="@+id/about"
88
android:icon="@drawable/ic_info_vector"
99
android:title="@string/about"
1010
app:showAsAction="always" />
11+
<item
12+
android:id="@+id/more_apps_from_us"
13+
android:title="@string/more_apps_from_us"
14+
app:showAsAction="never" />
1115
</menu>

0 commit comments

Comments
 (0)