Skip to content

Commit aedf893

Browse files
BertwareBertware
committed
Adjust dark mode colors, fix some dark mode issues
1 parent 02ef08e commit aedf893

9 files changed

Lines changed: 33 additions & 17 deletions

File tree

‎Hyperrail/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ apply plugin: 'com.android.application'
88
apply plugin: 'com.google.gms.google-services'
99
apply plugin: 'com.google.firebase.crashlytics'
1010

11-
def VERSION_CODE = 55
12-
def VERSION_NAME = '1.3.1'
11+
def VERSION_CODE = 56
12+
def VERSION_NAME = '1.3.2'
1313

1414
android {
1515
compileSdkVersion 31

‎Hyperrail/src/main/res/layout/activity_result_tabbed.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,11 @@
2121
android:layout_width="match_parent"
2222
android:layout_height="wrap_content"
2323
android:layout_gravity="top"
24-
android:background="@color/colorPrimary"
24+
android:background="@color/colorPrimaryDark"
2525
android:elevation="4dp"
2626
app:tabSelectedTextColor="@color/colorOnPrimary"
27-
app:tabTextColor="@color/colorMuted" />
27+
app:tabIndicatorColor="@color/colorTranslucentBackground"
28+
app:tabTextColor="@color/colorTranslucentWhite" />
2829

2930
</androidx.viewpager.widget.ViewPager>
3031

‎Hyperrail/src/main/res/layout/contextmenu_spitsgids.xml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@
5858
android:layout_marginLeft="24dp"
5959
android:layout_marginRight="8dp"
6060
android:layout_marginTop="8dp"
61-
android:src="@drawable/ic_action_share"/>
61+
android:src="@drawable/ic_action_share"
62+
android:tint="@color/colorTextDark"/>
6263

6364
<TextView
6465
android:layout_width="wrap_content"
@@ -84,7 +85,8 @@
8485
android:layout_marginLeft="24dp"
8586
android:layout_marginRight="8dp"
8687
android:layout_marginTop="8dp"
87-
android:src="@drawable/ic_action_share"/>
88+
android:src="@drawable/ic_action_share"
89+
android:tint="@color/colorTextDark"/>
8890

8991
<TextView
9092
android:layout_width="wrap_content"

‎Hyperrail/src/main/res/layout/fragment_recyclerview_vehiclejourney_map.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
android:id="@+id/fragment_vehicle_composition"
2727
android:layout_width="match_parent"
2828
android:layout_height="wrap_content"
29-
android:background="#a0fafafa"
29+
android:background="@color/colorTranslucentBackground"
3030
app:layout_constraintBottom_toBottomOf="@id/fragment_map" />
3131

3232
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout

‎Hyperrail/src/main/res/layout/fragment_vehicle_composition.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,15 @@
3737
android:background="#006ab3"
3838
android:gravity="center"
3939
android:text="@string/warning_composition_unconfirmed"
40-
android:textColor="@color/colorTextLight" />
40+
android:textColor="@color/colorTextAlwaysLight" />
4141

4242
<TextView
4343
android:id="@+id/text_status_unavailable"
4444
android:layout_width="match_parent"
4545
android:layout_height="@dimen/listitem_content_height_double"
4646
android:animateLayoutChanges="true"
47-
android:background="@color/backgroundMaterialDark"
47+
android:background="@color/colorBackgroundAlwaysDark"
4848
android:gravity="center"
4949
android:text="@string/warning_composition_unavailable"
50-
android:textColor="@color/colorTextLight" />
50+
android:textColor="@color/colorTextAlwaysLight" />
5151
</LinearLayout>

‎Hyperrail/src/main/res/values-night/colors.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
3-
<color name="colorPrimary">#8e0000</color><!-- Material red 800 -->
3+
<color name="colorPrimary">#c62828</color><!-- Material red 800 -->
44
<color name="colorOnPrimary">#fffafafa</color>
55
<color name="ic_launcher_background">#c62828</color><!-- Material red 800 -->
66
<color name="colorPrimaryDark">#8e0000</color>
@@ -10,6 +10,7 @@
1010
<color name="colorWhite">#000</color>
1111
<color name="backgroundMaterialDark">#fffafafa</color>
1212
<color name="backgroundMaterialLight">#ff212121</color>
13+
<color name="colorTranslucentBackground">#a0212121</color>
1314
<color name="colorTextDark">#fffafafa</color>
1415
<color name="colorTextLight">#333</color>
1516
<color name="colorTextAlwaysLight">#fffafafa</color>

‎Hyperrail/src/main/res/values-night/styles.xml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,14 @@
1717
<item name="android:progressTint">@color/colorPrimary</item>
1818
<item name="backgroundColor">@color/backgroundMaterialLight</item>
1919
<item name="background">@color/backgroundMaterialLight</item>
20+
<item name="android:navigationBarColor">
21+
@android:color/transparent
22+
</item>
2023
</style>
2124

2225
<style name="ActionBarTheme" parent="@style/ThemeOverlay.AppCompat.DayNight.ActionBar">
2326
<item name="android:textColor">@color/colorTextLight</item>
24-
<item name="android:background">@color/colorPrimary</item>
27+
<item name="android:background">@color/colorPrimaryDark</item>
2528
</style>
2629

2730
<style name="ActionBarPopupTheme" parent="@style/ThemeOverlay.AppCompat.DayNight">
@@ -36,7 +39,7 @@
3639
</style>
3740

3841
<style name="HyperrailAccentSearchContainer" parent="HyperrailAccentSearchField">
39-
<item name="android:background">@color/colorPrimary</item>
42+
<item name="android:background">@color/colorPrimaryDark</item>
4043
<item name="android:elevation">4dp</item>
4144
<item name="editTextStyle">@style/HyperrailAccentSearchText</item>
4245
</style>
@@ -90,11 +93,13 @@
9093
<item name="android:windowIsFloating">true</item>
9194
<item name="android:actionMenuTextColor">@color/colorTextDark</item>
9295
<item name="android:windowTitleStyle">@style/TrainLongClickDialogTitle</item>
96+
<item name="android:background">@color/backgroundMaterialLight</item>
97+
<item name="android:windowBackground">@color/backgroundMaterialLight</item>
9398
</style>
9499

95100
<style name="TrainLongClickDialogTitle" parent="@style/Base.DialogWindowTitle.AppCompat">
96101
<item name="android:background">@color/colorPrimary</item>
97-
<item name="android:textColor">@color/colorTextLight</item>
102+
<item name="android:textColor">@color/colorOnPrimary</item>
98103
<item name="android:paddingBottom">@dimen/activity_vertical_margin</item>
99104
</style>
100105
</resources>

‎Hyperrail/src/main/res/values/colors.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@
88
<color name="colorAccent">#FFF</color>
99

1010
<color name="colorWhite">#FFF</color>
11+
<color name="colorTranslucentBackground">#a0fafafa</color>
12+
<color name="colorTranslucentWhite">#a0fafafa</color>
1113
<color name="backgroundMaterialDark">#ff212121</color>
14+
<color name="colorBackgroundAlwaysDark">#ff212121</color>
1215
<color name="backgroundMaterialLight">#fffafafa</color>
1316
<color name="colorTextDark">#333</color>
1417
<color name="colorTextLight">#fffafafa</color>

‎Hyperrail/src/main/res/values/styles.xml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,14 @@
1717
<item name="android:progressTint">@color/colorPrimary</item>
1818
<item name="backgroundColor">@color/backgroundMaterialLight</item>
1919
<item name="background">@color/backgroundMaterialLight</item>
20+
<item name="android:navigationBarColor">
21+
@android:color/transparent
22+
</item>
2023
</style>
2124

2225
<style name="ActionBarTheme" parent="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
2326
<item name="android:textColor">@color/colorTextLight</item>
24-
<item name="android:background">@color/colorPrimary</item>
27+
<item name="android:background">@color/colorPrimaryDark</item>
2528
</style>
2629

2730
<style name="ActionBarPopupTheme" parent="@style/ThemeOverlay.AppCompat.Dark">
@@ -36,7 +39,7 @@
3639
</style>
3740

3841
<style name="HyperrailAccentSearchContainer" parent="HyperrailAccentSearchField">
39-
<item name="android:background">@color/colorPrimary</item>
42+
<item name="android:background">@color/colorPrimaryDark</item>
4043
<item name="android:elevation">4dp</item>
4144
<item name="editTextStyle">@style/HyperrailAccentSearchText</item>
4245
</style>
@@ -90,11 +93,12 @@
9093
<item name="android:windowIsFloating">true</item>
9194
<item name="android:actionMenuTextColor">@color/colorTextDark</item>
9295
<item name="android:windowTitleStyle">@style/TrainLongClickDialogTitle</item>
96+
<item name="android:background">@color/backgroundMaterialLight</item>
9397
</style>
9498

9599
<style name="TrainLongClickDialogTitle" parent="@style/Base.DialogWindowTitle.AppCompat">
96100
<item name="android:background">@color/colorPrimary</item>
97-
<item name="android:textColor">@color/colorTextLight</item>
101+
<item name="android:textColor">@color/colorOnPrimary</item>
98102
<item name="android:paddingBottom">@dimen/activity_vertical_margin</item>
99103
</style>
100104
</resources>

0 commit comments

Comments
 (0)