karolina/avh-plan-android
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switched to DayNight for styling -> great code reduction, further Kotlin conversion

Browse Source
This commit is contained in:
Deniz Düzgören
2019-05-21 18:55:29 +02:00
parent 3b7a89b512
commit 2cec9ebd67
50 changed files with 550 additions and 723 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/values/colors.xml
+24 -16
View File
@@ -1,29 +1,37 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools">
<color name="background">#121212</color>
<color name="colorChipLight">#f5f5f5</color>
<color name="colorChipDark">#1E1E1E</color>
<color name="white">#FFFFFF</color>
<color name="black">#000000</color>
<color name="background">#eeeeee</color>
<color name="lightbackground">#f5f5f5</color>
<color name="accent">#448aff</color>
<color name="accentPastel">#64b5f6</color>
<color name="dark">#121212</color>
<color name="lessdark">#1E1E1E</color>
<color name="lightgrey">#bdbdbd</color>
<color name="textcolor">#212121</color>
<color name="hintcolor">#757575</color>
<color name="lighthintcolor">#bdbdbd</color>
<color name="textDark">#212121</color>
<color name="textLight">#e0e0e0</color>
<!-- <color name="background">#FFFFFF</color>-->
<!-- <color name="colorChipLight">#f5f5f5</color>-->
<!-- <color name="colorChipDark">#1E1E1E</color>-->
<color name="darkdivider">#313131</color>
<!-- <color name="white">#FFFFFF</color>-->
<!-- <color name="black">#000000</color>-->
<!-- <color name="accent">#448aff</color>-->
<!-- <color name="accentPastel">#64b5f6</color>-->
<!-- <color name="dark">#121212</color>-->
<!-- <color name="lessdark">#1E1E1E</color>-->
<!-- <color name="lightgrey">#bdbdbd</color>-->
<color name="darkwhite">#eeeeee</color>
<color name="lightwhite">#f5f5f5</color>
<!-- <color name="textcolor">#212121</color>-->
<!-- <color name="textLight">#e0e0e0</color>-->
<!-- <color name="darkdivider">#313131</color>-->
<!-- <color name="darkwhite">#eeeeee</color>-->
<!-- <color name="lightwhite">#f5f5f5</color>-->
<color name="datingPink">#d81b60</color>
<color name="hint">#9e9e9e</color>
<color name="hintdark">#757575</color>
<!-- <color name="hint">#9e9e9e</color>-->
<!-- <color name="hintdark">#757575</color>-->
<color name="slighttransparency">#42000000</color>
app/src/main/res/values/strings.xml
+2
View File
@@ -151,4 +151,6 @@
<string name="lastupdatedK">"Last updated: "</string>
<string name="darkmode2">Enables night mode</string>
</resources>
app/src/main/res/values/styles.xml
+19 -35
View File
@@ -1,7 +1,7 @@
<resources>
<style name="SelectableItemTheme">
<item name="colorControlHighlight">#448aff</item>
<item name="colorControlHighlight">@color/accent</item>
</style>
<style name="SelectableItemBackground">
@@ -9,36 +9,20 @@
<item name="android:background">?attr/selectableItemBackground</item>
</style>
<style name="AppTheme0" parent="Theme.MaterialComponents.Light.DarkActionBar">
<item name="colorPrimary">#448aff</item>
<item name="colorPrimaryDark">#FFFFFF</item>
<item name="colorAccent">#448aff</item>
<item name="colorBackground">#eeeeee</item>
<item name="colorBackgroundCard">#f5f5f5</item>
<item name="colorText">#212121</item>
<item name="colorHintLight">#212121</item>
<item name="colorHint">#9e9e9e</item>
<item name="colorHintDark">#000000</item>
<style name="AppTheme0" parent="Theme.MaterialComponents.DayNight.NoActionBar">
<item name="colorPrimary">@color/accent</item>
<item name="colorPrimaryDark">@color/background</item>
<item name="colorAccent">@color/accent</item>
<!-- <item name="colorBackground">#eeeeee</item>-->
<!-- <item name="colorBackgroundCard">#f5f5f5</item>-->
<!-- <item name="colorText">#212121</item>-->
<!-- <item name="colorHintLight">#212121</item>-->
<!-- <item name="colorHint">#9e9e9e</item>-->
<!-- <item name="colorHintDark">#000000</item>-->
<item name="android:fontFamily">@font/manrope_medium</item>
<item name="referenceTextColor">?attr/colorHint</item>
<item name="colorChip">#e0e0e0</item>
<item name="android:colorEdgeEffect">#9e9e9e</item>
</style>
<style name="AppTheme0Dark" parent="Theme.MaterialComponents.Light.DarkActionBar">
<item name="colorPrimary">#64b5f6</item>
<item name="colorPrimaryDark">#121212</item>
<item name="colorAccent">#64b5f6</item>
<item name="colorBackground">#121212</item>
<item name="colorBackgroundCard">#1E1E1E</item>
<item name="colorText">#e0e0e0</item>
<item name="colorHintLight">#e0e0e0</item>
<item name="colorHint">#9e9e9e</item>
<item name="colorHintDark">#757575</item>
<item name="android:fontFamily">@font/manrope_medium</item>
<item name="referenceTextColor">?attr/colorHint</item>
<item name="colorChip">#1E1E1E</item>
<item name="android:colorEdgeEffect">#9e9e9e</item>
<!-- <item name="referenceTextColor">?attr/colorHint</item>-->
<!-- <item name="colorChip">#e0e0e0</item>-->
<item name="android:colorEdgeEffect">@color/accent</item>
</style>
<style name="AlertDialogCustomLight" parent="Theme.AppCompat.Light.Dialog.Alert">
@@ -60,15 +44,15 @@
</style>
<style name="EditTextTheme" parent="Theme.AppCompat.Light.DarkActionBar">
<item name="colorControlNormal">#9e9e9e</item>
<item name="colorControlActivated">#448aff</item>
<item name="colorControlHighlight">#448aff</item>
<item name="colorControlNormal">@color/hintcolor</item>
<item name="colorControlActivated">@color/accent</item>
<item name="colorControlHighlight">@color/accent</item>
</style>
<!-- The launcher theme. It sets the main window background to the launch_screen drawable -->
<style name="AppThemeLight.Launcher" parent="AppTheme0.NoActionBar">
<style name="AppTheme0.Launcher">
<item name="android:windowBackground">@drawable/launch_screen</item>
<item name="colorPrimaryDark">?attr/colorAccent</item>
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:navigationBarColor">@android:color/transparent</item>
</style>