Skip to content

Commit d6fe0ff

Browse files
LennoardLennoard
committed
refactor: color and theme adjustments
1 parent 1c37aeb commit d6fe0ff

14 files changed

Lines changed: 162 additions & 127 deletions

File tree

‎app/src/main/kotlin/com/androidvip/sysctlgui/Extensions.kt‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package com.androidvip.sysctlgui
22

33
import android.app.Activity
44
import android.content.Context
5+
import android.content.res.ColorStateList
56
import android.graphics.Color
67
import android.net.Uri
78
import android.os.Bundle
@@ -10,6 +11,7 @@ import android.os.Looper
1011
import android.view.View
1112
import android.widget.Toast
1213
import androidx.annotation.AttrRes
14+
import androidx.core.view.ViewCompat
1315
import com.androidvip.sysctlgui.receivers.TaskerReceiver
1416
import com.google.android.material.color.ColorRoles
1517
import com.google.android.material.color.MaterialColors
@@ -24,14 +26,15 @@ fun View.goAway() { this.visibility = View.GONE }
2426
fun View.hide() { this.visibility = View.INVISIBLE }
2527
fun View.show() { this.visibility = View.VISIBLE }
2628

27-
fun View.getColorRoles(@AttrRes colorAttrRes: Int = R.attr.colorSecondary): ColorRoles {
29+
fun View.getColorRoles(@AttrRes colorAttrRes: Int = R.attr.colorPrimary): ColorRoles {
2830
val color = MaterialColors.getColor(this, colorAttrRes)
2931
return MaterialColors.getColorRoles(context, color)
3032
}
3133

3234
fun Snackbar.showAsLight() {
33-
view.setBackgroundColor(Color.parseColor("#cfd8dc"))
34-
setTextColor(Color.parseColor("#DE000000"))
35+
val roles = view.getColorRoles()
36+
ViewCompat.setBackgroundTintList(view, ColorStateList.valueOf(roles.accentContainer))
37+
setTextColor(roles.accent)
3538
show()
3639
}
3740

‎app/src/main/kotlin/com/androidvip/sysctlgui/SysctlGuiApp.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,3 @@ class SysctlGuiApp : Application() {
2020
}
2121
}
2222
}
23-

‎app/src/main/kotlin/com/androidvip/sysctlgui/ui/params/browse/KernelParamBrowserActivity.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,10 +219,10 @@ class KernelParamBrowserActivity :
219219
swipeLayout.isRefreshing = false
220220

221221
val containerColorInt = MaterialColors.getColor(
222-
swipeLayout, R.attr.colorSecondaryContainer
222+
swipeLayout, R.attr.colorPrimaryContainer
223223
)
224224
val colorInt = MaterialColors.getColor(
225-
swipeLayout, R.attr.colorOnSecondaryContainer
225+
swipeLayout, R.attr.colorOnPrimaryContainer
226226
)
227227

228228
val containerColorHex = "#%06X".format(0xFFFFFF and containerColorInt)

‎app/src/main/kotlin/com/androidvip/sysctlgui/utils/DataBindingUtils.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ fun AppCompatImageView.setImageResourceCompat(@DrawableRes res: Int) {
1818

1919
@BindingAdapter("binding:iconTintForFile")
2020
fun AppCompatImageView.setIconTintForFile(file: File) {
21-
val attr = if (file.isDirectory) R.attr.colorOnSecondary else R.attr.colorOnSurface
21+
val attr = if (file.isDirectory) R.attr.colorOnPrimaryContainer else R.attr.colorOnSurface
2222
val color = MaterialColors.getColor(this, attr)
2323
val colorStateList = ColorStateList.valueOf(color)
2424
ImageViewCompat.setImageTintList(this, colorStateList)

‎app/src/main/res/drawable/circle_folder.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<shape xmlns:android="http://schemas.android.com/apk/res/android"
33
android:shape="oval">
44

5-
<solid android:color="?colorSecondary" />
5+
<solid android:color="?attr/colorPrimaryContainer" />
66

77
<size
88
android:width="42dp"

‎app/src/main/res/layout-land/activity_edit_kernel_param.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88

99
<com.google.android.material.appbar.AppBarLayout
1010
android:layout_width="match_parent"
11-
android:layout_height="wrap_content"
12-
android:theme="@style/AppTheme.AppBarOverlay">
11+
android:layout_height="wrap_content">
1312

1413
<androidx.appcompat.widget.Toolbar
1514
android:id="@+id/toolbar"

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88

99
<com.google.android.material.appbar.AppBarLayout
1010
android:layout_width="match_parent"
11-
android:layout_height="wrap_content"
12-
android:theme="@style/AppTheme.AppBarOverlay">
11+
android:layout_height="wrap_content">
1312

1413
<androidx.appcompat.widget.Toolbar
1514
android:id="@+id/toolbar"

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@
1111
<com.google.android.material.appbar.AppBarLayout
1212
android:id="@+id/app_bar"
1313
android:layout_width="match_parent"
14-
android:layout_height="?attr/actionBarSize"
15-
android:theme="@style/AppTheme.AppBarOverlay">
14+
android:layout_height="?attr/actionBarSize">
1615

1716
<androidx.appcompat.widget.Toolbar
1817
android:id="@+id/toolbar"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99

1010
<com.google.android.material.appbar.AppBarLayout
1111
android:id="@+id/app_bar"
12+
style="@style/AppTheme.AppBarLayout.Flat"
1213
android:layout_width="match_parent"
13-
android:fitsSystemWindows="false"
1414
android:layout_height="@dimen/app_bar_height"
15-
android:theme="@style/AppTheme.AppBarOverlay">
15+
android:fitsSystemWindows="false">
1616

1717
<com.google.android.material.appbar.CollapsingToolbarLayout
1818
android:id="@+id/toolbar_layout"

‎app/src/main/res/values-night-v23/themes.xml‎

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,35 +2,37 @@
22
<resources>
33

44
<style name="AppTheme" parent="Theme.Material3.DayNight.NoActionBar">
5-
<item name="colorPrimary">@color/gray_600</item>
6-
<item name="colorPrimaryVariant">@color/gray_800</item>
7-
<item name="colorOnPrimary">@color/white</item>
8-
<item name="colorPrimaryContainer">@color/gray_100</item>
9-
<item name="colorOnPrimaryContainer">@color/gray_900</item>
10-
<item name="colorPrimaryInverse">@color/gray_200</item>
11-
12-
<item name="colorSecondary">@color/yellow_600</item>
13-
<item name="colorSecondaryVariant">@color/yellow_800</item>
14-
<item name="colorOnSecondary">@color/black</item>
15-
<item name="colorSecondaryContainer">@color/yellow_100</item>
16-
<item name="colorOnSecondaryContainer">@color/yellow_900</item>
17-
18-
<item name="colorTertiary">@color/cyan_600</item>
19-
<item name="colorOnTertiary">@color/black</item>
20-
<item name="colorTertiaryContainer">@color/cyan_100</item>
21-
<item name="colorOnTertiaryContainer">@color/cyan_900</item>
22-
23-
<item name="colorError">@color/red_500</item>
24-
<item name="colorOnError">@color/white</item>
25-
<item name="colorErrorContainer">@color/red_100</item>
26-
<item name="colorOnErrorContainer">@color/red_900</item>
27-
28-
<item name="android:colorBackground">@color/gray_50</item>
5+
<item name="colorPrimary">@color/gray_300</item>
6+
<item name="colorPrimaryVariant">@color/gray_500</item>
7+
<item name="colorOnPrimary">@color/black_87</item>
8+
<item name="colorPrimaryContainer">@color/gray_800</item>
9+
<item name="colorOnPrimaryContainer">@color/gray_200</item>
10+
<item name="colorPrimaryInverse">@color/gray_800</item>
11+
12+
<item name="colorSecondary">@color/violet_300</item>
13+
<item name="colorSecondaryVariant">@color/violet_500</item>
14+
<item name="colorOnSecondary">@color/black_87</item>
15+
<item name="colorSecondaryContainer">@color/violet_700</item>
16+
<item name="colorOnSecondaryContainer">@color/violet_100</item>
17+
18+
<item name="colorTertiary">@color/eden_300</item>
19+
<item name="colorOnTertiary">@color/black_87</item>
20+
<item name="colorTertiaryContainer">@color/eden_700</item>
21+
<item name="colorOnTertiaryContainer">@color/eden_100</item>
22+
23+
<item name="colorError">@color/red_300</item>
24+
<item name="colorOnError">@color/black_87</item>
25+
<item name="colorErrorContainer">@color/red_400</item>
26+
<item name="colorOnErrorContainer">@color/red_100</item>
27+
28+
<item name="android:colorBackground">@color/neutral_900</item>
2929
<item name="android:statusBarColor">@android:color/transparent</item>
3030
<item name="android:windowLightStatusBar">false</item>
31-
<item name="colorOnBackground">@color/neutral_900</item>
32-
<item name="colorSurface">@color/gray_50</item>
33-
<item name="colorOnSurface">@color/neutral_900</item>
31+
<item name="colorOnBackground">@color/white_87</item>
32+
<item name="colorSurface">@color/neutral_900</item>
33+
<item name="colorOnSurface">@color/white</item>
34+
35+
<item name="appBarLayoutStyle">@style/AppTheme.AppBarLayout</item>
3436
</style>
3537

3638
<style name="AppTheme.Starting" parent="Theme.SplashScreen">

0 commit comments

Comments
 (0)