Merge pull request #195 from Adventech/tm/feat/about_screen

About screen [Dark-mode]
Adventech · May 18, 2021 · 4277437 · 4277437
2 parents 3f38fb4 + 420b1ce
commit 4277437
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/app/src/main/res/layout/include_about_gc_content.xml b/app/src/main/res/layout/include_about_gc_content.xml
@@ -15,7 +15,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:tint="@color/ss_gc_logo_tint" />
+        app:tint="@color/ss_logo_tint" />
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/content"

diff --git a/app/src/main/res/layout/ss_about_activity.xml b/app/src/main/res/layout/ss_about_activity.xml
@@ -82,14 +82,15 @@
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent"
                         app:srcCompat="@drawable/ic_logo_adventech"
+                        app:tint="@color/ss_logo_tint"
                         tools:ignore="HardcodedText" />
 
                     <androidx.appcompat.widget.AppCompatTextView
                         android:id="@+id/about_title"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="Adventech"
-                        android:textColor="#3B3B3B"
+                        android:textColor="?android:attr/textColorPrimary"
                         android:textSize="40sp"
                         app:fontFamily="@font/lato_bold"
                         app:layout_constraintEnd_toEndOf="@id/about_adventech_logo"

diff --git a/common/design/src/main/res/values-night/colors.xml b/common/design/src/main/res/values-night/colors.xml
@@ -25,5 +25,5 @@
     <color name="color_navigation_full">@color/black_40</color>
     <color name="list_divider">#1fffffff</color>
     <color name="text_primary">@color/white_70</color>
-    <color name="ss_gc_logo_tint">@color/white</color>
+    <color name="ss_logo_tint">@color/white</color>
 </resources>
diff --git a/common/design/src/main/res/values/colors.xml b/common/design/src/main/res/values/colors.xml
@@ -57,7 +57,7 @@
     <color name="ss_gray_6">#FAFAFA</color>
     <color name="ss_grey_7">#E2E2E5</color>
     <color name="ss_grey_shimmer">@color/ss_gray_2</color>
-    <color name="ss_gc_logo_tint">@color/black</color>
+    <color name="ss_logo_tint">@color/black</color>
 
     <color name="text_primary">@color/ss_gray_3</color>
     <color name="text_secondary">@color/ss_gray_2</color>

diff --git a/features/lessons/src/main/res/layout/ss_prompt_app_re_branding.xml b/features/lessons/src/main/res/layout/ss_prompt_app_re_branding.xml
@@ -48,7 +48,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/content"
-            app:tint="@color/ss_gc_logo_tint" />
+            app:tint="@color/ss_logo_tint" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_ok"