Colors, styles and resources cleanup

This commit is contained in:
Arty Bishop committed 2020-10-11 23:16:58 +01:00
1 parent 57eb0a7a38
commit b071131ba3
14 files changed
+57 -50

No files matched your search

+11 -16
View File
@@ -18,22 +18,17 @@
-->
<resources>
<!-- main colors -->
<color name="themeAccent">#FFE082</color>
<color name="themeLight">#C0C0C0</color>
<color name="themePrimText">#E8E8E8</color>
<color name="themeSecText">#808080</color>
<!-- background colors -->
<color name="primBackground">#282828</color>
<color name="secBackground">#242424</color>
<color name="themeDark">#191919</color>
<color name="themeIcon">#FFE082</color>
<color name="themeButton">#242424</color>
<color name="backgroundDark">#121212</color>
<color name="backgroundMapText">#CC000000</color>
<color name="backgroundMapInfoLayout">#66000000</color>
<color name="satTrack">#D50000</color>
<color name="satPrimary">#FFE082</color>
<color name="satSecondary">#80FFE082</color>
<color name="satOsmTemp">#26FFE082</color>
<!-- temp colors -->
<color name="shark">#202124</color>
<color name="shark_light">#2E2F32</color>
<color name="athens_gray">#e8e9ec</color>
<color name="shuttle_gray">#606367</color>
<color name="mako">#3d4043</color>
<color name="darkBackground">#121212</color>
<color name="mapInfoLayout">#66000000</color>
<!-- satellite colors -->
<color name="satTrack">#CE2029</color>
<color name="satFootprint">#26FFE082</color>
</resources>
+9 -11
View File
@@ -19,17 +19,15 @@
<resources>
<style name="AppTheme" parent="Theme.MaterialComponents">
<style name="AppTheme" parent="Theme.MaterialComponents.NoActionBar">
<item name="colorPrimary">@color/themeAccent</item>
<item name="colorSecondary">@color/themeAccent</item>
<item name="colorSurface">@color/backgroundDark</item>
<item name="colorSurface">@color/darkBackground</item>
<item name="colorOnPrimary">@color/backgroundDark</item>
<item name="colorOnSecondary">@color/backgroundDark</item>
<item name="colorOnSurface">@color/themeLight</item>
<item name="colorOnPrimary">@color/darkBackground</item>
<item name="colorOnSecondary">@color/darkBackground</item>
<item name="colorOnSurface">@color/themePrimText</item>
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
<item name="android:statusBarColor">@android:color/transparent</item>
</style>
@@ -49,14 +47,14 @@
<style name="PolarViewText">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:textColor">@color/themeLight</item>
<item name="android:textColor">@color/themePrimText</item>
<item name="android:textSize">15sp</item>
</style>
<style name="CardTransText">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:textColor">@color/themeLight</item>
<item name="android:textColor">@color/themePrimText</item>
<item name="android:textSize">15sp</item>
</style>
@@ -96,14 +94,14 @@
<item name="android:layout_width">0dp</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:gravity">center</item>
<item name="android:textColor">@color/themeLight</item>
<item name="android:textColor">@color/themePrimText</item>
<item name="android:textSize">16sp</item>
</style>
<style name="AboutRegular">
<item name="android:layout_width">0dp</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:textColor">@color/themeLight</item>
<item name="android:textColor">@color/themePrimText</item>
<item name="android:textSize">15sp</item>
</style>