Merge pull request #50 from cyclexuxu/rank

change background color
cyclexuxu · Dec 5, 2020 · 005d777 · 005d777
2 parents 10e9beb + e9c4746
commit 005d777
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/app/src/main/res/layout/fragment_rank.xml b/app/src/main/res/layout/fragment_rank.xml
@@ -2,6 +2,8 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="#EFBBCF"
+    android:backgroundTint="#EFBBCF"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <LinearLayout
@@ -15,7 +17,7 @@
             android:id="@+id/etToday"
             android:textAlignment="center"
             android:textSize="20sp"
-            android:textColor="#FF9800"
+            android:fontFamily="@font/baloo"
             android:textStyle="bold"
             />
 
@@ -34,7 +36,7 @@
             android:layout_height="wrap_content"
             android:padding="10dp"
             android:textAlignment="center"
-            android:textColor="#FF9800"
+            android:fontFamily="@font/baloo"
             android:textSize="20sp"
             android:textStyle="bold" />
 
@@ -52,7 +54,7 @@
             android:layout_weight="0.4"
             android:padding="10dp"
             android:textAlignment="center"
-            android:textColor="#FF9800"
+            android:fontFamily="@font/baloo"
             android:textSize="20sp"
             android:textStyle="bold" />
 
@@ -63,15 +65,16 @@
             android:layout_weight="0.4"
             android:padding="10dp"
             android:textAlignment="center"
-            android:textColor="#FF9800"
+            android:fontFamily="@font/baloo"
             android:textSize="20sp"
             android:textStyle="bold" />
 
         <ImageButton
             android:id="@+id/btnLikeIcon"
             android:layout_width="50dp"
             android:layout_height="50dp"
-            android:background="#FFFFFF"
+            android:background="#EFBBCF"
+            android:backgroundTint="#EFBBCF"
             android:soundEffectsEnabled="false"
             android:src="@drawable/ic_action_like" />
 
@@ -81,8 +84,8 @@
             android:layout_height="wrap_content"
             android:layout_weight="0.2"
             android:padding="10dp"
+            android:fontFamily="@font/baloo"
             android:textAlignment="center"
-            android:textColor="#FF9800"
             android:textSize="20sp"
             android:textStyle="bold" />
 

diff --git a/app/src/main/res/layout/item_layout.xml b/app/src/main/res/layout/item_layout.xml
@@ -10,12 +10,15 @@
         android:id="@+id/tvRank"
         android:layout_width="40dp"
         android:layout_height="40dp"
+        android:fontFamily="@font/baloo"
         android:textAlignment="center" />
 
     <ImageView
         android:id="@+id/ivIcon"
         android:layout_width="30dp"
         android:layout_height="30dp"
+        android:background="#EFBBCF"
+        android:backgroundTint="#EFBBCF"
         android:src="@drawable/paw"
         />
 
@@ -24,13 +27,15 @@
         android:layout_width="40dp"
         android:layout_height="40dp"
         android:layout_weight="0.4"
+        android:fontFamily="@font/baloo"
         android:textAlignment="center"
         android:textSize="18sp"
         android:textStyle="bold" />
     <TextView
         android:id="@+id/tvSteps"
         android:layout_width="40dp"
         android:layout_height="40dp"
+        android:fontFamily="@font/baloo"
         android:layout_weight="0.4"
         android:textAlignment="center"
         />
@@ -39,15 +44,17 @@
         android:id="@+id/btnLikeIcon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:background="#40FFFFFF"
         android:clickable="true"
+        android:background="#EFBBCF"
+        android:backgroundTint="#EFBBCF"
         android:soundEffectsEnabled="true"
         android:src="@drawable/ic_action_dislike" />
 
     <TextView
         android:id="@+id/tvLikes"
         android:layout_width="40dp"
         android:layout_height="40dp"
+        android:fontFamily="@font/baloo"
         android:textAlignment="center"
         android:layout_weight="0.2"
         />