improved about page in dark mode

SecUSo · Dec 14, 2021 · ff5c32c · ff5c32c
1 parent 2e08dd1
commit ff5c32c
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 0 deletions.
diff --git a/app/src/main/res/layout/about.xml b/app/src/main/res/layout/about.xml
@@ -36,6 +36,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
+            android:textColor="?attr/textColor"
+            android:textColorLink="?attr/textColorLink"
             android:layout_marginTop="15dp"
             android:text="@string/app_name_long" />
 
@@ -50,6 +52,8 @@
             <TextView
                 android:id="@+id/textFieldVersion"
                 android:layout_width="wrap_content"
+                android:textColor="?attr/textColor"
+                android:textColorLink="?attr/textColorLink"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="5dp"
                 android:text="@string/version_number" />
@@ -59,6 +63,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="4dp"
+                android:textColor="?attr/textColor"
+                android:textColorLink="?attr/textColorLink"
                 android:layout_marginTop="5dp"
                 android:layout_toEndOf="@+id/textFieldVersion" />
 
@@ -69,6 +75,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
+            android:textColor="?attr/textColor"
+            android:textColorLink="?attr/textColorLink"
             android:layout_marginTop="5dp"
             android:text="@string/about_author" />
 
@@ -78,6 +86,8 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
             android:layout_marginTop="5dp"
+            android:textColor="?attr/textColor"
+            android:textColorLink="?attr/textColorLink"
             android:textAlignment="center"
             android:text="@string/about_author_names" />
 
@@ -86,6 +96,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
+            android:textColor="?attr/textColor"
+            android:textColorLink="?attr/textColorLink"
             android:layout_marginTop="5dp"
             android:text="@string/about_author_contributors" />
 
@@ -94,6 +106,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
+            android:textColor="?attr/textColor"
+            android:textColorLink="?attr/textColorLink"
             android:layout_marginTop="30dp"
             android:text="@string/about_affiliation"
             android:textStyle="bold" />
@@ -110,13 +124,17 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
             android:layout_marginTop="10dp"
+            android:textColor="?attr/textColor"
+            android:textColorLink="?attr/textColorLink"
             android:gravity="center_horizontal"
             android:text="@string/privacy_friendly" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
+            android:textColor="?attr/textColor"
+            android:textColorLink="?attr/textColorLink"
             android:layout_marginTop="15dp"
             android:gravity="center"
             android:text="@string/more_info" />
@@ -126,6 +144,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
+            android:textColor="?attr/textColor"
+            android:textColorLink="?attr/textColorLink"
             android:text="@string/url"
             android:textStyle="bold" />
 
@@ -135,6 +155,8 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
             android:gravity="center_horizontal"
+            android:textColorLink="?attr/textColorLink"
+            android:textColor="?attr/textColor"
             android:text="@string/github"
             android:textStyle="bold" />
 
@@ -143,6 +165,8 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
             android:gravity="center_horizontal"
+            android:textColor="?attr/textColor"
+            android:textColorLink="?attr/textColorLink"
             android:text="@string/owm_about"
             android:layout_marginTop="40dp" />
 
@@ -153,10 +177,13 @@
             android:layout_gravity="center_horizontal"
             android:gravity="center_horizontal"
             android:text="@string/owm_url"
+            android:textColor="?attr/textColor"
+            android:textColorLink="?attr/textColorLink"
             android:textStyle="bold" />
 
         <ImageView
             android:id="@+id/owm_logo_about"
+            android:layout_marginTop="3dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:adjustViewBounds="true"
@@ -168,6 +195,8 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
             android:gravity="center_horizontal"
+            android:textColor="?attr/textColor"
+            android:textColorLink="?attr/textColorLink"
             android:text="@string/owm_logo_copyright" />
 
     </LinearLayout>

diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
@@ -13,6 +13,7 @@
         <item name="circleColor">@color/transparent</item>
         <item name="rectangleColor">@color/textColorDarkTheme</item>
         <item name="textColor">@color/textColorDarkTheme</item>
+        <item name="textColorLink">@color/cardBackgroundLightTheme</item>
 
         <item name="circlebackground">@drawable/backgroundcircle_icons_night</item>
         <item name="rectanglebackground">@drawable/backgroundrectangle_drops_night</item>

diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
@@ -12,6 +12,7 @@
         <attr name="circleColor" format="color" />
         <attr name="rectangleColor" format="color" />
         <attr name="textColor" format="color" />
+        <attr name="textColorLink" format="color" />
 
     </declare-styleable>
     <attr name="circlebackground" format="reference" />

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -11,6 +11,7 @@
     <color name="cardBackgroundLightTheme">#37AAFF</color>
     <color name="cardBackgroundDarkTheme">#00192C</color>
     <color name="middlegrey">#A8A8A8</color>
+    <color name="darkgrey">#454545</color>
     <color name="white">#ffffff</color>
     <color name="black">#000000</color>
     <color name="red">#d01530</color>

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -13,6 +13,7 @@
         <item name="circleColor">@color/transorange</item>
         <item name="rectangleColor">@color/transparent</item>
         <item name="textColor">@color/textColorLightTheme</item>
+        <item name="textColorLink">@color/colorAccentLightTheme</item>
 
         <item name="circlebackground">@drawable/backgroundcircle_icons_day</item>
         <item name="rectanglebackground">@drawable/backgroundrectangle_drops_day</item>