Convert hardcoded colors to be changed when Theme changes

kunall17 · kunall17 · commit 2ea0228d8608 · 2016-08-15T12:19:54.000+05:30
diff --git a/app/src/main/java/com/zulip/android/activities/ZulipActivity.java b/app/src/main/java/com/zulip/android/activities/ZulipActivity.java
@@ -24,7 +24,6 @@
 import android.database.MatrixCursor;
 import android.database.MergeCursor;
 import android.graphics.Bitmap;
-import android.graphics.Color;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
@@ -239,6 +238,7 @@ public void recyclerViewScrolled() {
             displayChatBox(false);
         }
     }
+
     public RefreshableCursorAdapter getPeopleAdapter() {
         return peopleAdapter;
     }
@@ -686,9 +686,9 @@ public boolean setViewValue(View view, Cursor cursor, int columnIndex) {
                         name.setText(streamName);
                         //Change color in the drawer if this stream is inHomeView only.
                         if (!Stream.getByName(app, streamName).getInHomeView()) {
-                            name.setTextColor(ContextCompat.getColor(ZulipActivity.this, android.R.color.secondary_text_light_nodisable));
+                            name.setTextColor(ContextCompat.getColor(ZulipActivity.this, R.color.colorTextTertiary));
                         } else {
-                            name.setTextColor(ContextCompat.getColor(ZulipActivity.this, android.R.color.primary_text_light));
+                            name.setTextColor(ContextCompat.getColor(ZulipActivity.this, R.color.colorTextPrimary));
                         }
                         view.setOnClickListener(new View.OnClickListener() {
                             @Override
@@ -707,8 +707,8 @@ public void onClick(View v) {
                     case R.id.name_child:
                         TextView name_child = (TextView) view;
                         name_child.setText(cursor.getString(columnIndex));
-                        if (app.isTopicMute(cursor.getInt(1), cursor.getString(columnIndex))){
-                            name_child.setTextColor(ContextCompat.getColor(ZulipActivity.this, android.R.color.secondary_text_light_nodisable));
+                        if (app.isTopicMute(cursor.getInt(1), cursor.getString(columnIndex))) {
+                            name_child.setTextColor(ContextCompat.getColor(ZulipActivity.this, R.color.colorTextSecondary));
                         }
                         return true;
                 }
@@ -1171,6 +1171,7 @@ public boolean onCreateOptionsMenu(Menu menu) {
 
         return false;
     }
+
     private boolean prepareSearchView(Menu menu) {
         if (this.logged_in && Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
             // Get the SearchView and set the searchable configuration
@@ -1180,7 +1181,7 @@ private boolean prepareSearchView(Menu menu) {
             final android.support.v7.widget.SearchView searchView = (android.support.v7.widget.SearchView) MenuItemCompat.getActionView(mSearchMenuItem);
             searchView.setSearchableInfo(searchManager.getSearchableInfo(new ComponentName(getApplicationContext(), ZulipActivity.class)));
             searchView.setSearchableInfo(searchManager.getSearchableInfo(getComponentName()));
-            ((EditText) searchView.findViewById(android.support.v7.appcompat.R.id.search_src_text)).setHintTextColor(Color.BLACK);
+            ((EditText) searchView.findViewById(android.support.v7.appcompat.R.id.search_src_text)).setHintTextColor(ContextCompat.getColor(this,R.color.colorTextPrimary));
             searchView.setOnQueryTextListener(new android.support.v7.widget.SearchView.OnQueryTextListener() {
                 @Override
                 public boolean onQueryTextSubmit(String s) {
diff --git a/app/src/main/res/color/huddle_body.xml b/app/src/main/res/color/huddle_body.xml
diff --git a/app/src/main/res/color/huddle_header.xml b/app/src/main/res/color/huddle_header.xml
diff --git a/app/src/main/res/color/stream_body.xml b/app/src/main/res/color/stream_body.xml
diff --git a/app/src/main/res/color/stream_header.xml b/app/src/main/res/color/stream_header.xml
diff --git a/app/src/main/res/drawable/stream_header.xml b/app/src/main/res/drawable/stream_header.xml
diff --git a/app/src/main/res/drawable/triangle.xml b/app/src/main/res/drawable/triangle.xml
@@ -7,7 +7,7 @@
     <group android:name="triableGroup">
         <path
             android:name="triangle"
-            android:fillColor="#444444"
+            android:fillColor="@color/stream_header"
             android:pathData="M0 0 L0 0 L10 5 L0 10 Z" />
     </group>
 </vector>
diff --git a/app/src/main/res/layout-v21/login.xml b/app/src/main/res/layout-v21/login.xml
@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/windowBackground"
     android:gravity="center_horizontal"
     android:orientation="vertical">
 
diff --git a/app/src/main/res/layout/fragment_message_list.xml b/app/src/main/res/layout/fragment_message_list.xml
@@ -7,7 +7,7 @@
         android:id="@+id/recyclerView"
         android:layout_width="match_parent"
         android:layout_height="fill_parent"
-        android:background="@android:color/white"
+        android:background="@color/listBackground"
         android:fadeScrollbars="false"
         android:scrollbars="vertical" />
 
@@ -20,4 +20,4 @@
         android:text="@string/empty_list"
         android:textAppearance="@style/TextAppearance.AppCompat.Medium"
         android:visibility="gone" />
-</LinearLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/list_loading.xml b/app/src/main/res/layout/list_loading.xml
@@ -11,7 +11,7 @@ per http://pivotallabs.com/android-tidbits-6-22-2011-hiding-header-views/
         android:layout_width="match_parent"
         android:layout_height="48dp"
         android:layout_gravity="center"
-        android:background="#eeeeee"
+        android:background="@color/loadingBackground"
         android:gravity="center|center_vertical">
 
         <ProgressBar
@@ -23,8 +23,9 @@ per http://pivotallabs.com/android-tidbits-6-22-2011-hiding-header-views/
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingLeft="16dp"
+            android:textColor="@color/colorTextPrimary"
             android:text="@string/loading_messages"
             android:textSize="18sp" />
     </LinearLayout>
 
-</LinearLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/main.xml b/app/src/main/res/layout/main.xml
@@ -57,15 +57,15 @@
         android:layout_width="320dp"
         android:layout_height="match_parent"
         android:layout_gravity="start"
-        android:background="#FFF"
+        android:background="@color/listBackground"
         android:choiceMode="singleChoice" />
 
     <ListView
         android:id="@+id/people_drawer"
         android:layout_width="320dp"
         android:layout_height="match_parent"
         android:layout_gravity="end"
-        android:background="#FFF"
+        android:background="@color/listBackground"
         android:choiceMode="singleChoice" />
 
-</android.support.v4.widget.DrawerLayout>
+</android.support.v4.widget.DrawerLayout>
diff --git a/app/src/main/res/layout/message_header.xml b/app/src/main/res/layout/message_header.xml
@@ -3,19 +3,19 @@
     android:id="@+id/envelopeTile"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="#e5e5e5">
+    android:background="@color/messageHeaderBackground">
 
     <TextView
         android:id="@+id/displayRecipient"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:background="@drawable/stream_header"
+        android:background="@color/stream_header"
         android:gravity="center_horizontal"
         android:padding="4dp"
         android:paddingLeft="10dp"
         android:paddingStart="10dp"
         android:text="@string/stream_txt"
-        android:textColor="@android:color/white"
+        android:textColor="@color/colorTextPrimary"
         android:textStyle="bold"
         tools:text="Stream" />
 
@@ -33,7 +33,7 @@
         android:layout_height="wrap_content"
         android:layout_marginLeft="7dp"
         android:layout_weight="1"
-        android:background="#e5e5e5"
+        android:background="@color/messageHeaderBackground"
         android:padding="4dp"
         android:text="@string/subject" />
 
@@ -45,4 +45,4 @@
         android:visibility="gone" />
 </LinearLayout>
 
-    
+    
diff --git a/app/src/main/res/layout/message_tile.xml b/app/src/main/res/layout/message_tile.xml
@@ -4,7 +4,7 @@
     android:id="@+id/messageTile"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@android:color/white"
+    android:background="@color/stream_background"
     android:paddingEnd="8dp"
     android:paddingRight="8dp">
 
@@ -34,15 +34,15 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:textColor="@android:color/black"
+            android:textColor="@color/colorTextPrimary"
             android:textStyle="bold"
             tools:text="Sender &lt;alice@example.com&gt;" />
 
         <TextView
             android:id="@+id/timestamp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="@android:color/darker_gray"
+            android:textColor="@color/colorTextTertiary"
             tools:text="17:45" />
 
 
@@ -74,4 +74,4 @@
         android:scaleType="centerInside"
         android:src="@android:drawable/presence_online" />
 
-</RelativeLayout>
+</RelativeLayout>
diff --git a/app/src/main/res/layout/stream_tile.xml b/app/src/main/res/layout/stream_tile.xml
@@ -20,7 +20,7 @@
         android:layout_marginLeft="16dp"
         android:layout_marginRight="48dp"
         android:text="MyStream"
-        android:textColor="@android:color/primary_text_light"
+        android:textColor="@color/colorTextPrimary"
         android:textSize="18sp" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/stream_tile_child.xml b/app/src/main/res/layout/stream_tile_child.xml
@@ -9,5 +9,5 @@
     android:paddingRight="16dp"
     android:paddingTop="16dp"
     android:text="Subject"
-    android:textColor="@android:color/secondary_text_light"
+    android:textColor="@color/colorTextSecondary"
     android:textSize="16sp" />
diff --git a/app/src/main/res/layout/stream_tile_new.xml b/app/src/main/res/layout/stream_tile_new.xml
@@ -21,6 +21,6 @@
         android:layout_marginLeft="16dp"
         android:layout_marginRight="48dp"
         android:text="MyStream"
-        android:textColor="@android:color/primary_text_light"
+        android:textColor="@color/colorTextPrimary"
         android:textSize="18sp" />
 </LinearLayout>
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#212121</color>
+    <color name="colorAccent">#eeeeee</color>
+    <color name="colorPrimaryDark">#000000</color>
+    <color name="dev_auth_admin">#f44336</color>
+    <color name="dev_auth_user">#1e88e5</color>
+    <color name="stream_header">#212121</color>
+    <color name="messageHeaderBackground">#616161</color>
+    <color name="huddle_header">#333333</color>
+    <color name="private_background">#303030</color>
+    <color name="stream_background">#424242</color>
+    <color name="colorTextPrimary">@android:color/primary_text_dark</color>
+    <color name="colorTextSecondary">@android:color/secondary_text_dark</color>
+    <color name="colorTextTertiary">@android:color/tertiary_text_dark</color>
+    <color name="windowBackground">#616161</color>
+    <color name="listBackground">#262626</color>
+    <color name="loadingBackground">#757575</color>
+</resources>
diff --git a/app/src/main/res/values-v21/themes.xml b/app/src/main/res/values-v21/themes.xml
@@ -6,5 +6,6 @@
         <item name="windowNoTitle">true</item>
         <item name="android:windowDrawsSystemBarBackgrounds">true</item>
         <item name="android:statusBarColor">@color/colorPrimaryDark</item>
+        <item name="android:windowBackground">@color/windowBackground</item>
     </style>
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -5,4 +5,15 @@
     <color name="colorPrimaryDark">#747474</color>
     <color name="dev_auth_admin">#ff4136</color>
     <color name="dev_auth_user">#428bca</color>
+    <color name="stream_header">#C0C0C0</color>
+    <color name="private_background">#FEFFE0</color>
+    <color name="huddle_header">#333333</color>
+    <color name="colorTextPrimary">@android:color/primary_text_light</color>
+    <color name="colorTextSecondary">@android:color/secondary_text_light</color>
+    <color name="colorTextTertiary">@android:color/tertiary_text_light</color>
+    <color name="windowBackground">#eeeeee</color>
+    <color name="listBackground">#FFFFFF</color>
+    <color name="messageHeaderBackground">#e5e5e5</color>
+    <color name="stream_background">#ffff</color>
+    <color name="loadingBackground">#eeeeee</color>
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
@@ -7,7 +7,6 @@
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
-        <item name="android:textColorSecondary">@android:color/black</item>
     </style>
 
     <style name="AppTheme.DayNight.NoActionBar">
@@ -20,4 +19,4 @@
         <item name="android:textColorSecondary">@android:color/secondary_text_light</item>
         <item name="android:textColorTertiary">@android:color/tertiary_text_dark</item>
     </style>
-</resources>
+</resources>
