Skip to content

Commit

Permalink
Add Dynamic Colors + Dark Mode (stable for release)
Browse files Browse the repository at this point in the history
  • Loading branch information
@czlucius
czlucius committed Jun 25, 2022
1 parent e68582f commit f63f9de
Show file tree
Hide file tree
Showing 6 changed files with 164 additions and 14 deletions.
3 changes: 3 additions & 0 deletions app/src/main/java/com/czlucius/scan/App.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import androidx.annotation.StringRes;

import com.czlucius.scan.misc.monetization.AdStrategy2;
import com.google.android.material.color.DynamicColors;

import org.acra.ACRA;
import org.acra.BuildConfig;
Expand Down Expand Up @@ -58,6 +59,8 @@ public class App extends Application {
@Override
public void onCreate() {
super.onCreate();
DynamicColors.applyToActivitiesIfAvailable(this);




Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/layout/activity_main.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
android:id="@+id/bottomNav"
android:layout_width="match_parent"
android:layout_height="@dimen/bottom_nav_height"
android:background="@color/white_smoke"
app:itemTextColor="@color/pure_black"
android:background="?attr/colorSurface"
app:itemTextColor="?attr/colorOnSurface"
app:labelVisibilityMode="selected"
app:menu="@menu/bottom_nav" />

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/floating_tooltip.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
android:layout_gravity="bottom|center_horizontal"
android:layout_margin="8dp"
android:background="@drawable/rounded_shape"
android:backgroundTint="@color/pure_white"
android:backgroundTint="?attr/colorSurface"
android:clickable="false"
android:orientation="horizontal">

Expand Down
56 changes: 56 additions & 0 deletions app/src/main/res/values-night/themes.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
<?xml version="1.0" encoding="utf-8"?><!--
~ Code Scanner. An android app to scan and create codes(barcodes, QR codes, etc)
~ Copyright (C) 2021 Lucius Chee Zihan
~
~ This program is free software: you can redistribute it and/or modify
~ it under the terms of the GNU Affero General Public License as published
~ by the Free Software Foundation, either version 3 of the License, or
~ (at your option) any later version.
~
~ This program is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ GNU Affero General Public License for more details.
~
~ You should have received a copy of the GNU Affero General Public License
~ along with this program. If not, see <https://www.gnu.org/licenses/>.
-->

<resources>

<style name="Theme.App" parent="Theme.Material3.Dark">


<item name="android:textColorLink">?attr/colorSecondary</item>
<item name="chipIconTint">@color/moderate_grey</item>
<item name="android:textColorHighlight">?attr/colorPrimary</item>

<item name="android:statusBarColor">?attr/colorSurface</item>

<item name="colorPrimary">@color/md_theme_dark_primary</item>
<item name="colorOnPrimary">@color/md_theme_dark_onPrimary</item>
<item name="colorPrimaryContainer">@color/md_theme_dark_primaryContainer</item>
<item name="colorOnPrimaryContainer">@color/md_theme_dark_onPrimaryContainer</item>
<item name="colorSecondary">@color/md_theme_dark_secondary</item>
<item name="colorOnSecondary">@color/md_theme_dark_onSecondary</item>
<item name="colorSecondaryContainer">@color/md_theme_dark_secondaryContainer</item>
<item name="colorOnSecondaryContainer">@color/md_theme_dark_onSecondaryContainer</item>
<item name="colorTertiary">@color/md_theme_dark_tertiary</item>
<item name="colorOnTertiary">@color/md_theme_dark_onTertiary</item>
<item name="colorTertiaryContainer">@color/md_theme_dark_tertiaryContainer</item>
<item name="colorOnTertiaryContainer">@color/md_theme_dark_onTertiaryContainer</item>
<item name="colorError">@color/md_theme_dark_error</item>
<item name="colorErrorContainer">@color/md_theme_dark_errorContainer</item>
<item name="colorOnError">@color/md_theme_dark_onError</item>
<item name="colorOnErrorContainer">@color/md_theme_dark_onErrorContainer</item>
<item name="colorOnBackground">@color/md_theme_dark_onBackground</item>
<item name="colorSurface">@color/md_theme_dark_surface</item>
<item name="colorOnSurface">@color/md_theme_dark_onSurface</item>
<item name="colorSurfaceVariant">@color/md_theme_dark_surfaceVariant</item>
<item name="colorOnSurfaceVariant">@color/md_theme_dark_onSurfaceVariant</item>
<item name="colorOutline">@color/md_theme_dark_outline</item>
<item name="colorOnSurfaceInverse">@color/md_theme_dark_inverseOnSurface</item>
<item name="colorSurfaceInverse">@color/md_theme_dark_inverseSurface</item>
<item name="colorPrimaryInverse">@color/md_theme_dark_inversePrimary</item>
</style>
</resources>
60 changes: 60 additions & 0 deletions app/src/main/res/values/colors.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
<color name="mist">#D4D4D4</color>
<color name="moderate_grey">#acacac</color>
<color name="jungle_green">#26a69a</color>
<color name="jungle_green_dark">#00766c</color>
<color name="downy_green">#64d8cb</color>
<color name="pine_green">#00766c</color>
<color name="pure_black">#000000</color>
Expand All @@ -39,4 +40,63 @@
<color name="onboarding_background">@color/pure_white</color>
<color name="onboarding_background_dark">@color/white_smoke</color>

<color name="md_theme_light_primary">#b6b6b6</color>
<color name="md_theme_light_onPrimary">#121212</color>
<color name="md_theme_light_primaryContainer">#d7d7d7</color>
<color name="md_theme_light_onPrimaryContainer">#161616</color>
<color name="md_theme_light_secondary">@color/jungle_green</color>
<color name="md_theme_light_onSecondary">#ffffff</color>
<color name="md_theme_light_secondaryContainer">#C8C8C8</color>
<color name="md_theme_light_onSecondaryContainer">#171717</color>
<color name="md_theme_light_tertiary">#646464</color>
<color name="md_theme_light_onTertiary">#ffffff</color>
<color name="md_theme_light_tertiaryContainer">#e9e9e9</color>
<color name="md_theme_light_onTertiaryContainer">#202020</color>
<color name="md_theme_light_error">#BA1A1A</color>
<color name="md_theme_light_errorContainer">#FFDAD6</color>
<color name="md_theme_light_onError">#FFFFFF</color>
<color name="md_theme_light_onErrorContainer">#410002</color>
<color name="md_theme_light_background">#fcfcfc</color>
<color name="md_theme_light_onBackground">#1b1b1b</color>
<color name="md_theme_light_surface">#FCFCFC</color>
<color name="md_theme_light_onSurface">#1b1b1b</color>
<color name="md_theme_light_surfaceVariant">#e1e1e1</color>
<color name="md_theme_light_onSurfaceVariant">#454545</color>
<color name="md_theme_light_outline">#767676</color>
<color name="md_theme_light_inverseOnSurface">#f0f0f0</color>
<color name="md_theme_light_inverseSurface">#303030</color>
<color name="md_theme_light_inversePrimary">#b0b0b0</color>
<color name="md_theme_light_shadow">#000000</color>
<color name="md_theme_light_surfaceTint">#494949</color>
<color name="md_theme_light_surfaceTintColor">#494949</color>
<color name="seed">#2e2e2e</color>
<color name="md_theme_dark_primary">#4f4f4f</color>
<color name="md_theme_dark_onPrimary">#d9d9d9</color>
<color name="md_theme_dark_primaryContainer">#373737</color>
<color name="md_theme_dark_onPrimaryContainer">#d7d7d7</color>
<color name="md_theme_dark_secondary">@color/jungle_green_dark</color>
<color name="md_theme_dark_onSecondary">#2d2d2d</color>
<color name="md_theme_dark_secondaryContainer">#444444</color>
<color name="md_theme_dark_onSecondaryContainer">#e0e0e0</color>
<color name="md_theme_dark_tertiary">#cecece</color>
<color name="md_theme_dark_onTertiary">#353535</color>
<color name="md_theme_dark_tertiaryContainer">#4c4c4c</color>
<color name="md_theme_dark_onTertiaryContainer">#e9e9e9</color>
<color name="md_theme_dark_error">#FFB4AB</color>
<color name="md_theme_dark_errorContainer">#93000A</color>
<color name="md_theme_dark_onError">#690005</color>
<color name="md_theme_dark_onErrorContainer">#FFDAD6</color>
<color name="md_theme_dark_background">#1b1b1b</color>
<color name="md_theme_dark_onBackground">#e2e2e2</color>
<color name="md_theme_dark_surface">#1b1b1b</color>
<color name="md_theme_dark_onSurface">#e2e2e2</color>
<color name="md_theme_dark_surfaceVariant">#454545</color>
<color name="md_theme_dark_onSurfaceVariant">#c5c5c5</color>
<color name="md_theme_dark_outline">#8f8f8f</color>
<color name="md_theme_dark_inverseOnSurface">#1b1b1b</color>
<color name="md_theme_dark_inverseSurface">#e2e2e2</color>
<color name="md_theme_dark_inversePrimary">#494949</color>
<color name="md_theme_dark_shadow">#000000</color>
<color name="md_theme_dark_surfaceTint">#b0b0b0</color>
<color name="md_theme_dark_surfaceTintColor">#b0b0b0</color>
</resources>
53 changes: 42 additions & 11 deletions app/src/main/res/values/themes.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,23 +18,54 @@

<resources>
<!-- Base application theme. -->
<style name="Theme.App" parent="Theme.Material3.DynamicColors.Light">
<style name="Theme.App" parent="Theme.Material3.Light">
<!-- Customize your theme here. -->
<item name="colorPrimary">@color/pure_white</item>
<item name="colorPrimaryDark">@color/mist</item>
<!-- <item name="colorPrimary">@color/pure_white</item>-->
<!-- <item name="colorPrimaryDark">@color/mist</item>-->

<item name="backgroundColor">@color/pine_green</item>
<!-- <item name="backgroundColor">@color/pine_green</item>-->

<item name="colorSecondary">@color/jungle_green</item>
<item name="colorSecondaryContainer">@color/mist</item>
<item name="color">@color/pine_green</item>
<!-- <item name="colorSecondary">@color/jungle_green</item>-->
<!-- <item name="colorSecondaryContainer">@color/mist</item>-->
<!-- <item name="color">@color/pine_green</item>-->

<item name="android:textColorLink">@color/pine_green</item>
<item name="chipIconTint">@color/moderate_grey</item>
<!-- <item name="colorOnPrimary">@color/pure_black</item>-->
<!-- <item name="colorAccent">@color/jungle_green</item>-->


<item name="colorOnPrimary">@color/pure_black</item>
<item name="colorAccent">@color/jungle_green</item>
<item name="android:textColorLink">?attr/colorSecondary</item>
<item name="chipIconTint">@color/moderate_grey</item>
<item name="android:textColorHighlight">?attr/colorPrimary</item>
<item name="android:statusBarColor">?attr/colorSurface</item>

<item name="colorPrimary">@color/md_theme_light_primary</item>
<item name="colorOnPrimary">@color/md_theme_light_onPrimary</item>
<item name="colorPrimaryContainer">@color/md_theme_light_primaryContainer</item>
<item name="colorOnPrimaryContainer">@color/md_theme_light_onPrimaryContainer</item>
<item name="colorSecondary">@color/md_theme_light_secondary</item>
<item name="colorOnSecondary">@color/md_theme_light_onSecondary</item>
<item name="colorSecondaryContainer">@color/md_theme_light_secondaryContainer</item>
<item name="colorOnSecondaryContainer">@color/md_theme_light_onSecondaryContainer</item>
<item name="colorTertiary">@color/md_theme_light_tertiary</item>
<item name="colorOnTertiary">@color/md_theme_light_onTertiary</item>
<item name="colorTertiaryContainer">@color/md_theme_light_tertiaryContainer</item>
<item name="colorOnTertiaryContainer">@color/md_theme_light_onTertiaryContainer</item>
<item name="colorError">@color/md_theme_light_error</item>
<item name="colorErrorContainer">@color/md_theme_light_errorContainer</item>
<item name="colorOnError">@color/md_theme_light_onError</item>
<item name="colorOnErrorContainer">@color/md_theme_light_onErrorContainer</item>
<item name="android:colorBackground">@color/md_theme_light_background</item>
<item name="colorOnBackground">@color/md_theme_light_onBackground</item>
<item name="colorSurface">@color/md_theme_light_surface</item>
<item name="colorOnSurface">@color/md_theme_light_onSurface</item>
<item name="colorSurfaceVariant">@color/md_theme_light_surfaceVariant</item>
<item name="colorOnSurfaceVariant">@color/md_theme_light_onSurfaceVariant</item>
<item name="colorOutline">@color/md_theme_light_outline</item>
<item name="colorOnSurfaceInverse">@color/md_theme_light_inverseOnSurface</item>
<item name="colorSurfaceInverse">@color/md_theme_light_inverseSurface</item>
<!-- <item name="colorSurfaceTint">@color/md_theme_light_surfaceTint</item>-->
<!-- <item name="colorSurfaceTintColor">@color/md_theme_light_surfaceTintColor</item>-->
<item name="colorPrimaryInverse">@color/md_theme_light_inversePrimary</item>


<item name="bottomNavigationStyle">
Expand Down

0 comments on commit f63f9de

Please sign in to comment.