From 36774620dbeaf77b4be824677b4dd8385b356b04 Mon Sep 17 00:00:00 2001
From: M M Arif <mmarif@swatian.com>
Date: Tue, 7 Jan 2020 17:27:05 +0500
Subject: [PATCH 01/14] initial work on adding new theme

---
 app/src/main/AndroidManifest.xml              |  3 +-
 .../mian/gitnex/activities/BaseActivity.java  |  3 ++
 .../mian/gitnex/activities/MainActivity.java  |  5 +--
 .../gitnex/activities/NewRepoActivity.java    | 10 ++++--
 app/src/main/res/drawable/circle.xml          |  2 +-
 app/src/main/res/drawable/ic_add_person.xml   |  2 +-
 app/src/main/res/drawable/ic_android.xml      |  2 +-
 app/src/main/res/drawable/ic_arrow_down.xml   |  2 +-
 app/src/main/res/drawable/ic_arrow_up.xml     |  2 +-
 app/src/main/res/drawable/ic_calendar.xml     |  2 +-
 app/src/main/res/drawable/ic_check.xml        |  2 +-
 app/src/main/res/drawable/ic_close.xml        |  2 +-
 app/src/main/res/drawable/ic_color.xml        |  2 +-
 app/src/main/res/drawable/ic_comment.xml      |  2 +-
 app/src/main/res/drawable/ic_comment_16.xml   |  2 +-
 app/src/main/res/drawable/ic_comment_20.xml   |  2 +-
 app/src/main/res/drawable/ic_content_copy.xml |  2 +-
 app/src/main/res/drawable/ic_delete.xml       |  2 +-
 app/src/main/res/drawable/ic_done.xml         |  2 +-
 app/src/main/res/drawable/ic_dotted_menu.xml  |  2 +-
 .../drawable/ic_dotted_menu_horizontal.xml    |  2 +-
 app/src/main/res/drawable/ic_edit.xml         |  2 +-
 app/src/main/res/drawable/ic_email.xml        |  2 +-
 app/src/main/res/drawable/ic_exit_24dp.xml    |  2 +-
 app/src/main/res/drawable/ic_file.xml         |  2 +-
 app/src/main/res/drawable/ic_file_new.xml     |  2 +-
 app/src/main/res/drawable/ic_filter.xml       |  2 +-
 app/src/main/res/drawable/ic_folder_24.xml    |  2 +-
 app/src/main/res/drawable/ic_forks_24.xml     |  2 +-
 app/src/main/res/drawable/ic_home_24dp.xml    |  2 +-
 app/src/main/res/drawable/ic_info_24dp.xml    |  2 +-
 .../res/drawable/ic_info_outline_24dp.xml     |  2 +-
 app/src/main/res/drawable/ic_issue_closed.xml |  2 +-
 .../main/res/drawable/ic_issue_comments.xml   |  2 +-
 app/src/main/res/drawable/ic_issue_open.xml   |  2 +-
 .../main/res/drawable/ic_issue_open_white.xml |  2 +-
 app/src/main/res/drawable/ic_issues.xml       |  2 +-
 app/src/main/res/drawable/ic_label.xml        |  2 +-
 app/src/main/res/drawable/ic_language.xml     |  2 +-
 app/src/main/res/drawable/ic_link_24dp.xml    |  2 +-
 app/src/main/res/drawable/ic_lock_24dp.xml    |  2 +-
 app/src/main/res/drawable/ic_lock_bold.xml    |  2 +-
 app/src/main/res/drawable/ic_lock_open.xml    |  2 +-
 app/src/main/res/drawable/ic_merge.xml        |  2 +-
 app/src/main/res/drawable/ic_milestone.xml    |  2 +-
 .../main/res/drawable/ic_my_repositories.xml  |  2 +-
 app/src/main/res/drawable/ic_new_releases.xml |  2 +-
 .../main/res/drawable/ic_open_in_browser.xml  |  2 +-
 .../main/res/drawable/ic_organizations.xml    |  2 +-
 app/src/main/res/drawable/ic_otp.xml          |  2 +-
 app/src/main/res/drawable/ic_person_24dp.xml  |  2 +-
 .../main/res/drawable/ic_person_filled.xml    |  2 +-
 app/src/main/res/drawable/ic_public.xml       |  2 +-
 .../main/res/drawable/ic_question_mark_24.xml |  2 +-
 app/src/main/res/drawable/ic_reopen.xml       |  2 +-
 app/src/main/res/drawable/ic_reply.xml        |  2 +-
 app/src/main/res/drawable/ic_repos.xml        |  2 +-
 app/src/main/res/drawable/ic_search.xml       |  2 +-
 .../main/res/drawable/ic_settings_24dp.xml    |  2 +-
 app/src/main/res/drawable/ic_star.xml         |  2 +-
 .../main/res/drawable/ic_star_border_24dp.xml |  2 +-
 .../main/res/drawable/ic_thumb_up_like.xml    |  2 +-
 app/src/main/res/drawable/ic_unwatch.xml      |  4 +--
 app/src/main/res/drawable/ic_users.xml        |  2 +-
 .../main/res/drawable/ic_verified_user.xml    |  2 +-
 app/src/main/res/drawable/ic_warning.xml      |  2 +-
 app/src/main/res/drawable/ic_watchers.xml     |  2 +-
 app/src/main/res/layout/activity_main.xml     | 11 ++++---
 app/src/main/res/layout/activity_new_repo.xml | 31 +++++++++----------
 app/src/main/res/layout/fragment_about.xml    | 19 ++++++------
 .../main/res/layout/fragment_repositories.xml |  4 +--
 app/src/main/res/layout/repos_list.xml        | 15 +++++----
 app/src/main/res/values-v21/styles.xml        |  8 -----
 app/src/main/res/values/attrs.xml             |  5 +++
 app/src/main/res/values/colors.xml            |  3 ++
 app/src/main/res/values/styles.xml            |  9 ------
 app/src/main/res/values/themes.xml            | 22 +++++++++++++
 77 files changed, 147 insertions(+), 129 deletions(-)
 create mode 100644 app/src/main/res/values/attrs.xml
 create mode 100644 app/src/main/res/values/themes.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b317cb1f..a13a7e14 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -11,8 +11,7 @@
         android:label="@string/app_name"
         android:networkSecurityConfig="@xml/network_security_config"
         android:roundIcon="@mipmap/app_logo_round"
-        android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:supportsRtl="true">
         <activity android:name=".activities.MergePullRequestActivity" />
         <activity
             android:name=".activities.FileViewActivity"
diff --git a/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java b/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java
index db146eda..ece3082b 100644
--- a/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java
@@ -2,6 +2,7 @@ package org.mian.gitnex.activities;
 
 import android.os.Bundle;
 import androidx.appcompat.app.AppCompatActivity;
+import org.mian.gitnex.R;
 import org.mian.gitnex.helpers.FontsOverride;
 import org.mian.gitnex.util.TinyDB;
 
@@ -14,6 +15,8 @@ public abstract class BaseActivity extends AppCompatActivity {
     @Override
     public void onCreate(Bundle savedInstanceState) {
 
+        setTheme(R.style.AppThemeLight);
+
         super.onCreate(savedInstanceState);
         setContentView(getLayoutResourceId());
 
diff --git a/app/src/main/java/org/mian/gitnex/activities/MainActivity.java b/app/src/main/java/org/mian/gitnex/activities/MainActivity.java
index 51f3a4e3..8b258efc 100644
--- a/app/src/main/java/org/mian/gitnex/activities/MainActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/MainActivity.java
@@ -5,6 +5,7 @@ import android.content.Context;
 import android.content.Intent;
 import androidx.annotation.NonNull;
 import com.google.android.material.navigation.NavigationView;
+import androidx.appcompat.widget.Toolbar;
 import androidx.core.view.GravityCompat;
 import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.appcompat.app.ActionBarDrawerToggle;
@@ -101,7 +102,7 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
             return;
         }
 
-        androidx.appcompat.widget.Toolbar toolbar = findViewById(R.id.toolbar);
+        Toolbar toolbar = findViewById(R.id.toolbar);
         toolbarTitle = toolbar.findViewById(R.id.toolbar_title);
 
         if(tinyDb.getInt("customFontId") == 0) {
@@ -167,7 +168,7 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
 
         ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(this, drawer, toolbar,
                 R.string.navigation_drawer_open, R.string.navigation_drawer_close);
-        toggle.getDrawerArrowDrawable().setColor(getResources().getColor(R.color.white));
+        toggle.getDrawerArrowDrawable().setColor(getResources().getColor(R.color.darkGreen));
         drawer.addDrawerListener(toggle);
 
         drawer.addDrawerListener(new DrawerLayout.DrawerListener() {
diff --git a/app/src/main/java/org/mian/gitnex/activities/NewRepoActivity.java b/app/src/main/java/org/mian/gitnex/activities/NewRepoActivity.java
index 3e5413fc..e5fd76d0 100644
--- a/app/src/main/java/org/mian/gitnex/activities/NewRepoActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/NewRepoActivity.java
@@ -33,7 +33,7 @@ import retrofit2.Callback;
  * Author M M Arif
  */
 
-public class NewRepoActivity extends AppCompatActivity {
+public class NewRepoActivity extends BaseActivity {
 
     public ImageView closeActivity;
     private View.OnClickListener onClickListener;
@@ -47,9 +47,13 @@ public class NewRepoActivity extends AppCompatActivity {
     List<OrgOwner> orgsList = new ArrayList<>();
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    protected int getLayoutResourceId(){
+        return R.layout.activity_new_repo;
+    }
+    
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_new_repo);
 
         boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
 
diff --git a/app/src/main/res/drawable/circle.xml b/app/src/main/res/drawable/circle.xml
index 1fff93db..27c363c7 100644
--- a/app/src/main/res/drawable/circle.xml
+++ b/app/src/main/res/drawable/circle.xml
@@ -1,5 +1,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval">
     <solid
-        android:color="@color/lightBlue"/>
+        android:color="@color/darkGreen"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_add_person.xml b/app/src/main/res/drawable/ic_add_person.xml
index c273ca40..4ffbfd7b 100644
--- a/app/src/main/res/drawable/ic_add_person.xml
+++ b/app/src/main/res/drawable/ic_add_person.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="#368f73"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M15,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM6,10L6,7L4,7v3L1,10v2h3v3h2v-3h3v-2L6,10zM15,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/>
diff --git a/app/src/main/res/drawable/ic_android.xml b/app/src/main/res/drawable/ic_android.xml
index 8d3fd387..75126b08 100644
--- a/app/src/main/res/drawable/ic_android.xml
+++ b/app/src/main/res/drawable/ic_android.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="#368f73"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M6,18c0,0.55 0.45,1 1,1h1v3.5c0,0.83 0.67,1.5 1.5,1.5s1.5,-0.67 1.5,-1.5L11,19h2v3.5c0,0.83 0.67,1.5 1.5,1.5s1.5,-0.67 1.5,-1.5L16,19h1c0.55,0 1,-0.45 1,-1L18,8L6,8v10zM3.5,8C2.67,8 2,8.67 2,9.5v7c0,0.83 0.67,1.5 1.5,1.5S5,17.33 5,16.5v-7C5,8.67 4.33,8 3.5,8zM20.5,8c-0.83,0 -1.5,0.67 -1.5,1.5v7c0,0.83 0.67,1.5 1.5,1.5s1.5,-0.67 1.5,-1.5v-7c0,-0.83 -0.67,-1.5 -1.5,-1.5zM15.53,2.16l1.3,-1.3c0.2,-0.2 0.2,-0.51 0,-0.71 -0.2,-0.2 -0.51,-0.2 -0.71,0l-1.48,1.48C13.85,1.23 12.95,1 12,1c-0.96,0 -1.86,0.23 -2.66,0.63L7.85,0.15c-0.2,-0.2 -0.51,-0.2 -0.71,0 -0.2,0.2 -0.2,0.51 0,0.71l1.31,1.31C6.97,3.26 6,5.01 6,7h12c0,-1.99 -0.97,-3.75 -2.47,-4.84zM10,5L9,5L9,4h1v1zM15,5h-1L14,4h1v1z"/>
diff --git a/app/src/main/res/drawable/ic_arrow_down.xml b/app/src/main/res/drawable/ic_arrow_down.xml
index 3d577786..7b5745b0 100644
--- a/app/src/main/res/drawable/ic_arrow_down.xml
+++ b/app/src/main/res/drawable/ic_arrow_down.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="#368f73"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M7.41,7.84L12,12.42l4.59,-4.58L18,9.25l-6,6 -6,-6z"/>
diff --git a/app/src/main/res/drawable/ic_arrow_up.xml b/app/src/main/res/drawable/ic_arrow_up.xml
index bc010396..a8148237 100644
--- a/app/src/main/res/drawable/ic_arrow_up.xml
+++ b/app/src/main/res/drawable/ic_arrow_up.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="#368f73"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M7.41,15.41L12,10.83l4.59,4.58L18,14l-6,-6 -6,6z"/>
diff --git a/app/src/main/res/drawable/ic_calendar.xml b/app/src/main/res/drawable/ic_calendar.xml
index 9f2745e4..bb4524e6 100644
--- a/app/src/main/res/drawable/ic_calendar.xml
+++ b/app/src/main/res/drawable/ic_calendar.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="#368f73"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M17,12h-5v5h5v-5zM16,1v2L8,3L8,1L6,1v2L5,3c-1.11,0 -1.99,0.9 -1.99,2L3,19c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2h-1L18,1h-2zM19,19L5,19L5,8h14v11z"/>
diff --git a/app/src/main/res/drawable/ic_check.xml b/app/src/main/res/drawable/ic_check.xml
index 17aca2af..cbaa42cd 100644
--- a/app/src/main/res/drawable/ic_check.xml
+++ b/app/src/main/res/drawable/ic_check.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="#368f73"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/>
diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml
index 0c8775c4..32323cf0 100644
--- a/app/src/main/res/drawable/ic_close.xml
+++ b/app/src/main/res/drawable/ic_close.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="#368f73"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
diff --git a/app/src/main/res/drawable/ic_color.xml b/app/src/main/res/drawable/ic_color.xml
index 4abeea58..ace41e5f 100644
--- a/app/src/main/res/drawable/ic_color.xml
+++ b/app/src/main/res/drawable/ic_color.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="#368f73"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M12,3c-4.97,0 -9,4.03 -9,9s4.03,9 9,9c0.83,0 1.5,-0.67 1.5,-1.5 0,-0.39 -0.15,-0.74 -0.39,-1.01 -0.23,-0.26 -0.38,-0.61 -0.38,-0.99 0,-0.83 0.67,-1.5 1.5,-1.5L16,16c2.76,0 5,-2.24 5,-5 0,-4.42 -4.03,-8 -9,-8zM6.5,12c-0.83,0 -1.5,-0.67 -1.5,-1.5S5.67,9 6.5,9 8,9.67 8,10.5 7.33,12 6.5,12zM9.5,8C8.67,8 8,7.33 8,6.5S8.67,5 9.5,5s1.5,0.67 1.5,1.5S10.33,8 9.5,8zM14.5,8c-0.83,0 -1.5,-0.67 -1.5,-1.5S13.67,5 14.5,5s1.5,0.67 1.5,1.5S15.33,8 14.5,8zM17.5,12c-0.83,0 -1.5,-0.67 -1.5,-1.5S16.67,9 17.5,9s1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5z"/>
diff --git a/app/src/main/res/drawable/ic_comment.xml b/app/src/main/res/drawable/ic_comment.xml
index efb7e76a..8aebe804 100644
--- a/app/src/main/res/drawable/ic_comment.xml
+++ b/app/src/main/res/drawable/ic_comment.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="#368f73"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M21.99,4c0,-1.1 -0.89,-2 -1.99,-2L4,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h14l4,4 -0.01,-18zM18,14L6,14v-2h12v2zM18,11L6,11L6,9h12v2zM18,8L6,8L6,6h12v2z"/>
diff --git a/app/src/main/res/drawable/ic_comment_16.xml b/app/src/main/res/drawable/ic_comment_16.xml
index 186a57d7..48d25d22 100644
--- a/app/src/main/res/drawable/ic_comment_16.xml
+++ b/app/src/main/res/drawable/ic_comment_16.xml
@@ -1,4 +1,4 @@
-<vector android:height="16dp" android:tint="#FFFFFF"
+<vector android:height="16dp" android:tint="#368f73"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="16dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M21.99,4c0,-1.1 -0.89,-2 -1.99,-2H4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h14l4,4 -0.01,-18z"/>
diff --git a/app/src/main/res/drawable/ic_comment_20.xml b/app/src/main/res/drawable/ic_comment_20.xml
index 8a5e73a5..e776fbea 100644
--- a/app/src/main/res/drawable/ic_comment_20.xml
+++ b/app/src/main/res/drawable/ic_comment_20.xml
@@ -1,4 +1,4 @@
-<vector android:height="20dp" android:tint="#FFFFFF"
+<vector android:height="20dp" android:tint="#368f73"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="20dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M21.99,4c0,-1.1 -0.89,-2 -1.99,-2H4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h14l4,4 -0.01,-18z"/>
diff --git a/app/src/main/res/drawable/ic_content_copy.xml b/app/src/main/res/drawable/ic_content_copy.xml
index 62ad9539..cf704c38 100644
--- a/app/src/main/res/drawable/ic_content_copy.xml
+++ b/app/src/main/res/drawable/ic_content_copy.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="#368f73"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M16,1L4,1c-1.1,0 -2,0.9 -2,2v14h2L4,3h12L16,1zM19,5L8,5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h11c1.1,0 2,-0.9 2,-2L21,7c0,-1.1 -0.9,-2 -2,-2zM19,21L8,21L8,7h11v14z"/>
diff --git a/app/src/main/res/drawable/ic_delete.xml b/app/src/main/res/drawable/ic_delete.xml
index 8bed121a..e892e7c0 100644
--- a/app/src/main/res/drawable/ic_delete.xml
+++ b/app/src/main/res/drawable/ic_delete.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="#368f73"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/>
diff --git a/app/src/main/res/drawable/ic_done.xml b/app/src/main/res/drawable/ic_done.xml
index 2479e86c..421be914 100644
--- a/app/src/main/res/drawable/ic_done.xml
+++ b/app/src/main/res/drawable/ic_done.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="#368f73"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M18,7l-1.41,-1.41 -6.34,6.34 1.41,1.41L18,7zM22.24,5.59L11.66,16.17 7.48,12l-1.41,1.41L11.66,19l12,-12 -1.42,-1.41zM0.41,13.41L6,19l1.41,-1.41L1.83,12 0.41,13.41z"/>
diff --git a/app/src/main/res/drawable/ic_dotted_menu.xml b/app/src/main/res/drawable/ic_dotted_menu.xml
index c097d3e4..52b9c2ca 100644
--- a/app/src/main/res/drawable/ic_dotted_menu.xml
+++ b/app/src/main/res/drawable/ic_dotted_menu.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="#368f73"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
diff --git a/app/src/main/res/drawable/ic_dotted_menu_horizontal.xml b/app/src/main/res/drawable/ic_dotted_menu_horizontal.xml
index bc4c55ab..3c2bb154 100644
--- a/app/src/main/res/drawable/ic_dotted_menu_horizontal.xml
+++ b/app/src/main/res/drawable/ic_dotted_menu_horizontal.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="#368f73"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M6,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM18,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
diff --git a/app/src/main/res/drawable/ic_edit.xml b/app/src/main/res/drawable/ic_edit.xml
index 46462b57..ab20cd1e 100644
--- a/app/src/main/res/drawable/ic_edit.xml
+++ b/app/src/main/res/drawable/ic_edit.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="#368f73"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
diff --git a/app/src/main/res/drawable/ic_email.xml b/app/src/main/res/drawable/ic_email.xml
index 79199e39..8ce97f0c 100644
--- a/app/src/main/res/drawable/ic_email.xml
+++ b/app/src/main/res/drawable/ic_email.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="#368f73"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM20,8l-8,5 -8,-5L4,6l8,5 8,-5v2z"/>
diff --git a/app/src/main/res/drawable/ic_exit_24dp.xml b/app/src/main/res/drawable/ic_exit_24dp.xml
index e233f593..78f89ebd 100644
--- a/app/src/main/res/drawable/ic_exit_24dp.xml
+++ b/app/src/main/res/drawable/ic_exit_24dp.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="#368f73"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M10.09,15.59L11.5,17l5,-5 -5,-5 -1.41,1.41L12.67,11H3v2h9.67l-2.58,2.59zM19,3H5c-1.11,0 -2,0.9 -2,2v4h2V5h14v14H5v-4H3v4c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2z"/>
diff --git a/app/src/main/res/drawable/ic_file.xml b/app/src/main/res/drawable/ic_file.xml
index a431a5e9..dba37435 100644
--- a/app/src/main/res/drawable/ic_file.xml
+++ b/app/src/main/res/drawable/ic_file.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="#368f73"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M6,2c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2L18,22c1.1,0 2,-0.9 2,-2L20,8l-6,-6L6,2zM13,9L13,3.5L18.5,9L13,9z"/>
diff --git a/app/src/main/res/drawable/ic_file_new.xml b/app/src/main/res/drawable/ic_file_new.xml
index 65334152..489e3ec0 100644
--- a/app/src/main/res/drawable/ic_file_new.xml
+++ b/app/src/main/res/drawable/ic_file_new.xml
@@ -6,6 +6,6 @@
     android:viewportHeight="16"
     tools:ignore="VectorRaster">
   <path
-      android:fillColor="#FFFFFF"
+      android:fillColor="#368f73"
       android:pathData="m13.707,3.293 l-3,-3c-0.1875,-0.1875 -0.4419,-0.293 -0.707,-0.293h-7c-0.5522,0 -1,0.4478 -1,1v14c0,0.5527 0.4478,1 1,1h10c0.5522,0 1,-0.4473 1,-1v-11c0,-0.2651 -0.1055,-0.5195 -0.293,-0.707zM8,12h-3v-2h3zM11,9h-6v-2h6zM11,4c-0.5523,0 -1,-0.4478 -1,-1v-2l3,3z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_filter.xml b/app/src/main/res/drawable/ic_filter.xml
index 5d4ec18e..e1f8fb45 100644
--- a/app/src/main/res/drawable/ic_filter.xml
+++ b/app/src/main/res/drawable/ic_filter.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="#368f73"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M10,18h4v-2h-4v2zM3,6v2h18L21,6L3,6zM6,13h12v-2L6,11v2z"/>
diff --git a/app/src/main/res/drawable/ic_folder_24.xml b/app/src/main/res/drawable/ic_folder_24.xml
index 82347288..0e4fa59c 100644
--- a/app/src/main/res/drawable/ic_folder_24.xml
+++ b/app/src/main/res/drawable/ic_folder_24.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="#368f73"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M10,4H4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V8c0,-1.1 -0.9,-2 -2,-2h-8l-2,-2z"/>
diff --git a/app/src/main/res/drawable/ic_forks_24.xml b/app/src/main/res/drawable/ic_forks_24.xml
index 052486c6..25ac239f 100644
--- a/app/src/main/res/drawable/ic_forks_24.xml
+++ b/app/src/main/res/drawable/ic_forks_24.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="#368f73"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M14,4l2.29,2.29 -2.88,2.88 1.42,1.42 2.88,-2.88L20,10L20,4zM10,4L4,4v6l2.29,-2.29 4.71,4.7L11,20h2v-8.41l-5.29,-5.3z"/>
diff --git a/app/src/main/res/drawable/ic_home_24dp.xml b/app/src/main/res/drawable/ic_home_24dp.xml
index 30296ba9..2c735000 100644
--- a/app/src/main/res/drawable/ic_home_24dp.xml
+++ b/app/src/main/res/drawable/ic_home_24dp.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="#368f73"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z"/>
diff --git a/app/src/main/res/drawable/ic_info_24dp.xml b/app/src/main/res/drawable/ic_info_24dp.xml
index 7be01472..f28cf03e 100644
--- a/app/src/main/res/drawable/ic_info_24dp.xml
+++ b/app/src/main/res/drawable/ic_info_24dp.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="#368f73"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-6h2v6zM13,9h-2L11,7h2v2z"/>
diff --git a/app/src/main/res/drawable/ic_info_outline_24dp.xml b/app/src/main/res/drawable/ic_info_outline_24dp.xml
index af0d4d06..5fcf7402 100644
--- a/app/src/main/res/drawable/ic_info_outline_24dp.xml
+++ b/app/src/main/res/drawable/ic_info_outline_24dp.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="#368f73"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M11,17h2v-6h-2v6zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,9h2L13,7h-2v2z"/>
diff --git a/app/src/main/res/drawable/ic_issue_closed.xml b/app/src/main/res/drawable/ic_issue_closed.xml
index 7cdc15de..f60d56e6 100644
--- a/app/src/main/res/drawable/ic_issue_closed.xml
+++ b/app/src/main/res/drawable/ic_issue_closed.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="#368f73"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM10,17l-5,-5 1.41,-1.41L10,14.17l7.59,-7.59L19,8l-9,9z"/>
diff --git a/app/src/main/res/drawable/ic_issue_comments.xml b/app/src/main/res/drawable/ic_issue_comments.xml
index 55b04ab1..4b253fc4 100644
--- a/app/src/main/res/drawable/ic_issue_comments.xml
+++ b/app/src/main/res/drawable/ic_issue_comments.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="#368f73"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M21,6h-2v9L6,15v2c0,0.55 0.45,1 1,1h11l4,4L22,7c0,-0.55 -0.45,-1 -1,-1zM17,12L17,3c0,-0.55 -0.45,-1 -1,-1L3,2c-0.55,0 -1,0.45 -1,1v14l4,-4h10c0.55,0 1,-0.45 1,-1z"/>
diff --git a/app/src/main/res/drawable/ic_issue_open.xml b/app/src/main/res/drawable/ic_issue_open.xml
index d191ba92..7180582e 100644
--- a/app/src/main/res/drawable/ic_issue_open.xml
+++ b/app/src/main/res/drawable/ic_issue_open.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="#368f73"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-2h2v2zM13,13h-2L11,7h2v6z"/>
diff --git a/app/src/main/res/drawable/ic_issue_open_white.xml b/app/src/main/res/drawable/ic_issue_open_white.xml
index d191ba92..7180582e 100644
--- a/app/src/main/res/drawable/ic_issue_open_white.xml
+++ b/app/src/main/res/drawable/ic_issue_open_white.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="#368f73"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-2h2v2zM13,13h-2L11,7h2v6z"/>
diff --git a/app/src/main/res/drawable/ic_issues.xml b/app/src/main/res/drawable/ic_issues.xml
index 93db1791..d7b44e88 100644
--- a/app/src/main/res/drawable/ic_issues.xml
+++ b/app/src/main/res/drawable/ic_issues.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="#368f73"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M11,15h2v2h-2zM11,7h2v6h-2zM11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8z"/>
diff --git a/app/src/main/res/drawable/ic_label.xml b/app/src/main/res/drawable/ic_label.xml
index eb94181d..580cc961 100644
--- a/app/src/main/res/drawable/ic_label.xml
+++ b/app/src/main/res/drawable/ic_label.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="#368f73"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M21.41,11.58l-9,-9C12.05,2.22 11.55,2 11,2H4c-1.1,0 -2,0.9 -2,2v7c0,0.55 0.22,1.05 0.59,1.42l9,9c0.36,0.36 0.86,0.58 1.41,0.58 0.55,0 1.05,-0.22 1.41,-0.59l7,-7c0.37,-0.36 0.59,-0.86 0.59,-1.41 0,-0.55 -0.23,-1.06 -0.59,-1.42zM5.5,7C4.67,7 4,6.33 4,5.5S4.67,4 5.5,4 7,4.67 7,5.5 6.33,7 5.5,7z"/>
diff --git a/app/src/main/res/drawable/ic_language.xml b/app/src/main/res/drawable/ic_language.xml
index 74bc2790..26a7bf52 100644
--- a/app/src/main/res/drawable/ic_language.xml
+++ b/app/src/main/res/drawable/ic_language.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="#368f73"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM18.92,8h-2.95c-0.32,-1.25 -0.78,-2.45 -1.38,-3.56 1.84,0.63 3.37,1.91 4.33,3.56zM12,4.04c0.83,1.2 1.48,2.53 1.91,3.96h-3.82c0.43,-1.43 1.08,-2.76 1.91,-3.96zM4.26,14C4.1,13.36 4,12.69 4,12s0.1,-1.36 0.26,-2h3.38c-0.08,0.66 -0.14,1.32 -0.14,2 0,0.68 0.06,1.34 0.14,2L4.26,14zM5.08,16h2.95c0.32,1.25 0.78,2.45 1.38,3.56 -1.84,-0.63 -3.37,-1.9 -4.33,-3.56zM8.03,8L5.08,8c0.96,-1.66 2.49,-2.93 4.33,-3.56C8.81,5.55 8.35,6.75 8.03,8zM12,19.96c-0.83,-1.2 -1.48,-2.53 -1.91,-3.96h3.82c-0.43,1.43 -1.08,2.76 -1.91,3.96zM14.34,14L9.66,14c-0.09,-0.66 -0.16,-1.32 -0.16,-2 0,-0.68 0.07,-1.35 0.16,-2h4.68c0.09,0.65 0.16,1.32 0.16,2 0,0.68 -0.07,1.34 -0.16,2zM14.59,19.56c0.6,-1.11 1.06,-2.31 1.38,-3.56h2.95c-0.96,1.65 -2.49,2.93 -4.33,3.56zM16.36,14c0.08,-0.66 0.14,-1.32 0.14,-2 0,-0.68 -0.06,-1.34 -0.14,-2h3.38c0.16,0.64 0.26,1.31 0.26,2s-0.1,1.36 -0.26,2h-3.38z"/>
diff --git a/app/src/main/res/drawable/ic_link_24dp.xml b/app/src/main/res/drawable/ic_link_24dp.xml
index cb9fa025..cfb3de32 100644
--- a/app/src/main/res/drawable/ic_link_24dp.xml
+++ b/app/src/main/res/drawable/ic_link_24dp.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="#368f73"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M3.9,12c0,-1.71 1.39,-3.1 3.1,-3.1h4L11,7L7,7c-2.76,0 -5,2.24 -5,5s2.24,5 5,5h4v-1.9L7,15.1c-1.71,0 -3.1,-1.39 -3.1,-3.1zM8,13h8v-2L8,11v2zM17,7h-4v1.9h4c1.71,0 3.1,1.39 3.1,3.1s-1.39,3.1 -3.1,3.1h-4L13,17h4c2.76,0 5,-2.24 5,-5s-2.24,-5 -5,-5z"/>
diff --git a/app/src/main/res/drawable/ic_lock_24dp.xml b/app/src/main/res/drawable/ic_lock_24dp.xml
index 3d9f5431..c8826764 100644
--- a/app/src/main/res/drawable/ic_lock_24dp.xml
+++ b/app/src/main/res/drawable/ic_lock_24dp.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="#368f73"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M12,17c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1s3.1,1.39 3.1,3.1v2L8.9,8L8.9,6zM18,20L6,20L6,10h12v10z"/>
diff --git a/app/src/main/res/drawable/ic_lock_bold.xml b/app/src/main/res/drawable/ic_lock_bold.xml
index 146c066b..c6daf188 100644
--- a/app/src/main/res/drawable/ic_lock_bold.xml
+++ b/app/src/main/res/drawable/ic_lock_bold.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="#368f73"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8L8.9,8L8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z"/>
diff --git a/app/src/main/res/drawable/ic_lock_open.xml b/app/src/main/res/drawable/ic_lock_open.xml
index 6c09b2a9..f8ba66a2 100644
--- a/app/src/main/res/drawable/ic_lock_open.xml
+++ b/app/src/main/res/drawable/ic_lock_open.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="#368f73"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M12,17c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6h1.9c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM18,20L6,20L6,10h12v10z"/>
diff --git a/app/src/main/res/drawable/ic_merge.xml b/app/src/main/res/drawable/ic_merge.xml
index 35cdcf9e..4f3b8225 100644
--- a/app/src/main/res/drawable/ic_merge.xml
+++ b/app/src/main/res/drawable/ic_merge.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="#368f73"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M17,20.41L18.41,19 15,15.59 13.59,17 17,20.41zM7.5,8H11v5.59L5.59,19 7,20.41l6,-6V8h3.5L12,3.5 7.5,8z"/>
diff --git a/app/src/main/res/drawable/ic_milestone.xml b/app/src/main/res/drawable/ic_milestone.xml
index 5fa11896..a04d7e2e 100644
--- a/app/src/main/res/drawable/ic_milestone.xml
+++ b/app/src/main/res/drawable/ic_milestone.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="#368f73"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M19,3h-4.18C14.4,1.84 13.3,1 12,1c-1.3,0 -2.4,0.84 -2.82,2L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM12,3c0.55,0 1,0.45 1,1s-0.45,1 -1,1 -1,-0.45 -1,-1 0.45,-1 1,-1zM10,17l-4,-4 1.41,-1.41L10,14.17l6.59,-6.59L18,9l-8,8z"/>
diff --git a/app/src/main/res/drawable/ic_my_repositories.xml b/app/src/main/res/drawable/ic_my_repositories.xml
index e51e7a7a..52e62dad 100644
--- a/app/src/main/res/drawable/ic_my_repositories.xml
+++ b/app/src/main/res/drawable/ic_my_repositories.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="#368f73"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M10,16v-1L3.01,15L3,19c0,1.11 0.89,2 2,2h14c1.11,0 2,-0.89 2,-2v-4h-7v1h-4zM20,7h-4.01L15.99,5l-2,-2h-4l-2,2v2L4,7c-1.1,0 -2,0.9 -2,2v3c0,1.11 0.89,2 2,2h6v-2h4v2h6c1.1,0 2,-0.9 2,-2L22,9c0,-1.1 -0.9,-2 -2,-2zM14,7h-4L10,5h4v2z"/>
diff --git a/app/src/main/res/drawable/ic_new_releases.xml b/app/src/main/res/drawable/ic_new_releases.xml
index 36c3b630..6df66f71 100644
--- a/app/src/main/res/drawable/ic_new_releases.xml
+++ b/app/src/main/res/drawable/ic_new_releases.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="#368f73"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M23,12l-2.44,-2.78 0.34,-3.68 -3.61,-0.82 -1.89,-3.18L12,3 8.6,1.54 6.71,4.72l-3.61,0.81 0.34,3.68L1,12l2.44,2.78 -0.34,3.69 3.61,0.82 1.89,3.18L12,21l3.4,1.46 1.89,-3.18 3.61,-0.82 -0.34,-3.68L23,12zM13,17h-2v-2h2v2zM13,13h-2L11,7h2v6z"/>
diff --git a/app/src/main/res/drawable/ic_open_in_browser.xml b/app/src/main/res/drawable/ic_open_in_browser.xml
index 3fb9799c..0e583b3c 100644
--- a/app/src/main/res/drawable/ic_open_in_browser.xml
+++ b/app/src/main/res/drawable/ic_open_in_browser.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="#368f73"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M19,4L5,4c-1.11,0 -2,0.9 -2,2v12c0,1.1 0.89,2 2,2h4v-2L5,18L5,8h14v10h-4v2h4c1.1,0 2,-0.9 2,-2L21,6c0,-1.1 -0.89,-2 -2,-2zM12,10l-4,4h3v6h2v-6h3l-4,-4z"/>
diff --git a/app/src/main/res/drawable/ic_organizations.xml b/app/src/main/res/drawable/ic_organizations.xml
index 7fa7a3c0..6e17c51c 100644
--- a/app/src/main/res/drawable/ic_organizations.xml
+++ b/app/src/main/res/drawable/ic_organizations.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="#368f73"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M16.5,12c1.38,0 2.49,-1.12 2.49,-2.5S17.88,7 16.5,7C15.12,7 14,8.12 14,9.5s1.12,2.5 2.5,2.5zM9,11c1.66,0 2.99,-1.34 2.99,-3S10.66,5 9,5C7.34,5 6,6.34 6,8s1.34,3 3,3zM16.5,14c-1.83,0 -5.5,0.92 -5.5,2.75L11,19h11v-2.25c0,-1.83 -3.67,-2.75 -5.5,-2.75zM9,13c-2.33,0 -7,1.17 -7,3.5L2,19h7v-2.25c0,-0.85 0.33,-2.34 2.37,-3.47C10.5,13.1 9.66,13 9,13z"/>
diff --git a/app/src/main/res/drawable/ic_otp.xml b/app/src/main/res/drawable/ic_otp.xml
index 56aad2a4..a69c1eaa 100644
--- a/app/src/main/res/drawable/ic_otp.xml
+++ b/app/src/main/res/drawable/ic_otp.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="#368f73"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M19,1L9,1c-1.1,0 -2,0.9 -2,2v3h2L9,4h10v16L9,20v-2L7,18v3c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2L21,3c0,-1.1 -0.9,-2 -2,-2zM10.8,11L10.8,9.5C10.8,8.1 9.4,7 8,7S5.2,8.1 5.2,9.5L5.2,11c-0.6,0 -1.2,0.6 -1.2,1.2v3.5c0,0.7 0.6,1.3 1.2,1.3h5.5c0.7,0 1.3,-0.6 1.3,-1.2v-3.5c0,-0.7 -0.6,-1.3 -1.2,-1.3zM9.5,11h-3L6.5,9.5c0,-0.8 0.7,-1.3 1.5,-1.3s1.5,0.5 1.5,1.3L9.5,11z"/>
diff --git a/app/src/main/res/drawable/ic_person_24dp.xml b/app/src/main/res/drawable/ic_person_24dp.xml
index 9b1420c9..34c1d163 100644
--- a/app/src/main/res/drawable/ic_person_24dp.xml
+++ b/app/src/main/res/drawable/ic_person_24dp.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="#368f73"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M12,5.9c1.16,0 2.1,0.94 2.1,2.1s-0.94,2.1 -2.1,2.1S9.9,9.16 9.9,8s0.94,-2.1 2.1,-2.1m0,9c2.97,0 6.1,1.46 6.1,2.1v1.1L5.9,18.1L5.9,17c0,-0.64 3.13,-2.1 6.1,-2.1M12,4C9.79,4 8,5.79 8,8s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4zM12,13c-2.67,0 -8,1.34 -8,4v3h16v-3c0,-2.66 -5.33,-4 -8,-4z"/>
diff --git a/app/src/main/res/drawable/ic_person_filled.xml b/app/src/main/res/drawable/ic_person_filled.xml
index d7366bda..569ebace 100644
--- a/app/src/main/res/drawable/ic_person_filled.xml
+++ b/app/src/main/res/drawable/ic_person_filled.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="#368f73"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/>
diff --git a/app/src/main/res/drawable/ic_public.xml b/app/src/main/res/drawable/ic_public.xml
index 880e4277..e3f5593c 100644
--- a/app/src/main/res/drawable/ic_public.xml
+++ b/app/src/main/res/drawable/ic_public.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="#368f73"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM11,19.93c-3.95,-0.49 -7,-3.85 -7,-7.93 0,-0.62 0.08,-1.21 0.21,-1.79L9,15v1c0,1.1 0.9,2 2,2v1.93zM17.9,17.39c-0.26,-0.81 -1,-1.39 -1.9,-1.39h-1v-3c0,-0.55 -0.45,-1 -1,-1L8,12v-2h2c0.55,0 1,-0.45 1,-1L11,7h2c1.1,0 2,-0.9 2,-2v-0.41c2.93,1.19 5,4.06 5,7.41 0,2.08 -0.8,3.97 -2.1,5.39z"/>
diff --git a/app/src/main/res/drawable/ic_question_mark_24.xml b/app/src/main/res/drawable/ic_question_mark_24.xml
index 5ec2577a..c5741a68 100644
--- a/app/src/main/res/drawable/ic_question_mark_24.xml
+++ b/app/src/main/res/drawable/ic_question_mark_24.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="#368f73"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,19h-2v-2h2v2zM15.07,11.25l-0.9,0.92C13.45,12.9 13,13.5 13,15h-2v-0.5c0,-1.1 0.45,-2.1 1.17,-2.83l1.24,-1.26c0.37,-0.36 0.59,-0.86 0.59,-1.41 0,-1.1 -0.9,-2 -2,-2s-2,0.9 -2,2L8,9c0,-2.21 1.79,-4 4,-4s4,1.79 4,4c0,0.88 -0.36,1.68 -0.93,2.25z"/>
diff --git a/app/src/main/res/drawable/ic_reopen.xml b/app/src/main/res/drawable/ic_reopen.xml
index cc2d1e04..09f758f0 100644
--- a/app/src/main/res/drawable/ic_reopen.xml
+++ b/app/src/main/res/drawable/ic_reopen.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="#368f73"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"/>
diff --git a/app/src/main/res/drawable/ic_reply.xml b/app/src/main/res/drawable/ic_reply.xml
index 3aff3f9f..9ff78ee1 100644
--- a/app/src/main/res/drawable/ic_reply.xml
+++ b/app/src/main/res/drawable/ic_reply.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="#368f73"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M10,9V5l-7,7 7,7v-4.1c5,0 8.5,1.6 11,5.1 -1,-5 -4,-10 -11,-11z"/>
diff --git a/app/src/main/res/drawable/ic_repos.xml b/app/src/main/res/drawable/ic_repos.xml
index 0d321254..7773644d 100644
--- a/app/src/main/res/drawable/ic_repos.xml
+++ b/app/src/main/res/drawable/ic_repos.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="#368f73"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M20,6h-3L17,4c0,-1.11 -0.89,-2 -2,-2L9,2c-1.11,0 -2,0.89 -2,2v2L4,6c-1.11,0 -2,0.89 -2,2v11c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2L22,8c0,-1.11 -0.89,-2 -2,-2zM9,4h6v2L9,6L9,4zM20,19L4,19v-2h16v2zM20,14L4,14L4,8h3v2h2L9,8h6v2h2L17,8h3v6z"/>
diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml
index be5ad99c..e5ff5093 100644
--- a/app/src/main/res/drawable/ic_search.xml
+++ b/app/src/main/res/drawable/ic_search.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="#368f73"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
diff --git a/app/src/main/res/drawable/ic_settings_24dp.xml b/app/src/main/res/drawable/ic_settings_24dp.xml
index 79af3ab6..86f0cbd8 100644
--- a/app/src/main/res/drawable/ic_settings_24dp.xml
+++ b/app/src/main/res/drawable/ic_settings_24dp.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="#368f73"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z"/>
diff --git a/app/src/main/res/drawable/ic_star.xml b/app/src/main/res/drawable/ic_star.xml
index 85c045c0..b47a7cb0 100644
--- a/app/src/main/res/drawable/ic_star.xml
+++ b/app/src/main/res/drawable/ic_star.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="#368f73"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z"/>
diff --git a/app/src/main/res/drawable/ic_star_border_24dp.xml b/app/src/main/res/drawable/ic_star_border_24dp.xml
index 3fc251d1..3706f71c 100644
--- a/app/src/main/res/drawable/ic_star_border_24dp.xml
+++ b/app/src/main/res/drawable/ic_star_border_24dp.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="#368f73"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M22,9.24l-7.19,-0.62L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27 1,-4.28 -3.32,-2.88 4.38,-0.38L12,6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z"/>
diff --git a/app/src/main/res/drawable/ic_thumb_up_like.xml b/app/src/main/res/drawable/ic_thumb_up_like.xml
index d9acf750..03ab0483 100644
--- a/app/src/main/res/drawable/ic_thumb_up_like.xml
+++ b/app/src/main/res/drawable/ic_thumb_up_like.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="#368f73"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M1,21h4L5,9L1,9v12zM23,10c0,-1.1 -0.9,-2 -2,-2h-6.31l0.95,-4.57 0.03,-0.32c0,-0.41 -0.17,-0.79 -0.44,-1.06L14.17,1 7.59,7.59C7.22,7.95 7,8.45 7,9v10c0,1.1 0.9,2 2,2h9c0.83,0 1.54,-0.5 1.84,-1.22l3.02,-7.05c0.09,-0.23 0.14,-0.47 0.14,-0.73v-1.91l-0.01,-0.01L23,10z"/>
diff --git a/app/src/main/res/drawable/ic_unwatch.xml b/app/src/main/res/drawable/ic_unwatch.xml
index 3d2f50d8..3d694e13 100644
--- a/app/src/main/res/drawable/ic_unwatch.xml
+++ b/app/src/main/res/drawable/ic_unwatch.xml
@@ -1,6 +1,6 @@
 <vector android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="511.999" android:viewportWidth="511.999"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FFFFFFFF" android:pathData="M508.745,246.041c-4.574,-6.257 -113.557,-153.206 -252.748,-153.206S7.818,239.784 3.249,246.035c-4.332,5.936 -4.332,13.987 0,19.923c4.569,6.257 113.557,153.206 252.748,153.206s248.174,-146.95 252.748,-153.201C513.083,260.028 513.083,251.971 508.745,246.041zM255.997,385.406c-102.529,0 -191.33,-97.533 -217.617,-129.418c26.253,-31.913 114.868,-129.395 217.617,-129.395c102.524,0 191.319,97.516 217.617,129.418C447.361,287.923 358.746,385.406 255.997,385.406z"/>
-    <path android:fillColor="#FFFFFFFF" android:pathData="M255.997,154.725c-55.842,0 -101.275,45.433 -101.275,101.275s45.433,101.275 101.275,101.275s101.275,-45.433 101.275,-101.275S311.839,154.725 255.997,154.725zM255.997,323.516c-37.23,0 -67.516,-30.287 -67.516,-67.516s30.287,-67.516 67.516,-67.516s67.516,30.287 67.516,67.516S293.227,323.516 255.997,323.516z"/>
+    <path android:fillColor="#368f73" android:pathData="M508.745,246.041c-4.574,-6.257 -113.557,-153.206 -252.748,-153.206S7.818,239.784 3.249,246.035c-4.332,5.936 -4.332,13.987 0,19.923c4.569,6.257 113.557,153.206 252.748,153.206s248.174,-146.95 252.748,-153.201C513.083,260.028 513.083,251.971 508.745,246.041zM255.997,385.406c-102.529,0 -191.33,-97.533 -217.617,-129.418c26.253,-31.913 114.868,-129.395 217.617,-129.395c102.524,0 191.319,97.516 217.617,129.418C447.361,287.923 358.746,385.406 255.997,385.406z"/>
+    <path android:fillColor="#368f73" android:pathData="M255.997,154.725c-55.842,0 -101.275,45.433 -101.275,101.275s45.433,101.275 101.275,101.275s101.275,-45.433 101.275,-101.275S311.839,154.725 255.997,154.725zM255.997,323.516c-37.23,0 -67.516,-30.287 -67.516,-67.516s30.287,-67.516 67.516,-67.516s67.516,30.287 67.516,67.516S293.227,323.516 255.997,323.516z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_users.xml b/app/src/main/res/drawable/ic_users.xml
index 23afe227..bdc23ad1 100644
--- a/app/src/main/res/drawable/ic_users.xml
+++ b/app/src/main/res/drawable/ic_users.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="#368f73"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M16,11c1.66,0 2.99,-1.34 2.99,-3S17.66,5 16,5c-1.66,0 -3,1.34 -3,3s1.34,3 3,3zM8,11c1.66,0 2.99,-1.34 2.99,-3S9.66,5 8,5C6.34,5 5,6.34 5,8s1.34,3 3,3zM8,13c-2.33,0 -7,1.17 -7,3.5L1,19h14v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5zM16,13c-0.29,0 -0.62,0.02 -0.97,0.05 1.16,0.84 1.97,1.97 1.97,3.45L17,19h6v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5z"/>
diff --git a/app/src/main/res/drawable/ic_verified_user.xml b/app/src/main/res/drawable/ic_verified_user.xml
index 1f48d2d9..cc155514 100644
--- a/app/src/main/res/drawable/ic_verified_user.xml
+++ b/app/src/main/res/drawable/ic_verified_user.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="#368f73"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M12,1L3,5v6c0,5.55 3.84,10.74 9,12 5.16,-1.26 9,-6.45 9,-12L21,5l-9,-4zM10,17l-4,-4 1.41,-1.41L10,14.17l6.59,-6.59L18,9l-8,8z"/>
diff --git a/app/src/main/res/drawable/ic_warning.xml b/app/src/main/res/drawable/ic_warning.xml
index 29d8a440..e5541c63 100644
--- a/app/src/main/res/drawable/ic_warning.xml
+++ b/app/src/main/res/drawable/ic_warning.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="#368f73"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M1,21h22L12,2 1,21zM13,18h-2v-2h2v2zM13,14h-2v-4h2v4z"/>
diff --git a/app/src/main/res/drawable/ic_watchers.xml b/app/src/main/res/drawable/ic_watchers.xml
index 743220b5..f585f63e 100644
--- a/app/src/main/res/drawable/ic_watchers.xml
+++ b/app/src/main/res/drawable/ic_watchers.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="24dp" android:tint="#368f73"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M12,4.5C7,4.5 2.73,7.61 1,12c1.73,4.39 6,7.5 11,7.5s9.27,-3.11 11,-7.5c-1.73,-4.39 -6,-7.5 -11,-7.5zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5zM12,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3z"/>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index f31c6bde..92d525a9 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -18,9 +18,9 @@
         <androidx.appcompat.widget.Toolbar
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:background="@color/backgroundColor"
+            android:background="?attr/primaryBackgroundColor"
             android:id="@+id/toolbar"
-            app:titleTextColor="@color/white"
+            app:titleTextColor="?attr/primaryTextColor"
             app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
             android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
             android:elevation="4dp">
@@ -31,6 +31,7 @@
                 android:layout_gravity="center_vertical"
                 android:gravity="center_vertical"
                 android:textSize="18sp"
+                android:textColor="?attr/primaryTextColor"
                 android:id="@+id/toolbar_title" />
 
         </androidx.appcompat.widget.Toolbar>
@@ -49,9 +50,9 @@
         android:id="@+id/nav_view"
         app:headerLayout="@layout/nav_header"
         app:menu="@menu/drawer_menu"
-        android:background="@color/backgroundColor"
-        app:itemIconTint="@color/white"
+        android:background="?attr/primaryBackgroundColor"
+        app:itemIconTint="?attr/primaryTextColor"
         app:itemTextAppearance="@style/DrawerIcon"
-        app:itemTextColor="@color/white" />
+        app:itemTextColor="?attr/primaryTextColor" />
 
 </androidx.drawerlayout.widget.DrawerLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_new_repo.xml b/app/src/main/res/layout/activity_new_repo.xml
index 715b7118..8bc338b5 100644
--- a/app/src/main/res/layout/activity_new_repo.xml
+++ b/app/src/main/res/layout/activity_new_repo.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <LinearLayout android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:fitsSystemWindows="true"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:background="@color/colorPrimary">
+    android:background="?attr/primaryBackgroundColor">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
@@ -16,7 +15,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
+            android:background="?attr/primaryBackgroundColor"
             tools:ignore="UnusedAttribute">
 
             <ImageView
@@ -35,7 +34,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/pageTitleNewRepo"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:maxLines="1"
                 android:textSize="20sp" />
 
@@ -46,7 +45,7 @@
     <ScrollView xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/backgroundColor" >
+        android:background="?attr/primaryBackgroundColor" >
 
         <LinearLayout
             android:orientation="vertical"
@@ -61,7 +60,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/newRepoOwner"
-                android:textColor="@color/colorWhite"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp" />
 
             <Spinner
@@ -79,7 +78,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/newRepoTintCopy"
-                android:textColor="@color/colorWhite"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp" />
 
             <EditText
@@ -92,16 +91,16 @@
                 tools:ignore="Autofill"
                 android:labelFor="@+id/newRepoName"
                 android:background="@drawable/shape_inputs"
-                android:textColor="@color/colorWhite"
-                android:textColorHint="@color/colorWhite"
+                android:textColor="?attr/primaryTextColor"
+                android:textColorHint="?attr/primaryBackgroundColor"
                 android:inputType="textCapSentences|text"
-                android:textColorHighlight="@color/colorWhite"/>
+                android:textColorHighlight="?attr/primaryTextColor"/>
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/newRepoDescTintCopy"
-                android:textColor="@color/colorWhite"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
                 android:layout_marginTop="10dp" />
 
@@ -119,16 +118,16 @@
                 android:scrollbars="vertical"
                 android:gravity="top|start"
                 android:textSize="14sp"
-                android:textColor="@color/colorWhite"
-                android:textColorHint="@color/colorWhite"
+                android:textColor="?attr/primaryTextColor"
+                android:textColorHint="?attr/primaryBackgroundColor"
                 android:inputType="textCapSentences|textMultiLine"
-                android:textColorHighlight="@color/colorWhite"/>
+                android:textColorHighlight="?attr/primaryTextColor"/>
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/newRepoDescInfo"
-                android:textColor="@color/colorWhite"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="12sp"
                 android:gravity="end" />
 
@@ -141,7 +140,7 @@
                 android:textSize="16sp"
                 android:layout_marginTop="10dp"
                 android:theme="@style/checkBoxTheme"
-                android:textColor="@color/colorWhite"/>
+                android:textColor="?attr/primaryTextColor"/>
 
             <Button
                 android:id="@+id/createNewRepoButton"
diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml
index 75ae97e0..dcc909f1 100644
--- a/app/src/main/res/layout/fragment_about.xml
+++ b/app/src/main/res/layout/fragment_about.xml
@@ -5,13 +5,12 @@
 
     <ScrollView android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/colorPrimary">
+        android:background="?attr/primaryBackgroundColor">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:theme="@style/AppTheme"
             android:fitsSystemWindows="true"
             android:gravity="start"
             android:layout_marginStart="20dp"
@@ -35,7 +34,7 @@
                 android:textIsSelectable="true"
                 android:layout_marginTop="5dp"
                 android:textSize="24sp"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:layout_gravity="center_horizontal"/>
 
             <TextView
@@ -46,7 +45,7 @@
                 android:textIsSelectable="true"
                 android:layout_marginTop="5dp"
                 android:textSize="16sp"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:layout_gravity="center_horizontal"/>
 
             <TextView
@@ -57,9 +56,9 @@
                 android:textIsSelectable="true"
                 android:layout_marginTop="25dp"
                 android:textSize="16sp"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:padding="5dp"
-                android:background="@drawable/round_corners_with_background"
+                android:background="?attr/primaryBackgroundColor"
                 android:layout_gravity="center_horizontal"/>
 
             <TextView
@@ -69,9 +68,9 @@
                 android:text="@string/commitPage"
                 android:layout_marginTop="15dp"
                 android:textSize="16sp"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:padding="5dp"
-                android:background="@drawable/round_corners_with_background"
+                android:background="?attr/primaryBackgroundColor"
                 android:autoLink="web" />
 
             <LinearLayout
@@ -80,7 +79,7 @@
                 android:layout_marginTop="15dp"
                 android:orientation="vertical"
                 android:padding="5dp"
-                android:background="@drawable/round_corners_with_background">
+                android:background="?attr/primaryBackgroundColor">
 
                 <TextView
                     android:id="@+id/donationLink"
@@ -128,7 +127,7 @@
                 android:layout_marginTop="15dp"
                 android:orientation="vertical"
                 android:padding="5dp"
-                android:background="@drawable/round_corners_with_background">
+                android:background="?attr/primaryBackgroundColor">
 
                 <TextView
                     android:id="@+id/sponsorsButton"
diff --git a/app/src/main/res/layout/fragment_repositories.xml b/app/src/main/res/layout/fragment_repositories.xml
index 9ebb0f8c..21c475a9 100644
--- a/app/src/main/res/layout/fragment_repositories.xml
+++ b/app/src/main/res/layout/fragment_repositories.xml
@@ -14,7 +14,7 @@
             android:id="@+id/recyclerView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@color/colorPrimary"
+            android:background="?attr/primaryBackgroundColor"
             android:padding="4dp"
             android:scrollbars="vertical"
             />
@@ -28,7 +28,7 @@
         android:layout_margin="15dp"
         android:gravity="center"
         android:text="@string/noData"
-        android:textColor="@color/white"
+        android:textColor="?attr/primaryTextColor"
         android:textSize="20sp"
         android:visibility="gone" />
 
diff --git a/app/src/main/res/layout/repos_list.xml b/app/src/main/res/layout/repos_list.xml
index 8aa5ea25..514d5a85 100644
--- a/app/src/main/res/layout/repos_list.xml
+++ b/app/src/main/res/layout/repos_list.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/backgroundColor" >
+    android:background="?attr/primaryBackgroundColor" >
 
     <TextView
         android:id="@+id/repoType"
@@ -20,7 +20,6 @@
         android:fitsSystemWindows="true"
         android:orientation="vertical"
         android:layout_margin="10dp"
-        android:theme="@style/AppTheme"
         tools:context=".activities.MainActivity">
 
         <ImageView
@@ -51,7 +50,7 @@
                     android:layout_weight=".95"
                     android:layout_marginBottom="5dp"
                     android:text="@string/repoName"
-                    android:textColor="@color/white"
+                    android:textColor="?attr/primaryTextColor"
                     android:textSize="18sp" />
 
                 <ImageView
@@ -71,7 +70,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="5dp"
                 android:text="@string/repoFullname"
-                android:textColor="@color/colorWhite"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp" />
 
             <TextView
@@ -80,7 +79,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="10dp"
                 android:text="@string/repoDescription"
-                android:textColor="@color/colorWhite"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
                 android:visibility="gone" />
 
@@ -101,7 +100,7 @@
                     android:gravity="center_vertical"
                     android:layout_gravity="center_vertical"
                     android:text="@string/repoWatchers"
-                    android:textColor="@color/colorWhite"
+                    android:textColor="?attr/primaryTextColor"
                     android:textSize="14sp" />
 
                 <TextView
@@ -114,7 +113,7 @@
                     android:gravity="center_vertical"
                     android:layout_gravity="center_vertical"
                     android:text="@string/repoStars"
-                    android:textColor="@color/colorWhite"
+                    android:textColor="?attr/primaryTextColor"
                     android:textSize="14sp" />
 
                 <TextView
@@ -127,7 +126,7 @@
                     android:gravity="center_vertical"
                     android:layout_gravity="center_vertical"
                     android:text="@string/repoWatchers"
-                    android:textColor="@color/colorWhite"
+                    android:textColor="?attr/primaryTextColor"
                     android:textSize="14sp" />
 
                 <ImageView
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index 5b43477f..0d2c4cc4 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -1,12 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
-        <item name="android:statusBarColor">@color/colorPrimary</item>
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimary</item>
-        <item name="android:windowBackground">@color/colorPrimary</item>
-        <item name="android:typeface">monospace</item>
-    </style>
-
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
new file mode 100644
index 00000000..c9df3125
--- /dev/null
+++ b/app/src/main/res/values/attrs.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <attr name="primaryTextColor" format="reference"/>
+    <attr name="primaryBackgroundColor" format="reference" />
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 0fcecdee..b174d936 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -29,4 +29,7 @@
     <color name="diffRemovedColor">#ffe0e0</color>
     <color name="diffAddedColor">#d6fcd6</color>
 
+    <color name="lightThemeTextColor">#646565</color>
+    <color name="lightThemeBackground">#f9f9f9</color>
+
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index b5ac6bbf..ea5c013e 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,14 +1,5 @@
 <resources>
 
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-        <item name="drawerArrowStyle">@style/DrawerIcon</item>
-        <item name="colorControlHighlight">#123456</item>
-        <item name="android:typeface">monospace</item>
-    </style>
-
     <style name="DrawerIcon" parent="Widget.AppCompat.DrawerArrowToggle">
         <item name="color">@color/white</item>
         <item name="android:textSize">16sp</item>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
new file mode 100644
index 00000000..0b272e24
--- /dev/null
+++ b/app/src/main/res/values/themes.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="android:statusBarColor">@color/colorPrimary</item>
+        <item name="android:windowBackground">@color/colorPrimary</item>
+        <item name="android:typeface">monospace</item>
+
+        <item name="primaryTextColor">@color/white</item>
+        <item name="primaryBackgroundColor">@color/colorPrimary</item>
+    </style>
+
+    <style name="AppThemeLight" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="android:statusBarColor">@color/colorPrimary</item>
+        <item name="android:windowBackground">@color/lightThemeBackground</item>
+        <item name="android:typeface">monospace</item>
+
+        <item name="primaryTextColor">@color/lightThemeTextColor</item>
+        <item name="primaryBackgroundColor">@color/lightThemeBackground</item>
+    </style>
+
+</resources>
\ No newline at end of file

From 50671907ba7f4577554d7388b96731560211e329 Mon Sep 17 00:00:00 2001
From: M M Arif <mmarif@swatian.com>
Date: Wed, 29 Jan 2020 19:31:27 +0500
Subject: [PATCH 02/14] changed checkbox style and input background

---
 .../mian/gitnex/activities/NewRepoActivity.java |  1 -
 app/src/main/res/drawable/shape_inputs.xml      |  2 +-
 app/src/main/res/drawable/spinner.xml           |  5 ++---
 app/src/main/res/layout/activity_new_repo.xml   |  6 +++---
 app/src/main/res/values/attrs.xml               |  2 ++
 app/src/main/res/values/colors.xml              |  2 ++
 app/src/main/res/values/themes.xml              | 17 ++++++++++++++++-
 7 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/org/mian/gitnex/activities/NewRepoActivity.java b/app/src/main/java/org/mian/gitnex/activities/NewRepoActivity.java
index e5fd76d0..7b1b43a0 100644
--- a/app/src/main/java/org/mian/gitnex/activities/NewRepoActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/NewRepoActivity.java
@@ -5,7 +5,6 @@ import android.graphics.PorterDuff;
 import android.graphics.drawable.GradientDrawable;
 import android.os.Bundle;
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.view.View;
 import android.widget.AdapterView;
diff --git a/app/src/main/res/drawable/shape_inputs.xml b/app/src/main/res/drawable/shape_inputs.xml
index 99ffb651..cc896af4 100644
--- a/app/src/main/res/drawable/shape_inputs.xml
+++ b/app/src/main/res/drawable/shape_inputs.xml
@@ -4,7 +4,7 @@
     android:shape="rectangle">
 
     <solid
-        android:color="@color/inputBackground">
+        android:color="?attr/inputBackgroundColor">
     </solid>
 
     <corners
diff --git a/app/src/main/res/drawable/spinner.xml b/app/src/main/res/drawable/spinner.xml
index be6f4bdf..9c385ed8 100644
--- a/app/src/main/res/drawable/spinner.xml
+++ b/app/src/main/res/drawable/spinner.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
 <item>
-    <shape
-        xmlns:android="http://schemas.android.com/apk/res/android">
+    <shape>
 
         <solid
-            android:color="@color/inputBackground">
+            android:color="?attr/inputBackgroundColor">
         </solid>
 
         <corners
diff --git a/app/src/main/res/layout/activity_new_repo.xml b/app/src/main/res/layout/activity_new_repo.xml
index 8bc338b5..55b8c71e 100644
--- a/app/src/main/res/layout/activity_new_repo.xml
+++ b/app/src/main/res/layout/activity_new_repo.xml
@@ -91,7 +91,7 @@
                 tools:ignore="Autofill"
                 android:labelFor="@+id/newRepoName"
                 android:background="@drawable/shape_inputs"
-                android:textColor="?attr/primaryTextColor"
+                android:textColor="?attr/inputTextColor"
                 android:textColorHint="?attr/primaryBackgroundColor"
                 android:inputType="textCapSentences|text"
                 android:textColorHighlight="?attr/primaryTextColor"/>
@@ -118,7 +118,7 @@
                 android:scrollbars="vertical"
                 android:gravity="top|start"
                 android:textSize="14sp"
-                android:textColor="?attr/primaryTextColor"
+                android:textColor="?attr/inputTextColor"
                 android:textColorHint="?attr/primaryBackgroundColor"
                 android:inputType="textCapSentences|textMultiLine"
                 android:textColorHighlight="?attr/primaryTextColor"/>
@@ -139,7 +139,7 @@
                 android:checked="true"
                 android:textSize="16sp"
                 android:layout_marginTop="10dp"
-                android:theme="@style/checkBoxTheme"
+
                 android:textColor="?attr/primaryTextColor"/>
 
             <Button
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index c9df3125..862be9e5 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -2,4 +2,6 @@
 <resources>
     <attr name="primaryTextColor" format="reference"/>
     <attr name="primaryBackgroundColor" format="reference" />
+    <attr name="inputBackgroundColor" format="reference" />
+    <attr name="inputTextColor" format="reference" />
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index b174d936..d4967598 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -31,5 +31,7 @@
 
     <color name="lightThemeTextColor">#646565</color>
     <color name="lightThemeBackground">#f9f9f9</color>
+    <color name="lightThemeInputBackground">#b6bbbf</color>
+    <color name="lightThemeInputTextColor">#212121</color>
 
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 0b272e24..a384fced 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -6,8 +6,11 @@
         <item name="android:windowBackground">@color/colorPrimary</item>
         <item name="android:typeface">monospace</item>
 
-        <item name="primaryTextColor">@color/white</item>
+        <item name="primaryTextColor">@color/colorWhite</item>
         <item name="primaryBackgroundColor">@color/colorPrimary</item>
+        <item name="inputBackgroundColor">@color/inputBackground</item>
+        <item name="inputTextColor">@color/colorWhite</item>
+        <item name="checkboxStyle">@style/AppThemeCheckBoxStyle</item>
     </style>
 
     <style name="AppThemeLight" parent="Theme.AppCompat.Light.NoActionBar">
@@ -17,6 +20,18 @@
 
         <item name="primaryTextColor">@color/lightThemeTextColor</item>
         <item name="primaryBackgroundColor">@color/lightThemeBackground</item>
+        <item name="inputBackgroundColor">@color/lightThemeInputBackground</item>
+        <item name="inputTextColor">@color/lightThemeInputTextColor</item>
+        <item name="checkboxStyle">@style/AppThemeLightCheckBoxStyle</item>
+    </style>
+
+
+    <style name="AppThemeLightCheckBoxStyle" parent="Base.Widget.AppCompat.CompoundButton.CheckBox">
+        <item name="buttonTint">@color/colorDarkGreen</item>
+    </style>
+
+    <style name="AppThemeCheckBoxStyle" parent="Base.Widget.AppCompat.CompoundButton.CheckBox">
+        <item name="buttonTint">@color/colorWhite</item>
     </style>
 
 </resources>
\ No newline at end of file

From 8b75cac9d86709447017caecfeff8b9fd80db6af Mon Sep 17 00:00:00 2001
From: M M Arif <mmarif@swatian.com>
Date: Mon, 3 Feb 2020 00:14:38 +0500
Subject: [PATCH 03/14] New spinner style

---
 .../activities/IssueDetailActivity.java       | 10 +++++---
 app/src/main/res/drawable-v23/spinner.xml     |  3 +--
 app/src/main/res/drawable/shape_dropdown.xml  | 21 ++++++++++++++++
 app/src/main/res/layout/activity_new_repo.xml | 24 ++++++++++++-------
 .../main/res/layout/spinner_dropdown_item.xml |  4 ++--
 app/src/main/res/layout/spinner_item.xml      |  2 +-
 app/src/main/res/values/themes.xml            |  3 ++-
 7 files changed, 50 insertions(+), 17 deletions(-)
 create mode 100644 app/src/main/res/drawable/shape_dropdown.xml

diff --git a/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java b/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java
index 8873a6ad..ead431b1 100644
--- a/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java
@@ -80,7 +80,7 @@ import java.util.Objects;
  * Author M M Arif
  */
 
-public class IssueDetailActivity extends AppCompatActivity {
+public class IssueDetailActivity extends BaseActivity {
 
     public ImageView closeActivity;
     private IssueCommentsAdapter adapter;
@@ -100,10 +100,14 @@ public class IssueDetailActivity extends AppCompatActivity {
     private LinearLayout assigneesLayout;
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    protected int getLayoutResourceId(){
+        return R.layout.activity_issue_detail;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_issue_detail);
 
         final TinyDB tinyDb = new TinyDB(getApplicationContext());
 
diff --git a/app/src/main/res/drawable-v23/spinner.xml b/app/src/main/res/drawable-v23/spinner.xml
index 91edca93..c6a85257 100644
--- a/app/src/main/res/drawable-v23/spinner.xml
+++ b/app/src/main/res/drawable-v23/spinner.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
 <item>
-    <shape
-        xmlns:android="http://schemas.android.com/apk/res/android">
+    <shape>
 
         <solid
             android:color="@color/inputBackground">
diff --git a/app/src/main/res/drawable/shape_dropdown.xml b/app/src/main/res/drawable/shape_dropdown.xml
new file mode 100644
index 00000000..9974acb5
--- /dev/null
+++ b/app/src/main/res/drawable/shape_dropdown.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+xmlns:android="http://schemas.android.com/apk/res/android"
+android:shape="rectangle">
+
+    <solid
+        android:color="?attr/inputBackgroundColor">
+    </solid>
+
+    <corners
+        android:radius="3dp">
+    </corners>
+
+    <padding
+        android:top="0dp"
+        android:right="0dp"
+        android:left="5dp"
+        android:bottom="0dp">
+    </padding>
+
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_new_repo.xml b/app/src/main/res/layout/activity_new_repo.xml
index 55b8c71e..3e1d03bf 100644
--- a/app/src/main/res/layout/activity_new_repo.xml
+++ b/app/src/main/res/layout/activity_new_repo.xml
@@ -63,16 +63,25 @@
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp" />
 
-            <Spinner
-                android:id="@+id/ownerSpinner"
+            <RelativeLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:spinnerMode="dropdown"
+                android:background="@drawable/shape_dropdown"
                 android:layout_marginTop="10dp"
-                android:layout_marginBottom="10dp"
-                android:paddingLeft="5dp"
-                android:paddingRight="5dp"
-                android:paddingStart="5dp" />
+                android:layout_marginBottom="10dp" >
+
+                <Spinner
+                    android:id="@+id/ownerSpinner"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:spinnerMode="dropdown"
+                    android:layout_marginTop="5dp"
+                    android:layout_marginBottom="5dp"
+                    android:paddingLeft="5dp"
+                    android:paddingRight="5dp"
+                    android:paddingStart="5dp" />
+
+            </RelativeLayout>
 
             <TextView
                 android:layout_width="match_parent"
@@ -139,7 +148,6 @@
                 android:checked="true"
                 android:textSize="16sp"
                 android:layout_marginTop="10dp"
-
                 android:textColor="?attr/primaryTextColor"/>
 
             <Button
diff --git a/app/src/main/res/layout/spinner_dropdown_item.xml b/app/src/main/res/layout/spinner_dropdown_item.xml
index aee90929..d2a78c81 100644
--- a/app/src/main/res/layout/spinner_dropdown_item.xml
+++ b/app/src/main/res/layout/spinner_dropdown_item.xml
@@ -6,5 +6,5 @@
     android:padding="10dp"
     android:layout_height="wrap_content"
     android:ellipsize="marquee"
-    android:background="@color/colorPrimary"
-    android:textColor="@color/colorWhite"/>
+    android:background="?attr/primaryBackgroundColor"
+    android:textColor="?attr/primaryTextColor"/>
diff --git a/app/src/main/res/layout/spinner_item.xml b/app/src/main/res/layout/spinner_item.xml
index e3c332f9..854e433b 100644
--- a/app/src/main/res/layout/spinner_item.xml
+++ b/app/src/main/res/layout/spinner_item.xml
@@ -5,4 +5,4 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:textSize="16sp"
-    android:textColor="@color/colorWhite" />
+    android:textColor="@color/darkGreen" />
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index a384fced..ed64bb5f 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
+    <!-- Dark theme - default -->
     <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="android:statusBarColor">@color/colorPrimary</item>
         <item name="android:windowBackground">@color/colorPrimary</item>
@@ -13,6 +14,7 @@
         <item name="checkboxStyle">@style/AppThemeCheckBoxStyle</item>
     </style>
 
+    <!-- Light theme -->
     <style name="AppThemeLight" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="android:statusBarColor">@color/colorPrimary</item>
         <item name="android:windowBackground">@color/lightThemeBackground</item>
@@ -25,7 +27,6 @@
         <item name="checkboxStyle">@style/AppThemeLightCheckBoxStyle</item>
     </style>
 
-
     <style name="AppThemeLightCheckBoxStyle" parent="Base.Widget.AppCompat.CompoundButton.CheckBox">
         <item name="buttonTint">@color/colorDarkGreen</item>
     </style>

From dbcd80eace4001bc1467462a96a424ff5551907d Mon Sep 17 00:00:00 2001
From: M M Arif <mmarif@swatian.com>
Date: Tue, 4 Feb 2020 19:19:39 +0500
Subject: [PATCH 04/14] updated settings, star and my repos layouts

---
 .../res/layout/fragment_my_repositories.xml   |  4 ++--
 app/src/main/res/layout/fragment_settings.xml |  5 ++---
 .../layout/fragment_starred_repositories.xml  |  4 ++--
 .../res/layout/layout_settings_appearance.xml | 21 ++++++++++---------
 .../res/layout/layout_settings_languages.xml  |  7 ++++---
 app/src/main/res/layout/my_repos_list.xml     | 15 +++++++------
 .../main/res/layout/starred_repos_list.xml    | 15 +++++++------
 app/src/main/res/values/attrs.xml             |  1 +
 app/src/main/res/values/themes.xml            |  2 ++
 9 files changed, 38 insertions(+), 36 deletions(-)

diff --git a/app/src/main/res/layout/fragment_my_repositories.xml b/app/src/main/res/layout/fragment_my_repositories.xml
index a5321ad9..f079ce0f 100644
--- a/app/src/main/res/layout/fragment_my_repositories.xml
+++ b/app/src/main/res/layout/fragment_my_repositories.xml
@@ -14,7 +14,7 @@
             android:id="@+id/recyclerView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@color/colorPrimary"
+            android:background="?attr/primaryBackgroundColor"
             android:padding="4dp"
             android:scrollbars="vertical" />
 
@@ -47,7 +47,7 @@
         android:layout_height="match_parent"
         android:layout_margin="15dp"
         android:text="@string/noData"
-        android:textColor="@color/white"
+        android:textColor="?attr/primaryTextColor"
         android:gravity="center"
         android:textSize="20sp"
         android:visibility="gone" />
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index 7202296d..37325ca1 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -2,12 +2,12 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/colorPrimary">
+    android:background="?attr/primaryBackgroundColor">
 
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/backgroundColor" >
+        android:background="?attr/primaryBackgroundColor" >
 
         <RelativeLayout
             android:layout_width="match_parent"
@@ -27,7 +27,6 @@
                 android:layout_marginTop="20dp"
                 android:layout_marginBottom="20dp"
                 android:layout_below="@id/timeLayout"
-                android:background="@color/divider"
                 />
 
             <include
diff --git a/app/src/main/res/layout/fragment_starred_repositories.xml b/app/src/main/res/layout/fragment_starred_repositories.xml
index 9ebb0f8c..21c475a9 100644
--- a/app/src/main/res/layout/fragment_starred_repositories.xml
+++ b/app/src/main/res/layout/fragment_starred_repositories.xml
@@ -14,7 +14,7 @@
             android:id="@+id/recyclerView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@color/colorPrimary"
+            android:background="?attr/primaryBackgroundColor"
             android:padding="4dp"
             android:scrollbars="vertical"
             />
@@ -28,7 +28,7 @@
         android:layout_margin="15dp"
         android:gravity="center"
         android:text="@string/noData"
-        android:textColor="@color/white"
+        android:textColor="?attr/primaryTextColor"
         android:textSize="20sp"
         android:visibility="gone" />
 
diff --git a/app/src/main/res/layout/layout_settings_appearance.xml b/app/src/main/res/layout/layout_settings_appearance.xml
index ddcf6a23..57beb3e6 100644
--- a/app/src/main/res/layout/layout_settings_appearance.xml
+++ b/app/src/main/res/layout/layout_settings_appearance.xml
@@ -4,7 +4,7 @@
     android:layout_height="wrap_content"
     android:id="@+id/layoutTime"
     android:orientation="vertical"
-    android:background="@color/colorPrimary">
+    android:background="?attr/primaryBackgroundColor">
 
     <TextView
         android:id="@+id/tvAppearance"
@@ -14,6 +14,7 @@
         android:drawableStart="@drawable/ic_color"
         android:drawablePadding="20dp"
         android:text="@string/settingsAppearanceHeader"
+        android:textStyle="bold"
         android:textColor="@color/colorDarkGreen"/>
 
     <LinearLayout
@@ -32,7 +33,7 @@
             android:layout_marginStart="44dp"
             android:layout_marginEnd="4dp"
             android:text="@string/settingsDateTimeHeaderText"
-            android:textColor="@color/white"/>
+            android:textColor="?attr/primaryTextColor"/>
 
         <TextView
             android:id="@+id/tvDateTimeSelected"
@@ -42,7 +43,7 @@
             android:layout_marginStart="44dp"
             android:layout_marginEnd="4dp"
             android:text="@string/settingsDateTimeHeaderDefault"
-            android:textColor="@color/white"/>
+            android:textColor="?attr/selectedTextColor"/>
 
     </LinearLayout>
 
@@ -61,7 +62,7 @@
             android:layout_marginStart="44dp"
             android:layout_marginEnd="4dp"
             android:text="@string/settingsIssueBadgeHeaderText"
-            android:textColor="@color/white"/>
+            android:textColor="?attr/primaryTextColor"/>
 
         <Switch
             android:id="@+id/switchIssuesBadge"
@@ -91,7 +92,7 @@
             android:layout_marginStart="44dp"
             android:layout_marginEnd="4dp"
             android:text="@string/codeBlockHeaderText"
-            android:textColor="@color/white"/>
+            android:textColor="?attr/primaryTextColor"/>
 
         <TextView
             android:id="@+id/codeBlockSelected"
@@ -101,7 +102,7 @@
             android:layout_marginStart="44dp"
             android:layout_marginEnd="4dp"
             android:text="@string/codeBlockSelectedText"
-            android:textColor="@color/white"/>
+            android:textColor="?attr/selectedTextColor"/>
 
     </LinearLayout>
 
@@ -121,7 +122,7 @@
             android:layout_marginStart="44dp"
             android:layout_marginEnd="4dp"
             android:text="@string/settingsHomeScreenHeaderText"
-            android:textColor="@color/white"/>
+            android:textColor="?attr/primaryTextColor"/>
 
         <TextView
             android:id="@+id/homeScreenSelected"
@@ -131,7 +132,7 @@
             android:layout_marginStart="44dp"
             android:layout_marginEnd="4dp"
             android:text="@string/settingsHomeScreenSelectedText"
-            android:textColor="@color/white"/>
+            android:textColor="?attr/selectedTextColor"/>
 
     </LinearLayout>
 
@@ -151,7 +152,7 @@
             android:layout_marginStart="44dp"
             android:layout_marginEnd="4dp"
             android:text="@string/settingsCustomFontHeaderText"
-            android:textColor="@color/white"/>
+            android:textColor="?attr/primaryTextColor"/>
 
         <TextView
             android:id="@+id/customFontSelected"
@@ -161,7 +162,7 @@
             android:layout_marginStart="44dp"
             android:layout_marginEnd="4dp"
             android:text="@string/defaultCopy"
-            android:textColor="@color/white"/>
+            android:textColor="?attr/selectedTextColor"/>
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/layout_settings_languages.xml b/app/src/main/res/layout/layout_settings_languages.xml
index 41a0453f..cae6160c 100644
--- a/app/src/main/res/layout/layout_settings_languages.xml
+++ b/app/src/main/res/layout/layout_settings_languages.xml
@@ -4,7 +4,7 @@
     android:layout_height="wrap_content"
     android:orientation="vertical"
     android:layout_below="@+id/translationDivider"
-    android:background="@color/colorPrimary">
+    android:background="?attr/primaryBackgroundColor">
 
     <TextView
         android:id="@+id/tvLanguage"
@@ -14,6 +14,7 @@
         android:drawableStart="@drawable/ic_language"
         android:drawablePadding="20dp"
         android:text="@string/settingsLanguageHeaderText"
+        android:textStyle="bold"
         android:textColor="@color/colorDarkGreen"/>
 
     <LinearLayout
@@ -32,7 +33,7 @@
             android:layout_marginStart="44dp"
             android:layout_marginEnd="4dp"
             android:text="@string/settingsLanguageSelectorHeader"
-            android:textColor="@color/white"/>
+            android:textColor="?attr/primaryTextColor"/>
 
         <TextView
             android:id="@+id/tvLanguageSelected"
@@ -42,7 +43,7 @@
             android:layout_marginStart="44dp"
             android:layout_marginEnd="4dp"
             android:text="@string/settingsLanguageSelectedHeaderDefault"
-            android:textColor="@color/white"/>
+            android:textColor="?attr/selectedTextColor"/>
 
         <TextView
             android:id="@+id/helpTranslate"
diff --git a/app/src/main/res/layout/my_repos_list.xml b/app/src/main/res/layout/my_repos_list.xml
index 6a76758b..84c64108 100644
--- a/app/src/main/res/layout/my_repos_list.xml
+++ b/app/src/main/res/layout/my_repos_list.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/backgroundColor" >
+    android:background="?attr/primaryBackgroundColor" >
 
     <TextView
         android:id="@+id/repoType"
@@ -20,7 +20,6 @@
         android:fitsSystemWindows="true"
         android:orientation="vertical"
         android:padding="10dp"
-        android:theme="@style/AppTheme"
         tools:context=".activities.MainActivity">
 
         <ImageView
@@ -51,7 +50,7 @@
                     android:layout_weight=".95"
                     android:layout_marginBottom="5dp"
                     android:text="@string/repoName"
-                    android:textColor="@color/white"
+                    android:textColor="?attr/primaryTextColor"
                     android:textSize="18sp" />
 
                 <ImageView
@@ -71,7 +70,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="5dp"
                 android:text="@string/repoFullname"
-                android:textColor="@color/colorWhite"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp" />
 
             <TextView
@@ -80,7 +79,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="10dp"
                 android:text="@string/repoDescription"
-                android:textColor="@color/colorWhite"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
                 android:visibility="gone" />
 
@@ -101,7 +100,7 @@
                     android:gravity="center_vertical"
                     android:layout_gravity="center_vertical"
                     android:text="@string/repoWatchers"
-                    android:textColor="@color/colorWhite"
+                    android:textColor="?attr/primaryTextColor"
                     android:textSize="16sp" />
 
                 <TextView
@@ -114,7 +113,7 @@
                     android:gravity="center_vertical"
                     android:layout_gravity="center_vertical"
                     android:text="@string/repoStars"
-                    android:textColor="@color/colorWhite"
+                    android:textColor="?attr/primaryTextColor"
                     android:textSize="16sp" />
 
                 <TextView
@@ -127,7 +126,7 @@
                     android:gravity="center_vertical"
                     android:layout_gravity="center_vertical"
                     android:text="@string/repoWatchers"
-                    android:textColor="@color/colorWhite"
+                    android:textColor="?attr/primaryTextColor"
                     android:textSize="16sp" />
 
                 <ImageView
diff --git a/app/src/main/res/layout/starred_repos_list.xml b/app/src/main/res/layout/starred_repos_list.xml
index 32c4cedc..2b6dabb3 100644
--- a/app/src/main/res/layout/starred_repos_list.xml
+++ b/app/src/main/res/layout/starred_repos_list.xml
@@ -10,8 +10,7 @@
     android:fitsSystemWindows="true"
     android:orientation="vertical"
     android:padding="10dp"
-    android:theme="@style/AppTheme"
-    android:background="@color/backgroundColor"
+    android:background="?attr/primaryBackgroundColor"
     tools:context=".activities.MainActivity">
 
     <TextView
@@ -48,7 +47,7 @@
                 android:layout_weight=".95"
                 android:layout_marginBottom="5dp"
                 android:text="@string/repoName"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="18sp" />
 
             <ImageView
@@ -68,7 +67,7 @@
             android:layout_height="wrap_content"
             android:layout_marginBottom="5dp"
             android:text="@string/repoFullname"
-            android:textColor="@color/colorWhite"
+            android:textColor="?attr/primaryTextColor"
             android:textSize="16sp" />
 
         <TextView
@@ -77,7 +76,7 @@
             android:layout_height="wrap_content"
             android:layout_marginBottom="10dp"
             android:text="@string/repoDescription"
-            android:textColor="@color/colorWhite"
+            android:textColor="?attr/primaryTextColor"
             android:textSize="16sp"
             android:visibility="gone" />
 
@@ -98,7 +97,7 @@
                 android:gravity="center_vertical"
                 android:layout_gravity="center_vertical"
                 android:text="@string/repoWatchers"
-                android:textColor="@color/colorWhite"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="14sp" />
 
             <TextView
@@ -111,7 +110,7 @@
                 android:gravity="center_vertical"
                 android:layout_gravity="center_vertical"
                 android:text="@string/repoStars"
-                android:textColor="@color/colorWhite"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="14sp" />
 
             <TextView
@@ -124,7 +123,7 @@
                 android:gravity="center_vertical"
                 android:layout_gravity="center_vertical"
                 android:text="@string/repoWatchers"
-                android:textColor="@color/colorWhite"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="14sp" />
 
             <ImageView
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 862be9e5..aa54a526 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -4,4 +4,5 @@
     <attr name="primaryBackgroundColor" format="reference" />
     <attr name="inputBackgroundColor" format="reference" />
     <attr name="inputTextColor" format="reference" />
+    <attr name="selectedTextColor" format="reference" />
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index ed64bb5f..08d65633 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -12,6 +12,7 @@
         <item name="inputBackgroundColor">@color/inputBackground</item>
         <item name="inputTextColor">@color/colorWhite</item>
         <item name="checkboxStyle">@style/AppThemeCheckBoxStyle</item>
+        <item name="selectedTextColor">@color/darkGreen</item>
     </style>
 
     <!-- Light theme -->
@@ -25,6 +26,7 @@
         <item name="inputBackgroundColor">@color/lightThemeInputBackground</item>
         <item name="inputTextColor">@color/lightThemeInputTextColor</item>
         <item name="checkboxStyle">@style/AppThemeLightCheckBoxStyle</item>
+        <item name="selectedTextColor">@color/darkGreen</item>
     </style>
 
     <style name="AppThemeLightCheckBoxStyle" parent="Base.Widget.AppCompat.CompoundButton.CheckBox">

From acdb9ce6824cd36b768cea7b3a2ed9e342ac78a9 Mon Sep 17 00:00:00 2001
From: M M Arif <mmarif@swatian.com>
Date: Thu, 20 Feb 2020 10:19:52 +0500
Subject: [PATCH 05/14] updates to other files

---
 .../mian/gitnex/activities/BaseActivity.java  |  2 +-
 .../activities/CreateTeamByOrgActivity.java   | 15 ++++---
 .../gitnex/activities/CreditsActivity.java    | 11 +++--
 .../mian/gitnex/activities/LoginActivity.java |  2 +-
 .../gitnex/activities/SponsorsActivity.java   | 11 +++--
 .../adapters/ExploreRepositoriesAdapter.java  |  4 +-
 .../gitnex/adapters/IssueCommentsAdapter.java |  4 +-
 .../mian/gitnex/adapters/LabelsAdapter.java   |  4 +-
 .../gitnex/adapters/MyReposListAdapter.java   |  4 +-
 .../gitnex/adapters/ReposListAdapter.java     |  4 +-
 .../adapters/RepositoriesByOrgAdapter.java    |  4 +-
 .../adapters/StarredReposListAdapter.java     |  4 +-
 .../gitnex/adapters/UserSearchAdapter.java    |  2 +-
 .../gitnex/fragments/SettingsFragment.java    | 10 ++---
 .../org/mian/gitnex/helpers/AlertDialogs.java |  6 +--
 app/src/main/res/layout/activity_credits.xml  |  8 ++--
 app/src/main/res/layout/activity_sponsors.xml |  8 ++--
 app/src/main/res/layout/credits.xml           |  4 +-
 app/src/main/res/layout/sponsors.xml          |  4 +-
 app/src/main/res/values/attrs.xml             |  1 +
 app/src/main/res/values/styles.xml            | 15 -------
 app/src/main/res/values/themes.xml            | 40 +++++++++++++++++++
 22 files changed, 101 insertions(+), 66 deletions(-)

diff --git a/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java b/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java
index ece3082b..069b2e1e 100644
--- a/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java
@@ -15,7 +15,7 @@ public abstract class BaseActivity extends AppCompatActivity {
     @Override
     public void onCreate(Bundle savedInstanceState) {
 
-        setTheme(R.style.AppThemeLight);
+        setTheme(R.style.AppTheme);
 
         super.onCreate(savedInstanceState);
         setContentView(getLayoutResourceId());
diff --git a/app/src/main/java/org/mian/gitnex/activities/CreateTeamByOrgActivity.java b/app/src/main/java/org/mian/gitnex/activities/CreateTeamByOrgActivity.java
index 0ba362ca..8d86e082 100644
--- a/app/src/main/java/org/mian/gitnex/activities/CreateTeamByOrgActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreateTeamByOrgActivity.java
@@ -2,7 +2,6 @@ package org.mian.gitnex.activities;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.app.AppCompatActivity;
 import retrofit2.Call;
 import retrofit2.Callback;
 import android.content.Context;
@@ -30,7 +29,7 @@ import android.util.Log;
  * Author M M Arif
  */
 
-public class CreateTeamByOrgActivity extends AppCompatActivity implements View.OnClickListener {
+public class CreateTeamByOrgActivity extends BaseActivity implements View.OnClickListener {
 
     final Context ctx = CreateTeamByOrgActivity.this;
     private View.OnClickListener onClickListener;
@@ -44,6 +43,11 @@ public class CreateTeamByOrgActivity extends AppCompatActivity implements View.O
     private String[] permissionList = {"Read", "Write", "Admin"};
     public int permissionSelectedChoice = -1;
 
+    @Override
+    protected int getLayoutResourceId(){
+        return R.layout.activity_create_team_by_org;
+    }
+
     private String[] accessControlsList = new String[] {
             "Code",
             "Issues",
@@ -67,9 +71,8 @@ public class CreateTeamByOrgActivity extends AppCompatActivity implements View.O
     };
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_create_team_by_org);
 
         boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
 
@@ -89,7 +92,7 @@ public class CreateTeamByOrgActivity extends AppCompatActivity implements View.O
             @Override
             public void onClick(View view) {
 
-                AlertDialog.Builder pBuilder = new AlertDialog.Builder(ctx, R.style.confirmDialog);
+                AlertDialog.Builder pBuilder = new AlertDialog.Builder(ctx);
 
                 pBuilder.setTitle(R.string.newTeamPermission);
                 if(permissionSelectedChoice != -1) {
@@ -141,7 +144,7 @@ public class CreateTeamByOrgActivity extends AppCompatActivity implements View.O
                 teamAccessControlsArray.setText("");
                 pushAccessList = Arrays.asList(accessControlsList);
 
-                AlertDialog.Builder aDialogBuilder = new AlertDialog.Builder(ctx, R.style.confirmDialog);
+                AlertDialog.Builder aDialogBuilder = new AlertDialog.Builder(ctx);
 
                 aDialogBuilder.setMultiChoiceItems(accessControlsList, selectedAccessControlsTrueFalse, new DialogInterface.OnMultiChoiceClickListener() {
 
diff --git a/app/src/main/java/org/mian/gitnex/activities/CreditsActivity.java b/app/src/main/java/org/mian/gitnex/activities/CreditsActivity.java
index 9c3bddb7..695113c0 100644
--- a/app/src/main/java/org/mian/gitnex/activities/CreditsActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreditsActivity.java
@@ -1,6 +1,5 @@
 package org.mian.gitnex.activities;
 
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -18,15 +17,19 @@ import java.util.List;
  * Author M M Arif
  */
 
-public class CreditsActivity extends AppCompatActivity {
+public class CreditsActivity extends BaseActivity {
 
     private View.OnClickListener onClickListener;
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    protected int getLayoutResourceId(){
+        return R.layout.activity_credits;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_credits);
 
         ImageView closeActivity = findViewById(R.id.close);
 
diff --git a/app/src/main/java/org/mian/gitnex/activities/LoginActivity.java b/app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
index 2c858632..76eecc7d 100644
--- a/app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
@@ -403,7 +403,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
                             return;
                         case UNSUPPORTED_OLD:
 
-                            AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(ctx, R.style.confirmDialog);
+                            AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(ctx);
 
                             alertDialogBuilder
                                     .setTitle(getString(R.string.versionAlertDialogHeader))
diff --git a/app/src/main/java/org/mian/gitnex/activities/SponsorsActivity.java b/app/src/main/java/org/mian/gitnex/activities/SponsorsActivity.java
index 4acf0279..84d0b357 100644
--- a/app/src/main/java/org/mian/gitnex/activities/SponsorsActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/SponsorsActivity.java
@@ -1,6 +1,5 @@
 package org.mian.gitnex.activities;
 
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -18,14 +17,18 @@ import java.util.List;
  * Author M M Arif
  */
 
-public class SponsorsActivity extends AppCompatActivity {
+public class SponsorsActivity extends BaseActivity {
 
     private View.OnClickListener onClickListener;
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    protected int getLayoutResourceId(){
+        return R.layout.activity_sponsors;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_sponsors);
 
         ImageView closeActivity = findViewById(R.id.close);
 
diff --git a/app/src/main/java/org/mian/gitnex/adapters/ExploreRepositoriesAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/ExploreRepositoriesAdapter.java
index 70cace46..240a8421 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/ExploreRepositoriesAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/ExploreRepositoriesAdapter.java
@@ -90,9 +90,9 @@ public class ExploreRepositoriesAdapter extends RecyclerView.Adapter<ExploreRepo
                 public void onClick(View v) {
 
                     final Context context = v.getContext();
-                    Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
+                    //Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
 
-                    PopupMenu popupMenu = new PopupMenu(context_, v);
+                    PopupMenu popupMenu = new PopupMenu(context, v);
                     popupMenu.inflate(R.menu.repo_dotted_list_menu);
 
                     Object menuHelper;
diff --git a/app/src/main/java/org/mian/gitnex/adapters/IssueCommentsAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/IssueCommentsAdapter.java
index e83a39d3..fc93753e 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/IssueCommentsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/IssueCommentsAdapter.java
@@ -90,9 +90,9 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter<IssueCommentsAdap
                 public void onClick(View v) {
 
                     final Context context = v.getContext();
-                    Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
+                    //Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
 
-                    PopupMenu popupMenu = new PopupMenu(context_, v);
+                    PopupMenu popupMenu = new PopupMenu(context, v);
                     popupMenu.inflate(R.menu.issue_comment_menu);
 
                     Object menuHelper;
diff --git a/app/src/main/java/org/mian/gitnex/adapters/LabelsAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/LabelsAdapter.java
index 262aabed..e6200440 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/LabelsAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/LabelsAdapter.java
@@ -56,9 +56,9 @@ public class LabelsAdapter extends RecyclerView.Adapter<LabelsAdapter.LabelsView
                 public void onClick(View v) {
 
                     final Context context = v.getContext();
-                    Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
+                    //Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
 
-                    PopupMenu popupMenu = new PopupMenu(context_, v);
+                    PopupMenu popupMenu = new PopupMenu(context, v);
                     popupMenu.inflate(R.menu.labels_menu);
 
                     Object menuHelper;
diff --git a/app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
index 2304d6cb..79b0d666 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/MyReposListAdapter.java
@@ -88,9 +88,9 @@ public class MyReposListAdapter extends RecyclerView.Adapter<MyReposListAdapter.
                 public void onClick(View v) {
 
                     final Context context = v.getContext();
-                    Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
+                    //Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
 
-                    PopupMenu popupMenu = new PopupMenu(context_, v);
+                    PopupMenu popupMenu = new PopupMenu(context, v);
                     popupMenu.inflate(R.menu.repo_dotted_list_menu);
 
                     Object menuHelper;
diff --git a/app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java
index 29668264..6244d642 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java
@@ -91,9 +91,9 @@ public class ReposListAdapter extends RecyclerView.Adapter<ReposListAdapter.Repo
                 public void onClick(View v) {
 
                     final Context context = v.getContext();
-                    Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
+                    //Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
 
-                    PopupMenu popupMenu = new PopupMenu(context_, v);
+                    PopupMenu popupMenu = new PopupMenu(context, v);
                     popupMenu.inflate(R.menu.repo_dotted_list_menu);
 
                     Object menuHelper;
diff --git a/app/src/main/java/org/mian/gitnex/adapters/RepositoriesByOrgAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/RepositoriesByOrgAdapter.java
index 26a99926..711ed4c5 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/RepositoriesByOrgAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/RepositoriesByOrgAdapter.java
@@ -88,9 +88,9 @@ public class RepositoriesByOrgAdapter extends RecyclerView.Adapter<RepositoriesB
                 public void onClick(View v) {
 
                     final Context context = v.getContext();
-                    Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
+                    //Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
 
-                    PopupMenu popupMenu = new PopupMenu(context_, v);
+                    PopupMenu popupMenu = new PopupMenu(context, v);
                     popupMenu.inflate(R.menu.repo_dotted_list_menu);
 
                     Object menuHelper;
diff --git a/app/src/main/java/org/mian/gitnex/adapters/StarredReposListAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/StarredReposListAdapter.java
index f382f6e4..acd897e3 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/StarredReposListAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/StarredReposListAdapter.java
@@ -88,9 +88,9 @@ public class StarredReposListAdapter extends RecyclerView.Adapter<StarredReposLi
                 public void onClick(View v) {
 
                     final Context context = v.getContext();
-                    Context context_ = new ContextThemeWrapper(context, R.style.popupMenuStyle);
+                    Context context_ = new ContextThemeWrapper(context, R.style.AppThemeConfirmDialog);
 
-                    PopupMenu popupMenu = new PopupMenu(context_, v);
+                    PopupMenu popupMenu = new PopupMenu(context, v);
                     popupMenu.inflate(R.menu.repo_dotted_list_menu);
 
                     Object menuHelper;
diff --git a/app/src/main/java/org/mian/gitnex/adapters/UserSearchAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/UserSearchAdapter.java
index 629fd2ec..244f486d 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/UserSearchAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/UserSearchAdapter.java
@@ -68,7 +68,7 @@ public class UserSearchAdapter extends RecyclerView.Adapter<UserSearchAdapter.Us
 
                     final Context context = v.getContext();
 
-                    AlertDialog.Builder pBuilder = new AlertDialog.Builder(context, R.style.confirmDialog);
+                    AlertDialog.Builder pBuilder = new AlertDialog.Builder(context);
 
                     pBuilder.setTitle(R.string.newTeamPermission);
                     pBuilder.setSingleChoiceItems(permissionList, permissionSelectedChoice, new DialogInterface.OnClickListener() {
diff --git a/app/src/main/java/org/mian/gitnex/fragments/SettingsFragment.java b/app/src/main/java/org/mian/gitnex/fragments/SettingsFragment.java
index 3ea7e686..69c116ec 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/SettingsFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/SettingsFragment.java
@@ -140,7 +140,7 @@ public class SettingsFragment extends Fragment {
             @Override
             public void onClick(View view) {
 
-                AlertDialog.Builder cfBuilder = new AlertDialog.Builder(ctx, R.style.confirmDialog);
+                AlertDialog.Builder cfBuilder = new AlertDialog.Builder(ctx, R.style.AppThemeLightConfirmDialog);
 
                 cfBuilder.setTitle(R.string.settingsCustomFontSelectorDialogTitle);
                 if(customFontSelectedChoice != -1) {
@@ -178,7 +178,7 @@ public class SettingsFragment extends Fragment {
             @Override
             public void onClick(View view) {
 
-                AlertDialog.Builder hsBuilder = new AlertDialog.Builder(ctx, R.style.confirmDialog);
+                AlertDialog.Builder hsBuilder = new AlertDialog.Builder(ctx);
 
                 hsBuilder.setTitle(R.string.settingshomeScreenSelectorDialogTitle);
                 if(homeScreenSelectedChoice != -1) {
@@ -214,7 +214,7 @@ public class SettingsFragment extends Fragment {
             @Override
             public void onClick(View view) {
 
-                AlertDialog.Builder cBuilder = new AlertDialog.Builder(ctx, R.style.confirmDialog);
+                AlertDialog.Builder cBuilder = new AlertDialog.Builder(ctx);
 
                 cBuilder.setTitle(R.string.settingsCodeBlockSelectorDialogTitle);
                 if(codeBlockSelectedChoice != -1) {
@@ -273,7 +273,7 @@ public class SettingsFragment extends Fragment {
             @Override
             public void onClick(View view) {
 
-                AlertDialog.Builder lBuilder = new AlertDialog.Builder(ctx, R.style.confirmDialog);
+                AlertDialog.Builder lBuilder = new AlertDialog.Builder(ctx);
 
                 lBuilder.setTitle(R.string.settingsLanguageSelectorDialogTitle);
                 if(langSelectedChoice != -1) {
@@ -359,7 +359,7 @@ public class SettingsFragment extends Fragment {
             @Override
             public void onClick(View view) {
 
-                AlertDialog.Builder tBuilder = new AlertDialog.Builder(ctx, R.style.confirmDialog);
+                AlertDialog.Builder tBuilder = new AlertDialog.Builder(ctx);
 
                 tBuilder.setTitle(R.string.settingsTimeSelectorDialogTitle);
                 if(timeSelectedChoice != -1) {
diff --git a/app/src/main/java/org/mian/gitnex/helpers/AlertDialogs.java b/app/src/main/java/org/mian/gitnex/helpers/AlertDialogs.java
index 3d37bbbe..595a9297 100644
--- a/app/src/main/java/org/mian/gitnex/helpers/AlertDialogs.java
+++ b/app/src/main/java/org/mian/gitnex/helpers/AlertDialogs.java
@@ -18,7 +18,7 @@ public class AlertDialogs {
 
     public static void authorizationTokenRevokedDialog(final Context context, String title, String message, String copyNegativeButton, String copyPositiveButton) {
 
-        AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(context, R.style.confirmDialog);
+        AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(context);
 
         alertDialogBuilder
                 .setTitle(title)
@@ -52,7 +52,7 @@ public class AlertDialogs {
 
     public static void labelDeleteDialog(final Context context, final String labelTitle, final String labelId, String title, String message, String positiveButton, String negativeButton) {
 
-        new AlertDialog.Builder(context, R.style.confirmDialog)
+        new AlertDialog.Builder(context)
             .setTitle(title + labelTitle)
             .setMessage(message)
             .setIcon(R.drawable.ic_delete)
@@ -71,7 +71,7 @@ public class AlertDialogs {
 
     public static void collaboratorRemoveDialog(final Context context, final String userNameMain, String title, String message, String positiveButton, String negativeButton, final String searchKeyword) {
 
-        new AlertDialog.Builder(context, R.style.confirmDialog)
+        new AlertDialog.Builder(context)
                 .setTitle(title + userNameMain)
                 .setMessage(message)
                 .setIcon(R.drawable.ic_warning)
diff --git a/app/src/main/res/layout/activity_credits.xml b/app/src/main/res/layout/activity_credits.xml
index 09999d87..ce4b3423 100644
--- a/app/src/main/res/layout/activity_credits.xml
+++ b/app/src/main/res/layout/activity_credits.xml
@@ -5,7 +5,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:background="@color/colorPrimary">
+    android:background="?attr/primaryBackgroundColor">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
@@ -15,7 +15,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?attr/colorPrimary"
+            android:background="?attr/primaryBackgroundColor"
             tools:ignore="UnusedAttribute">
 
             <ImageView
@@ -34,7 +34,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/pageTitleCredits"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:maxLines="1"
                 android:textSize="20sp" />
 
@@ -52,7 +52,7 @@
             android:id="@+id/recyclerView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@color/colorPrimary"
+            android:background="?attr/primaryBackgroundColor"
             android:padding="4dp"
             android:scrollbars="vertical" />
 
diff --git a/app/src/main/res/layout/activity_sponsors.xml b/app/src/main/res/layout/activity_sponsors.xml
index 30f1cbfc..7078ab9f 100644
--- a/app/src/main/res/layout/activity_sponsors.xml
+++ b/app/src/main/res/layout/activity_sponsors.xml
@@ -5,7 +5,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:background="@color/colorPrimary">
+    android:background="?attr/primaryBackgroundColor">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
@@ -15,7 +15,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?attr/colorPrimary"
+            android:background="?attr/primaryBackgroundColor"
             tools:ignore="UnusedAttribute">
 
             <ImageView
@@ -34,7 +34,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/pageTitleSponsors"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:maxLines="1"
                 android:textSize="20sp" />
 
@@ -52,7 +52,7 @@
             android:id="@+id/recyclerView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@color/colorPrimary"
+            android:background="?attr/primaryBackgroundColor"
             android:padding="4dp"
             android:scrollbars="vertical" />
 
diff --git a/app/src/main/res/layout/credits.xml b/app/src/main/res/layout/credits.xml
index 2c2b1749..00f39d97 100644
--- a/app/src/main/res/layout/credits.xml
+++ b/app/src/main/res/layout/credits.xml
@@ -7,14 +7,14 @@
     android:paddingTop="10dp"
     android:paddingStart="20dp"
     android:paddingEnd="20dp"
-    android:background="@color/backgroundColor" >
+    android:background="?attr/primaryBackgroundColor" >
 
     <TextView
         android:id="@+id/creditText"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="5dp"
-        android:textColor="@color/white"
+        android:textColor="?attr/primaryTextColor"
         android:textColorLink="@color/lightBlue"
         android:textSize="16sp" />
 
diff --git a/app/src/main/res/layout/sponsors.xml b/app/src/main/res/layout/sponsors.xml
index 7820d034..6982208c 100644
--- a/app/src/main/res/layout/sponsors.xml
+++ b/app/src/main/res/layout/sponsors.xml
@@ -7,14 +7,14 @@
     android:paddingTop="10dp"
     android:paddingStart="20dp"
     android:paddingEnd="20dp"
-    android:background="@color/backgroundColor" >
+    android:background="?attr/primaryBackgroundColor" >
 
     <TextView
         android:id="@+id/sponsorText"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="5dp"
-        android:textColor="@color/white"
+        android:textColor="?attr/primaryTextColor"
         android:textColorLink="@color/lightBlue"
         android:textSize="16sp" />
 
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index aa54a526..7035e28e 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -5,4 +5,5 @@
     <attr name="inputBackgroundColor" format="reference" />
     <attr name="inputTextColor" format="reference" />
     <attr name="selectedTextColor" format="reference" />
+    <attr name="alertDialogTheme" format="reference" />
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index ea5c013e..f4fc7905 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -19,22 +19,7 @@
 
     <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
 
-    <style name="popupMenuStyle">
-        <item name="android:itemBackground">@color/colorPrimary</item>
-        <item name="android:background">@android:color/transparent</item>
-        <item name="android:textColor">@android:color/white</item>
-        <item name="android:colorBackground">@color/colorPrimary</item>
-        <item name="android:layout_marginStart">3dp</item>
-        <item name="android:layout_marginEnd">3dp</item>
-    </style>
 
-    <style name="confirmDialog" parent="Theme.AppCompat.Dialog.Alert">
-        <item name="android:background">@color/colorPrimary</item>
-        <item name="android:textColorPrimary">@android:color/white</item>
-        <item name="android:textColor">@android:color/white</item>
-        <item name="colorControlNormal">@color/white</item>
-        <item name="colorControlActivated">@color/white</item>
-    </style>
 
     <style name="customTabLayout" parent="TextAppearance.Design.Tab">
         <item name="android:textSize">16sp</item>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 08d65633..8c7a462e 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -6,6 +6,7 @@
         <item name="android:statusBarColor">@color/colorPrimary</item>
         <item name="android:windowBackground">@color/colorPrimary</item>
         <item name="android:typeface">monospace</item>
+        <item name="colorAccent">@color/colorAccent</item>
 
         <item name="primaryTextColor">@color/colorWhite</item>
         <item name="primaryBackgroundColor">@color/colorPrimary</item>
@@ -13,6 +14,8 @@
         <item name="inputTextColor">@color/colorWhite</item>
         <item name="checkboxStyle">@style/AppThemeCheckBoxStyle</item>
         <item name="selectedTextColor">@color/darkGreen</item>
+        <item name="dialogTheme">@style/AppThemeConfirmDialog</item>
+        <item name="popupMenuStyle">@style/AppThemePopupMenuStyle</item>
     </style>
 
     <!-- Light theme -->
@@ -20,6 +23,7 @@
         <item name="android:statusBarColor">@color/colorPrimary</item>
         <item name="android:windowBackground">@color/lightThemeBackground</item>
         <item name="android:typeface">monospace</item>
+        <item name="colorAccent">@color/colorAccent</item>
 
         <item name="primaryTextColor">@color/lightThemeTextColor</item>
         <item name="primaryBackgroundColor">@color/lightThemeBackground</item>
@@ -27,6 +31,42 @@
         <item name="inputTextColor">@color/lightThemeInputTextColor</item>
         <item name="checkboxStyle">@style/AppThemeLightCheckBoxStyle</item>
         <item name="selectedTextColor">@color/darkGreen</item>
+        <item name="dialogTheme">@style/AppThemeLightConfirmDialog</item>
+        <item name="popupMenuStyle">@style/AppThemePopupMenuStyle</item>
+    </style>
+
+    <style name="AppThemeConfirmDialog" parent="Theme.AppCompat.Dialog.Alert">
+        <item name="android:background">@color/colorPrimary</item>
+        <item name="android:textColorPrimary">@android:color/white</item>
+        <item name="android:textColor">@android:color/white</item>
+        <item name="colorControlNormal">@color/white</item>
+        <item name="colorControlActivated">@color/white</item>
+    </style>
+
+    <style name="AppThemeLightConfirmDialog" parent="Theme.AppCompat.Dialog.Alert">
+        <item name="android:background">@color/colorPrimary</item>
+        <item name="android:textColorPrimary">@color/colorPrimary</item>
+        <item name="android:textColor">@color/lightThemeTextColor</item>
+        <item name="colorControlNormal">@color/lightThemeTextColor</item>
+        <item name="colorControlActivated">@color/lightThemeTextColor</item>
+    </style>
+
+    <style name="AppThemePopupMenuStyle">
+        <item name="android:itemBackground">@color/colorPrimary</item>
+        <item name="android:background">@android:color/transparent</item>
+        <item name="android:textColor">@android:color/white</item>
+        <item name="android:colorBackground">@color/colorPrimary</item>
+        <item name="android:layout_marginStart">3dp</item>
+        <item name="android:layout_marginEnd">3dp</item>
+    </style>
+
+    <style name="AppThemeLightPopupMenuStyle">
+        <item name="android:itemBackground">@color/lightThemeBackground</item>
+        <item name="android:background">@android:color/transparent</item>
+        <item name="android:textColor">@color/lightThemeTextColor</item>
+        <item name="android:colorBackground">@color/lightThemeBackground</item>
+        <item name="android:layout_marginStart">3dp</item>
+        <item name="android:layout_marginEnd">3dp</item>
     </style>
 
     <style name="AppThemeLightCheckBoxStyle" parent="Base.Widget.AppCompat.CompoundButton.CheckBox">

From 1008b8611d885cbfe3845dda5ad40b8eb5ab9ac9 Mon Sep 17 00:00:00 2001
From: M M Arif <mmarif@swatian.com>
Date: Wed, 4 Mar 2020 19:54:21 +0500
Subject: [PATCH 06/14] Added custom attr to more files

---
 .../java/org/mian/gitnex/activities/BaseActivity.java |  2 +-
 .../java/org/mian/gitnex/activities/MainActivity.java |  2 +-
 .../gitnex/activities/RepoStargazersActivity.java     | 11 +++++++----
 .../mian/gitnex/activities/RepoWatchersActivity.java  | 11 +++++++----
 .../mian/gitnex/adapters/RepoStargazersAdapter.java   |  4 ++--
 .../org/mian/gitnex/adapters/RepoWatchersAdapter.java |  4 ++--
 .../org/mian/gitnex/fragments/SettingsFragment.java   |  2 +-
 app/src/main/res/layout/activity_repo_stargazers.xml  |  8 ++++----
 app/src/main/res/layout/activity_repo_watchers.xml    |  8 ++++----
 app/src/main/res/layout/collaborators_list.xml        |  4 ++--
 app/src/main/res/layout/fragment_collaborators.xml    |  4 ++--
 app/src/main/res/layout/repo_stargazers_list.xml      |  4 ++--
 app/src/main/res/layout/repo_watchers_list.xml        |  4 ++--
 build.gradle                                          |  2 +-
 gradle/wrapper/gradle-wrapper.properties              |  4 ++--
 15 files changed, 40 insertions(+), 34 deletions(-)

diff --git a/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java b/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java
index 069b2e1e..ece3082b 100644
--- a/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java
@@ -15,7 +15,7 @@ public abstract class BaseActivity extends AppCompatActivity {
     @Override
     public void onCreate(Bundle savedInstanceState) {
 
-        setTheme(R.style.AppTheme);
+        setTheme(R.style.AppThemeLight);
 
         super.onCreate(savedInstanceState);
         setContentView(getLayoutResourceId());
diff --git a/app/src/main/java/org/mian/gitnex/activities/MainActivity.java b/app/src/main/java/org/mian/gitnex/activities/MainActivity.java
index 8b258efc..9c56a19e 100644
--- a/app/src/main/java/org/mian/gitnex/activities/MainActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/MainActivity.java
@@ -410,7 +410,7 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
             }
 
             @Override
-            public void onFailure(@NonNull Call<GiteaVersion> callVersion, Throwable t) {
+            public void onFailure(@NonNull Call<GiteaVersion> callVersion, @NonNull Throwable t) {
 
                 Log.e("onFailure-version", t.toString());
 
diff --git a/app/src/main/java/org/mian/gitnex/activities/RepoStargazersActivity.java b/app/src/main/java/org/mian/gitnex/activities/RepoStargazersActivity.java
index 661e5ba1..f70f2eac 100644
--- a/app/src/main/java/org/mian/gitnex/activities/RepoStargazersActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/RepoStargazersActivity.java
@@ -2,7 +2,6 @@ package org.mian.gitnex.activities;
 
 import android.os.Bundle;
 import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
 import android.view.View;
@@ -22,7 +21,7 @@ import java.util.List;
  * Author M M Arif
  */
 
-public class RepoStargazersActivity extends AppCompatActivity {
+public class RepoStargazersActivity extends BaseActivity {
 
     private TextView noDataStargazers;
     private View.OnClickListener onClickListener;
@@ -31,9 +30,13 @@ public class RepoStargazersActivity extends AppCompatActivity {
     private ProgressBar mProgressBar;
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    protected int getLayoutResourceId(){
+        return R.layout.activity_repo_stargazers;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_repo_stargazers);
 
         TinyDB tinyDb = new TinyDB(getApplicationContext());
         final String instanceUrl = tinyDb.getString("instanceUrl");
diff --git a/app/src/main/java/org/mian/gitnex/activities/RepoWatchersActivity.java b/app/src/main/java/org/mian/gitnex/activities/RepoWatchersActivity.java
index e3e6afb8..a1f44076 100644
--- a/app/src/main/java/org/mian/gitnex/activities/RepoWatchersActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/RepoWatchersActivity.java
@@ -2,7 +2,6 @@ package org.mian.gitnex.activities;
 
 import android.os.Bundle;
 import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
 import android.view.View;
@@ -22,7 +21,7 @@ import java.util.List;
  * Author M M Arif
  */
 
-public class RepoWatchersActivity extends AppCompatActivity {
+public class RepoWatchersActivity extends BaseActivity {
 
     private TextView noDataWatchers;
     private View.OnClickListener onClickListener;
@@ -31,9 +30,13 @@ public class RepoWatchersActivity extends AppCompatActivity {
     private ProgressBar mProgressBar;
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    protected int getLayoutResourceId(){
+        return R.layout.activity_repo_watchers;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_repo_watchers);
 
         TinyDB tinyDb = new TinyDB(getApplicationContext());
         final String instanceUrl = tinyDb.getString("instanceUrl");
diff --git a/app/src/main/java/org/mian/gitnex/adapters/RepoStargazersAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/RepoStargazersAdapter.java
index 9dacfe95..9d195090 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/RepoStargazersAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/RepoStargazersAdapter.java
@@ -25,7 +25,7 @@ public class RepoStargazersAdapter extends BaseAdapter {
     private List<UserInfo> stargazersList;
     private Context mCtx;
 
-    private class ViewHolder {
+    private static class ViewHolder {
 
         private ImageView memberAvatar;
         private TextView memberName;
@@ -64,7 +64,7 @@ public class RepoStargazersAdapter extends BaseAdapter {
 
         if (finalView == null) {
             finalView = LayoutInflater.from(mCtx).inflate(R.layout.repo_stargazers_list, null);
-            viewHolder = new RepoStargazersAdapter.ViewHolder(finalView);
+            viewHolder = new ViewHolder(finalView);
             finalView.setTag(viewHolder);
         }
         else {
diff --git a/app/src/main/java/org/mian/gitnex/adapters/RepoWatchersAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/RepoWatchersAdapter.java
index 478ef19e..11304210 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/RepoWatchersAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/RepoWatchersAdapter.java
@@ -25,7 +25,7 @@ public class RepoWatchersAdapter extends BaseAdapter {
     private List<UserInfo> watchersList;
     private Context mCtx;
 
-    private class ViewHolder {
+    private static class ViewHolder {
 
         private ImageView memberAvatar;
         private TextView memberName;
@@ -64,7 +64,7 @@ public class RepoWatchersAdapter extends BaseAdapter {
 
         if (finalView == null) {
             finalView = LayoutInflater.from(mCtx).inflate(R.layout.repo_watchers_list, null);
-            viewHolder = new RepoWatchersAdapter.ViewHolder(finalView);
+            viewHolder = new ViewHolder(finalView);
             finalView.setTag(viewHolder);
         }
         else {
diff --git a/app/src/main/java/org/mian/gitnex/fragments/SettingsFragment.java b/app/src/main/java/org/mian/gitnex/fragments/SettingsFragment.java
index 69c116ec..32ce439a 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/SettingsFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/SettingsFragment.java
@@ -140,7 +140,7 @@ public class SettingsFragment extends Fragment {
             @Override
             public void onClick(View view) {
 
-                AlertDialog.Builder cfBuilder = new AlertDialog.Builder(ctx, R.style.AppThemeLightConfirmDialog);
+                AlertDialog.Builder cfBuilder = new AlertDialog.Builder(ctx);
 
                 cfBuilder.setTitle(R.string.settingsCustomFontSelectorDialogTitle);
                 if(customFontSelectedChoice != -1) {
diff --git a/app/src/main/res/layout/activity_repo_stargazers.xml b/app/src/main/res/layout/activity_repo_stargazers.xml
index e1b407eb..47136de5 100644
--- a/app/src/main/res/layout/activity_repo_stargazers.xml
+++ b/app/src/main/res/layout/activity_repo_stargazers.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/colorPrimary"
+    android:background="?attr/primaryBackgroundColor"
     android:orientation="vertical">
 
     <com.google.android.material.appbar.AppBarLayout
@@ -14,7 +14,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?attr/colorPrimary"
+            android:background="?attr/primaryBackgroundColor"
             tools:ignore="UnusedAttribute">
 
             <ImageView
@@ -32,7 +32,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:maxLines="1"
                 android:textSize="20sp" />
 
@@ -58,7 +58,7 @@
         android:layout_margin="15dp"
         android:gravity="center"
         android:text="@string/noDataFound"
-        android:textColor="@color/white"
+        android:textColor="?attr/primaryTextColor"
         android:textSize="20sp"
         android:visibility="gone" />
 
diff --git a/app/src/main/res/layout/activity_repo_watchers.xml b/app/src/main/res/layout/activity_repo_watchers.xml
index 57e98d4e..641b75e4 100644
--- a/app/src/main/res/layout/activity_repo_watchers.xml
+++ b/app/src/main/res/layout/activity_repo_watchers.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/colorPrimary"
+    android:background="?attr/primaryBackgroundColor"
     android:orientation="vertical">
 
     <com.google.android.material.appbar.AppBarLayout
@@ -14,7 +14,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?attr/colorPrimary"
+            android:background="?attr/primaryBackgroundColor"
             tools:ignore="UnusedAttribute">
 
             <ImageView
@@ -32,7 +32,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:maxLines="1"
                 android:textSize="20sp" />
 
@@ -58,7 +58,7 @@
         android:layout_margin="15dp"
         android:gravity="center"
         android:text="@string/noDataFound"
-        android:textColor="@color/white"
+        android:textColor="?attr/primaryTextColor"
         android:textSize="20sp"
         android:visibility="gone" />
 
diff --git a/app/src/main/res/layout/collaborators_list.xml b/app/src/main/res/layout/collaborators_list.xml
index 962c826f..f945cc02 100644
--- a/app/src/main/res/layout/collaborators_list.xml
+++ b/app/src/main/res/layout/collaborators_list.xml
@@ -4,7 +4,7 @@
     android:id="@+id/gridViewData"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/colorPrimary"
+    android:background="?attr/primaryBackgroundColor"
     android:orientation="vertical">
 
     <ImageView
@@ -22,6 +22,6 @@
         android:layout_marginTop="1dp"
         android:text="@string/tab_text_collaborators"
         android:textSize="14sp"
-        android:textColor="@color/white" />
+        android:textColor="?attr/primaryTextColor" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_collaborators.xml b/app/src/main/res/layout/fragment_collaborators.xml
index 76f6e6e1..86826ef1 100644
--- a/app/src/main/res/layout/fragment_collaborators.xml
+++ b/app/src/main/res/layout/fragment_collaborators.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/colorPrimary"
+    android:background="?attr/primaryBackgroundColor"
     android:orientation="vertical">
 
     <GridView
@@ -23,7 +23,7 @@
         android:layout_margin="15dp"
         android:gravity="center"
         android:text="@string/noDataCollaboratorTab"
-        android:textColor="@color/white"
+        android:textColor="?attr/primaryTextColor"
         android:textSize="20sp"
         android:visibility="gone" />
 
diff --git a/app/src/main/res/layout/repo_stargazers_list.xml b/app/src/main/res/layout/repo_stargazers_list.xml
index b71a03fc..407417fb 100644
--- a/app/src/main/res/layout/repo_stargazers_list.xml
+++ b/app/src/main/res/layout/repo_stargazers_list.xml
@@ -4,7 +4,7 @@
     android:id="@+id/gridViewData"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/colorPrimary"
+    android:background="?attr/primaryBackgroundColor"
     android:orientation="vertical">
 
     <ImageView
@@ -22,6 +22,6 @@
         android:layout_marginTop="1dp"
         android:text="@string/starMember"
         android:textSize="14sp"
-        android:textColor="@color/white" />
+        android:textColor="?attr/primaryTextColor" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/repo_watchers_list.xml b/app/src/main/res/layout/repo_watchers_list.xml
index 78904d5d..33d74779 100644
--- a/app/src/main/res/layout/repo_watchers_list.xml
+++ b/app/src/main/res/layout/repo_watchers_list.xml
@@ -4,7 +4,7 @@
     android:id="@+id/gridViewData"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/colorPrimary"
+    android:background="?attr/primaryBackgroundColor"
     android:orientation="vertical">
 
     <ImageView
@@ -22,6 +22,6 @@
         android:layout_marginTop="1dp"
         android:text="@string/watcherMember"
         android:textSize="14sp"
-        android:textColor="@color/white" />
+        android:textColor="?attr/primaryTextColor" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 623f86d8..9aea99c1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.android.tools.build:gradle:3.6.1'
 
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e2b44955..3a2ffa5a 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Sep 12 16:12:36 SGT 2019
+#Wed Mar 04 00:16:50 SGT 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip

From a8cc4c00b8612d94e10b80ca67cadf6b0bfc04df Mon Sep 17 00:00:00 2001
From: M M Arif <mmarif@swatian.com>
Date: Wed, 4 Mar 2020 21:15:57 +0500
Subject: [PATCH 07/14] worked on repo info, files tabs and files activity

---
 .../gitnex/activities/FileViewActivity.java   | 32 ++++++++-----
 .../main/res/layout/activity_file_view.xml    | 17 +++----
 app/src/main/res/layout/files_list.xml        |  5 +-
 app/src/main/res/layout/fragment_files.xml    |  6 +--
 .../main/res/layout/fragment_repo_info.xml    | 48 +++++++++----------
 5 files changed, 59 insertions(+), 49 deletions(-)

diff --git a/app/src/main/java/org/mian/gitnex/activities/FileViewActivity.java b/app/src/main/java/org/mian/gitnex/activities/FileViewActivity.java
index 77ee3ce3..8cf6f63b 100644
--- a/app/src/main/java/org/mian/gitnex/activities/FileViewActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/FileViewActivity.java
@@ -10,10 +10,10 @@ import android.util.Base64;
 import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import com.github.barteksc.pdfviewer.PDFView;
 import com.github.barteksc.pdfviewer.util.FitPolicy;
@@ -37,23 +37,29 @@ import retrofit2.Callback;
  * Author M M Arif
  */
 
-public class FileViewActivity extends AppCompatActivity {
+public class FileViewActivity extends BaseActivity {
 
     private View.OnClickListener onClickListener;
     private TextView singleFileContents;
+    private LinearLayout singleFileContentsFrame;
     private HighlightJsView singleCodeContents;
     private PhotoView imageView;
     final Context ctx = this;
     private ProgressBar mProgressBar;
     private byte[] imageData;
     private PDFView pdfView;
+    private LinearLayout pdfViewFrame;
     private byte[] decodedPdf;
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    protected int getLayoutResourceId(){
+        return R.layout.activity_file_view;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_file_view);
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
@@ -70,9 +76,10 @@ public class FileViewActivity extends AppCompatActivity {
         singleFileContents = findViewById(R.id.singleFileContents);
         singleCodeContents = findViewById(R.id.singleCodeContents);
         imageView = findViewById(R.id.imageView);
-        singleFileContents.setVisibility(View.GONE);
         mProgressBar = findViewById(R.id.progress_bar);
         pdfView = findViewById(R.id.pdfView);
+        pdfViewFrame = findViewById(R.id.pdfViewFrame);
+        singleFileContentsFrame = findViewById(R.id.singleFileContentsFrame);
 
         String singleFileName = getIntent().getStringExtra("singleFileName");
 
@@ -126,8 +133,9 @@ public class FileViewActivity extends AppCompatActivity {
 
                         if(appUtil.imageExtension(fileExtension)) { // file is image
 
-                            singleFileContents.setVisibility(View.GONE);
+                            singleFileContentsFrame.setVisibility(View.GONE);
                             singleCodeContents.setVisibility(View.GONE);
+                            pdfViewFrame.setVisibility(View.GONE);
                             imageView.setVisibility(View.VISIBLE);
 
                             imageData = Base64.decode(response.body().getContent(), Base64.DEFAULT);
@@ -138,7 +146,8 @@ public class FileViewActivity extends AppCompatActivity {
                         else if (appUtil.sourceCodeExtension(fileExtension)) { // file is sourcecode
 
                             imageView.setVisibility(View.GONE);
-                            singleFileContents.setVisibility(View.GONE);
+                            singleFileContentsFrame.setVisibility(View.GONE);
+                            pdfViewFrame.setVisibility(View.GONE);
                             singleCodeContents.setVisibility(View.VISIBLE);
 
                             singleCodeContents.setTheme(Theme.GRUVBOX_DARK);
@@ -149,9 +158,9 @@ public class FileViewActivity extends AppCompatActivity {
                         else if (appUtil.pdfExtension(fileExtension)) { // file is pdf
 
                             imageView.setVisibility(View.GONE);
-                            singleFileContents.setVisibility(View.GONE);
+                            singleFileContentsFrame.setVisibility(View.GONE);
                             singleCodeContents.setVisibility(View.GONE);
-                            pdfView.setVisibility(View.VISIBLE);
+                            pdfViewFrame.setVisibility(View.VISIBLE);
 
                             decodedPdf = Base64.decode(response.body().getContent(), Base64.DEFAULT);
                             pdfView.fromBytes(decodedPdf)
@@ -169,7 +178,7 @@ public class FileViewActivity extends AppCompatActivity {
                                     .fitEachPage(true)
                                     .pageSnap(false)
                                     .pageFling(true)
-                                    .nightMode(true)
+                                    .nightMode(false)
                                     .load();
 
                         }
@@ -177,7 +186,8 @@ public class FileViewActivity extends AppCompatActivity {
 
                             imageView.setVisibility(View.GONE);
                             singleCodeContents.setVisibility(View.GONE);
-                            singleFileContents.setVisibility(View.VISIBLE);
+                            pdfViewFrame.setVisibility(View.GONE);
+                            singleFileContentsFrame.setVisibility(View.VISIBLE);
 
                             singleFileContents.setText(appUtil.decodeBase64(response.body().getContent()));
 
diff --git a/app/src/main/res/layout/activity_file_view.xml b/app/src/main/res/layout/activity_file_view.xml
index 0059e546..584a8d7c 100644
--- a/app/src/main/res/layout/activity_file_view.xml
+++ b/app/src/main/res/layout/activity_file_view.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:background="@color/colorPrimary">
+    android:background="?attr/primaryBackgroundColor">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
@@ -15,7 +15,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?attr/colorPrimary"
+            android:background="?attr/primaryBackgroundColor"
             tools:ignore="UnusedAttribute">
 
             <ImageView
@@ -34,7 +34,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/defaultFilename"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:ellipsize="none"
                 android:scrollbars="horizontal"
                 android:singleLine="true"
@@ -46,10 +46,11 @@
     </com.google.android.material.appbar.AppBarLayout>
 
     <LinearLayout
+        android:id="@+id/singleFileContentsFrame"
         android:layout_marginTop="50dp"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/colorPrimary"
+        android:background="?attr/primaryBackgroundColor"
         android:orientation="vertical">
 
         <ScrollView
@@ -61,7 +62,7 @@
                 android:id="@+id/singleFileContents"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textColor="@color/colorWhite"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="14sp"
                 android:padding="15dp"
                 android:textIsSelectable="true"
@@ -72,18 +73,18 @@
     </LinearLayout>
 
     <LinearLayout
+        android:id="@+id/pdfViewFrame"
         android:layout_marginTop="55dp"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/colorPrimary"
+        android:background="?attr/primaryBackgroundColor"
         android:orientation="vertical">
 
         <com.github.barteksc.pdfviewer.PDFView
             android:id="@+id/pdfView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@color/black"
-            android:visibility="visible" />
+            android:background="?attr/primaryBackgroundColor" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/files_list.xml b/app/src/main/res/layout/files_list.xml
index f9390c74..bfbb5b69 100644
--- a/app/src/main/res/layout/files_list.xml
+++ b/app/src/main/res/layout/files_list.xml
@@ -9,8 +9,7 @@
     android:fitsSystemWindows="true"
     android:orientation="vertical"
     android:layout_margin="10dp"
-    android:theme="@style/AppTheme"
-    android:background="@color/backgroundColor"
+    android:background="?attr/primaryBackgroundColor"
     tools:context=".activities.MainActivity">
 
     <TextView
@@ -41,7 +40,7 @@
             android:layout_weight=".80"
             android:layout_marginBottom="0dp"
             android:text="@string/defaultFilename"
-            android:textColor="@color/white"
+            android:textColor="?attr/primaryTextColor"
             android:textSize="16sp" />
 
         <ImageView
diff --git a/app/src/main/res/layout/fragment_files.xml b/app/src/main/res/layout/fragment_files.xml
index fff86eea..e848afde 100644
--- a/app/src/main/res/layout/fragment_files.xml
+++ b/app/src/main/res/layout/fragment_files.xml
@@ -26,7 +26,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:CustomTextSize="16sp"
-            app:SelectedTextColor="@color/colorAccent"
+            app:SelectedTextColor="?attr/primaryTextColor"
             app:UnSelectedTextColor="@color/lightGray"
             android:text="@string/filesBreadcrumbRoot"/>
 
@@ -34,7 +34,7 @@
             android:id="@+id/recyclerView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@color/colorPrimary"
+            android:background="?attr/primaryBackgroundColor"
             android:padding="4dp"
             android:scrollbars="vertical" />
 
@@ -45,7 +45,7 @@
             android:layout_margin="15dp"
             android:gravity="center"
             android:text="@string/noDataFilesTab"
-            android:textColor="@color/white"
+            android:textColor="?attr/primaryTextColor"
             android:textSize="20sp"
             android:visibility="gone" />
 
diff --git a/app/src/main/res/layout/fragment_repo_info.xml b/app/src/main/res/layout/fragment_repo_info.xml
index 4c3a58a1..f982dfce 100644
--- a/app/src/main/res/layout/fragment_repo_info.xml
+++ b/app/src/main/res/layout/fragment_repo_info.xml
@@ -6,7 +6,7 @@
 
     <ScrollView
         android:orientation="vertical"
-        android:background="@color/backgroundColor"
+        android:background="?attr/primaryBackgroundColor"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
@@ -61,7 +61,7 @@
                     android:layout_height="match_parent"
                     android:text="@string/infoTabRepoName1"
                     android:textSize="16sp"
-                    android:textColor="@color/white"/>
+                    android:textColor="?attr/primaryTextColor"/>
 
                 <TextView
                     android:id="@+id/repoNameInfo"
@@ -71,14 +71,14 @@
                     android:textIsSelectable="true"
                     android:textSize="14sp"
                     android:paddingTop="5dp"
-                    android:textColor="@color/colorWhite"/>
+                    android:textColor="?attr/primaryTextColor"/>
 
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:text="@string/infoTabRepoOwner1"
                     android:textSize="16sp"
-                    android:textColor="@color/white"
+                    android:textColor="?attr/primaryTextColor"
                     android:layout_marginTop="15dp"/>
 
                 <TextView
@@ -89,14 +89,14 @@
                     android:textIsSelectable="true"
                     android:textSize="14sp"
                     android:paddingTop="5dp"
-                    android:textColor="@color/colorWhite"/>
+                    android:textColor="?attr/primaryTextColor"/>
 
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:text="@string/infoTabRepoDesc"
                     android:textSize="16sp"
-                    android:textColor="@color/white"
+                    android:textColor="?attr/primaryTextColor"
                     android:layout_marginTop="15dp"/>
 
                 <TextView
@@ -108,14 +108,14 @@
                     android:textSize="14sp"
                     android:paddingTop="5dp"
                     android:autoLink="web"
-                    android:textColor="@color/colorWhite"/>
+                    android:textColor="?attr/primaryTextColor"/>
 
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:text="@string/infoTabRepoWebsite"
                     android:textSize="16sp"
-                    android:textColor="@color/white"
+                    android:textColor="?attr/primaryTextColor"
                     android:layout_marginTop="15dp"/>
 
                 <TextView
@@ -128,14 +128,14 @@
                     android:paddingTop="5dp"
                     android:autoLink="web"
                     android:textColorLink="@color/lightBlue"
-                    android:textColor="@color/colorWhite"/>
+                    android:textColor="?attr/primaryTextColor"/>
 
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:text="@string/infoTabRepoSize"
                     android:textSize="16sp"
-                    android:textColor="@color/white"
+                    android:textColor="?attr/primaryTextColor"
                     android:layout_marginTop="15dp"/>
 
                 <TextView
@@ -146,14 +146,14 @@
                     android:textIsSelectable="true"
                     android:textSize="14sp"
                     android:paddingTop="5dp"
-                    android:textColor="@color/colorWhite"/>
+                    android:textColor="?attr/primaryTextColor"/>
 
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:text="@string/infoTabRepoDefaultBranch"
                     android:textSize="16sp"
-                    android:textColor="@color/white"
+                    android:textColor="?attr/primaryTextColor"
                     android:layout_marginTop="15dp"/>
 
                 <TextView
@@ -164,14 +164,14 @@
                     android:textIsSelectable="true"
                     android:textSize="14sp"
                     android:paddingTop="5dp"
-                    android:textColor="@color/colorWhite"/>
+                    android:textColor="?attr/primaryTextColor"/>
 
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:text="@string/infoTabRepoSshUrl"
                     android:textSize="16sp"
-                    android:textColor="@color/white"
+                    android:textColor="?attr/primaryTextColor"
                     android:layout_marginTop="15dp"/>
 
                 <TextView
@@ -184,14 +184,14 @@
                     android:paddingTop="5dp"
                     android:autoLink="web"
                     android:textColorLink="@color/lightBlue"
-                    android:textColor="@color/colorWhite"/>
+                    android:textColor="?attr/primaryTextColor"/>
 
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:text="@string/infoTabRepoCloneUrl"
                     android:textSize="16sp"
-                    android:textColor="@color/white"
+                    android:textColor="?attr/primaryTextColor"
                     android:layout_marginTop="15dp"/>
 
                 <TextView
@@ -204,14 +204,14 @@
                     android:paddingTop="5dp"
                     android:autoLink="web"
                     android:textColorLink="@color/lightBlue"
-                    android:textColor="@color/colorWhite"/>
+                    android:textColor="?attr/primaryTextColor"/>
 
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:text="@string/infoTabRepoRepoUrl"
                     android:textSize="16sp"
-                    android:textColor="@color/white"
+                    android:textColor="?attr/primaryTextColor"
                     android:layout_marginTop="15dp"/>
 
                 <TextView
@@ -224,14 +224,14 @@
                     android:paddingTop="5dp"
                     android:autoLink="web"
                     android:textColorLink="@color/lightBlue"
-                    android:textColor="@color/colorWhite"/>
+                    android:textColor="?attr/primaryTextColor"/>
 
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:text="@string/infoTabRepoForksCount"
                     android:textSize="16sp"
-                    android:textColor="@color/white"
+                    android:textColor="?attr/primaryTextColor"
                     android:layout_marginTop="15dp"/>
 
                 <TextView
@@ -242,14 +242,14 @@
                     android:textIsSelectable="true"
                     android:textSize="14sp"
                     android:paddingTop="5dp"
-                    android:textColor="@color/colorWhite"/>
+                    android:textColor="?attr/primaryTextColor"/>
 
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:text="@string/infoTabRepoCreatedAt"
                     android:textSize="16sp"
-                    android:textColor="@color/white"
+                    android:textColor="?attr/primaryTextColor"
                     android:layout_marginTop="15dp"/>
 
                 <TextView
@@ -259,7 +259,7 @@
                     android:text="@string/infoTabRepoDummyTime"
                     android:textSize="14sp"
                     android:paddingTop="5dp"
-                    android:textColor="@color/colorWhite"/>
+                    android:textColor="?attr/primaryTextColor"/>
 
             </LinearLayout>
 
@@ -310,7 +310,7 @@
                     android:layout_height="wrap_content"
                     android:textIsSelectable="true"
                     android:textSize="16sp"
-                    android:textColor="@color/colorWhite"/>
+                    android:textColor="?attr/primaryTextColor"/>
 
             </LinearLayout>
 

From 51ab3f7a92dd5267165efb53ee6cb61ad25ac6dc Mon Sep 17 00:00:00 2001
From: M M Arif <mmarif@swatian.com>
Date: Thu, 5 Mar 2020 00:37:28 +0500
Subject: [PATCH 08/14] updated all the layouts and activities

---
 .../AddCollaboratorToRepositoryActivity.java  | 12 ++--
 .../AddRemoveAssigneesActivity.java           | 11 ++--
 .../activities/AddRemoveLabelsActivity.java   | 11 ++--
 .../activities/AdminGetUsersActivity.java     | 11 ++--
 .../activities/CreateIssueActivity.java       | 12 ++--
 .../activities/CreateLabelActivity.java       | 11 ++--
 .../activities/CreateNewUserActivity.java     | 11 ++--
 .../activities/CreateReleaseActivity.java     | 11 ++--
 .../gitnex/activities/EditIssueActivity.java  | 11 ++--
 .../gitnex/activities/FileDiffActivity.java   | 11 ++--
 .../activities/IssueDetailActivity.java       |  1 -
 .../activities/MergePullRequestActivity.java  | 11 ++--
 .../gitnex/activities/NewFileActivity.java    | 11 ++--
 .../activities/NewMilestoneActivity.java      | 11 ++--
 .../activities/NewOrganizationActivity.java   | 11 ++--
 .../gitnex/activities/OrgDetailActivity.java  | 11 ++--
 .../activities/ProfileEmailActivity.java      | 11 ++--
 .../activities/ReplyToIssueActivity.java      | 11 ++--
 app/src/main/res/drawable/progress_bar.xml    |  4 +-
 ...ctivity_add_collaborator_to_repository.xml | 16 ++---
 .../layout/activity_add_remove_assignees.xml  |  2 +-
 .../res/layout/activity_add_remove_labels.xml |  2 +-
 .../res/layout/activity_admin_get_users.xml   | 10 +--
 .../main/res/layout/activity_create_issue.xml | 42 ++++++-------
 .../main/res/layout/activity_create_label.xml | 16 ++---
 .../res/layout/activity_create_new_user.xml   | 38 ++++++------
 .../res/layout/activity_create_release.xml    | 38 ++++++------
 .../layout/activity_create_team_by_org.xml    | 34 +++++-----
 .../main/res/layout/activity_edit_issue.xml   | 30 ++++-----
 .../main/res/layout/activity_file_diff.xml    |  6 +-
 .../main/res/layout/activity_issue_detail.xml | 22 +++----
 app/src/main/res/layout/activity_login.xml    | 62 +++++++++----------
 .../layout/activity_merge_pull_request.xml    |  8 +--
 app/src/main/res/layout/activity_new_file.xml | 49 +++++++--------
 .../res/layout/activity_new_milestone.xml     | 37 ++++++-----
 .../res/layout/activity_new_organization.xml  | 29 +++++----
 app/src/main/res/layout/activity_new_repo.xml |  4 +-
 .../res/layout/activity_profile_email.xml     | 12 ++--
 .../res/layout/activity_reply_to_issue.xml    |  6 +-
 .../main/res/layout/activity_repo_detail.xml  |  5 +-
 .../admin_users_bottom_sheet_layout.xml       |  4 +-
 app/src/main/res/layout/admin_users_list.xml  |  8 +--
 app/src/main/res/layout/branches_list.xml     |  8 +--
 .../res/layout/collaborators_list_search.xml  |  6 +-
 .../main/res/layout/custom_multi_select.xml   | 14 ++---
 app/src/main/res/layout/files_diffs_list.xml  | 10 +--
 app/src/main/res/layout/fragment_branches.xml |  4 +-
 .../main/res/layout/fragment_explore_repo.xml | 10 +--
 app/src/main/res/layout/fragment_issues.xml   |  4 +-
 .../res/layout/fragment_issues_closed.xml     |  4 +-
 app/src/main/res/layout/fragment_labels.xml   |  4 +-
 .../main/res/layout/fragment_milestones.xml   |  4 +-
 .../res/layout/fragment_organization_info.xml | 10 +--
 .../res/layout/fragment_organizations.xml     |  5 +-
 app/src/main/res/layout/fragment_profile.xml  |  9 ++-
 .../res/layout/fragment_profile_emails.xml    |  4 +-
 .../res/layout/fragment_profile_followers.xml |  4 +-
 .../res/layout/fragment_profile_following.xml |  4 +-
 .../res/layout/fragment_pull_requests.xml     |  4 +-
 app/src/main/res/layout/fragment_releases.xml |  4 +-
 .../main/res/layout/fragment_teams_by_org.xml |  4 +-
 app/src/main/res/layout/issue_comments.xml    |  9 ++-
 app/src/main/res/layout/labels_list.xml       |  2 +-
 .../main/res/layout/members_by_org_list.xml   |  4 +-
 .../layout/members_by_team_by_org_list.xml    |  4 +-
 app/src/main/res/layout/milestones_list.xml   | 12 ++--
 app/src/main/res/layout/multi_select_item.xml |  4 +-
 .../nav_sub_menu_bottom_sheet_layout.xml      |  4 +-
 .../res/layout/org_bottom_sheet_layout.xml    |  4 +-
 .../main/res/layout/organizations_list.xml    |  8 +--
 .../layout/profile_bottom_sheet_layout.xml    |  4 +-
 .../main/res/layout/profile_emails_list.xml   |  4 +-
 .../res/layout/profile_followers_list.xml     |  6 +-
 .../res/layout/profile_following_list.xml     |  6 +-
 app/src/main/res/layout/releases_list.xml     | 19 +++---
 .../res/layout/repo_bottom_sheet_layout.xml   | 24 +++----
 .../res/layout/repo_detail_issues_list.xml    |  9 ++-
 app/src/main/res/layout/repo_pr_list.xml      |  7 +--
 .../res/layout/repositories_by_org_list.xml   | 15 +++--
 app/src/main/res/layout/row_load.xml          |  3 +-
 .../single_issue_bottom_sheet_layout.xml      | 20 +++---
 app/src/main/res/layout/teams_by_org_list.xml |  8 +--
 82 files changed, 503 insertions(+), 463 deletions(-)

diff --git a/app/src/main/java/org/mian/gitnex/activities/AddCollaboratorToRepositoryActivity.java b/app/src/main/java/org/mian/gitnex/activities/AddCollaboratorToRepositoryActivity.java
index 2e6fd727..43815ae2 100644
--- a/app/src/main/java/org/mian/gitnex/activities/AddCollaboratorToRepositoryActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/AddCollaboratorToRepositoryActivity.java
@@ -1,7 +1,6 @@
 package org.mian.gitnex.activities;
 
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -25,13 +24,12 @@ import org.mian.gitnex.models.UserSearch;
 import org.mian.gitnex.models.UserInfo;
 import org.mian.gitnex.util.TinyDB;
 import java.util.List;
-import java.util.Objects;
 
 /**
  * Author M M Arif
  */
 
-public class AddCollaboratorToRepositoryActivity extends AppCompatActivity {
+public class AddCollaboratorToRepositoryActivity extends BaseActivity {
 
     private View.OnClickListener onClickListener;
     final Context ctx = this;
@@ -42,9 +40,13 @@ public class AddCollaboratorToRepositoryActivity extends AppCompatActivity {
     private RecyclerView mRecyclerView;
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    protected int getLayoutResourceId(){
+        return R.layout.activity_add_collaborator_to_repository;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_add_collaborator_to_repository);
 
         TinyDB tinyDb = new TinyDB(getApplicationContext());
         final String instanceUrl = tinyDb.getString("instanceUrl");
diff --git a/app/src/main/java/org/mian/gitnex/activities/AddRemoveAssigneesActivity.java b/app/src/main/java/org/mian/gitnex/activities/AddRemoveAssigneesActivity.java
index 83774b0d..15722d7e 100644
--- a/app/src/main/java/org/mian/gitnex/activities/AddRemoveAssigneesActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/AddRemoveAssigneesActivity.java
@@ -1,7 +1,6 @@
 package org.mian.gitnex.activities;
 
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatActivity;
 import android.content.Context;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
@@ -29,7 +28,7 @@ import retrofit2.Callback;
  * Author M M Arif
  */
 
-public class AddRemoveAssigneesActivity extends AppCompatActivity {
+public class AddRemoveAssigneesActivity extends BaseActivity {
 
     private ArrayList<MultiSelectModel> listOfCollaborators = new ArrayList<>();
     private ArrayList<Integer> issueAssigneesIds = new ArrayList<>();
@@ -38,11 +37,15 @@ public class AddRemoveAssigneesActivity extends AppCompatActivity {
     final Context ctx = this;
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    protected int getLayoutResourceId(){
+        return R.layout.activity_add_remove_assignees;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
         supportRequestWindowFeature(Window.FEATURE_NO_TITLE);
-        setContentView(R.layout.activity_add_remove_assignees);
 
         getWindow().getDecorView().setBackground(new ColorDrawable(Color.TRANSPARENT));
 
diff --git a/app/src/main/java/org/mian/gitnex/activities/AddRemoveLabelsActivity.java b/app/src/main/java/org/mian/gitnex/activities/AddRemoveLabelsActivity.java
index ee7fbe70..2c301ab3 100644
--- a/app/src/main/java/org/mian/gitnex/activities/AddRemoveLabelsActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/AddRemoveLabelsActivity.java
@@ -1,7 +1,6 @@
 package org.mian.gitnex.activities;
 
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatActivity;
 import retrofit2.Call;
 import retrofit2.Callback;
 import android.content.Context;
@@ -27,7 +26,7 @@ import java.util.List;
  * Author M M Arif
  */
 
-public class AddRemoveLabelsActivity extends AppCompatActivity {
+public class AddRemoveLabelsActivity extends BaseActivity {
 
     private ArrayList<MultiSelectModel> listOfLabels = new ArrayList<>();
     private ArrayList<Integer> issueLabelIds = new ArrayList<>();
@@ -36,10 +35,14 @@ public class AddRemoveLabelsActivity extends AppCompatActivity {
     final Context ctx = this;
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    protected int getLayoutResourceId(){
+        return R.layout.activity_add_remove_labels;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         supportRequestWindowFeature(Window.FEATURE_NO_TITLE);
-        setContentView(R.layout.activity_add_remove_labels);
 
         getWindow().getDecorView().setBackground(new ColorDrawable(Color.TRANSPARENT));
 
diff --git a/app/src/main/java/org/mian/gitnex/activities/AdminGetUsersActivity.java b/app/src/main/java/org/mian/gitnex/activities/AdminGetUsersActivity.java
index ca82dbe8..e5d60274 100644
--- a/app/src/main/java/org/mian/gitnex/activities/AdminGetUsersActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/AdminGetUsersActivity.java
@@ -1,7 +1,6 @@
 package org.mian.gitnex.activities;
 
 import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProviders;
@@ -35,7 +34,7 @@ import java.util.Objects;
  * Author M M Arif
  */
 
-public class AdminGetUsersActivity extends AppCompatActivity implements AdminUsersBottomSheetFragment.BottomSheetListener {
+public class AdminGetUsersActivity extends BaseActivity implements AdminUsersBottomSheetFragment.BottomSheetListener {
 
     private View.OnClickListener onClickListener;
     final Context ctx = this;
@@ -45,10 +44,14 @@ public class AdminGetUsersActivity extends AppCompatActivity implements AdminUse
     private Boolean searchFilter = false;
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    protected int getLayoutResourceId(){
+        return R.layout.activity_admin_get_users;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_admin_get_users);
 
         TinyDB tinyDb = new TinyDB(getApplicationContext());
         final String instanceUrl = tinyDb.getString("instanceUrl");
diff --git a/app/src/main/java/org/mian/gitnex/activities/CreateIssueActivity.java b/app/src/main/java/org/mian/gitnex/activities/CreateIssueActivity.java
index 16448ae3..0d36d282 100644
--- a/app/src/main/java/org/mian/gitnex/activities/CreateIssueActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreateIssueActivity.java
@@ -1,7 +1,6 @@
 package org.mian.gitnex.activities;
 
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatActivity;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -40,13 +39,12 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.List;
-import java.util.Objects;
 
 /**
  * Author M M Arif
  */
 
-public class CreateIssueActivity extends AppCompatActivity implements View.OnClickListener {
+public class CreateIssueActivity extends BaseActivity implements View.OnClickListener {
 
     private View.OnClickListener onClickListener;
     MultiSelectDialog multiSelectDialog;
@@ -69,9 +67,13 @@ public class CreateIssueActivity extends AppCompatActivity implements View.OnCli
     private ArrayAdapter<Mention> defaultMentionAdapter;
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    protected int getLayoutResourceId(){
+        return R.layout.activity_create_issue;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_create_issue);
 
         boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
 
diff --git a/app/src/main/java/org/mian/gitnex/activities/CreateLabelActivity.java b/app/src/main/java/org/mian/gitnex/activities/CreateLabelActivity.java
index e8d49ae8..5380f76a 100644
--- a/app/src/main/java/org/mian/gitnex/activities/CreateLabelActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreateLabelActivity.java
@@ -2,7 +2,6 @@ package org.mian.gitnex.activities;
 
 import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.content.ContextCompat;
 import retrofit2.Call;
 import retrofit2.Callback;
@@ -34,7 +33,7 @@ import java.util.Objects;
  * Author M M Arif
  */
 
-public class CreateLabelActivity extends AppCompatActivity {
+public class CreateLabelActivity extends BaseActivity {
 
     private View.OnClickListener onClickListener;
     private TextView colorPicker;
@@ -43,9 +42,13 @@ public class CreateLabelActivity extends AppCompatActivity {
     final Context ctx = this;
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    protected int getLayoutResourceId(){
+        return R.layout.activity_create_label;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_create_label);
 
         final TinyDB tinyDb = new TinyDB(getApplicationContext());
         String repoFullName = tinyDb.getString("repoFullName");
diff --git a/app/src/main/java/org/mian/gitnex/activities/CreateNewUserActivity.java b/app/src/main/java/org/mian/gitnex/activities/CreateNewUserActivity.java
index 634a82c0..a1bf3ef6 100644
--- a/app/src/main/java/org/mian/gitnex/activities/CreateNewUserActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreateNewUserActivity.java
@@ -1,7 +1,6 @@
 package org.mian.gitnex.activities;
 
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatActivity;
 import retrofit2.Call;
 import retrofit2.Callback;
 import android.content.Context;
@@ -26,7 +25,7 @@ import org.mian.gitnex.util.TinyDB;
  * Author M M Arif
  */
 
-public class CreateNewUserActivity extends AppCompatActivity {
+public class CreateNewUserActivity extends BaseActivity {
 
     private View.OnClickListener onClickListener;
     private EditText fullName;
@@ -37,10 +36,14 @@ public class CreateNewUserActivity extends AppCompatActivity {
     final Context ctx = this;
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    protected int getLayoutResourceId(){
+        return R.layout.activity_create_new_user;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_create_new_user);
 
         boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
 
diff --git a/app/src/main/java/org/mian/gitnex/activities/CreateReleaseActivity.java b/app/src/main/java/org/mian/gitnex/activities/CreateReleaseActivity.java
index 19d56763..e64b0e07 100644
--- a/app/src/main/java/org/mian/gitnex/activities/CreateReleaseActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/CreateReleaseActivity.java
@@ -1,7 +1,6 @@
 package org.mian.gitnex.activities;
 
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatActivity;
 import retrofit2.Call;
 import retrofit2.Callback;
 import android.content.Context;
@@ -33,7 +32,7 @@ import java.util.List;
  * Author M M Arif
  */
 
-public class CreateReleaseActivity extends AppCompatActivity {
+public class CreateReleaseActivity extends BaseActivity {
 
     private View.OnClickListener onClickListener;
     public ImageView closeActivity;
@@ -49,10 +48,14 @@ public class CreateReleaseActivity extends AppCompatActivity {
     List<Branches> branchesList = new ArrayList<>();
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    protected int getLayoutResourceId(){
+        return R.layout.activity_create_release;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_create_release);
 
         boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
 
diff --git a/app/src/main/java/org/mian/gitnex/activities/EditIssueActivity.java b/app/src/main/java/org/mian/gitnex/activities/EditIssueActivity.java
index 7b7887be..ac24b781 100644
--- a/app/src/main/java/org/mian/gitnex/activities/EditIssueActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/EditIssueActivity.java
@@ -1,7 +1,6 @@
 package org.mian.gitnex.activities;
 
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatActivity;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -45,7 +44,7 @@ import java.util.List;
  * Author M M Arif
  */
 
-public class EditIssueActivity extends AppCompatActivity implements View.OnClickListener {
+public class EditIssueActivity extends BaseActivity implements View.OnClickListener {
 
     final Context ctx = this;
     private View.OnClickListener onClickListener;
@@ -62,10 +61,14 @@ public class EditIssueActivity extends AppCompatActivity implements View.OnClick
     private ArrayAdapter<Mention> defaultMentionAdapter;
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    protected int getLayoutResourceId(){
+        return R.layout.activity_edit_issue;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_edit_issue);
 
         final TinyDB tinyDb = new TinyDB(getApplicationContext());
 
diff --git a/app/src/main/java/org/mian/gitnex/activities/FileDiffActivity.java b/app/src/main/java/org/mian/gitnex/activities/FileDiffActivity.java
index 660656fe..876736b0 100644
--- a/app/src/main/java/org/mian/gitnex/activities/FileDiffActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/FileDiffActivity.java
@@ -7,7 +7,6 @@ import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -31,7 +30,7 @@ import retrofit2.Callback;
  * Author M M Arif
  */
 
-public class FileDiffActivity extends AppCompatActivity {
+public class FileDiffActivity extends BaseActivity {
 
     private View.OnClickListener onClickListener;
     private TextView toolbar_title;
@@ -39,10 +38,14 @@ public class FileDiffActivity extends AppCompatActivity {
     private ProgressBar mProgressBar;
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    protected int getLayoutResourceId(){
+        return R.layout.activity_file_diff;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_file_diff);
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
diff --git a/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java b/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java
index ead431b1..85e474b0 100644
--- a/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java
@@ -2,7 +2,6 @@ package org.mian.gitnex.activities;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProviders;
diff --git a/app/src/main/java/org/mian/gitnex/activities/MergePullRequestActivity.java b/app/src/main/java/org/mian/gitnex/activities/MergePullRequestActivity.java
index 32c3cb4b..3eacf3e5 100644
--- a/app/src/main/java/org/mian/gitnex/activities/MergePullRequestActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/MergePullRequestActivity.java
@@ -1,7 +1,6 @@
 package org.mian.gitnex.activities;
 
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatActivity;
 import android.content.Context;
 import android.graphics.drawable.GradientDrawable;
 import android.os.Bundle;
@@ -33,7 +32,7 @@ import retrofit2.Response;
  * Author M M Arif
  */
 
-public class MergePullRequestActivity extends AppCompatActivity {
+public class MergePullRequestActivity extends BaseActivity {
 
     public ImageView closeActivity;
     private View.OnClickListener onClickListener;
@@ -45,9 +44,13 @@ public class MergePullRequestActivity extends AppCompatActivity {
     private Button mergeButton;
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    protected int getLayoutResourceId(){
+        return R.layout.activity_merge_pull_request;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_merge_pull_request);
 
         boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
         TinyDB tinyDb = new TinyDB(getApplicationContext());
diff --git a/app/src/main/java/org/mian/gitnex/activities/NewFileActivity.java b/app/src/main/java/org/mian/gitnex/activities/NewFileActivity.java
index d3c27ee4..0bd99513 100644
--- a/app/src/main/java/org/mian/gitnex/activities/NewFileActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/NewFileActivity.java
@@ -13,7 +13,6 @@ import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.Spinner;
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatActivity;
 import com.google.gson.JsonElement;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
@@ -33,7 +32,7 @@ import retrofit2.Callback;
  * Author M M Arif
  */
 
-public class NewFileActivity extends AppCompatActivity {
+public class NewFileActivity extends BaseActivity {
 
     public ImageView closeActivity;
     private View.OnClickListener onClickListener;
@@ -49,10 +48,14 @@ public class NewFileActivity extends AppCompatActivity {
     List<Branches> branchesList = new ArrayList<>();
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    protected int getLayoutResourceId(){
+        return R.layout.activity_new_file;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_new_file);
 
         boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
 
diff --git a/app/src/main/java/org/mian/gitnex/activities/NewMilestoneActivity.java b/app/src/main/java/org/mian/gitnex/activities/NewMilestoneActivity.java
index 61d68c58..d7fda9da 100644
--- a/app/src/main/java/org/mian/gitnex/activities/NewMilestoneActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/NewMilestoneActivity.java
@@ -1,7 +1,6 @@
 package org.mian.gitnex.activities;
 
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatActivity;
 import retrofit2.Call;
 import retrofit2.Callback;
 import android.app.DatePickerDialog;
@@ -29,7 +28,7 @@ import java.util.Calendar;
  * Author M M Arif
  */
 
-public class NewMilestoneActivity extends AppCompatActivity implements View.OnClickListener {
+public class NewMilestoneActivity extends BaseActivity implements View.OnClickListener {
 
     private EditText milestoneDueDate;
     private View.OnClickListener onClickListener;
@@ -39,9 +38,13 @@ public class NewMilestoneActivity extends AppCompatActivity implements View.OnCl
     final Context ctx = this;
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    protected int getLayoutResourceId(){
+        return R.layout.activity_new_milestone;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_new_milestone);
 
         boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
 
diff --git a/app/src/main/java/org/mian/gitnex/activities/NewOrganizationActivity.java b/app/src/main/java/org/mian/gitnex/activities/NewOrganizationActivity.java
index 0472cada..51229abc 100644
--- a/app/src/main/java/org/mian/gitnex/activities/NewOrganizationActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/NewOrganizationActivity.java
@@ -4,7 +4,6 @@ import android.content.Context;
 import android.graphics.drawable.GradientDrawable;
 import android.os.Bundle;
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.view.View;
 import android.widget.Button;
@@ -25,7 +24,7 @@ import retrofit2.Callback;
  * Author M M Arif
  */
 
-public class NewOrganizationActivity extends AppCompatActivity {
+public class NewOrganizationActivity extends BaseActivity {
 
     public ImageView closeActivity;
     private View.OnClickListener onClickListener;
@@ -36,9 +35,13 @@ public class NewOrganizationActivity extends AppCompatActivity {
     final Context ctx = this;
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    protected int getLayoutResourceId(){
+        return R.layout.activity_new_organization;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_new_organization);
 
         boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
 
diff --git a/app/src/main/java/org/mian/gitnex/activities/OrgDetailActivity.java b/app/src/main/java/org/mian/gitnex/activities/OrgDetailActivity.java
index 45ea48f6..43ba6d7d 100644
--- a/app/src/main/java/org/mian/gitnex/activities/OrgDetailActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/OrgDetailActivity.java
@@ -2,7 +2,6 @@ package org.mian.gitnex.activities;
 
 import com.google.android.material.tabs.TabLayout;
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
@@ -30,12 +29,16 @@ import java.util.Objects;
  * Author M M Arif
  */
 
-public class OrgDetailActivity extends AppCompatActivity implements OrgBottomSheetFragment.BottomSheetListener {
+public class OrgDetailActivity extends BaseActivity implements OrgBottomSheetFragment.BottomSheetListener {
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    protected int getLayoutResourceId(){
+        return R.layout.activity_org_detail;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_org_detail);
 
         TinyDB tinyDb = new TinyDB(getApplicationContext());
         String orgName = tinyDb.getString("orgName");
diff --git a/app/src/main/java/org/mian/gitnex/activities/ProfileEmailActivity.java b/app/src/main/java/org/mian/gitnex/activities/ProfileEmailActivity.java
index 9549875b..6f1a0b49 100644
--- a/app/src/main/java/org/mian/gitnex/activities/ProfileEmailActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/ProfileEmailActivity.java
@@ -1,7 +1,6 @@
 package org.mian.gitnex.activities;
 
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatActivity;
 import retrofit2.Call;
 import retrofit2.Callback;
 import android.content.Context;
@@ -30,7 +29,7 @@ import java.util.List;
  * Author M M Arif
  */
 
-public class ProfileEmailActivity extends AppCompatActivity {
+public class ProfileEmailActivity extends BaseActivity {
 
     private View.OnClickListener onClickListener;
     private EditText userEmail;
@@ -38,9 +37,13 @@ public class ProfileEmailActivity extends AppCompatActivity {
     private Button addEmailButton;
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    protected int getLayoutResourceId(){
+        return R.layout.activity_profile_email;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_profile_email);
 
         boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
 
diff --git a/app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java b/app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
index f5ac58e9..01fa41ed 100644
--- a/app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/ReplyToIssueActivity.java
@@ -1,7 +1,6 @@
 package org.mian.gitnex.activities;
 
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatActivity;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -33,7 +32,7 @@ import java.util.List;
  * Author M M Arif
  */
 
-public class ReplyToIssueActivity extends AppCompatActivity {
+public class ReplyToIssueActivity extends BaseActivity {
 
     public ImageView closeActivity;
     private View.OnClickListener onClickListener;
@@ -45,10 +44,14 @@ public class ReplyToIssueActivity extends AppCompatActivity {
     private Button replyButton;
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    protected int getLayoutResourceId(){
+        return R.layout.activity_reply_to_issue;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_reply_to_issue);
 
         boolean connToInternet = AppUtil.haveNetworkConnection(getApplicationContext());
         TinyDB tinyDb = new TinyDB(getApplicationContext());
diff --git a/app/src/main/res/drawable/progress_bar.xml b/app/src/main/res/drawable/progress_bar.xml
index 49ed5a6c..935176f9 100644
--- a/app/src/main/res/drawable/progress_bar.xml
+++ b/app/src/main/res/drawable/progress_bar.xml
@@ -16,8 +16,8 @@
 
     <item
         android:id="@android:id/progress"
-        android:top="3dp"
-        android:bottom="3dp"
+        android:top="2dp"
+        android:bottom="2dp"
         android:left="1dp"
         android:right="1dp">
 
diff --git a/app/src/main/res/layout/activity_add_collaborator_to_repository.xml b/app/src/main/res/layout/activity_add_collaborator_to_repository.xml
index 33e81021..a6271eb2 100644
--- a/app/src/main/res/layout/activity_add_collaborator_to_repository.xml
+++ b/app/src/main/res/layout/activity_add_collaborator_to_repository.xml
@@ -3,7 +3,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:background="@color/colorPrimary">
+    android:background="?attr/primaryBackgroundColor">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
@@ -14,7 +14,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?attr/colorPrimary"
+            android:background="?attr/primaryBackgroundColor"
             tools:ignore="UnusedAttribute">
 
             <ImageView
@@ -33,7 +33,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/addCollaboratorTitle"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:maxLines="1"
                 android:textSize="20sp" />
 
@@ -54,10 +54,10 @@
         android:inputType="text"
         android:labelFor="@+id/addCollaboratorSearch"
         android:background="@drawable/shape_inputs"
-        android:textColor="@color/white"
-        android:textColorHint="@color/colorAccent"
+        android:textColor="?attr/inputTextColor"
+        android:textColorHint="?attr/primaryBackgroundColor"
+        android:textColorHighlight="?attr/primaryTextColor"
         android:hint="@string/addCollaboratorSearchHint"
-        android:textColorHighlight="@color/white"
         android:imeOptions="actionSend"/>
 
     <TextView
@@ -67,7 +67,7 @@
         android:layout_margin="15dp"
         android:gravity="center"
         android:text="@string/noDataFound"
-        android:textColor="@color/white"
+        android:textColor="?attr/primaryTextColor"
         android:textSize="20sp"
         android:visibility="gone" />
 
@@ -83,7 +83,7 @@
         android:id="@+id/recyclerViewUserSearch"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/colorPrimary"
+        android:background="?attr/primaryBackgroundColor"
         android:layout_marginStart="0dp"
         android:layout_marginEnd="0dp"
         android:layout_marginTop="5dp"
diff --git a/app/src/main/res/layout/activity_add_remove_assignees.xml b/app/src/main/res/layout/activity_add_remove_assignees.xml
index bcc640e1..612c60f8 100644
--- a/app/src/main/res/layout/activity_add_remove_assignees.xml
+++ b/app/src/main/res/layout/activity_add_remove_assignees.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/colorPrimary"
+    android:background="?attr/primaryBackgroundColor"
     tools:context=".activities.AddRemoveAssigneesActivity">
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_add_remove_labels.xml b/app/src/main/res/layout/activity_add_remove_labels.xml
index 70b21c89..9d0dc751 100644
--- a/app/src/main/res/layout/activity_add_remove_labels.xml
+++ b/app/src/main/res/layout/activity_add_remove_labels.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/colorPrimary"
+    android:background="?attr/primaryBackgroundColor"
     tools:context=".activities.AddRemoveLabelsActivity">
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_admin_get_users.xml b/app/src/main/res/layout/activity_admin_get_users.xml
index 26a13588..0c9cd8f5 100644
--- a/app/src/main/res/layout/activity_admin_get_users.xml
+++ b/app/src/main/res/layout/activity_admin_get_users.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/colorPrimary"
+    android:background="?attr/primaryBackgroundColor"
     android:fitsSystemWindows="true"
     android:orientation="vertical">
 
@@ -15,7 +15,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?attr/colorPrimary"
+            android:background="?attr/primaryBackgroundColor"
             android:theme="@style/AppTheme.AppBarOverlay"
             tools:ignore="UnusedAttribute">
 
@@ -35,7 +35,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/adminUsers"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:maxLines="1"
                 android:textSize="20sp" />
 
@@ -52,7 +52,7 @@
             android:id="@+id/recyclerView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@color/colorPrimary"
+            android:background="?attr/primaryBackgroundColor"
             android:padding="4dp"
             android:scrollbars="vertical"
             />
@@ -66,7 +66,7 @@
         android:layout_margin="15dp"
         android:gravity="center"
         android:text="@string/noDataFound"
-        android:textColor="@color/white"
+        android:textColor="?attr/primaryTextColor"
         android:textSize="20sp"
         android:visibility="visible" />
 
diff --git a/app/src/main/res/layout/activity_create_issue.xml b/app/src/main/res/layout/activity_create_issue.xml
index 2901239c..1bec3f36 100644
--- a/app/src/main/res/layout/activity_create_issue.xml
+++ b/app/src/main/res/layout/activity_create_issue.xml
@@ -3,7 +3,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:background="@color/colorPrimary">
+    android:background="?attr/primaryBackgroundColor">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
@@ -14,7 +14,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?attr/colorPrimary"
+            android:background="?attr/primaryBackgroundColor"
             tools:ignore="UnusedAttribute">
 
             <ImageView
@@ -33,7 +33,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/pageTitleCreateNewIssue"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:maxLines="1"
                 android:textSize="20sp" />
 
@@ -58,7 +58,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/newIssueTitle"
-                android:textColor="@color/colorWhite"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
                 />
 
@@ -73,15 +73,15 @@
                 android:inputType="textCapSentences|text"
                 android:labelFor="@+id/newIssueTitle"
                 android:background="@drawable/shape_inputs"
-                android:textColor="@color/colorWhite"
-                android:textColorHint="@color/colorWhite"
-                android:textColorHighlight="@color/colorWhite"/>
+                android:textColor="?attr/inputTextColor"
+                android:textColorHint="?attr/primaryBackgroundColor"
+                android:textColorHighlight="?attr/primaryTextColor"/>
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/newIssueDescriptionTitle"
-                android:textColor="@color/colorWhite"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
                 android:layout_marginTop="10dp"/>
 
@@ -109,7 +109,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/newIssueAssigneesListTitle"
-                android:textColor="@color/colorWhite"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
                 android:layout_marginTop="10dp"/>
 
@@ -122,10 +122,10 @@
                 android:textSize="14sp"
                 tools:ignore="Autofill"
                 android:background="@drawable/shape_inputs"
-                android:textColor="@color/colorWhite"
-                android:textColorHint="@color/colorWhite"
+                android:textColor="?attr/primaryTextColor"
+                android:textColorHint="?attr/primaryTextColor"
                 android:inputType="none"
-                android:textColorHighlight="@color/colorWhite"/>
+                android:textColorHighlight="?attr/primaryTextColor"/>
 
             <TextView
                 android:layout_width="match_parent"
@@ -138,7 +138,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/newIssueMilestoneTitle"
-                android:textColor="@color/colorWhite"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
                 android:layout_marginTop="10dp"/>
 
@@ -157,7 +157,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/newIssueLabelsTitle"
-                android:textColor="@color/colorWhite"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
                 android:layout_marginTop="10dp"/>
 
@@ -170,16 +170,16 @@
                 android:textSize="14sp"
                 tools:ignore="Autofill"
                 android:background="@drawable/shape_inputs"
-                android:textColor="@color/colorWhite"
-                android:textColorHint="@color/colorWhite"
+                android:textColor="?attr/primaryTextColor"
+                android:textColorHint="?attr/primaryTextColor"
                 android:inputType="none"
-                android:textColorHighlight="@color/colorWhite"/>
+                android:textColorHighlight="?attr/primaryTextColor"/>
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/newIssueDueDateTitle"
-                android:textColor="@color/colorWhite"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
                 android:layout_marginTop="10dp" />
 
@@ -193,9 +193,9 @@
                 android:textSize="14sp"
                 tools:ignore="Autofill"
                 android:background="@drawable/shape_inputs"
-                android:textColor="@color/colorWhite"
-                android:textColorHint="@color/colorWhite"
-                android:textColorHighlight="@color/colorWhite"/>
+                android:textColor="?attr/primaryTextColor"
+                android:textColorHint="?attr/primaryTextColor"
+                android:textColorHighlight="?attr/primaryTextColor"/>
 
             <Button
                 android:id="@+id/createNewIssueButton"
diff --git a/app/src/main/res/layout/activity_create_label.xml b/app/src/main/res/layout/activity_create_label.xml
index 0d6c6575..4e4fabe2 100644
--- a/app/src/main/res/layout/activity_create_label.xml
+++ b/app/src/main/res/layout/activity_create_label.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:background="@color/colorPrimary">
+    android:background="?attr/primaryBackgroundColor">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
@@ -13,7 +13,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?attr/colorPrimary"
+            android:background="?attr/primaryBackgroundColor"
             tools:ignore="UnusedAttribute">
 
             <ImageView
@@ -32,7 +32,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/pageTitleCreateLabel"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:maxLines="1"
                 android:textSize="20sp" />
 
@@ -51,7 +51,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/labelName"
-            android:textColor="@color/colorWhite"
+            android:textColor="?attr/primaryTextColor"
             android:textSize="16sp"
             />
 
@@ -66,9 +66,9 @@
             android:inputType="textCapSentences|text"
             android:labelFor="@+id/labelName"
             android:background="@drawable/shape_inputs"
-            android:textColor="@color/colorWhite"
-            android:textColorHint="@color/colorWhite"
-            android:textColorHighlight="@color/colorWhite"/>
+            android:textColor="?attr/inputTextColor"
+            android:textColorHint="?attr/primaryBackgroundColor"
+            android:textColorHighlight="?attr/primaryTextColor"/>
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -83,7 +83,7 @@
                 android:layout_gravity="center_vertical"
                 android:gravity="center_vertical"
                 android:text="@string/labelColor"
-                android:textColor="@color/colorWhite"
+                android:textColor="?attr/primaryTextColor"
                 android:layout_weight=".95"
                 android:textSize="16sp" />
 
diff --git a/app/src/main/res/layout/activity_create_new_user.xml b/app/src/main/res/layout/activity_create_new_user.xml
index 747d2da6..33f6f27e 100644
--- a/app/src/main/res/layout/activity_create_new_user.xml
+++ b/app/src/main/res/layout/activity_create_new_user.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:background="@color/colorPrimary">
+    android:background="?attr/primaryBackgroundColor">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
@@ -14,7 +14,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?attr/colorPrimary"
+            android:background="?attr/primaryBackgroundColor"
             tools:ignore="UnusedAttribute">
 
             <ImageView
@@ -33,7 +33,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/adminCreateNewUser"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:maxLines="1"
                 android:textSize="20sp" />
 
@@ -56,7 +56,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/userFullNameText"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
                 />
 
@@ -71,15 +71,15 @@
                 android:inputType="textCapSentences|text"
                 android:labelFor="@+id/fullName"
                 android:background="@drawable/shape_inputs"
-                android:textColor="@color/white"
-                android:textColorHint="@color/white"
-                android:textColorHighlight="@color/white"/>
+                android:textColor="?attr/inputTextColor"
+                android:textColorHint="?attr/primaryBackgroundColor"
+                android:textColorHighlight="?attr/primaryTextColor"/>
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/userUserName"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
                 android:layout_marginTop="10dp"
                 />
@@ -95,15 +95,15 @@
                 android:inputType="text"
                 android:labelFor="@+id/userUserName"
                 android:background="@drawable/shape_inputs"
-                android:textColor="@color/white"
-                android:textColorHint="@color/white"
-                android:textColorHighlight="@color/white"/>
+                android:textColor="?attr/inputTextColor"
+                android:textColorHint="?attr/primaryBackgroundColor"
+                android:textColorHighlight="?attr/primaryTextColor"/>
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/userEmail"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
                 android:layout_marginTop="10dp"
                 />
@@ -119,15 +119,15 @@
                 android:inputType="textEmailAddress"
                 android:labelFor="@+id/userEmail"
                 android:background="@drawable/shape_inputs"
-                android:textColor="@color/white"
-                android:textColorHint="@color/white"
-                android:textColorHighlight="@color/white"/>
+                android:textColor="?attr/inputTextColor"
+                android:textColorHint="?attr/primaryBackgroundColor"
+                android:textColorHighlight="?attr/primaryTextColor"/>
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/userPassword"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
                 android:layout_marginTop="10dp"/>
 
@@ -142,9 +142,9 @@
                 android:inputType="textPassword"
                 android:labelFor="@+id/userPassword"
                 android:background="@drawable/shape_inputs"
-                android:textColor="@color/white"
-                android:textColorHint="@color/white"
-                android:textColorHighlight="@color/white"/>
+                android:textColor="?attr/inputTextColor"
+                android:textColorHint="?attr/primaryBackgroundColor"
+                android:textColorHighlight="?attr/primaryTextColor"/>
 
             <Button
                 android:id="@+id/createUserButton"
diff --git a/app/src/main/res/layout/activity_create_release.xml b/app/src/main/res/layout/activity_create_release.xml
index 52e07092..9ce162a0 100644
--- a/app/src/main/res/layout/activity_create_release.xml
+++ b/app/src/main/res/layout/activity_create_release.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:background="@color/colorPrimary">
+    android:background="?attr/primaryBackgroundColor">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
@@ -14,7 +14,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?attr/colorPrimary"
+            android:background="?attr/primaryBackgroundColor"
             tools:ignore="UnusedAttribute">
 
             <ImageView
@@ -33,7 +33,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/createRelease"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:maxLines="1"
                 android:textSize="20sp" />
 
@@ -56,7 +56,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/releaseTagNameText"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
                 />
 
@@ -71,9 +71,9 @@
                 android:inputType="text"
                 android:labelFor="@+id/releaseTagName"
                 android:background="@drawable/shape_inputs"
-                android:textColor="@color/white"
-                android:textColorHint="@color/white"
-                android:textColorHighlight="@color/white"/>
+                android:textColor="?attr/inputTextColor"
+                android:textColorHint="?attr/primaryBackgroundColor"
+                android:textColorHighlight="?attr/primaryTextColor"/>
 
             <TextView
                 android:layout_width="match_parent"
@@ -98,7 +98,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/releaseTitleText"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
                 android:layout_marginTop="10dp"
                 />
@@ -114,15 +114,15 @@
                 android:inputType="text"
                 android:labelFor="@+id/releaseTitle"
                 android:background="@drawable/shape_inputs"
-                android:textColor="@color/white"
-                android:textColorHint="@color/white"
-                android:textColorHighlight="@color/white"/>
+                android:textColor="?attr/inputTextColor"
+                android:textColorHint="?attr/primaryBackgroundColor"
+                android:textColorHighlight="?attr/primaryTextColor"/>
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/releaseContentText"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
                 android:layout_marginTop="10dp"
                 />
@@ -133,7 +133,6 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="10dp"
                 android:padding="10dp"
-                android:background="@drawable/shape_inputs"
                 android:maxLines="8"
                 android:minLines="6"
                 tools:ignore="Autofill"
@@ -141,10 +140,11 @@
                 android:scrollbars="vertical"
                 android:gravity="top|start"
                 android:textSize="14sp"
-                android:textColor="@color/white"
-                android:textColorHint="@color/white"
-                android:inputType="textCapSentences|textMultiLine"
-                android:textColorHighlight="@color/white"/>
+                android:background="@drawable/shape_inputs"
+                android:textColor="?attr/inputTextColor"
+                android:textColorHint="?attr/primaryBackgroundColor"
+                android:textColorHighlight="?attr/primaryTextColor"
+                android:inputType="textCapSentences|textMultiLine" />
 
             <CheckBox
                 android:id="@+id/releaseType"
@@ -155,7 +155,7 @@
                 android:textSize="16sp"
                 android:layout_marginTop="10dp"
                 android:theme="@style/checkBoxTheme"
-                android:textColor="@color/white"/>
+                android:textColor="?attr/primaryTextColor"/>
 
             <CheckBox
                 android:id="@+id/releaseDraft"
@@ -166,7 +166,7 @@
                 android:textSize="16sp"
                 android:layout_marginTop="10dp"
                 android:theme="@style/checkBoxTheme"
-                android:textColor="@color/white"/>
+                android:textColor="?attr/primaryTextColor"/>
 
             <Button
                 android:id="@+id/createNewRelease"
diff --git a/app/src/main/res/layout/activity_create_team_by_org.xml b/app/src/main/res/layout/activity_create_team_by_org.xml
index 70a03a23..0f74ea42 100644
--- a/app/src/main/res/layout/activity_create_team_by_org.xml
+++ b/app/src/main/res/layout/activity_create_team_by_org.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:background="@color/colorPrimary">
+    android:background="?attr/primaryBackgroundColor">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
@@ -13,7 +13,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?attr/colorPrimary"
+            android:background="?attr/primaryBackgroundColor"
             tools:ignore="UnusedAttribute">
 
             <ImageView
@@ -32,7 +32,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/pageTitleCreateTeam"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:maxLines="1"
                 android:textSize="20sp" />
 
@@ -55,7 +55,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/newTeamTitle"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
                 />
 
@@ -70,15 +70,15 @@
                 android:inputType="textCapSentences|text"
                 android:labelFor="@+id/teamName"
                 android:background="@drawable/shape_inputs"
-                android:textColor="@color/white"
-                android:textColorHint="@color/white"
-                android:textColorHighlight="@color/white"/>
+                android:textColor="?attr/inputTextColor"
+                android:textColorHint="?attr/primaryBackgroundColor"
+                android:textColorHighlight="?attr/primaryTextColor"/>
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/newTeamDesc"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
                 android:layout_marginTop="10dp"
                 />
@@ -94,15 +94,15 @@
                 android:inputType="textCapSentences|text"
                 android:labelFor="@+id/teamDesc"
                 android:background="@drawable/shape_inputs"
-                android:textColor="@color/white"
-                android:textColorHint="@color/white"
-                android:textColorHighlight="@color/white"/>
+                android:textColor="?attr/inputTextColor"
+                android:textColorHint="?attr/primaryBackgroundColor"
+                android:textColorHighlight="?attr/primaryTextColor"/>
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/newTeamPermission"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
                 android:layout_marginTop="10dp"/>
 
@@ -124,7 +124,7 @@
                 android:id="@+id/teamPermissionDetail"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textColor="@color/colorWhite"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="12sp"
                 android:gravity="start"
                 android:visibility="gone"/>
@@ -133,7 +133,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/newTeamAccessControls"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
                 android:layout_marginTop="10dp"/>
 
@@ -146,10 +146,10 @@
                 android:textSize="14sp"
                 tools:ignore="Autofill"
                 android:background="@drawable/shape_inputs"
-                android:textColor="@color/white"
-                android:textColorHint="@color/white"
+                android:textColor="?attr/primaryTextColor"
+                android:textColorHint="?attr/primaryTextColor"
                 android:inputType="none"
-                android:textColorHighlight="@color/white"/>
+                android:textColorHighlight="?attr/primaryTextColor"/>
 
             <TextView
                 android:id="@+id/teamAccessControlsArray"
diff --git a/app/src/main/res/layout/activity_edit_issue.xml b/app/src/main/res/layout/activity_edit_issue.xml
index bef28f49..457e20de 100644
--- a/app/src/main/res/layout/activity_edit_issue.xml
+++ b/app/src/main/res/layout/activity_edit_issue.xml
@@ -3,7 +3,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:background="@color/colorPrimary">
+    android:background="?attr/primaryBackgroundColor">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
@@ -14,7 +14,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@color/colorPrimary"
+            android:background="?attr/primaryBackgroundColor"
             tools:ignore="UnusedAttribute">
 
             <ImageView
@@ -33,7 +33,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/editIssueNavHeader"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:maxLines="1"
                 android:textSize="20sp" />
 
@@ -58,7 +58,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/newIssueTitle"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
                 />
 
@@ -73,15 +73,15 @@
                 android:inputType="textCapSentences|text"
                 android:labelFor="@+id/editIssueTitle"
                 android:background="@drawable/shape_inputs"
-                android:textColor="@color/white"
-                android:textColorHint="@color/white"
-                android:textColorHighlight="@color/white"/>
+                android:textColor="?attr/inputTextColor"
+                android:textColorHint="?attr/primaryBackgroundColor"
+                android:textColorHighlight="?attr/primaryTextColor"/>
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/newIssueDescriptionTitle"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
                 android:layout_marginTop="10dp"/>
 
@@ -100,16 +100,16 @@
                 android:scrollbars="vertical"
                 android:gravity="top|start"
                 android:textSize="14sp"
-                android:textColor="@color/white"
-                android:textColorHint="@color/white"
+                android:textColor="?attr/primaryTextColor"
+                android:textColorHint="?attr/primaryTextColor"
                 android:inputType="textCapSentences|textMultiLine"
-                android:textColorHighlight="@color/white" />
+                android:textColorHighlight="?attr/primaryTextColor" />
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/newIssueDueDateTitle"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
                 android:visibility="gone"
                 android:layout_marginTop="10dp" />
@@ -124,10 +124,10 @@
                 android:textSize="14sp"
                 tools:ignore="Autofill"
                 android:background="@drawable/shape_inputs"
-                android:textColor="@color/white"
-                android:textColorHint="@color/white"
+                android:textColor="?attr/primaryTextColor"
+                android:textColorHint="?attr/primaryTextColor"
                 android:visibility="gone"
-                android:textColorHighlight="@color/white"/>
+                android:textColorHighlight="?attr/primaryTextColor"/>
 
             <TextView
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_file_diff.xml b/app/src/main/res/layout/activity_file_diff.xml
index af6d9e2b..62a7225c 100644
--- a/app/src/main/res/layout/activity_file_diff.xml
+++ b/app/src/main/res/layout/activity_file_diff.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:background="@color/colorPrimary">
+    android:background="?attr/primaryBackgroundColor">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
@@ -15,7 +15,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?attr/colorPrimary"
+            android:background="?attr/primaryBackgroundColor"
             tools:ignore="UnusedAttribute">
 
             <ImageView
@@ -34,7 +34,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/fileDiffViewHeader"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:ellipsize="none"
                 android:scrollbars="horizontal"
                 android:singleLine="true"
diff --git a/app/src/main/res/layout/activity_issue_detail.xml b/app/src/main/res/layout/activity_issue_detail.xml
index 3623d9d6..3923c14f 100644
--- a/app/src/main/res/layout/activity_issue_detail.xml
+++ b/app/src/main/res/layout/activity_issue_detail.xml
@@ -5,7 +5,7 @@
     android:orientation="vertical"
     android:fitsSystemWindows="true"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:background="@color/colorPrimary">
+    android:background="?attr/primaryBackgroundColor">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
@@ -17,7 +17,7 @@
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:layout_weight="1"
-            android:background="?attr/colorPrimary"
+            android:background="?attr/primaryBackgroundColor"
             app:popupTheme="@style/AppTheme.PopupOverlay"
             app:title="@string/app_name" >
 
@@ -27,6 +27,7 @@
                 android:layout_gravity="center_vertical"
                 android:gravity="center_vertical"
                 android:textSize="18sp"
+                android:textColor="?attr/primaryTextColor"
                 android:id="@+id/toolbar_title" />
 
         </androidx.appcompat.widget.Toolbar>
@@ -54,8 +55,7 @@
                     android:id="@+id/relativeLayoutFrame"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:padding="15dp"
-                    android:theme="@style/AppTheme">
+                    android:padding="15dp">
 
                     <ImageView
                         android:id="@+id/assigneeAvatar"
@@ -70,7 +70,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:gravity="start"
-                        android:textColor="@color/white"
+                        android:textColor="?attr/primaryTextColor"
                         android:textSize="18sp" />
 
                     <RelativeLayout
@@ -88,7 +88,7 @@
                             android:layout_gravity="start"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:textColor="@color/colorWhite"
+                            android:textColor="?attr/primaryTextColor"
                             android:textSize="14sp" />
 
                         <TextView
@@ -99,7 +99,7 @@
                             android:layout_alignParentEnd="true"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:textColor="@color/colorWhite"
+                            android:textColor="?attr/primaryTextColor"
                             android:textSize="14sp" />
 
                     </RelativeLayout>
@@ -132,7 +132,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:gravity="start"
-                        android:textColor="@color/colorWhite"
+                        android:textColor="?attr/primaryTextColor"
                         android:autoLink="web"
                         android:textColorLink="@color/lightBlue"
                         android:textSize="16sp" />
@@ -172,14 +172,14 @@
                             android:gravity="start"
                             android:text="@string/createdText"
                             android:visibility="gone"
-                            android:textColor="@color/colorWhite"
+                            android:textColor="?attr/primaryTextColor"
                             android:textSize="12sp" />
 
                         <TextView
                             android:id="@+id/issueModified"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:textColor="@color/white"
+                            android:textColor="?attr/primaryTextColor"
                             android:layout_toEndOf="@+id/issueCreatedTime"
                             android:textSize="12sp"
                             android:visibility="gone"
@@ -200,7 +200,7 @@
                         android:id="@+id/recyclerView"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                        android:background="@color/colorPrimary"
+                        android:background="?attr/primaryBackgroundColor"
                         android:padding="4dp"
                         android:scrollbars="vertical"
                         />
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 2684f922..0110a542 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:tools="http://schemas.android.com/tools"
-    android:background="@color/backgroundColor"
+    android:background="?attr/primaryBackgroundColor"
     android:orientation="vertical"
     android:gravity="center">
 
@@ -28,7 +28,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/loginMethodText"
-            android:textColor="@color/white"
+            android:textColor="?attr/primaryTextColor"
             android:textSize="12sp"
             android:paddingStart="5dp"
             android:paddingEnd="5dp"
@@ -53,14 +53,14 @@
                 android:checked="true"
                 android:layout_marginEnd="30dp"
                 android:theme="@style/radioButtonsInDarkTheme"
-                android:textColor="@color/white"/>
+                android:textColor="?attr/primaryTextColor"/>
             <RadioButton
                 android:id="@+id/loginToken"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/copyToken"
                 android:theme="@style/radioButtonsInDarkTheme"
-                android:textColor="@color/white"/>
+                android:textColor="?attr/primaryTextColor"/>
 
         </RadioGroup>
 
@@ -101,14 +101,14 @@
             android:padding="10dp"
             android:textSize="14sp"
             tools:ignore="Autofill"
-            android:background="@drawable/shape_inputs"
             android:drawableStart="@drawable/ic_link_24dp"
             android:drawablePadding="10dp"
             android:inputType="textUri"
-            android:textColor="@color/white"
-            android:textColorHint="@color/colorAccent"
-            android:hint="@string/instanceUrl"
-            android:textColorHighlight="@color/white"/>
+            android:background="@drawable/shape_inputs"
+            android:textColor="?attr/inputTextColor"
+            android:textColorHint="?attr/primaryBackgroundColor"
+            android:textColorHighlight="?attr/primaryTextColor"
+            android:hint="@string/instanceUrl" />
 
         <EditText
             android:id="@+id/login_uid"
@@ -118,14 +118,14 @@
             android:padding="10dp"
             android:textSize="14sp"
             tools:ignore="Autofill"
-            android:background="@drawable/shape_inputs"
             android:drawableStart="@drawable/ic_person_24dp"
             android:drawablePadding="10dp"
-            android:textColor="@color/white"
-            android:textColorHint="@color/colorAccent"
+            android:background="@drawable/shape_inputs"
+            android:textColor="?attr/inputTextColor"
+            android:textColorHint="?attr/primaryBackgroundColor"
+            android:textColorHighlight="?attr/primaryTextColor"
             android:hint="@string/userName"
-            android:inputType="text"
-            android:textColorHighlight="@color/white"/>
+            android:inputType="text" />
 
         <EditText
             android:id="@+id/login_passwd"
@@ -135,14 +135,14 @@
             android:padding="10dp"
             android:textSize="14sp"
             tools:ignore="Autofill"
-            android:background="@drawable/shape_inputs"
             android:drawableStart="@drawable/ic_lock_24dp"
             android:drawablePadding="10dp"
-            android:textColor="@color/white"
-            android:textColorHint="@color/colorAccent"
+            android:background="@drawable/shape_inputs"
+            android:textColor="?attr/inputTextColor"
+            android:textColorHint="?attr/primaryBackgroundColor"
+            android:textColorHighlight="?attr/primaryTextColor"
             android:hint="@string/passWord"
-            android:inputType="textPassword"
-            android:textColorHighlight="@color/white"/>
+            android:inputType="textPassword" />
 
         <EditText
             android:id="@+id/otpCode"
@@ -152,14 +152,14 @@
             android:padding="10dp"
             android:textSize="14sp"
             tools:ignore="Autofill"
-            android:background="@drawable/shape_inputs"
             android:drawableStart="@drawable/ic_otp"
             android:drawablePadding="10dp"
-            android:textColor="@color/white"
-            android:textColorHint="@color/colorAccent"
+            android:background="@drawable/shape_inputs"
+            android:textColor="?attr/inputTextColor"
+            android:textColorHint="?attr/primaryBackgroundColor"
+            android:textColorHighlight="?attr/primaryTextColor"
             android:hint="@string/loginOTP"
-            android:inputType="number"
-            android:textColorHighlight="@color/white"/>
+            android:inputType="number" />
 
         <EditText
             android:id="@+id/loginTokenCode"
@@ -169,15 +169,15 @@
             android:padding="10dp"
             android:textSize="14sp"
             tools:ignore="Autofill"
-            android:background="@drawable/shape_inputs"
             android:drawableStart="@drawable/ic_lock_24dp"
             android:drawablePadding="10dp"
-            android:textColor="@color/white"
-            android:textColorHint="@color/colorAccent"
+            android:background="@drawable/shape_inputs"
+            android:textColor="?attr/inputTextColor"
+            android:textColorHint="?attr/primaryBackgroundColor"
+            android:textColorHighlight="?attr/primaryTextColor"
             android:hint="@string/copyToken"
             android:inputType="text"
-            android:visibility="gone"
-            android:textColorHighlight="@color/white"/>
+            android:visibility="gone" />
 
         <TextView
             android:id="@+id/otpInfo"
@@ -207,7 +207,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/appRepoLink"
-            android:textColor="@color/colorWhite"
+            android:textColor="?attr/primaryTextColor"
             android:textSize="14sp"
             android:gravity="center"
             android:autoLink="web"
@@ -224,7 +224,7 @@
             android:layout_weight="1"
             android:maxLines="1"
             android:textSize="14sp"
-            android:textColor="@color/colorWhite"
+            android:textColor="?attr/primaryTextColor"
             android:layout_gravity="center_horizontal"/>
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/activity_merge_pull_request.xml b/app/src/main/res/layout/activity_merge_pull_request.xml
index cd079e0f..5280ca28 100644
--- a/app/src/main/res/layout/activity_merge_pull_request.xml
+++ b/app/src/main/res/layout/activity_merge_pull_request.xml
@@ -4,7 +4,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:background="@color/colorPrimary">
+    android:background="?attr/primaryBackgroundColor">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
@@ -15,7 +15,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?attr/colorPrimary"
+            android:background="?attr/primaryBackgroundColor"
             tools:ignore="UnusedAttribute">
 
             <ImageView
@@ -43,7 +43,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
-                    android:textColor="@color/white"
+                    android:textColor="?attr/primaryTextColor"
                     android:maxLines="1"
                     android:textSize="20sp" />
 
@@ -91,7 +91,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/mergeNoteText"
-                android:textColor="@color/hintColor"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="12sp"
                 android:gravity="start"
                 android:layout_marginTop="10dp" />
diff --git a/app/src/main/res/layout/activity_new_file.xml b/app/src/main/res/layout/activity_new_file.xml
index 97c65f48..d3b8b6bd 100644
--- a/app/src/main/res/layout/activity_new_file.xml
+++ b/app/src/main/res/layout/activity_new_file.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <LinearLayout
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -35,7 +34,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/pageTitleNewFile"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:maxLines="1"
                 android:textSize="20sp" />
 
@@ -60,7 +59,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/newFileNameTintCopy"
-                android:textColor="@color/colorWhite"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp" />
 
             <EditText
@@ -73,10 +72,10 @@
                 tools:ignore="Autofill"
                 android:labelFor="@+id/newFileName"
                 android:background="@drawable/shape_inputs"
-                android:textColor="@color/colorWhite"
-                android:textColorHint="@color/colorWhite"
-                android:inputType="textCapSentences|text"
-                android:textColorHighlight="@color/colorWhite"/>
+                android:textColor="?attr/inputTextColor"
+                android:textColorHint="?attr/primaryBackgroundColor"
+                android:textColorHighlight="?attr/primaryTextColor"
+                android:inputType="textCapSentences|text" />
 
             <TextView
                 android:layout_width="match_parent"
@@ -92,7 +91,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/newFileContentTintCopy"
-                android:textColor="@color/colorWhite"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
                 android:layout_marginTop="10dp" />
 
@@ -102,7 +101,6 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="10dp"
                 android:padding="10dp"
-                android:background="@drawable/shape_inputs"
                 android:maxLines="16"
                 android:minLines="14"
                 tools:ignore="Autofill"
@@ -110,16 +108,17 @@
                 android:scrollbars="vertical"
                 android:gravity="top|start"
                 android:textSize="14sp"
-                android:textColor="@color/colorWhite"
-                android:textColorHint="@color/colorWhite"
-                android:inputType="textCapSentences|textMultiLine"
-                android:textColorHighlight="@color/colorWhite"/>
+                android:background="@drawable/shape_inputs"
+                android:textColor="?attr/inputTextColor"
+                android:textColorHint="?attr/primaryBackgroundColor"
+                android:textColorHighlight="?attr/primaryTextColor"
+                android:inputType="textCapSentences|textMultiLine" />
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/newFileOldBranches"
-                android:textColor="@color/colorWhite"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
                 android:layout_marginTop="10dp"/>
 
@@ -148,7 +147,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/newFileBranchTintCopy"
-                android:textColor="@color/colorWhite"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
                 android:layout_marginTop="10dp" />
 
@@ -162,10 +161,10 @@
                 tools:ignore="Autofill"
                 android:labelFor="@+id/newFileBranchName"
                 android:background="@drawable/shape_inputs"
-                android:textColor="@color/colorWhite"
-                android:textColorHint="@color/colorWhite"
-                android:inputType="textCapSentences|text"
-                android:textColorHighlight="@color/colorWhite"/>
+                android:textColor="?attr/inputTextColor"
+                android:textColorHint="?attr/primaryBackgroundColor"
+                android:textColorHighlight="?attr/primaryTextColor"
+                android:inputType="textCapSentences|text" />
 
             <TextView
                 android:layout_width="match_parent"
@@ -181,7 +180,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/newFileMessageTintCopy"
-                android:textColor="@color/colorWhite"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
                 android:layout_marginTop="10dp" />
 
@@ -195,16 +194,16 @@
                 tools:ignore="Autofill"
                 android:labelFor="@+id/newFileCommitMessage"
                 android:background="@drawable/shape_inputs"
-                android:textColor="@color/colorWhite"
-                android:textColorHint="@color/colorWhite"
-                android:inputType="textCapSentences|text"
-                android:textColorHighlight="@color/colorWhite"/>
+                android:textColor="?attr/inputTextColor"
+                android:textColorHint="?attr/primaryBackgroundColor"
+                android:textColorHighlight="?attr/primaryTextColor"
+                android:inputType="textCapSentences|text" />
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/characters255Limit"
-                android:textColor="@color/hintColor"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="12sp"
                 android:paddingStart="10dp"
                 android:paddingEnd="5dp"
diff --git a/app/src/main/res/layout/activity_new_milestone.xml b/app/src/main/res/layout/activity_new_milestone.xml
index c3153b33..3de39038 100644
--- a/app/src/main/res/layout/activity_new_milestone.xml
+++ b/app/src/main/res/layout/activity_new_milestone.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <LinearLayout
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:background="@color/colorPrimary">
+    android:background="?attr/primaryBackgroundColor">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
@@ -35,7 +34,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/pageTitleCreateMilestone"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:maxLines="1"
                 android:textSize="20sp" />
 
@@ -60,7 +59,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/newMilestoneTitle"
-                android:textColor="@color/colorWhite"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp" />
 
             <EditText
@@ -73,16 +72,16 @@
                 tools:ignore="Autofill"
                 android:labelFor="@+id/milestoneTitle"
                 android:background="@drawable/shape_inputs"
-                android:textColor="@color/colorWhite"
-                android:textColorHint="@color/colorWhite"
-                android:inputType="textCapSentences|text"
-                android:textColorHighlight="@color/colorWhite"/>
+                android:textColor="?attr/inputTextColor"
+                android:textColorHint="?attr/primaryBackgroundColor"
+                android:textColorHighlight="?attr/primaryTextColor"
+                android:inputType="textCapSentences|text" />
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/newMilestoneDescription"
-                android:textColor="@color/colorWhite"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
                 android:layout_marginTop="10dp" />
 
@@ -92,7 +91,6 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="10dp"
                 android:padding="10dp"
-                android:background="@drawable/shape_inputs"
                 android:maxLines="8"
                 android:minLines="6"
                 tools:ignore="Autofill"
@@ -100,16 +98,17 @@
                 android:scrollbars="vertical"
                 android:gravity="top|start"
                 android:textSize="14sp"
-                android:textColor="@color/colorWhite"
-                android:textColorHint="@color/colorWhite"
-                android:inputType="textCapSentences|textMultiLine"
-                android:textColorHighlight="@color/colorWhite"/>
+                android:background="@drawable/shape_inputs"
+                android:textColor="?attr/inputTextColor"
+                android:textColorHint="?attr/primaryBackgroundColor"
+                android:textColorHighlight="?attr/primaryTextColor"
+                android:inputType="textCapSentences|textMultiLine" />
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/newOrgDescInfo"
-                android:textColor="@color/colorWhite"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="12sp"
                 android:gravity="end" />
 
@@ -117,7 +116,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/newMilestoneDueDate"
-                android:textColor="@color/colorWhite"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
                 android:layout_marginTop="10dp" />
 
@@ -133,9 +132,9 @@
                 android:inputType="date"
                 android:labelFor="@+id/milestoneDueDate"
                 android:background="@drawable/shape_inputs"
-                android:textColor="@color/colorWhite"
-                android:textColorHint="@color/colorWhite"
-                android:textColorHighlight="@color/colorWhite"/>
+                android:textColor="?attr/inputTextColor"
+                android:textColorHint="?attr/primaryBackgroundColor"
+                android:textColorHighlight="?attr/primaryTextColor"/>
 
             <Button
                 android:id="@+id/createNewMilestoneButton"
diff --git a/app/src/main/res/layout/activity_new_organization.xml b/app/src/main/res/layout/activity_new_organization.xml
index 78631667..7d26710e 100644
--- a/app/src/main/res/layout/activity_new_organization.xml
+++ b/app/src/main/res/layout/activity_new_organization.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <LinearLayout
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:background="@color/colorPrimary">
+    android:background="?attr/primaryBackgroundColor">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
@@ -35,7 +34,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/pageTitleCreateOrganization"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:maxLines="1"
                 android:textSize="20sp" />
 
@@ -60,7 +59,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/newOrgTintCopy"
-                android:textColor="@color/colorWhite"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp" />
 
             <EditText
@@ -73,16 +72,16 @@
                 tools:ignore="Autofill"
                 android:labelFor="@+id/newOrganizationName"
                 android:background="@drawable/shape_inputs"
-                android:textColor="@color/colorWhite"
-                android:textColorHint="@color/colorWhite"
-                android:inputType="textCapSentences|text"
-                android:textColorHighlight="@color/colorWhite"/>
+                android:textColor="?attr/inputTextColor"
+                android:textColorHint="?attr/primaryBackgroundColor"
+                android:textColorHighlight="?attr/primaryTextColor"
+                android:inputType="textCapSentences|text" />
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/newOrgDescTintCopy"
-                android:textColor="@color/colorWhite"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
                 android:layout_marginTop="10dp" />
 
@@ -92,7 +91,6 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="10dp"
                 android:padding="10dp"
-                android:background="@drawable/shape_inputs"
                 android:maxLines="8"
                 android:minLines="6"
                 tools:ignore="Autofill"
@@ -100,16 +98,17 @@
                 android:scrollbars="vertical"
                 android:gravity="top|start"
                 android:textSize="14sp"
-                android:textColor="@color/colorWhite"
-                android:textColorHint="@color/colorWhite"
-                android:inputType="textCapSentences|textMultiLine"
-                android:textColorHighlight="@color/colorWhite"/>
+                android:background="@drawable/shape_inputs"
+                android:textColor="?attr/inputTextColor"
+                android:textColorHint="?attr/primaryBackgroundColor"
+                android:textColorHighlight="?attr/primaryTextColor"
+                android:inputType="textCapSentences|textMultiLine" />
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/newOrgDescInfo"
-                android:textColor="@color/colorWhite"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="12sp"
                 android:gravity="end" />
 
diff --git a/app/src/main/res/layout/activity_new_repo.xml b/app/src/main/res/layout/activity_new_repo.xml
index 3e1d03bf..625bd7ca 100644
--- a/app/src/main/res/layout/activity_new_repo.xml
+++ b/app/src/main/res/layout/activity_new_repo.xml
@@ -102,8 +102,8 @@
                 android:background="@drawable/shape_inputs"
                 android:textColor="?attr/inputTextColor"
                 android:textColorHint="?attr/primaryBackgroundColor"
-                android:inputType="textCapSentences|text"
-                android:textColorHighlight="?attr/primaryTextColor"/>
+                android:textColorHighlight="?attr/primaryTextColor"
+                android:inputType="textCapSentences|text" />
 
             <TextView
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_profile_email.xml b/app/src/main/res/layout/activity_profile_email.xml
index 678ab21c..86553408 100644
--- a/app/src/main/res/layout/activity_profile_email.xml
+++ b/app/src/main/res/layout/activity_profile_email.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:background="@color/colorPrimary">
+    android:background="?attr/primaryBackgroundColor">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
@@ -32,7 +32,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/pageTitleAddEmail"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:maxLines="1"
                 android:textSize="20sp" />
 
@@ -51,7 +51,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/profileEmailTitle"
-            android:textColor="@color/colorWhite"
+            android:textColor="?attr/primaryTextColor"
             android:textSize="16sp"
             />
 
@@ -66,9 +66,9 @@
             android:inputType="textEmailAddress"
             android:labelFor="@+id/userEmail"
             android:background="@drawable/shape_inputs"
-            android:textColor="@color/white"
-            android:textColorHint="@color/white"
-            android:textColorHighlight="@color/white"/>
+            android:textColor="?attr/inputTextColor"
+            android:textColorHint="?attr/primaryBackgroundColor"
+            android:textColorHighlight="?attr/primaryTextColor"/>
 
         <Button
             android:id="@+id/addEmailButton"
diff --git a/app/src/main/res/layout/activity_reply_to_issue.xml b/app/src/main/res/layout/activity_reply_to_issue.xml
index c2df8a5e..81456f22 100644
--- a/app/src/main/res/layout/activity_reply_to_issue.xml
+++ b/app/src/main/res/layout/activity_reply_to_issue.xml
@@ -4,7 +4,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:background="@color/colorPrimary">
+    android:background="?attr/primaryBackgroundColor">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
@@ -15,7 +15,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?attr/colorPrimary"
+            android:background="?attr/primaryBackgroundColor"
             tools:ignore="UnusedAttribute">
 
             <ImageView
@@ -43,7 +43,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
-                    android:textColor="@color/white"
+                    android:textColor="?attr/primaryTextColor"
                     android:maxLines="1"
                     android:textSize="20sp" />
 
diff --git a/app/src/main/res/layout/activity_repo_detail.xml b/app/src/main/res/layout/activity_repo_detail.xml
index d1747470..184d4b0c 100644
--- a/app/src/main/res/layout/activity_repo_detail.xml
+++ b/app/src/main/res/layout/activity_repo_detail.xml
@@ -6,6 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
+    android:background="?attr/primaryBackgroundColor"
     tools:context=".activities.RepoDetailActivity">
 
     <com.google.android.material.appbar.AppBarLayout
@@ -20,7 +21,7 @@
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:layout_weight="1"
-            android:background="?attr/colorPrimary"
+            android:background="?attr/primaryBackgroundColor"
             app:popupTheme="@style/AppTheme.PopupOverlay"
             app:title="@string/app_name">
 
@@ -30,6 +31,7 @@
                 android:layout_gravity="center_vertical"
                 android:gravity="center_vertical"
                 android:textSize="18sp"
+                android:textColor="?attr/primaryTextColor"
                 android:id="@+id/toolbar_title" />
 
         </androidx.appcompat.widget.Toolbar>
@@ -39,6 +41,7 @@
             app:tabMode="scrollable"
             app:tabTextAppearance="@style/customTabLayout"
             android:layout_width="match_parent"
+            android:background="?attr/primaryBackgroundColor"
             android:layout_height="wrap_content">
 
             <com.google.android.material.tabs.TabItem
diff --git a/app/src/main/res/layout/admin_users_bottom_sheet_layout.xml b/app/src/main/res/layout/admin_users_bottom_sheet_layout.xml
index 231dcc73..d94c217e 100644
--- a/app/src/main/res/layout/admin_users_bottom_sheet_layout.xml
+++ b/app/src/main/res/layout/admin_users_bottom_sheet_layout.xml
@@ -5,7 +5,7 @@
     android:layout_height="wrap_content"
     android:orientation="vertical"
     android:paddingBottom="8dp"
-    android:background="@color/backgroundColor"
+    android:background="?attr/primaryBackgroundColor"
     android:paddingTop="8dp">
 
     <androidx.core.widget.NestedScrollView
@@ -25,7 +25,7 @@
                 android:text="@string/adminCreateNewUser"
                 android:drawableStart="@drawable/ic_add_person"
                 android:drawablePadding="24dp"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
                 android:padding="16dp" />
 
diff --git a/app/src/main/res/layout/admin_users_list.xml b/app/src/main/res/layout/admin_users_list.xml
index 09f33e17..ec3c9565 100644
--- a/app/src/main/res/layout/admin_users_list.xml
+++ b/app/src/main/res/layout/admin_users_list.xml
@@ -7,7 +7,7 @@
     android:paddingTop="10dp"
     android:paddingStart="15dp"
     android:paddingEnd="15dp"
-    android:background="@color/backgroundColor" >
+    android:background="?attr/primaryBackgroundColor" >
 
     <LinearLayout
         android:id="@+id/userInfoSection"
@@ -48,7 +48,7 @@
             android:layout_height="wrap_content"
             android:layout_marginBottom="5dp"
             android:text="@string/userName"
-            android:textColor="@color/white"
+            android:textColor="?attr/primaryTextColor"
             android:textSize="16sp" />
 
         <TextView
@@ -57,7 +57,7 @@
             android:layout_height="wrap_content"
             android:layout_marginBottom="5dp"
             android:text="@string/userName"
-            android:textColor="@color/white"
+            android:textColor="?attr/primaryTextColor"
             android:textSize="16sp" />
 
         <TextView
@@ -66,7 +66,7 @@
             android:layout_height="wrap_content"
             android:layout_marginBottom="5dp"
             android:text="@string/userEmail"
-            android:textColor="@color/white"
+            android:textColor="?attr/primaryTextColor"
             android:textSize="16sp" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/branches_list.xml b/app/src/main/res/layout/branches_list.xml
index daa51cc0..885565d3 100644
--- a/app/src/main/res/layout/branches_list.xml
+++ b/app/src/main/res/layout/branches_list.xml
@@ -4,7 +4,7 @@
     android:layout_height="wrap_content"
     android:orientation="vertical"
     android:id="@+id/relativeLayoutMainFrame"
-    android:background="@color/backgroundColor">
+    android:background="?attr/primaryBackgroundColor">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -18,7 +18,7 @@
             android:id="@+id/branchName"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textColor="@color/white"
+            android:textColor="?attr/primaryTextColor"
             android:textIsSelectable="true"
             android:textSize="18sp" />
 
@@ -28,7 +28,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textIsSelectable="true"
-            android:textColor="@color/colorWhite"
+            android:textColor="?attr/primaryTextColor"
             android:textSize="16sp" />
 
         <TextView
@@ -36,7 +36,7 @@
             android:layout_marginTop="10dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textColor="@color/colorWhite"
+            android:textColor="?attr/primaryTextColor"
             android:textSize="16sp"
             android:textColorLink="@color/lightBlue"/>
 
diff --git a/app/src/main/res/layout/collaborators_list_search.xml b/app/src/main/res/layout/collaborators_list_search.xml
index b9e6fd8a..520e70a9 100644
--- a/app/src/main/res/layout/collaborators_list_search.xml
+++ b/app/src/main/res/layout/collaborators_list_search.xml
@@ -6,7 +6,7 @@
     android:paddingBottom="10dp"
     android:paddingStart="20dp"
     android:paddingEnd="20dp"
-    android:background="@color/backgroundColor" >
+    android:background="?attr/primaryBackgroundColor" >
 
     <ImageView
         android:id="@+id/userAvatar"
@@ -29,7 +29,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="5dp"
                 android:text="@string/userName"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp" />
 
             <TextView
@@ -38,7 +38,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="5dp"
                 android:text="@string/addCollaboratorViewUserDesc"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="14sp" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/custom_multi_select.xml b/app/src/main/res/layout/custom_multi_select.xml
index 8e45386d..65395ee5 100644
--- a/app/src/main/res/layout/custom_multi_select.xml
+++ b/app/src/main/res/layout/custom_multi_select.xml
@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:padding="10dp"
-    android:background="@color/colorPrimary"
+    android:background="?attr/primaryBackgroundColor"
     android:orientation="vertical">
 
     <TextView
@@ -14,7 +14,7 @@
         android:layout_marginStart="10dp"
         android:layout_marginTop="10dp"
         android:text="@string/select_entry"
-        android:textColor="@color/white"
+        android:textColor="?attr/primaryTextColor"
         android:textSize="24sp" />
 
     <androidx.appcompat.widget.SearchView
@@ -53,7 +53,7 @@
             android:layout_marginEnd="10dp"
             android:layout_marginStart="10dp"
             android:textSize="18sp"
-            android:textColor="@color/white"
+            android:textColor="?attr/primaryTextColor"
             android:text="@string/select_all"/>
 
     </LinearLayout>
@@ -66,7 +66,7 @@
         android:layout_width="match_parent"
         android:layout_height="0.1dp"
         android:visibility="gone"
-        android:background="@color/colorPrimary"/>
+        android:background="?attr/primaryBackgroundColor"/>
 
     <FrameLayout
         android:layout_width="match_parent"
@@ -86,7 +86,7 @@
             android:layout_gravity="center"
             android:gravity="center"
             android:text="@string/noDataFound"
-            android:textColor="@color/white"
+            android:textColor="?attr/primaryTextColor"
             android:textSize="16sp" />
     </FrameLayout>
 
@@ -103,7 +103,7 @@
             android:layout_weight="1"
             android:gravity="end"
             android:text="@string/cancelButton"
-            android:textColor="@color/white"
+            android:textColor="?attr/primaryTextColor"
             android:textSize="16sp" />
 
         <TextView
@@ -113,7 +113,7 @@
             android:layout_weight="0.2"
             android:gravity="end"
             android:text="@string/doneButton"
-            android:textColor="@color/white"
+            android:textColor="?attr/primaryTextColor"
             android:textSize="16sp" />
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/files_diffs_list.xml b/app/src/main/res/layout/files_diffs_list.xml
index ed99cf7e..6897df51 100644
--- a/app/src/main/res/layout/files_diffs_list.xml
+++ b/app/src/main/res/layout/files_diffs_list.xml
@@ -8,14 +8,14 @@
     android:paddingEnd="2dp"
     android:paddingTop="5dp"
     android:paddingBottom="5dp"
-    android:background="@color/colorPrimary"
+    android:background="?attr/primaryBackgroundColor"
     android:orientation="vertical">
 
     <TextView
         android:id="@+id/fileName"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textColor="@color/colorWhite"
+        android:textColor="?attr/primaryTextColor"
         android:textSize="14sp"
         android:padding="5dp"
         android:background="@color/lightBlue" />
@@ -24,7 +24,7 @@
         android:id="@+id/fileInfo"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textColor="@color/colorWhite"
+        android:textColor="?attr/primaryTextColor"
         android:textSize="14sp"
         android:paddingBottom="5dp"
         android:paddingStart="5dp"
@@ -51,14 +51,14 @@
         android:id="@+id/fileContents"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textColor="@color/colorPrimary"
+        android:textColor="?attr/primaryBackgroundColor"
         android:textSize="14sp"
         android:paddingTop="5dp"
         android:paddingBottom="15dp"
         android:paddingStart="5dp"
         android:paddingEnd="5dp"
         android:visibility="gone"
-        android:background="@color/white" />
+        android:background="?attr/primaryTextColor" />
 
     <ImageView
         android:id="@+id/fileImage"
diff --git a/app/src/main/res/layout/fragment_branches.xml b/app/src/main/res/layout/fragment_branches.xml
index 11717de8..c5fa2c98 100644
--- a/app/src/main/res/layout/fragment_branches.xml
+++ b/app/src/main/res/layout/fragment_branches.xml
@@ -15,7 +15,7 @@
             android:id="@+id/recyclerView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@color/colorPrimary"
+            android:background="?attr/primaryBackgroundColor"
             android:padding="4dp"
             android:scrollbars="vertical"
             />
@@ -38,7 +38,7 @@
         android:layout_margin="15dp"
         android:gravity="center"
         android:text="@string/noDataBranchesTab"
-        android:textColor="@color/white"
+        android:textColor="?attr/primaryTextColor"
         android:textSize="20sp"
         android:visibility="gone" />
 
diff --git a/app/src/main/res/layout/fragment_explore_repo.xml b/app/src/main/res/layout/fragment_explore_repo.xml
index de000a22..f3b872f1 100644
--- a/app/src/main/res/layout/fragment_explore_repo.xml
+++ b/app/src/main/res/layout/fragment_explore_repo.xml
@@ -3,7 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/colorPrimary"
+    android:background="?attr/primaryBackgroundColor"
     android:orientation="vertical">
 
     <EditText
@@ -18,10 +18,10 @@
         android:layout_marginBottom="20dp"
         android:inputType="text"
         android:background="@drawable/shape_inputs"
-        android:textColor="@color/white"
-        android:textColorHint="@color/colorAccent"
+        android:textColor="?attr/inputTextColor"
+        android:textColorHint="?attr/primaryBackgroundColor"
         android:hint="@string/exploreTextBoxHint"
-        android:textColorHighlight="@color/white"
+        android:textColorHighlight="?attr/primaryTextColor"
         android:imeOptions="actionSend" />
 
     <TextView
@@ -31,7 +31,7 @@
         android:layout_margin="15dp"
         android:gravity="center"
         android:text="@string/noDataFound"
-        android:textColor="@color/white"
+        android:textColor="?attr/primaryTextColor"
         android:textSize="20sp"
         android:visibility="gone" />
 
diff --git a/app/src/main/res/layout/fragment_issues.xml b/app/src/main/res/layout/fragment_issues.xml
index 8c09553c..4de68c21 100644
--- a/app/src/main/res/layout/fragment_issues.xml
+++ b/app/src/main/res/layout/fragment_issues.xml
@@ -15,7 +15,7 @@
             android:id="@+id/recyclerView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@color/colorPrimary"
+            android:background="?attr/primaryBackgroundColor"
             android:padding="4dp"
             android:scrollbars="vertical"
             />
@@ -37,7 +37,7 @@
         android:layout_height="match_parent"
         android:layout_margin="15dp"
         android:text="@string/noDataIssueTab"
-        android:textColor="@color/white"
+        android:textColor="?attr/primaryTextColor"
         android:gravity="center"
         android:textSize="20sp"
         android:visibility="gone" />
diff --git a/app/src/main/res/layout/fragment_issues_closed.xml b/app/src/main/res/layout/fragment_issues_closed.xml
index ba59e5b7..501e478e 100644
--- a/app/src/main/res/layout/fragment_issues_closed.xml
+++ b/app/src/main/res/layout/fragment_issues_closed.xml
@@ -15,7 +15,7 @@
             android:id="@+id/recyclerViewClosed"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@color/colorPrimary"
+            android:background="?attr/primaryBackgroundColor"
             android:padding="4dp"
             android:scrollbars="vertical"
             />
@@ -37,7 +37,7 @@
         android:layout_height="match_parent"
         android:layout_margin="15dp"
         android:text="@string/noDataIssueTab"
-        android:textColor="@color/white"
+        android:textColor="?attr/primaryTextColor"
         android:gravity="center"
         android:textSize="20sp"
         android:visibility="gone" />
diff --git a/app/src/main/res/layout/fragment_labels.xml b/app/src/main/res/layout/fragment_labels.xml
index a93bb10f..db1c8133 100644
--- a/app/src/main/res/layout/fragment_labels.xml
+++ b/app/src/main/res/layout/fragment_labels.xml
@@ -15,7 +15,7 @@
             android:id="@+id/recyclerView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@color/colorPrimary"
+            android:background="?attr/primaryBackgroundColor"
             android:padding="4dp"
             android:scrollbars="vertical"
             />
@@ -29,7 +29,7 @@
         android:layout_margin="15dp"
         android:gravity="center"
         android:text="@string/noDataLabelsTab"
-        android:textColor="@color/white"
+        android:textColor="?attr/primaryTextColor"
         android:textSize="20sp"
         android:visibility="gone" />
 
diff --git a/app/src/main/res/layout/fragment_milestones.xml b/app/src/main/res/layout/fragment_milestones.xml
index c29cc4f6..baaf0675 100644
--- a/app/src/main/res/layout/fragment_milestones.xml
+++ b/app/src/main/res/layout/fragment_milestones.xml
@@ -15,7 +15,7 @@
             android:id="@+id/recyclerView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@color/colorPrimary"
+            android:background="?attr/primaryBackgroundColor"
             android:padding="4dp"
             android:scrollbars="vertical"
             />
@@ -29,7 +29,7 @@
         android:layout_margin="15dp"
         android:gravity="center"
         android:text="@string/noDataMilestonesTab"
-        android:textColor="@color/white"
+        android:textColor="?attr/primaryTextColor"
         android:textSize="20sp"
         android:visibility="gone" />
 
diff --git a/app/src/main/res/layout/fragment_organization_info.xml b/app/src/main/res/layout/fragment_organization_info.xml
index 52afcead..a016e6fb 100644
--- a/app/src/main/res/layout/fragment_organization_info.xml
+++ b/app/src/main/res/layout/fragment_organization_info.xml
@@ -6,7 +6,7 @@
 
     <ScrollView
         android:orientation="vertical"
-        android:background="@color/backgroundColor"
+        android:background="?attr/primaryBackgroundColor"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
@@ -31,7 +31,7 @@
                 android:layout_height="match_parent"
                 android:text="@string/nameText"
                 android:textSize="16sp"
-                android:textColor="@color/white"/>
+                android:textColor="?attr/primaryTextColor"/>
 
             <TextView
                 android:id="@+id/orgNameInfo"
@@ -47,7 +47,7 @@
                 android:layout_height="match_parent"
                 android:text="@string/descriptionText"
                 android:textSize="16sp"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:layout_marginTop="15dp"/>
 
             <TextView
@@ -64,7 +64,7 @@
                 android:layout_height="match_parent"
                 android:text="@string/websiteText"
                 android:textSize="16sp"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:layout_marginTop="15dp"/>
 
             <TextView
@@ -83,7 +83,7 @@
                 android:layout_height="match_parent"
                 android:text="@string/locationText"
                 android:textSize="16sp"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:layout_marginTop="15dp"/>
 
             <TextView
diff --git a/app/src/main/res/layout/fragment_organizations.xml b/app/src/main/res/layout/fragment_organizations.xml
index ad2f1a38..cd108af1 100644
--- a/app/src/main/res/layout/fragment_organizations.xml
+++ b/app/src/main/res/layout/fragment_organizations.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -13,7 +12,7 @@
             android:id="@+id/recyclerView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@color/colorPrimary"
+            android:background="?attr/primaryBackgroundColor"
             android:padding="4dp"
             android:scrollbars="vertical" />
 
@@ -46,7 +45,7 @@
         android:layout_height="match_parent"
         android:layout_margin="15dp"
         android:text="@string/noDataOrg"
-        android:textColor="@color/white"
+        android:textColor="?attr/primaryTextColor"
         android:gravity="center"
         android:textSize="20sp"
         android:visibility="gone" />
diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml
index 5c3a6328..be864935 100644
--- a/app/src/main/res/layout/fragment_profile.xml
+++ b/app/src/main/res/layout/fragment_profile.xml
@@ -4,8 +4,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/backgroundColor"
-    android:theme="@style/AppTheme"
+    android:background="?attr/primaryBackgroundColor"
     android:orientation="vertical">
 
     <RelativeLayout
@@ -42,7 +41,7 @@
                 android:textIsSelectable="true"
                 android:layout_marginBottom="5dp"
                 android:textSize="18sp"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:layout_gravity="start"/>
 
             <TextView
@@ -53,7 +52,7 @@
                 android:layout_marginBottom="5dp"
                 android:textSize="16sp"
                 android:layout_gravity="start"
-                android:textColor="@color/white" />
+                android:textColor="?attr/primaryTextColor" />
 
             <TextView
                 android:id="@+id/userEmail"
@@ -63,7 +62,7 @@
                 android:layout_marginBottom="0dp"
                 android:textSize="16sp"
                 android:layout_gravity="start"
-                android:textColor="@color/white" />
+                android:textColor="?attr/primaryTextColor" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_profile_emails.xml b/app/src/main/res/layout/fragment_profile_emails.xml
index d31d1108..f6638523 100644
--- a/app/src/main/res/layout/fragment_profile_emails.xml
+++ b/app/src/main/res/layout/fragment_profile_emails.xml
@@ -13,7 +13,7 @@
             android:id="@+id/recyclerView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@color/colorPrimary"
+            android:background="?attr/primaryBackgroundColor"
             android:padding="4dp"
             android:scrollbars="vertical"
             />
@@ -27,7 +27,7 @@
         android:layout_margin="15dp"
         android:gravity="center"
         android:text="@string/noDataFound"
-        android:textColor="@color/white"
+        android:textColor="?attr/primaryTextColor"
         android:textSize="20sp"
         android:visibility="gone" />
 
diff --git a/app/src/main/res/layout/fragment_profile_followers.xml b/app/src/main/res/layout/fragment_profile_followers.xml
index b8592440..fca96611 100644
--- a/app/src/main/res/layout/fragment_profile_followers.xml
+++ b/app/src/main/res/layout/fragment_profile_followers.xml
@@ -13,7 +13,7 @@
             android:id="@+id/recyclerView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@color/colorPrimary"
+            android:background="?attr/primaryBackgroundColor"
             android:padding="4dp"
             android:scrollbars="vertical"
             />
@@ -27,7 +27,7 @@
         android:layout_margin="15dp"
         android:gravity="center"
         android:text="@string/noDataFound"
-        android:textColor="@color/white"
+        android:textColor="?attr/primaryTextColor"
         android:textSize="20sp"
         android:visibility="gone" />
 
diff --git a/app/src/main/res/layout/fragment_profile_following.xml b/app/src/main/res/layout/fragment_profile_following.xml
index 6629de3e..24564816 100644
--- a/app/src/main/res/layout/fragment_profile_following.xml
+++ b/app/src/main/res/layout/fragment_profile_following.xml
@@ -13,7 +13,7 @@
             android:id="@+id/recyclerView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@color/colorPrimary"
+            android:background="?attr/primaryBackgroundColor"
             android:padding="4dp"
             android:scrollbars="vertical"
             />
@@ -27,7 +27,7 @@
         android:layout_margin="15dp"
         android:gravity="center"
         android:text="@string/noDataFound"
-        android:textColor="@color/white"
+        android:textColor="?attr/primaryTextColor"
         android:textSize="20sp"
         android:visibility="gone" />
 
diff --git a/app/src/main/res/layout/fragment_pull_requests.xml b/app/src/main/res/layout/fragment_pull_requests.xml
index 87ba9c16..e79b1aab 100644
--- a/app/src/main/res/layout/fragment_pull_requests.xml
+++ b/app/src/main/res/layout/fragment_pull_requests.xml
@@ -15,7 +15,7 @@
             android:id="@+id/recyclerView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@color/colorPrimary"
+            android:background="?attr/primaryBackgroundColor"
             android:padding="4dp"
             android:scrollbars="vertical"
             />
@@ -37,7 +37,7 @@
         android:layout_height="match_parent"
         android:layout_margin="15dp"
         android:text="@string/noDataPullRequests"
-        android:textColor="@color/white"
+        android:textColor="?attr/primaryTextColor"
         android:gravity="center"
         android:textSize="20sp"
         android:visibility="gone" />
diff --git a/app/src/main/res/layout/fragment_releases.xml b/app/src/main/res/layout/fragment_releases.xml
index e051f491..bf8a6125 100644
--- a/app/src/main/res/layout/fragment_releases.xml
+++ b/app/src/main/res/layout/fragment_releases.xml
@@ -15,7 +15,7 @@
             android:id="@+id/recyclerView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@color/colorPrimary"
+            android:background="?attr/primaryBackgroundColor"
             android:padding="4dp"
             android:scrollbars="vertical"
             />
@@ -29,7 +29,7 @@
         android:layout_margin="15dp"
         android:gravity="center"
         android:text="@string/noDataReleasesTab"
-        android:textColor="@color/white"
+        android:textColor="?attr/primaryTextColor"
         android:textSize="20sp"
         android:visibility="gone" />
 
diff --git a/app/src/main/res/layout/fragment_teams_by_org.xml b/app/src/main/res/layout/fragment_teams_by_org.xml
index db970d1a..ed5475bc 100644
--- a/app/src/main/res/layout/fragment_teams_by_org.xml
+++ b/app/src/main/res/layout/fragment_teams_by_org.xml
@@ -14,7 +14,7 @@
             android:id="@+id/recyclerView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@color/colorPrimary"
+            android:background="?attr/primaryBackgroundColor"
             android:padding="4dp"
             android:scrollbars="vertical"
             />
@@ -28,7 +28,7 @@
         android:layout_margin="15dp"
         android:gravity="center"
         android:text="@string/noDataTeams"
-        android:textColor="@color/white"
+        android:textColor="?attr/primaryTextColor"
         android:textSize="20sp"
         android:visibility="gone" />
 
diff --git a/app/src/main/res/layout/issue_comments.xml b/app/src/main/res/layout/issue_comments.xml
index ac37f823..9e91d237 100644
--- a/app/src/main/res/layout/issue_comments.xml
+++ b/app/src/main/res/layout/issue_comments.xml
@@ -8,8 +8,7 @@
     android:paddingBottom="10dp"
     android:id="@+id/relativeLayoutMainFrame"
     tools:context=".activities.RepoDetailActivity"
-    android:theme="@style/AppTheme"
-    android:background="@color/backgroundColor">
+    android:background="?attr/primaryBackgroundColor">
 
     <TextView
         android:id="@+id/issueNumber"
@@ -49,7 +48,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textIsSelectable="true"
-            android:textColor="@color/colorWhite"
+            android:textColor="?attr/primaryTextColor"
             android:autoLink="web"
             android:textColorLink="@color/lightBlue"
             android:textSize="16sp" />
@@ -74,14 +73,14 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/createdText"
-                    android:textColor="@color/colorWhite"
+                    android:textColor="?attr/primaryTextColor"
                     android:textSize="12sp" />
 
                 <TextView
                     android:id="@+id/commentModified"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textColor="@color/white"
+                    android:textColor="?attr/primaryTextColor"
                     android:layout_toEndOf="@+id/issueCommentDate"
                     android:textSize="12sp"
                     android:text="@string/modifiedText" />
diff --git a/app/src/main/res/layout/labels_list.xml b/app/src/main/res/layout/labels_list.xml
index 22a9a18a..241789a3 100644
--- a/app/src/main/res/layout/labels_list.xml
+++ b/app/src/main/res/layout/labels_list.xml
@@ -4,7 +4,7 @@
     android:layout_height="wrap_content"
     android:orientation="vertical"
     android:id="@+id/relativeLayoutMainFrame"
-    android:background="@color/backgroundColor">
+    android:background="?attr/primaryBackgroundColor">
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/members_by_org_list.xml b/app/src/main/res/layout/members_by_org_list.xml
index db2ebdca..36043111 100644
--- a/app/src/main/res/layout/members_by_org_list.xml
+++ b/app/src/main/res/layout/members_by_org_list.xml
@@ -4,7 +4,7 @@
     android:id="@+id/gridViewData"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/colorPrimary"
+    android:background="?attr/primaryBackgroundColor"
     android:orientation="vertical">
 
     <ImageView
@@ -22,6 +22,6 @@
         android:layout_marginTop="1dp"
         android:text="@string/orgMember"
         android:textSize="14sp"
-        android:textColor="@color/white" />
+        android:textColor="?attr/primaryTextColor" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/members_by_team_by_org_list.xml b/app/src/main/res/layout/members_by_team_by_org_list.xml
index db2ebdca..36043111 100644
--- a/app/src/main/res/layout/members_by_team_by_org_list.xml
+++ b/app/src/main/res/layout/members_by_team_by_org_list.xml
@@ -4,7 +4,7 @@
     android:id="@+id/gridViewData"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/colorPrimary"
+    android:background="?attr/primaryBackgroundColor"
     android:orientation="vertical">
 
     <ImageView
@@ -22,6 +22,6 @@
         android:layout_marginTop="1dp"
         android:text="@string/orgMember"
         android:textSize="14sp"
-        android:textColor="@color/white" />
+        android:textColor="?attr/primaryTextColor" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/milestones_list.xml b/app/src/main/res/layout/milestones_list.xml
index ab9f79d9..c2089961 100644
--- a/app/src/main/res/layout/milestones_list.xml
+++ b/app/src/main/res/layout/milestones_list.xml
@@ -5,7 +5,7 @@
     android:layout_height="wrap_content"
     android:layout_margin="15dp"
     android:id="@+id/milestoneFrame"
-    android:background="@color/backgroundColor"
+    android:background="?attr/primaryBackgroundColor"
     android:orientation="vertical">
 
     <LinearLayout
@@ -21,7 +21,7 @@
             android:layout_height="wrap_content"
             android:layout_weight=".80"
             android:layout_marginBottom="5dp"
-            android:textColor="@color/white"
+            android:textColor="?attr/primaryTextColor"
             android:textSize="18sp" />
 
         <ImageView
@@ -42,7 +42,7 @@
         android:layout_height="wrap_content"
         android:text="@string/repoDescription"
         android:textIsSelectable="true"
-        android:textColor="@color/colorWhite"
+        android:textColor="?attr/primaryTextColor"
         android:textSize="14sp" />
 
     <LinearLayout
@@ -59,7 +59,7 @@
             android:layout_weight="8"
             android:text="@string/repoWatchers"
             android:gravity="start"
-            android:textColor="@color/colorWhite"
+            android:textColor="?attr/primaryTextColor"
             android:textSize="14sp" />
 
         <ProgressBar
@@ -80,7 +80,7 @@
             android:layout_weight="8"
             android:text="@string/repoStars"
             android:gravity="end"
-            android:textColor="@color/colorWhite"
+            android:textColor="?attr/primaryTextColor"
             android:textSize="14sp" />
 
     </LinearLayout>
@@ -97,7 +97,7 @@
             android:text="@string/repoWatchers"
             android:gravity="start"
             android:layout_marginTop="5dp"
-            android:textColor="@color/colorWhite"
+            android:textColor="?attr/primaryTextColor"
             android:textSize="16sp" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/multi_select_item.xml b/app/src/main/res/layout/multi_select_item.xml
index 19edc7b9..cae3d01b 100644
--- a/app/src/main/res/layout/multi_select_item.xml
+++ b/app/src/main/res/layout/multi_select_item.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginTop="10dp"
-    android:background="@color/colorPrimary"
+    android:background="?attr/primaryBackgroundColor"
     android:orientation="horizontal">
 
     <androidx.appcompat.widget.AppCompatCheckBox
@@ -22,7 +22,7 @@
         android:layout_gravity="center_vertical"
         android:layout_marginEnd="10dp"
         android:layout_marginStart="10dp"
-        android:textColor="@color/white"
+        android:textColor="?attr/primaryTextColor"
         android:textSize="18sp" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/nav_sub_menu_bottom_sheet_layout.xml b/app/src/main/res/layout/nav_sub_menu_bottom_sheet_layout.xml
index b5479b50..1241c538 100644
--- a/app/src/main/res/layout/nav_sub_menu_bottom_sheet_layout.xml
+++ b/app/src/main/res/layout/nav_sub_menu_bottom_sheet_layout.xml
@@ -5,7 +5,7 @@
     android:layout_height="wrap_content"
     android:orientation="vertical"
     android:paddingBottom="8dp"
-    android:background="@color/backgroundColor"
+    android:background="?attr/primaryBackgroundColor"
     android:paddingTop="8dp">
 
     <androidx.core.widget.NestedScrollView
@@ -25,7 +25,7 @@
                 android:text="@string/adminUsers"
                 android:drawableStart="@drawable/ic_users"
                 android:drawablePadding="24dp"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
                 android:padding="16dp" />
 
diff --git a/app/src/main/res/layout/org_bottom_sheet_layout.xml b/app/src/main/res/layout/org_bottom_sheet_layout.xml
index 30376ec0..8d335a7a 100644
--- a/app/src/main/res/layout/org_bottom_sheet_layout.xml
+++ b/app/src/main/res/layout/org_bottom_sheet_layout.xml
@@ -5,7 +5,7 @@
     android:layout_height="wrap_content"
     android:orientation="vertical"
     android:paddingBottom="8dp"
-    android:background="@color/backgroundColor"
+    android:background="?attr/primaryBackgroundColor"
     android:paddingTop="8dp">
 
     <androidx.core.widget.NestedScrollView
@@ -25,7 +25,7 @@
                 android:text="@string/orgCreateTeam"
                 android:drawableStart="@drawable/ic_organizations"
                 android:drawablePadding="24dp"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
                 android:padding="16dp" />
 
diff --git a/app/src/main/res/layout/organizations_list.xml b/app/src/main/res/layout/organizations_list.xml
index efa335b8..9bdf3d84 100644
--- a/app/src/main/res/layout/organizations_list.xml
+++ b/app/src/main/res/layout/organizations_list.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/backgroundColor" >
+    android:background="?attr/primaryBackgroundColor" >
 
     <RelativeLayout
         xmlns:tools="http://schemas.android.com/tools"
@@ -14,7 +13,6 @@
         android:fitsSystemWindows="true"
         android:orientation="vertical"
         android:padding="10dp"
-        android:theme="@style/AppTheme"
         tools:context=".activities.MainActivity">
 
         <ImageView
@@ -39,7 +37,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="5dp"
                 android:text="@string/orgName"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp" />
 
             <TextView
@@ -48,7 +46,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="10dp"
                 android:text="@string/orgDescription"
-                android:textColor="@color/colorWhite"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
                 android:visibility="gone" />
 
diff --git a/app/src/main/res/layout/profile_bottom_sheet_layout.xml b/app/src/main/res/layout/profile_bottom_sheet_layout.xml
index e833227a..93765da0 100644
--- a/app/src/main/res/layout/profile_bottom_sheet_layout.xml
+++ b/app/src/main/res/layout/profile_bottom_sheet_layout.xml
@@ -5,7 +5,7 @@
     android:layout_height="wrap_content"
     android:orientation="vertical"
     android:paddingBottom="8dp"
-    android:background="@color/backgroundColor"
+    android:background="?attr/primaryBackgroundColor"
     android:paddingTop="8dp">
 
     <androidx.core.widget.NestedScrollView
@@ -25,7 +25,7 @@
                 android:text="@string/profileCreateNewEmailAddress"
                 android:drawableStart="@drawable/ic_email"
                 android:drawablePadding="24dp"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
                 android:padding="16dp" />
 
diff --git a/app/src/main/res/layout/profile_emails_list.xml b/app/src/main/res/layout/profile_emails_list.xml
index 59433d0e..ba7cded1 100644
--- a/app/src/main/res/layout/profile_emails_list.xml
+++ b/app/src/main/res/layout/profile_emails_list.xml
@@ -7,14 +7,14 @@
     android:paddingTop="15dp"
     android:paddingStart="20dp"
     android:paddingEnd="20dp"
-    android:background="@color/backgroundColor" >
+    android:background="?attr/primaryBackgroundColor" >
 
     <TextView
         android:id="@+id/userEmail"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/profileEmailTitle"
-        android:textColor="@color/white"
+        android:textColor="?attr/primaryTextColor"
         android:textSize="16sp" />
 
     <ImageView
diff --git a/app/src/main/res/layout/profile_followers_list.xml b/app/src/main/res/layout/profile_followers_list.xml
index eea63075..f7315e09 100644
--- a/app/src/main/res/layout/profile_followers_list.xml
+++ b/app/src/main/res/layout/profile_followers_list.xml
@@ -6,7 +6,7 @@
     android:paddingTop="10dp"
     android:paddingStart="20dp"
     android:paddingEnd="20dp"
-    android:background="@color/backgroundColor" >
+    android:background="?attr/primaryBackgroundColor" >
 
     <ImageView
         android:id="@+id/userAvatar"
@@ -29,7 +29,7 @@
             android:layout_height="wrap_content"
             android:layout_marginBottom="5dp"
             android:text="@string/userName"
-            android:textColor="@color/white"
+            android:textColor="?attr/primaryTextColor"
             android:textSize="16sp" />
 
         <TextView
@@ -38,7 +38,7 @@
             android:layout_height="wrap_content"
             android:layout_marginBottom="5dp"
             android:text="@string/userName"
-            android:textColor="@color/white"
+            android:textColor="?attr/primaryTextColor"
             android:textSize="16sp" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/profile_following_list.xml b/app/src/main/res/layout/profile_following_list.xml
index eea63075..f7315e09 100644
--- a/app/src/main/res/layout/profile_following_list.xml
+++ b/app/src/main/res/layout/profile_following_list.xml
@@ -6,7 +6,7 @@
     android:paddingTop="10dp"
     android:paddingStart="20dp"
     android:paddingEnd="20dp"
-    android:background="@color/backgroundColor" >
+    android:background="?attr/primaryBackgroundColor" >
 
     <ImageView
         android:id="@+id/userAvatar"
@@ -29,7 +29,7 @@
             android:layout_height="wrap_content"
             android:layout_marginBottom="5dp"
             android:text="@string/userName"
-            android:textColor="@color/white"
+            android:textColor="?attr/primaryTextColor"
             android:textSize="16sp" />
 
         <TextView
@@ -38,7 +38,7 @@
             android:layout_height="wrap_content"
             android:layout_marginBottom="5dp"
             android:text="@string/userName"
-            android:textColor="@color/white"
+            android:textColor="?attr/primaryTextColor"
             android:textSize="16sp" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/releases_list.xml b/app/src/main/res/layout/releases_list.xml
index 9e89a99b..4744ca66 100644
--- a/app/src/main/res/layout/releases_list.xml
+++ b/app/src/main/res/layout/releases_list.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/backgroundColor" >
+    android:background="?attr/primaryBackgroundColor" >
 
     <LinearLayout
         android:id="@+id/linearLayoutFrame"
@@ -11,8 +11,7 @@
         android:layout_alignParentTop="true"
         android:fitsSystemWindows="true"
         android:orientation="vertical"
-        android:layout_margin="15dp"
-        android:theme="@style/AppTheme">
+        android:layout_margin="15dp" >
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -25,7 +24,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/releaseTitle"
                 android:textIsSelectable="true"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="18sp" />
 
             <ImageView
@@ -47,7 +46,7 @@
             android:layout_marginTop="10dp"
             android:text="@string/releaseTag"
             android:textIsSelectable="true"
-            android:textColor="@color/colorWhite"
+            android:textColor="?attr/primaryTextColor"
             android:textSize="12sp" />
 
         <TextView
@@ -57,7 +56,7 @@
             android:layout_marginTop="10dp"
             android:text="@string/releaseDescription"
             android:textIsSelectable="true"
-            android:textColor="@color/colorWhite"
+            android:textColor="?attr/primaryTextColor"
             android:textSize="16sp" />
 
         <TextView
@@ -67,14 +66,14 @@
             android:text="@string/releaseDownloadText"
             android:textIsSelectable="true"
             android:layout_marginTop="10dp"
-            android:textColor="@color/white"
+            android:textColor="?attr/primaryTextColor"
             android:textSize="18sp" />
 
         <View
             android:layout_width="match_parent"
             android:layout_height="1dp"
             android:layout_marginTop="5dp"
-            android:background="@color/divider"
+            android:background="?attr/inputBackgroundColor"
             />
 
         <TextView
@@ -83,7 +82,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="5dp"
             android:text="@string/releaseZip"
-            android:textColor="@color/colorWhite"
+            android:textColor="?attr/primaryTextColor"
             android:textSize="16sp"
             android:textColorLink="@color/lightBlue"/>
 
@@ -93,7 +92,7 @@
             android:layout_height="wrap_content"
             android:text="@string/releaseTar"
             android:layout_marginTop="5dp"
-            android:textColor="@color/colorWhite"
+            android:textColor="?attr/primaryTextColor"
             android:textSize="16sp"
             android:textColorLink="@color/lightBlue"/>
 
diff --git a/app/src/main/res/layout/repo_bottom_sheet_layout.xml b/app/src/main/res/layout/repo_bottom_sheet_layout.xml
index 6ebc1747..be4e01c2 100644
--- a/app/src/main/res/layout/repo_bottom_sheet_layout.xml
+++ b/app/src/main/res/layout/repo_bottom_sheet_layout.xml
@@ -5,7 +5,7 @@
     android:layout_height="wrap_content"
     android:orientation="vertical"
     android:paddingBottom="8dp"
-    android:background="@color/backgroundColor"
+    android:background="?attr/primaryBackgroundColor"
     android:paddingTop="8dp">
 
     <androidx.core.widget.NestedScrollView
@@ -25,7 +25,7 @@
                 android:text="@string/pageTitleNewFile"
                 android:drawableStart="@drawable/ic_file"
                 android:drawablePadding="24dp"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
                 android:padding="16dp" />
 
@@ -37,7 +37,7 @@
                 android:text="@string/pageTitleCreateNewIssue"
                 android:drawableStart="@drawable/ic_issue_open_white"
                 android:drawablePadding="24dp"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
                 android:padding="16dp" />
 
@@ -49,7 +49,7 @@
                 android:text="@string/pageTitleCreateMilestone"
                 android:drawableStart="@drawable/ic_milestone"
                 android:drawablePadding="24dp"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
                 android:padding="16dp" />
 
@@ -61,7 +61,7 @@
                 android:text="@string/createLabel"
                 android:drawableStart="@drawable/ic_label"
                 android:drawablePadding="24dp"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
                 android:padding="16dp" />
 
@@ -73,7 +73,7 @@
                 android:text="@string/createRelease"
                 android:drawableStart="@drawable/ic_new_releases"
                 android:drawablePadding="24dp"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
                 android:padding="16dp" />
 
@@ -87,7 +87,7 @@
                 android:text="@string/addCollaboratorTitle"
                 android:drawableStart="@drawable/ic_person_filled"
                 android:drawablePadding="24dp"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
                 android:padding="16dp" />
 
@@ -99,7 +99,7 @@
                 android:text="@string/starRepository"
                 android:drawableStart="@drawable/ic_star_border_24dp"
                 android:drawablePadding="24dp"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
                 android:padding="16dp" />
 
@@ -111,7 +111,7 @@
                 android:text="@string/unStarRepository"
                 android:drawableStart="@drawable/ic_star"
                 android:drawablePadding="24dp"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
                 android:padding="16dp" />
 
@@ -123,7 +123,7 @@
                 android:text="@string/watchRepository"
                 android:drawableStart="@drawable/ic_unwatch"
                 android:drawablePadding="24dp"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
                 android:padding="16dp" />
 
@@ -135,7 +135,7 @@
                 android:text="@string/unWatchRepository"
                 android:drawableStart="@drawable/ic_watchers"
                 android:drawablePadding="24dp"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
                 android:padding="16dp" />
 
@@ -150,7 +150,7 @@
                 android:drawablePadding="24dp"
                 android:padding="16dp"
                 android:text="@string/openWebRepo"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp" />
 
         </LinearLayout>
diff --git a/app/src/main/res/layout/repo_detail_issues_list.xml b/app/src/main/res/layout/repo_detail_issues_list.xml
index 47efd905..f6c7820d 100644
--- a/app/src/main/res/layout/repo_detail_issues_list.xml
+++ b/app/src/main/res/layout/repo_detail_issues_list.xml
@@ -8,7 +8,6 @@
     android:layout_marginTop="15dp"
     android:layout_marginStart="15dp"
     android:layout_marginEnd="15dp"
-    android:theme="@style/AppTheme"
     tools:context=".activities.RepoDetailActivity">
 
     <TextView
@@ -46,7 +45,7 @@
                 android:gravity="top|center_vertical"
                 android:textAlignment="gravity"
                 android:text="@string/strFilter"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="18sp" />
 
         </LinearLayout>
@@ -73,7 +72,7 @@
                     android:drawablePadding="5dp"
                     android:drawableStart="@drawable/ic_comment_20"
                     android:layout_gravity="center_horizontal"
-                    android:textColor="@color/colorWhite"
+                    android:textColor="?attr/primaryTextColor"
                     android:textSize="14sp" />
 
             </LinearLayout>
@@ -84,7 +83,7 @@
                 android:layout_weight=".25"
                 android:layout_height="wrap_content"
                 android:gravity="end"
-                android:textColor="@color/colorWhite"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="14sp" />
 
         </LinearLayout>
@@ -97,6 +96,6 @@
         android:layout_height="1dp"
         android:id="@+id/divider"
         android:layout_marginTop="15dp"
-        android:background="@color/divider" />
+        android:background="?attr/inputBackgroundColor" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/repo_pr_list.xml b/app/src/main/res/layout/repo_pr_list.xml
index 331a2b24..343e973e 100644
--- a/app/src/main/res/layout/repo_pr_list.xml
+++ b/app/src/main/res/layout/repo_pr_list.xml
@@ -6,7 +6,6 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_margin="15dp"
-    android:theme="@style/AppTheme"
     tools:context=".activities.RepoDetailActivity">
 
     <TextView
@@ -43,7 +42,7 @@
                 android:layout_height="wrap_content"
                 android:gravity="top|center_vertical"
                 android:textAlignment="gravity"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="18sp" />
 
         </LinearLayout>
@@ -70,7 +69,7 @@
                     android:drawablePadding="5dp"
                     android:drawableStart="@drawable/ic_comment_20"
                     android:layout_gravity="center_horizontal"
-                    android:textColor="@color/colorWhite"
+                    android:textColor="?attr/primaryTextColor"
                     android:textSize="14sp" />
 
             </LinearLayout>
@@ -81,7 +80,7 @@
                 android:layout_weight=".25"
                 android:layout_height="wrap_content"
                 android:gravity="end"
-                android:textColor="@color/colorWhite"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="14sp" />
 
         </LinearLayout>
diff --git a/app/src/main/res/layout/repositories_by_org_list.xml b/app/src/main/res/layout/repositories_by_org_list.xml
index eab1a1c2..887ec401 100644
--- a/app/src/main/res/layout/repositories_by_org_list.xml
+++ b/app/src/main/res/layout/repositories_by_org_list.xml
@@ -10,8 +10,7 @@
     android:fitsSystemWindows="true"
     android:orientation="vertical"
     android:layout_margin="10dp"
-    android:theme="@style/AppTheme"
-    android:background="@color/backgroundColor"
+    android:background="?attr/primaryBackgroundColor"
     tools:context=".activities.MainActivity">
 
     <TextView
@@ -48,7 +47,7 @@
                 android:layout_weight=".95"
                 android:layout_marginBottom="5dp"
                 android:text="@string/repoName"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="18sp" />
 
             <ImageView
@@ -68,7 +67,7 @@
             android:layout_height="wrap_content"
             android:layout_marginBottom="5dp"
             android:text="@string/repoFullname"
-            android:textColor="@color/colorWhite"
+            android:textColor="?attr/primaryTextColor"
             android:textSize="16sp" />
 
         <TextView
@@ -77,7 +76,7 @@
             android:layout_height="wrap_content"
             android:layout_marginBottom="10dp"
             android:text="@string/repoDescription"
-            android:textColor="@color/colorWhite"
+            android:textColor="?attr/primaryTextColor"
             android:textSize="16sp"
             android:visibility="gone" />
 
@@ -98,7 +97,7 @@
                 android:gravity="center_vertical"
                 android:layout_gravity="center_vertical"
                 android:text="@string/repoWatchers"
-                android:textColor="@color/colorWhite"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="14sp" />
 
             <TextView
@@ -111,7 +110,7 @@
                 android:gravity="center_vertical"
                 android:layout_gravity="center_vertical"
                 android:text="@string/repoStars"
-                android:textColor="@color/colorWhite"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="14sp" />
 
             <TextView
@@ -124,7 +123,7 @@
                 android:gravity="center_vertical"
                 android:layout_gravity="center_vertical"
                 android:text="@string/repoWatchers"
-                android:textColor="@color/colorWhite"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="14sp" />
 
             <ImageView
diff --git a/app/src/main/res/layout/row_load.xml b/app/src/main/res/layout/row_load.xml
index a985e82b..2ea85201 100644
--- a/app/src/main/res/layout/row_load.xml
+++ b/app/src/main/res/layout/row_load.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:padding="10dp">
 
diff --git a/app/src/main/res/layout/single_issue_bottom_sheet_layout.xml b/app/src/main/res/layout/single_issue_bottom_sheet_layout.xml
index ad57159c..9a944dfb 100644
--- a/app/src/main/res/layout/single_issue_bottom_sheet_layout.xml
+++ b/app/src/main/res/layout/single_issue_bottom_sheet_layout.xml
@@ -5,7 +5,7 @@
     android:layout_height="wrap_content"
     android:orientation="vertical"
     android:paddingBottom="8dp"
-    android:background="@color/backgroundColor"
+    android:background="?attr/primaryBackgroundColor"
     android:paddingTop="8dp">
 
     <androidx.core.widget.NestedScrollView
@@ -25,7 +25,7 @@
                 android:text="@string/openFileDiffText"
                 android:drawableStart="@drawable/ic_file"
                 android:drawablePadding="24dp"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
                 android:visibility="gone"
                 android:padding="16dp" />
@@ -38,7 +38,7 @@
                 android:text="@string/replyToIssue"
                 android:drawableStart="@drawable/ic_reply"
                 android:drawablePadding="24dp"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
                 android:padding="16dp" />
 
@@ -50,7 +50,7 @@
                 android:text="@string/mergePullRequestText"
                 android:drawableStart="@drawable/ic_merge"
                 android:drawablePadding="24dp"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
                 android:padding="16dp" />
 
@@ -62,7 +62,7 @@
                 android:text="@string/editIssue"
                 android:drawableStart="@drawable/ic_edit"
                 android:drawablePadding="24dp"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
                 android:padding="16dp" />
 
@@ -74,7 +74,7 @@
                 android:text="@string/addRemoveAssignees"
                 android:drawableStart="@drawable/ic_person_filled"
                 android:drawablePadding="24dp"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
                 android:padding="16dp" />
 
@@ -86,7 +86,7 @@
                 android:text="@string/singleIssueEditLabels"
                 android:drawableStart="@drawable/ic_label"
                 android:drawablePadding="24dp"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
                 android:padding="16dp" />
 
@@ -101,7 +101,7 @@
                 android:drawablePadding="24dp"
                 android:padding="16dp"
                 android:text="@string/copyIssueUrl"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp" />
 
             <View style="@style/lineDividerHorizontal" />
@@ -114,7 +114,7 @@
                 android:text="@string/closeIssue"
                 android:drawableStart="@drawable/ic_done"
                 android:drawablePadding="24dp"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
                 android:padding="16dp" />
 
@@ -126,7 +126,7 @@
                 android:text="@string/reOpenIssue"
                 android:drawableStart="@drawable/ic_reopen"
                 android:drawablePadding="24dp"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
                 android:padding="16dp" />
 
diff --git a/app/src/main/res/layout/teams_by_org_list.xml b/app/src/main/res/layout/teams_by_org_list.xml
index bb9a9ed2..4228fbe8 100644
--- a/app/src/main/res/layout/teams_by_org_list.xml
+++ b/app/src/main/res/layout/teams_by_org_list.xml
@@ -4,7 +4,7 @@
     android:layout_height="wrap_content"
     android:orientation="vertical"
     android:id="@+id/relativeLayoutMainFrame"
-    android:background="@color/backgroundColor">
+    android:background="?attr/primaryBackgroundColor">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -25,7 +25,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="10dp"
-            android:textColor="@color/white"
+            android:textColor="?attr/primaryTextColor"
             android:textSize="18sp" />
 
         <TextView
@@ -33,7 +33,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/teamDescription"
-            android:textColor="@color/white"
+            android:textColor="?attr/primaryTextColor"
             android:layout_marginBottom="10dp"
             android:textSize="14sp" />
 
@@ -42,7 +42,7 @@
             android:text="@string/teamPermission"
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
-            android:textColor="@color/white"
+            android:textColor="?attr/primaryTextColor"
             android:textSize="14sp" />
 
     </LinearLayout>

From b012a7058d390a7dd09449b0d283408c94c55222 Mon Sep 17 00:00:00 2001
From: M M Arif <mmarif@swatian.com>
Date: Thu, 5 Mar 2020 20:23:15 +0500
Subject: [PATCH 09/14] Fixes to color styles and layouts

---
 .../AddRemoveAssigneesActivity.java           |  3 +-
 .../activities/AddRemoveLabelsActivity.java   |  3 +-
 .../main/res/layout/activity_create_issue.xml | 25 +++++++----
 .../res/layout/activity_create_new_user.xml   |  2 +-
 .../res/layout/activity_create_release.xml    | 33 +++++++++------
 .../main/res/layout/activity_edit_issue.xml   | 41 +++++++++++--------
 .../main/res/layout/activity_issue_detail.xml |  5 +--
 app/src/main/res/layout/activity_new_file.xml | 29 ++++++++-----
 .../res/layout/activity_new_milestone.xml     |  2 +-
 .../res/layout/activity_new_organization.xml  |  2 +-
 .../main/res/layout/activity_org_detail.xml   |  6 ++-
 .../res/layout/activity_reply_to_issue.xml    | 10 ++---
 .../main/res/layout/activity_repo_detail.xml  |  1 +
 .../main/res/layout/custom_multi_select.xml   |  3 +-
 .../main/res/layout/fragment_explore_repo.xml |  2 +-
 .../res/layout/fragment_members_by_org.xml    |  4 +-
 .../res/layout/fragment_organization_info.xml |  8 ++--
 app/src/main/res/layout/fragment_profile.xml  |  1 +
 .../layout/fragment_repositories_by_org.xml   |  4 +-
 app/src/main/res/layout/multi_select_item.xml |  2 +-
 .../res/layout/repo_bottom_sheet_layout.xml   | 16 +++++++-
 .../single_issue_bottom_sheet_layout.xml      | 16 +++++++-
 app/src/main/res/values/styles.xml            | 16 --------
 app/src/main/res/values/themes.xml            |  2 +
 24 files changed, 139 insertions(+), 97 deletions(-)

diff --git a/app/src/main/java/org/mian/gitnex/activities/AddRemoveAssigneesActivity.java b/app/src/main/java/org/mian/gitnex/activities/AddRemoveAssigneesActivity.java
index 15722d7e..a973b2a7 100644
--- a/app/src/main/java/org/mian/gitnex/activities/AddRemoveAssigneesActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/AddRemoveAssigneesActivity.java
@@ -6,7 +6,6 @@ import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.util.Log;
-import android.view.Window;
 import com.google.gson.JsonElement;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
@@ -45,7 +44,7 @@ public class AddRemoveAssigneesActivity extends BaseActivity {
     public void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
-        supportRequestWindowFeature(Window.FEATURE_NO_TITLE);
+        //supportRequestWindowFeature(Window.FEATURE_NO_TITLE);
 
         getWindow().getDecorView().setBackground(new ColorDrawable(Color.TRANSPARENT));
 
diff --git a/app/src/main/java/org/mian/gitnex/activities/AddRemoveLabelsActivity.java b/app/src/main/java/org/mian/gitnex/activities/AddRemoveLabelsActivity.java
index 2c301ab3..62fa57e1 100644
--- a/app/src/main/java/org/mian/gitnex/activities/AddRemoveLabelsActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/AddRemoveLabelsActivity.java
@@ -8,7 +8,6 @@ import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.util.Log;
-import android.view.Window;
 import com.google.gson.JsonElement;
 import org.mian.gitnex.R;
 import org.mian.gitnex.clients.RetrofitClient;
@@ -42,7 +41,7 @@ public class AddRemoveLabelsActivity extends BaseActivity {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        supportRequestWindowFeature(Window.FEATURE_NO_TITLE);
+        //supportRequestWindowFeature(Window.FEATURE_NO_TITLE);
 
         getWindow().getDecorView().setBackground(new ColorDrawable(Color.TRANSPARENT));
 
diff --git a/app/src/main/res/layout/activity_create_issue.xml b/app/src/main/res/layout/activity_create_issue.xml
index 1bec3f36..b294f387 100644
--- a/app/src/main/res/layout/activity_create_issue.xml
+++ b/app/src/main/res/layout/activity_create_issue.xml
@@ -45,7 +45,7 @@
         xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/backgroundColor">
+        android:background="?attr/primaryBackgroundColor">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -142,16 +142,25 @@
                 android:textSize="16sp"
                 android:layout_marginTop="10dp"/>
 
-            <Spinner
-                android:id="@+id/newIssueMilestoneSpinner"
+            <RelativeLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:spinnerMode="dropdown"
+                android:background="@drawable/shape_dropdown"
                 android:layout_marginTop="10dp"
-                android:layout_marginBottom="10dp"
-                android:paddingLeft="5dp"
-                android:paddingRight="5dp"
-                android:paddingStart="5dp" />
+                android:layout_marginBottom="10dp" >
+
+                <Spinner
+                    android:id="@+id/newIssueMilestoneSpinner"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:spinnerMode="dropdown"
+                    android:layout_marginTop="5dp"
+                    android:layout_marginBottom="5dp"
+                    android:paddingLeft="5dp"
+                    android:paddingRight="5dp"
+                    android:paddingStart="5dp" />
+
+            </RelativeLayout>
 
             <TextView
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_create_new_user.xml b/app/src/main/res/layout/activity_create_new_user.xml
index 33f6f27e..bd704a6c 100644
--- a/app/src/main/res/layout/activity_create_new_user.xml
+++ b/app/src/main/res/layout/activity_create_new_user.xml
@@ -44,7 +44,7 @@
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/backgroundColor">
+        android:background="?attr/primaryBackgroundColor">
 
         <LinearLayout
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_create_release.xml b/app/src/main/res/layout/activity_create_release.xml
index 9ce162a0..86c13542 100644
--- a/app/src/main/res/layout/activity_create_release.xml
+++ b/app/src/main/res/layout/activity_create_release.xml
@@ -44,7 +44,7 @@
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/backgroundColor">
+        android:background="?attr/primaryBackgroundColor">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -79,20 +79,29 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/releaseBranchText"
-                android:textColor="@color/colorWhite"
+                android:textColor="?attr/primaryTextColor"
                 android:layout_marginTop="10dp"
                 android:textSize="16sp" />
 
-            <Spinner
-                android:id="@+id/releaseBranch"
+            <RelativeLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:spinnerMode="dropdown"
+                android:background="@drawable/shape_dropdown"
                 android:layout_marginTop="10dp"
-                android:layout_marginBottom="10dp"
-                android:paddingLeft="5dp"
-                android:paddingRight="5dp"
-                android:paddingStart="5dp" />
+                android:layout_marginBottom="10dp" >
+
+                <Spinner
+                    android:id="@+id/releaseBranch"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:spinnerMode="dropdown"
+                    android:layout_marginTop="5dp"
+                    android:layout_marginBottom="5dp"
+                    android:paddingLeft="5dp"
+                    android:paddingRight="5dp"
+                    android:paddingStart="5dp" />
+
+            </RelativeLayout>
 
             <TextView
                 android:layout_width="match_parent"
@@ -151,10 +160,9 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/releaseTypeText"
-                android:checked="false"
+                android:checked="true"
                 android:textSize="16sp"
                 android:layout_marginTop="10dp"
-                android:theme="@style/checkBoxTheme"
                 android:textColor="?attr/primaryTextColor"/>
 
             <CheckBox
@@ -162,10 +170,9 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/releaseDraftText"
-                android:checked="false"
+                android:checked="true"
                 android:textSize="16sp"
                 android:layout_marginTop="10dp"
-                android:theme="@style/checkBoxTheme"
                 android:textColor="?attr/primaryTextColor"/>
 
             <Button
diff --git a/app/src/main/res/layout/activity_edit_issue.xml b/app/src/main/res/layout/activity_edit_issue.xml
index 457e20de..75478043 100644
--- a/app/src/main/res/layout/activity_edit_issue.xml
+++ b/app/src/main/res/layout/activity_edit_issue.xml
@@ -45,7 +45,7 @@
         xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/backgroundColor">
+        android:background="?attr/primaryBackgroundColor">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -59,8 +59,7 @@
                 android:layout_height="wrap_content"
                 android:text="@string/newIssueTitle"
                 android:textColor="?attr/primaryTextColor"
-                android:textSize="16sp"
-                />
+                android:textSize="16sp" />
 
             <EditText
                 android:id="@+id/editIssueTitle"
@@ -70,12 +69,11 @@
                 android:padding="10dp"
                 android:textSize="14sp"
                 tools:ignore="Autofill"
-                android:inputType="textCapSentences|text"
                 android:labelFor="@+id/editIssueTitle"
                 android:background="@drawable/shape_inputs"
                 android:textColor="?attr/inputTextColor"
                 android:textColorHint="?attr/primaryBackgroundColor"
-                android:textColorHighlight="?attr/primaryTextColor"/>
+                android:textColorHighlight="?attr/primaryTextColor" />
 
             <TextView
                 android:layout_width="match_parent"
@@ -100,10 +98,10 @@
                 android:scrollbars="vertical"
                 android:gravity="top|start"
                 android:textSize="14sp"
-                android:textColor="?attr/primaryTextColor"
-                android:textColorHint="?attr/primaryTextColor"
-                android:inputType="textCapSentences|textMultiLine"
-                android:textColorHighlight="?attr/primaryTextColor" />
+                android:textColor="?attr/inputTextColor"
+                android:textColorHint="?attr/primaryBackgroundColor"
+                android:textColorHighlight="?attr/primaryTextColor"
+                android:inputType="textCapSentences|textMultiLine" />
 
             <TextView
                 android:layout_width="match_parent"
@@ -133,20 +131,29 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/newIssueMilestoneTitle"
-                android:textColor="@color/colorWhite"
+                android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp"
                 android:layout_marginTop="10dp"/>
 
-            <Spinner
-                android:id="@+id/editIssueMilestoneSpinner"
+            <RelativeLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:spinnerMode="dropdown"
+                android:background="@drawable/shape_dropdown"
                 android:layout_marginTop="10dp"
-                android:layout_marginBottom="10dp"
-                android:paddingLeft="5dp"
-                android:paddingRight="5dp"
-                android:paddingStart="5dp" />
+                android:layout_marginBottom="10dp" >
+
+                <Spinner
+                    android:id="@+id/editIssueMilestoneSpinner"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:spinnerMode="dropdown"
+                    android:layout_marginTop="5dp"
+                    android:layout_marginBottom="5dp"
+                    android:paddingLeft="5dp"
+                    android:paddingRight="5dp"
+                    android:paddingStart="5dp" />
+
+            </RelativeLayout>
 
             <Button
                 android:id="@+id/editIssueButton"
diff --git a/app/src/main/res/layout/activity_issue_detail.xml b/app/src/main/res/layout/activity_issue_detail.xml
index 3923c14f..12bc2386 100644
--- a/app/src/main/res/layout/activity_issue_detail.xml
+++ b/app/src/main/res/layout/activity_issue_detail.xml
@@ -37,8 +37,7 @@
     <RelativeLayout
         android:id="@+id/relativeMainLayoutFrame"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:theme="@style/AppTheme">
+        android:layout_height="match_parent">
 
         <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
             android:id="@+id/pullToRefresh"
@@ -193,7 +192,7 @@
                         android:layout_height="1dp"
                         android:id="@+id/divider"
                         android:layout_marginTop="15dp"
-                        android:background="@color/divider" />
+                        android:background="?attr/inputBackgroundColor" />
 
                     <androidx.recyclerview.widget.RecyclerView
                         android:layout_below="@+id/divider"
diff --git a/app/src/main/res/layout/activity_new_file.xml b/app/src/main/res/layout/activity_new_file.xml
index d3b8b6bd..612defba 100644
--- a/app/src/main/res/layout/activity_new_file.xml
+++ b/app/src/main/res/layout/activity_new_file.xml
@@ -4,7 +4,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:background="@color/colorPrimary">
+    android:background="?attr/primaryBackgroundColor">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
@@ -15,7 +15,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?attr/colorPrimary"
+            android:background="?attr/primaryBackgroundColor"
             tools:ignore="UnusedAttribute">
 
             <ImageView
@@ -46,7 +46,7 @@
         xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/backgroundColor">
+        android:background="?attr/primaryBackgroundColor">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -122,16 +122,25 @@
                 android:textSize="16sp"
                 android:layout_marginTop="10dp"/>
 
-            <Spinner
-                android:id="@+id/newFileBranchesSpinner"
+            <RelativeLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:spinnerMode="dropdown"
+                android:background="@drawable/shape_dropdown"
                 android:layout_marginTop="10dp"
-                android:layout_marginBottom="10dp"
-                android:paddingLeft="5dp"
-                android:paddingRight="5dp"
-                android:paddingStart="5dp" />
+                android:layout_marginBottom="10dp" >
+
+                <Spinner
+                    android:id="@+id/newFileBranchesSpinner"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:spinnerMode="dropdown"
+                    android:layout_marginTop="5dp"
+                    android:layout_marginBottom="5dp"
+                    android:paddingLeft="5dp"
+                    android:paddingRight="5dp"
+                    android:paddingStart="5dp" />
+
+            </RelativeLayout>
 
             <TextView
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_new_milestone.xml b/app/src/main/res/layout/activity_new_milestone.xml
index 3de39038..6f53d581 100644
--- a/app/src/main/res/layout/activity_new_milestone.xml
+++ b/app/src/main/res/layout/activity_new_milestone.xml
@@ -46,7 +46,7 @@
         xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/backgroundColor">
+        android:background="?attr/primaryBackgroundColor">
 
         <LinearLayout
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_new_organization.xml b/app/src/main/res/layout/activity_new_organization.xml
index 7d26710e..38ae4a01 100644
--- a/app/src/main/res/layout/activity_new_organization.xml
+++ b/app/src/main/res/layout/activity_new_organization.xml
@@ -46,7 +46,7 @@
         xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/backgroundColor">
+        android:background="?attr/primaryBackgroundColor">
 
         <LinearLayout
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_org_detail.xml b/app/src/main/res/layout/activity_org_detail.xml
index ffd5933b..c9b25083 100644
--- a/app/src/main/res/layout/activity_org_detail.xml
+++ b/app/src/main/res/layout/activity_org_detail.xml
@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
-    android:background="@color/colorPrimary"
+    android:background="?attr/primaryBackgroundColor"
     tools:context=".activities.OrgDetailActivity">
 
     <com.google.android.material.appbar.AppBarLayout
@@ -21,7 +21,7 @@
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:layout_weight="1"
-            android:background="?attr/colorPrimary"
+            android:background="?attr/primaryBackgroundColor"
             app:layout_scrollFlags="enterAlways"
             app:popupTheme="@style/AppTheme.PopupOverlay"
             app:title="@string/app_name">
@@ -32,6 +32,7 @@
                 android:layout_gravity="center_vertical"
                 android:gravity="center_vertical"
                 android:textSize="18sp"
+                android:textColor="?attr/primaryTextColor"
                 android:id="@+id/toolbar_title" />
 
         </androidx.appcompat.widget.Toolbar>
@@ -40,6 +41,7 @@
             android:id="@+id/tabs"
             app:tabTextAppearance="@style/customTabLayout"
             app:tabMode="scrollable"
+            app:tabTextColor="?attr/primaryTextColor"
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
diff --git a/app/src/main/res/layout/activity_reply_to_issue.xml b/app/src/main/res/layout/activity_reply_to_issue.xml
index 81456f22..9e1141a7 100644
--- a/app/src/main/res/layout/activity_reply_to_issue.xml
+++ b/app/src/main/res/layout/activity_reply_to_issue.xml
@@ -57,7 +57,7 @@
         xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/backgroundColor">
+        android:background="?attr/primaryBackgroundColor">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -80,10 +80,10 @@
                 android:scrollbars="vertical"
                 android:gravity="top|start"
                 android:textSize="14sp"
-                android:textColor="@color/white"
-                android:textColorHint="@color/white"
-                android:inputType="textCapSentences|textMultiLine"
-                android:textColorHighlight="@color/white" />
+                android:textColor="?attr/inputTextColor"
+                android:textColorHint="?attr/primaryBackgroundColor"
+                android:textColorHighlight="?attr/primaryTextColor"
+                android:inputType="textCapSentences|textMultiLine" />
 
             <Button
                 android:id="@+id/replyButton"
diff --git a/app/src/main/res/layout/activity_repo_detail.xml b/app/src/main/res/layout/activity_repo_detail.xml
index 184d4b0c..fce878b7 100644
--- a/app/src/main/res/layout/activity_repo_detail.xml
+++ b/app/src/main/res/layout/activity_repo_detail.xml
@@ -42,6 +42,7 @@
             app:tabTextAppearance="@style/customTabLayout"
             android:layout_width="match_parent"
             android:background="?attr/primaryBackgroundColor"
+            app:tabTextColor="?attr/primaryTextColor"
             android:layout_height="wrap_content">
 
             <com.google.android.material.tabs.TabItem
diff --git a/app/src/main/res/layout/custom_multi_select.xml b/app/src/main/res/layout/custom_multi_select.xml
index 65395ee5..b698e24a 100644
--- a/app/src/main/res/layout/custom_multi_select.xml
+++ b/app/src/main/res/layout/custom_multi_select.xml
@@ -24,7 +24,6 @@
         android:layout_marginBottom="5dp"
         android:layout_marginTop="5dp"
         android:iconifiedByDefault="true"
-        android:theme="@style/ThemeOverlay.AppCompat.Dark"
         android:queryHint="Search" />
 
     <LinearLayout
@@ -41,7 +40,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:theme="@style/checkBoxTheme"
+            android:textColor="?attr/primaryTextColor"
             android:clickable="false" />
 
         <TextView
diff --git a/app/src/main/res/layout/fragment_explore_repo.xml b/app/src/main/res/layout/fragment_explore_repo.xml
index f3b872f1..5147d415 100644
--- a/app/src/main/res/layout/fragment_explore_repo.xml
+++ b/app/src/main/res/layout/fragment_explore_repo.xml
@@ -47,7 +47,7 @@
         android:id="@+id/recyclerViewReposSearch"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/colorPrimary"
+        android:background="?attr/primaryBackgroundColor"
         android:layout_marginStart="5dp"
         android:layout_marginEnd="5dp"
         android:layout_marginTop="5dp"
diff --git a/app/src/main/res/layout/fragment_members_by_org.xml b/app/src/main/res/layout/fragment_members_by_org.xml
index db759240..809289c2 100644
--- a/app/src/main/res/layout/fragment_members_by_org.xml
+++ b/app/src/main/res/layout/fragment_members_by_org.xml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/colorPrimary"
+    android:background="?attr/primaryBackgroundColor"
     android:orientation="vertical">
 
     <GridView
@@ -23,7 +23,7 @@
         android:layout_margin="15dp"
         android:gravity="center"
         android:text="@string/noDataMembers"
-        android:textColor="@color/white"
+        android:textColor="?attr/primaryTextColor"
         android:textSize="20sp"
         android:visibility="gone" />
 
diff --git a/app/src/main/res/layout/fragment_organization_info.xml b/app/src/main/res/layout/fragment_organization_info.xml
index a016e6fb..d9ec7c9c 100644
--- a/app/src/main/res/layout/fragment_organization_info.xml
+++ b/app/src/main/res/layout/fragment_organization_info.xml
@@ -40,7 +40,7 @@
                 android:textIsSelectable="true"
                 android:textSize="16sp"
                 android:paddingTop="5dp"
-                android:textColor="@color/colorWhite"/>
+                android:textColor="?attr/primaryTextColor"/>
 
             <TextView
                 android:layout_width="match_parent"
@@ -57,7 +57,7 @@
                 android:textIsSelectable="true"
                 android:textSize="16sp"
                 android:paddingTop="5dp"
-                android:textColor="@color/colorWhite"/>
+                android:textColor="?attr/primaryTextColor"/>
 
             <TextView
                 android:layout_width="match_parent"
@@ -76,7 +76,7 @@
                 android:paddingTop="5dp"
                 android:textColorLink="@color/lightBlue"
                 android:autoLink="web"
-                android:textColor="@color/colorWhite"/>
+                android:textColor="?attr/primaryTextColor"/>
 
             <TextView
                 android:layout_width="match_parent"
@@ -94,7 +94,7 @@
                 android:textSize="16sp"
                 android:paddingTop="5dp"
                 android:autoLink="web"
-                android:textColor="@color/colorWhite"/>
+                android:textColor="?attr/primaryTextColor"/>
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml
index be864935..c136ebde 100644
--- a/app/src/main/res/layout/fragment_profile.xml
+++ b/app/src/main/res/layout/fragment_profile.xml
@@ -79,6 +79,7 @@
             app:tabMode="scrollable"
             app:tabTextAppearance="@style/customTabLayout"
             android:layout_width="match_parent"
+            app:tabTextColor="?attr/primaryTextColor"
             android:layout_height="wrap_content">
 
             <com.google.android.material.tabs.TabItem
diff --git a/app/src/main/res/layout/fragment_repositories_by_org.xml b/app/src/main/res/layout/fragment_repositories_by_org.xml
index 985f484a..7af02963 100644
--- a/app/src/main/res/layout/fragment_repositories_by_org.xml
+++ b/app/src/main/res/layout/fragment_repositories_by_org.xml
@@ -14,7 +14,7 @@
             android:id="@+id/recyclerView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@color/colorPrimary"
+            android:background="?attr/primaryBackgroundColor"
             android:padding="4dp"
             android:scrollbars="vertical"
             />
@@ -28,7 +28,7 @@
         android:layout_margin="15dp"
         android:gravity="center"
         android:text="@string/noData"
-        android:textColor="@color/white"
+        android:textColor="?attr/primaryTextColor"
         android:textSize="20sp"
         android:visibility="gone" />
 
diff --git a/app/src/main/res/layout/multi_select_item.xml b/app/src/main/res/layout/multi_select_item.xml
index cae3d01b..f13767a4 100644
--- a/app/src/main/res/layout/multi_select_item.xml
+++ b/app/src/main/res/layout/multi_select_item.xml
@@ -12,7 +12,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:theme="@style/checkBoxTheme"
+        android:textColor="?attr/primaryTextColor"
         android:clickable="false" />
 
     <TextView
diff --git a/app/src/main/res/layout/repo_bottom_sheet_layout.xml b/app/src/main/res/layout/repo_bottom_sheet_layout.xml
index be4e01c2..44e9f2ef 100644
--- a/app/src/main/res/layout/repo_bottom_sheet_layout.xml
+++ b/app/src/main/res/layout/repo_bottom_sheet_layout.xml
@@ -77,7 +77,13 @@
                 android:textSize="16sp"
                 android:padding="16dp" />
 
-            <View style="@style/lineDividerHorizontal" />
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginTop="10dp"
+                android:layout_marginBottom="10dp"
+                android:layout_marginStart="64dp"
+                android:background="?attr/inputBackgroundColor" />
 
             <TextView
                 android:id="@+id/addCollaborator"
@@ -139,7 +145,13 @@
                 android:textSize="16sp"
                 android:padding="16dp" />
 
-            <View style="@style/lineDividerHorizontal" />
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginTop="10dp"
+                android:layout_marginBottom="10dp"
+                android:layout_marginStart="64dp"
+                android:background="?attr/inputBackgroundColor" />
 
             <TextView
                 android:id="@+id/openWebRepo"
diff --git a/app/src/main/res/layout/single_issue_bottom_sheet_layout.xml b/app/src/main/res/layout/single_issue_bottom_sheet_layout.xml
index 9a944dfb..cf15a6f3 100644
--- a/app/src/main/res/layout/single_issue_bottom_sheet_layout.xml
+++ b/app/src/main/res/layout/single_issue_bottom_sheet_layout.xml
@@ -90,7 +90,13 @@
                 android:textSize="16sp"
                 android:padding="16dp" />
 
-            <View style="@style/lineDividerHorizontal" />
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginTop="10dp"
+                android:layout_marginBottom="10dp"
+                android:layout_marginStart="64dp"
+                android:background="?attr/inputBackgroundColor" />
 
             <TextView
                 android:id="@+id/copyIssueUrl"
@@ -104,7 +110,13 @@
                 android:textColor="?attr/primaryTextColor"
                 android:textSize="16sp" />
 
-            <View style="@style/lineDividerHorizontal" />
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginTop="10dp"
+                android:layout_marginBottom="10dp"
+                android:layout_marginStart="64dp"
+                android:background="?attr/inputBackgroundColor" />
 
             <TextView
                 android:id="@+id/closeIssue"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index f4fc7905..4f9088db 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -5,11 +5,6 @@
         <item name="android:textSize">16sp</item>
     </style>
 
-    <style name="checkBoxTheme" parent="Theme.AppCompat.Dialog.Alert">
-        <item name="colorControlNormal">@color/white</item>
-        <item name="colorControlActivated">@color/white</item>
-    </style>
-
     <style name="AppTheme.NoActionBar">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
@@ -19,21 +14,10 @@
 
     <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
 
-
-
     <style name="customTabLayout" parent="TextAppearance.Design.Tab">
         <item name="android:textSize">16sp</item>
     </style>
 
-    <style name="lineDividerHorizontal">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">1dp</item>
-        <item name="android:background">@color/divider</item>
-        <item name="android:layout_marginStart">64dp</item>
-        <item name="android:layout_marginTop">10dp</item>
-        <item name="android:layout_marginBottom">10dp</item>
-    </style>
-
     <style name="radioButtonsInDarkTheme" parent="Theme.AppCompat.Dialog.Alert">
         <item name="colorControlNormal">@color/white</item>
         <item name="colorControlActivated">@color/white</item>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 8c7a462e..40beb351 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -17,6 +17,7 @@
         <item name="dialogTheme">@style/AppThemeConfirmDialog</item>
         <item name="popupMenuStyle">@style/AppThemePopupMenuStyle</item>
     </style>
+    <!-- Dark theme - default -->
 
     <!-- Light theme -->
     <style name="AppThemeLight" parent="Theme.AppCompat.Light.NoActionBar">
@@ -34,6 +35,7 @@
         <item name="dialogTheme">@style/AppThemeLightConfirmDialog</item>
         <item name="popupMenuStyle">@style/AppThemePopupMenuStyle</item>
     </style>
+    <!-- Light theme -->
 
     <style name="AppThemeConfirmDialog" parent="Theme.AppCompat.Dialog.Alert">
         <item name="android:background">@color/colorPrimary</item>

From 14addf5ed00b473b33d77efead6a4ea05ba49e38 Mon Sep 17 00:00:00 2001
From: M M Arif <mmarif@swatian.com>
Date: Fri, 6 Mar 2020 01:56:42 +0500
Subject: [PATCH 10/14] added theme selection to settings, updated login
 layout.

---
 .../mian/gitnex/activities/BaseActivity.java  | 14 ++-
 .../gitnex/adapters/ReposListAdapter.java     |  1 +
 .../gitnex/fragments/SettingsFragment.java    | 51 +++++++++++
 .../main/res/drawable/ic_arrow_back_24dp.xml  |  5 ++
 app/src/main/res/layout/activity_login.xml    | 51 ++++++-----
 .../main/res/layout/activity_org_detail.xml   |  2 +-
 .../main/res/layout/activity_repo_detail.xml  |  1 -
 app/src/main/res/layout/fragment_profile.xml  |  1 +
 .../res/layout/layout_settings_appearance.xml | 90 ++++++++++++-------
 app/src/main/res/values/attrs.xml             |  1 +
 app/src/main/res/values/strings.xml           | 10 ++-
 app/src/main/res/values/themes.xml            | 49 ++++++----
 12 files changed, 196 insertions(+), 80 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_arrow_back_24dp.xml

diff --git a/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java b/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java
index ece3082b..77138600 100644
--- a/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java
@@ -15,13 +15,21 @@ public abstract class BaseActivity extends AppCompatActivity {
     @Override
     public void onCreate(Bundle savedInstanceState) {
 
-        setTheme(R.style.AppThemeLight);
+        final TinyDB tinyDb = new TinyDB(getApplicationContext());
+
+        if(tinyDb.getInt("themeId") == 0) {
+            setTheme(R.style.AppTheme);
+        }
+        else if(tinyDb.getInt("themeId") == 1) {
+            setTheme(R.style.AppThemeLight);
+        }
+        else {
+            setTheme(R.style.AppTheme);
+        }
 
         super.onCreate(savedInstanceState);
         setContentView(getLayoutResourceId());
 
-        final TinyDB tinyDb = new TinyDB(getApplicationContext());
-
         if(tinyDb.getInt("customFontId") == 0) {
 
             FontsOverride.setDefaultFont(this, "DEFAULT", "fonts/roboto.ttf");
diff --git a/app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java
index 6244d642..2b54a4b7 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/ReposListAdapter.java
@@ -104,6 +104,7 @@ public class ReposListAdapter extends RecyclerView.Adapter<ReposListAdapter.Repo
                         fMenuHelper.setAccessible(true);
                         menuHelper = fMenuHelper.get(popupMenu);
                         argTypes = new Class[] { boolean.class };
+                        assert menuHelper != null;
                         menuHelper.getClass().getDeclaredMethod("setForceShowIcon",
                                 argTypes).invoke(menuHelper, true);
 
diff --git a/app/src/main/java/org/mian/gitnex/fragments/SettingsFragment.java b/app/src/main/java/org/mian/gitnex/fragments/SettingsFragment.java
index b7b54a09..f1ec516d 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/SettingsFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/SettingsFragment.java
@@ -44,6 +44,9 @@ public class SettingsFragment extends Fragment {
     private static String[] customFontList = {"Roboto", "Manrope", "Source Code Pro"};
     private static int customFontSelectedChoice = 0;
 
+    private static String[] themeList = {"Dark", "Light"};
+    private static int themeSelectedChoice = 0;
+
     @Nullable
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
@@ -56,12 +59,14 @@ public class SettingsFragment extends Fragment {
         final TextView codeBlockSelected = v.findViewById(R.id.codeBlockSelected); // setter for code block
         final TextView homeScreenSelected = v.findViewById(R.id.homeScreenSelected); // setter for home screen
         final TextView customFontSelected = v.findViewById(R.id.customFontSelected); // setter for custom font
+        final TextView themeSelected = v.findViewById(R.id.themeSelected); // setter for theme
 
         LinearLayout langFrame = v.findViewById(R.id.langFrame);
         LinearLayout timeFrame = v.findViewById(R.id.timeFrame);
         LinearLayout codeBlockFrame = v.findViewById(R.id.codeBlockFrame);
         LinearLayout homeScreenFrame = v.findViewById(R.id.homeScreenFrame);
         LinearLayout customFontFrame = v.findViewById(R.id.customFontFrame);
+        LinearLayout themeFrame = v.findViewById(R.id.themeSelectionFrame);
 
         Switch issuesSwitch =  v.findViewById(R.id.switchIssuesBadge);
         TextView helpTranslate = v.findViewById(R.id.helpTranslate);
@@ -96,6 +101,10 @@ public class SettingsFragment extends Fragment {
             customFontSelected.setText(tinyDb.getString("customFontStr"));
         }
 
+        if(!tinyDb.getString("themeStr").isEmpty()) {
+            themeSelected.setText(tinyDb.getString("themeStr"));
+        }
+
         if(langSelectedChoice == 0) {
             langSelectedChoice = tinyDb.getInt("langId");
         }
@@ -116,6 +125,10 @@ public class SettingsFragment extends Fragment {
             customFontSelectedChoice = tinyDb.getInt("customFontId");
         }
 
+        if(themeSelectedChoice == 0) {
+            themeSelectedChoice = tinyDb.getInt("themeId");
+        }
+
         if(tinyDb.getBoolean("enableCounterIssueBadge")) {
             issuesSwitch.setChecked(true);
         }
@@ -135,6 +148,44 @@ public class SettingsFragment extends Fragment {
             }
         });
 
+        // theme selection dialog
+        themeFrame.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+
+                AlertDialog.Builder tsBuilder = new AlertDialog.Builder(ctx);
+
+                tsBuilder.setTitle(R.string.themeSelectorDialogTitle);
+                if(themeSelectedChoice != -1) {
+                    tsBuilder.setCancelable(true);
+                }
+                else {
+                    tsBuilder.setCancelable(false);
+                }
+
+                tsBuilder.setSingleChoiceItems(themeList, themeSelectedChoice, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialogInterfaceTheme, int i) {
+
+                        themeSelectedChoice = i;
+                        themeSelected.setText(themeList[i]);
+                        tinyDb.putString("themeStr", themeList[i]);
+                        tinyDb.putInt("themeId", i);
+
+                        Objects.requireNonNull(getActivity()).recreate();
+                        getActivity().overridePendingTransition(0, 0);
+                        dialogInterfaceTheme.dismiss();
+                        Toasty.info(getContext(), getResources().getString(R.string.settingsSave));
+
+                    }
+                });
+
+                AlertDialog cfDialog = tsBuilder.create();
+                cfDialog.show();
+
+            }
+        });
+
         // custom font dialog
         customFontFrame.setOnClickListener(new View.OnClickListener() {
             @Override
diff --git a/app/src/main/res/drawable/ic_arrow_back_24dp.xml b/app/src/main/res/drawable/ic_arrow_back_24dp.xml
new file mode 100644
index 00000000..839e3868
--- /dev/null
+++ b/app/src/main/res/drawable/ic_arrow_back_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:tint="#368F73" android:viewportHeight="24.0"
+    android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 0110a542..c8a4f3cd 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -64,30 +64,35 @@
 
         </RadioGroup>
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+        <RelativeLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@drawable/shape_dropdown"
+            android:layout_marginStart="10dp"
+            android:layout_marginTop="10dp"
+            android:layout_marginBottom="10dp" >
 
             <Spinner
                 android:id="@+id/httpsSpinner"
                 android:layout_width="120dp"
                 android:layout_height="44dp"
-                android:dropDownWidth="120dp"
-                android:background="@drawable/spinner"
-                android:layout_marginStart="10dp"
-                android:layout_marginTop="10dp"
-                android:layout_marginBottom="10dp"
-                android:paddingStart="10dp"
-                android:paddingEnd="10dp"
-                android:paddingTop="10dp" />
+                android:spinnerMode="dropdown"
+                android:padding="10dp" />
+
+        </RelativeLayout>
+
+        <LinearLayout
+            android:visibility="gone"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
 
             <ImageView
                 android:id="@+id/info"
                 android:layout_width="28dp"
                 android:layout_height="28dp"
                 android:src="@drawable/ic_info_24dp"
-                android:layout_marginStart="20dp"
-                android:layout_marginTop="15dp"
+                android:layout_marginStart="120dp"
+                android:layout_marginTop="10dp"
                 android:contentDescription="@string/urlInfoTooltip"
                 />
 
@@ -106,8 +111,8 @@
             android:inputType="textUri"
             android:background="@drawable/shape_inputs"
             android:textColor="?attr/inputTextColor"
-            android:textColorHint="?attr/primaryBackgroundColor"
-            android:textColorHighlight="?attr/primaryTextColor"
+            android:textColorHint="?attr/hintColor"
+            android:textColorHighlight="?attr/hintColor"
             android:hint="@string/instanceUrl" />
 
         <EditText
@@ -122,8 +127,8 @@
             android:drawablePadding="10dp"
             android:background="@drawable/shape_inputs"
             android:textColor="?attr/inputTextColor"
-            android:textColorHint="?attr/primaryBackgroundColor"
-            android:textColorHighlight="?attr/primaryTextColor"
+            android:textColorHint="?attr/hintColor"
+            android:textColorHighlight="?attr/hintColor"
             android:hint="@string/userName"
             android:inputType="text" />
 
@@ -139,8 +144,8 @@
             android:drawablePadding="10dp"
             android:background="@drawable/shape_inputs"
             android:textColor="?attr/inputTextColor"
-            android:textColorHint="?attr/primaryBackgroundColor"
-            android:textColorHighlight="?attr/primaryTextColor"
+            android:textColorHint="?attr/hintColor"
+            android:textColorHighlight="?attr/hintColor"
             android:hint="@string/passWord"
             android:inputType="textPassword" />
 
@@ -156,8 +161,8 @@
             android:drawablePadding="10dp"
             android:background="@drawable/shape_inputs"
             android:textColor="?attr/inputTextColor"
-            android:textColorHint="?attr/primaryBackgroundColor"
-            android:textColorHighlight="?attr/primaryTextColor"
+            android:textColorHint="?attr/hintColor"
+            android:textColorHighlight="?attr/hintColor"
             android:hint="@string/loginOTP"
             android:inputType="number" />
 
@@ -173,8 +178,8 @@
             android:drawablePadding="10dp"
             android:background="@drawable/shape_inputs"
             android:textColor="?attr/inputTextColor"
-            android:textColorHint="?attr/primaryBackgroundColor"
-            android:textColorHighlight="?attr/primaryTextColor"
+            android:textColorHint="?attr/hintColor"
+            android:textColorHighlight="?attr/hintColor"
             android:hint="@string/copyToken"
             android:inputType="text"
             android:visibility="gone" />
diff --git a/app/src/main/res/layout/activity_org_detail.xml b/app/src/main/res/layout/activity_org_detail.xml
index c9b25083..1ee2e762 100644
--- a/app/src/main/res/layout/activity_org_detail.xml
+++ b/app/src/main/res/layout/activity_org_detail.xml
@@ -13,7 +13,6 @@
         android:id="@+id/appbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingTop="@dimen/appbar_padding_top"
         android:theme="@style/AppTheme.AppBarOverlay">
 
         <androidx.appcompat.widget.Toolbar
@@ -42,6 +41,7 @@
             app:tabTextAppearance="@style/customTabLayout"
             app:tabMode="scrollable"
             app:tabTextColor="?attr/primaryTextColor"
+            android:background="?attr/primaryBackgroundColor"
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
diff --git a/app/src/main/res/layout/activity_repo_detail.xml b/app/src/main/res/layout/activity_repo_detail.xml
index fce878b7..ce6408e5 100644
--- a/app/src/main/res/layout/activity_repo_detail.xml
+++ b/app/src/main/res/layout/activity_repo_detail.xml
@@ -13,7 +13,6 @@
         android:id="@+id/appbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingTop="@dimen/appbar_padding_top"
         android:theme="@style/AppTheme.AppBarOverlay">
 
         <androidx.appcompat.widget.Toolbar
diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml
index c136ebde..f11b0d79 100644
--- a/app/src/main/res/layout/fragment_profile.xml
+++ b/app/src/main/res/layout/fragment_profile.xml
@@ -80,6 +80,7 @@
             app:tabTextAppearance="@style/customTabLayout"
             android:layout_width="match_parent"
             app:tabTextColor="?attr/primaryTextColor"
+            android:background="?attr/primaryBackgroundColor"
             android:layout_height="wrap_content">
 
             <com.google.android.material.tabs.TabItem
diff --git a/app/src/main/res/layout/layout_settings_appearance.xml b/app/src/main/res/layout/layout_settings_appearance.xml
index 57beb3e6..3c9236d1 100644
--- a/app/src/main/res/layout/layout_settings_appearance.xml
+++ b/app/src/main/res/layout/layout_settings_appearance.xml
@@ -17,6 +17,66 @@
         android:textStyle="bold"
         android:textColor="@color/colorDarkGreen"/>
 
+    <LinearLayout
+        android:id="@+id/themeSelectionFrame"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/themeHeaderSelector"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="16sp"
+            android:layout_marginTop="10dp"
+            android:layout_marginStart="44dp"
+            android:layout_marginEnd="4dp"
+            android:text="@string/themeSelectionHeaderText"
+            android:textColor="?attr/primaryTextColor"/>
+
+        <TextView
+            android:id="@+id/themeSelected"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="14sp"
+            android:layout_marginStart="44dp"
+            android:layout_marginEnd="4dp"
+            android:text="@string/themeSelectionSelectedText"
+            android:textColor="?attr/selectedTextColor"/>
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/customFontFrame"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/customFontHeaderSelector"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="16sp"
+            android:layout_marginTop="10dp"
+            android:layout_marginStart="44dp"
+            android:layout_marginEnd="4dp"
+            android:text="@string/settingsCustomFontHeaderText"
+            android:textColor="?attr/primaryTextColor"/>
+
+        <TextView
+            android:id="@+id/customFontSelected"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="14sp"
+            android:layout_marginStart="44dp"
+            android:layout_marginEnd="4dp"
+            android:text="@string/defaultCopy"
+            android:textColor="?attr/selectedTextColor"/>
+
+    </LinearLayout>
+
     <LinearLayout
         android:id="@+id/timeFrame"
         android:layout_width="match_parent"
@@ -136,34 +196,4 @@
 
     </LinearLayout>
 
-    <LinearLayout
-        android:id="@+id/customFontFrame"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        android:orientation="vertical">
-
-        <TextView
-            android:id="@+id/customFontHeaderSelector"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textSize="16sp"
-            android:layout_marginTop="10dp"
-            android:layout_marginStart="44dp"
-            android:layout_marginEnd="4dp"
-            android:text="@string/settingsCustomFontHeaderText"
-            android:textColor="?attr/primaryTextColor"/>
-
-        <TextView
-            android:id="@+id/customFontSelected"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textSize="14sp"
-            android:layout_marginStart="44dp"
-            android:layout_marginEnd="4dp"
-            android:text="@string/defaultCopy"
-            android:textColor="?attr/selectedTextColor"/>
-
-    </LinearLayout>
-
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 7035e28e..4e85bd09 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -3,6 +3,7 @@
     <attr name="primaryTextColor" format="reference"/>
     <attr name="primaryBackgroundColor" format="reference" />
     <attr name="inputBackgroundColor" format="reference" />
+    <attr name="hintColor" format="reference" />
     <attr name="inputTextColor" format="reference" />
     <attr name="selectedTextColor" format="reference" />
     <attr name="alertDialogTheme" format="reference" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f4fccd1b..de0225ab 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -259,6 +259,12 @@
     <string name="settingsHomeScreenHeaderText">Home Screen</string>
     <string name="settingsHomeScreenSelectedText">My Repositories</string>
     <string name="settingshomeScreenSelectorDialogTitle">Select Home Screen</string>
+    <string name="settingsCustomFontHeaderText">Font</string>
+    <string name="settingsCustomFontSelectorDialogTitle">Choose Font</string>
+    <string name="settingsCustomFontDefault">Roboto</string>
+    <string name="themeSelectorDialogTitle">Select App Theme</string>
+    <string name="themeSelectionHeaderText">Theme</string>
+    <string name="themeSelectionSelectedText" translatable="false">Dark</string>
     <!-- settings -->
 
     <string name="noMoreData">No more data available</string>
@@ -543,8 +549,4 @@
     <string name="mergePRSuccessMsg">Pull Request was merged successfully</string>
     <string name="mergePR404ErrorMsg">Pull Request is not available for merge</string>
 
-    <string name="settingsCustomFontHeaderText">Font</string>
-    <string name="settingsCustomFontSelectorDialogTitle">Choose Font</string>
-    <string name="settingsCustomFontDefault">Roboto</string>
-
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 40beb351..4c5c432d 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -14,8 +14,11 @@
         <item name="inputTextColor">@color/colorWhite</item>
         <item name="checkboxStyle">@style/AppThemeCheckBoxStyle</item>
         <item name="selectedTextColor">@color/darkGreen</item>
-        <item name="dialogTheme">@style/AppThemeConfirmDialog</item>
+        <item name="alertDialogTheme">@style/AppThemeConfirmDialog</item>
         <item name="popupMenuStyle">@style/AppThemePopupMenuStyle</item>
+        <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back_24dp</item>
+        <item name="autoCompleteTextViewStyle">@style/AppThemeDarkSearchAutoCompleteTextView</item>
+        <item name="hintColor">@color/hintColor</item>
     </style>
     <!-- Dark theme - default -->
 
@@ -32,41 +35,51 @@
         <item name="inputTextColor">@color/lightThemeInputTextColor</item>
         <item name="checkboxStyle">@style/AppThemeLightCheckBoxStyle</item>
         <item name="selectedTextColor">@color/darkGreen</item>
-        <item name="dialogTheme">@style/AppThemeLightConfirmDialog</item>
-        <item name="popupMenuStyle">@style/AppThemePopupMenuStyle</item>
+        <item name="alertDialogTheme">@style/AppThemeLightConfirmDialog</item>
+        <item name="popupMenuStyle">@style/AppThemeLightPopupMenuStyle</item>
+        <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back_24dp</item>
+        <item name="autoCompleteTextViewStyle">@style/AppThemeLightSearchAutoCompleteTextView</item>
+        <item name="hintColor">@color/hintColor</item>
     </style>
     <!-- Light theme -->
 
+    <style name="AppThemeLightSearchAutoCompleteTextView" parent="Widget.AppCompat.Light.AutoCompleteTextView">
+        <item name="android:textColor">@color/lightThemeTextColor</item>
+        <item name="android:textColorHint">@color/lightThemeTextColor</item>
+    </style>
+
+    <style name="AppThemeDarkSearchAutoCompleteTextView" parent="Widget.AppCompat.Light.AutoCompleteTextView">
+        <item name="android:textColor">@color/colorWhite</item>
+        <item name="android:textColorHint">@color/colorWhite</item>
+    </style>
+
     <style name="AppThemeConfirmDialog" parent="Theme.AppCompat.Dialog.Alert">
         <item name="android:background">@color/colorPrimary</item>
-        <item name="android:textColorPrimary">@android:color/white</item>
-        <item name="android:textColor">@android:color/white</item>
+        <item name="android:textColorPrimary">@color/white</item>
+        <item name="android:textColor">@color/white</item>
         <item name="colorControlNormal">@color/white</item>
-        <item name="colorControlActivated">@color/white</item>
+        <item name="colorControlActivated">@color/darkGreen</item>
     </style>
 
-    <style name="AppThemeLightConfirmDialog" parent="Theme.AppCompat.Dialog.Alert">
-        <item name="android:background">@color/colorPrimary</item>
-        <item name="android:textColorPrimary">@color/colorPrimary</item>
+    <style name="AppThemeLightConfirmDialog" parent="Theme.AppCompat.Light.Dialog.Alert">
+        <item name="android:background">@color/white</item>
+        <item name="android:textColorPrimary">@color/lightThemeTextColor</item>
         <item name="android:textColor">@color/lightThemeTextColor</item>
         <item name="colorControlNormal">@color/lightThemeTextColor</item>
-        <item name="colorControlActivated">@color/lightThemeTextColor</item>
+        <item name="colorControlActivated">@color/darkGreen</item>
     </style>
 
-    <style name="AppThemePopupMenuStyle">
-        <item name="android:itemBackground">@color/colorPrimary</item>
-        <item name="android:background">@android:color/transparent</item>
-        <item name="android:textColor">@android:color/white</item>
-        <item name="android:colorBackground">@color/colorPrimary</item>
+    <style name="AppThemePopupMenuStyle" parent="Widget.AppCompat.PopupMenu">
+        <item name="android:popupBackground">@color/colorPrimary</item>
+        <item name="android:textColor">@color/white</item>
         <item name="android:layout_marginStart">3dp</item>
         <item name="android:layout_marginEnd">3dp</item>
     </style>
 
-    <style name="AppThemeLightPopupMenuStyle">
+    <style name="AppThemeLightPopupMenuStyle" parent="Widget.AppCompat.Light.PopupMenu">
+        <item name="android:popupBackground">@color/white</item>
         <item name="android:itemBackground">@color/lightThemeBackground</item>
-        <item name="android:background">@android:color/transparent</item>
         <item name="android:textColor">@color/lightThemeTextColor</item>
-        <item name="android:colorBackground">@color/lightThemeBackground</item>
         <item name="android:layout_marginStart">3dp</item>
         <item name="android:layout_marginEnd">3dp</item>
     </style>

From 61f953d70d781d9b08a130b02e160207cd704f29 Mon Sep 17 00:00:00 2001
From: M M Arif <mmarif@swatian.com>
Date: Fri, 6 Mar 2020 18:46:22 +0500
Subject: [PATCH 11/14] Fixes layout issue with themes, added pdf night mode
 switch in settings

---
 app/src/main/AndroidManifest.xml              |  6 ++-
 .../gitnex/activities/FileViewActivity.java   |  7 ++-
 .../adapters/RepoStargazersAdapter.java       | 11 ++++
 .../gitnex/adapters/RepoWatchersAdapter.java  | 11 ++++
 .../adapters/TeamMembersByOrgAdapter.java     | 15 +++++-
 .../gitnex/fragments/SettingsFragment.java    | 26 ++++++++++
 .../res/layout/activity_org_team_members.xml  |  9 ++--
 .../res/layout/activity_repo_stargazers.xml   |  1 +
 .../res/layout/activity_repo_watchers.xml     |  1 +
 .../main/res/layout/fragment_explore_repo.xml |  5 +-
 app/src/main/res/layout/fragment_settings.xml | 17 ++++++-
 .../res/layout/layout_settings_fileview.xml   | 51 +++++++++++++++++++
 .../layout/members_by_team_by_org_list.xml    |  4 +-
 .../main/res/layout/repo_stargazers_list.xml  |  4 +-
 .../main/res/layout/repo_watchers_list.xml    |  4 +-
 app/src/main/res/values/strings.xml           |  2 +
 app/src/main/res/values/themes.xml            |  4 +-
 17 files changed, 155 insertions(+), 23 deletions(-)
 create mode 100644 app/src/main/res/layout/layout_settings_fileview.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a13a7e14..76675bfd 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="org.mian.gitnex">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -11,7 +12,8 @@
         android:label="@string/app_name"
         android:networkSecurityConfig="@xml/network_security_config"
         android:roundIcon="@mipmap/app_logo_round"
-        android:supportsRtl="true">
+        android:supportsRtl="true"
+        tools:targetApi="n">
         <activity android:name=".activities.MergePullRequestActivity" />
         <activity
             android:name=".activities.FileViewActivity"
@@ -56,7 +58,7 @@
             android:name=".activities.RepoDetailActivity"
             android:label="@string/title_activity_repo_detail"
             android:theme="@style/AppTheme.NoActionBar" />
-        <activity android:name=".activities.MainActivity">
+        <activity android:name=".activities.MainActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/app/src/main/java/org/mian/gitnex/activities/FileViewActivity.java b/app/src/main/java/org/mian/gitnex/activities/FileViewActivity.java
index 8cf6f63b..ba336ed6 100644
--- a/app/src/main/java/org/mian/gitnex/activities/FileViewActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/FileViewActivity.java
@@ -50,6 +50,7 @@ public class FileViewActivity extends BaseActivity {
     private PDFView pdfView;
     private LinearLayout pdfViewFrame;
     private byte[] decodedPdf;
+    private Boolean $nightMode;
 
     @Override
     protected int getLayoutResourceId(){
@@ -111,6 +112,8 @@ public class FileViewActivity extends BaseActivity {
 
     private void getSingleFileContents(String instanceUrl, String token, final String owner, String repo, final String filename) {
 
+        final TinyDB tinyDb = new TinyDB(getApplicationContext());
+
         Call<Files> call = RetrofitClient
                 .getInstance(instanceUrl, getApplicationContext())
                 .getApiInterface()
@@ -162,6 +165,8 @@ public class FileViewActivity extends BaseActivity {
                             singleCodeContents.setVisibility(View.GONE);
                             pdfViewFrame.setVisibility(View.VISIBLE);
 
+                            $nightMode = tinyDb.getBoolean("enablePdfMode");
+
                             decodedPdf = Base64.decode(response.body().getContent(), Base64.DEFAULT);
                             pdfView.fromBytes(decodedPdf)
                                     .enableSwipe(true)
@@ -178,7 +183,7 @@ public class FileViewActivity extends BaseActivity {
                                     .fitEachPage(true)
                                     .pageSnap(false)
                                     .pageFling(true)
-                                    .nightMode(false)
+                                    .nightMode($nightMode)
                                     .load();
 
                         }
diff --git a/app/src/main/java/org/mian/gitnex/adapters/RepoStargazersAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/RepoStargazersAdapter.java
index 9d195090..6eb3c1cc 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/RepoStargazersAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/RepoStargazersAdapter.java
@@ -83,6 +83,7 @@ public class RepoStargazersAdapter extends BaseAdapter {
 
         final TinyDB tinyDb = new TinyDB(mCtx);
         Typeface myTypeface;
+
         if(tinyDb.getInt("customFontId") == 0) {
 
             myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/roboto.ttf");
@@ -113,6 +114,16 @@ public class RepoStargazersAdapter extends BaseAdapter {
             viewHolder.memberName.setTypeface(myTypeface);
         }
 
+        if(tinyDb.getInt("themeId") == 0) { // dark
+            viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.white));
+        }
+        else if(tinyDb.getInt("themeId") == 1) { //light
+            viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.lightThemeTextColor));
+        }
+        else {
+            viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.white));
+        }
+
     }
 
 }
diff --git a/app/src/main/java/org/mian/gitnex/adapters/RepoWatchersAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/RepoWatchersAdapter.java
index 11304210..92a5515f 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/RepoWatchersAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/RepoWatchersAdapter.java
@@ -83,6 +83,7 @@ public class RepoWatchersAdapter extends BaseAdapter {
 
         final TinyDB tinyDb = new TinyDB(mCtx);
         Typeface myTypeface;
+
         if(tinyDb.getInt("customFontId") == 0) {
 
             myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/roboto.ttf");
@@ -113,6 +114,16 @@ public class RepoWatchersAdapter extends BaseAdapter {
             viewHolder.memberName.setTypeface(myTypeface);
         }
 
+        if(tinyDb.getInt("themeId") == 0) { // dark
+            viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.white));
+        }
+        else if(tinyDb.getInt("themeId") == 1) { //light
+            viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.lightThemeTextColor));
+        }
+        else {
+            viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.white));
+        }
+
     }
 
 }
diff --git a/app/src/main/java/org/mian/gitnex/adapters/TeamMembersByOrgAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/TeamMembersByOrgAdapter.java
index db9c68af..7efbbabf 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/TeamMembersByOrgAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/TeamMembersByOrgAdapter.java
@@ -25,7 +25,7 @@ public class TeamMembersByOrgAdapter extends BaseAdapter {
     private List<UserInfo> teamMembersList;
     private Context mCtx;
 
-    private class ViewHolder {
+    private static class ViewHolder {
 
         private ImageView memberAvatar;
         private TextView memberName;
@@ -65,7 +65,7 @@ public class TeamMembersByOrgAdapter extends BaseAdapter {
 
         if (finalView == null) {
             finalView = LayoutInflater.from(mCtx).inflate(R.layout.members_by_team_by_org_list, null);
-            viewHolder = new TeamMembersByOrgAdapter.ViewHolder(finalView);
+            viewHolder = new ViewHolder(finalView);
             finalView.setTag(viewHolder);
         }
         else {
@@ -84,6 +84,7 @@ public class TeamMembersByOrgAdapter extends BaseAdapter {
 
         final TinyDB tinyDb = new TinyDB(mCtx);
         Typeface myTypeface;
+
         if(tinyDb.getInt("customFontId") == 0) {
 
             myTypeface = Typeface.createFromAsset(mCtx.getAssets(), "fonts/roboto.ttf");
@@ -114,5 +115,15 @@ public class TeamMembersByOrgAdapter extends BaseAdapter {
             viewHolder.memberName.setTypeface(myTypeface);
         }
 
+        if(tinyDb.getInt("themeId") == 0) { // dark
+            viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.white));
+        }
+        else if(tinyDb.getInt("themeId") == 1) { //light
+            viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.lightThemeTextColor));
+        }
+        else {
+            viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.white));
+        }
+
     }
 }
diff --git a/app/src/main/java/org/mian/gitnex/fragments/SettingsFragment.java b/app/src/main/java/org/mian/gitnex/fragments/SettingsFragment.java
index f1ec516d..492af7c4 100644
--- a/app/src/main/java/org/mian/gitnex/fragments/SettingsFragment.java
+++ b/app/src/main/java/org/mian/gitnex/fragments/SettingsFragment.java
@@ -69,6 +69,7 @@ public class SettingsFragment extends Fragment {
         LinearLayout themeFrame = v.findViewById(R.id.themeSelectionFrame);
 
         Switch issuesSwitch =  v.findViewById(R.id.switchIssuesBadge);
+        Switch pdfModeSwitch =  v.findViewById(R.id.switchPdfMode);
         TextView helpTranslate = v.findViewById(R.id.helpTranslate);
 
         helpTranslate.setOnClickListener(new View.OnClickListener() {
@@ -132,6 +133,16 @@ public class SettingsFragment extends Fragment {
         if(tinyDb.getBoolean("enableCounterIssueBadge")) {
             issuesSwitch.setChecked(true);
         }
+        else {
+            issuesSwitch.setChecked(false);
+        }
+
+        if(tinyDb.getBoolean("enablePdfMode")) {
+            pdfModeSwitch.setChecked(true);
+        }
+        else {
+            pdfModeSwitch.setChecked(false);
+        }
 
         // issues badge switcher
         issuesSwitch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@@ -148,6 +159,21 @@ public class SettingsFragment extends Fragment {
             }
         });
 
+        // pdf night mode switcher
+        pdfModeSwitch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                if (isChecked) {
+                    tinyDb.putBoolean("enablePdfMode", true);
+                    tinyDb.putString("enablePdfModeInit", "yes");
+                    Toasty.info(getContext(), getResources().getString(R.string.settingsSave));
+                } else {
+                    tinyDb.putBoolean("enablePdfMode", false);
+                    tinyDb.putString("enablePdfModeInit", "yes");
+                    Toasty.info(getContext(), getResources().getString(R.string.settingsSave));
+                }
+            }
+        });
+
         // theme selection dialog
         themeFrame.setOnClickListener(new View.OnClickListener() {
             @Override
diff --git a/app/src/main/res/layout/activity_org_team_members.xml b/app/src/main/res/layout/activity_org_team_members.xml
index cfa7e6af..8ea652e6 100644
--- a/app/src/main/res/layout/activity_org_team_members.xml
+++ b/app/src/main/res/layout/activity_org_team_members.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/colorPrimary"
+    android:background="?attr/primaryBackgroundColor"
     android:orientation="vertical">
 
     <com.google.android.material.appbar.AppBarLayout
@@ -14,7 +14,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?attr/colorPrimary"
+            android:background="?attr/primaryBackgroundColor"
             tools:ignore="UnusedAttribute">
 
             <ImageView
@@ -32,7 +32,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
-                android:textColor="@color/white"
+                android:textColor="?attr/primaryTextColor"
                 android:maxLines="1"
                 android:textSize="20sp" />
 
@@ -49,6 +49,7 @@
         android:numColumns="4"
         android:columnWidth="80dp"
         android:stretchMode="columnWidth"
+        android:background="?attr/primaryBackgroundColor"
         android:gravity="center"/>
 
     <TextView
@@ -58,7 +59,7 @@
         android:layout_margin="15dp"
         android:gravity="center"
         android:text="@string/noDataMembers"
-        android:textColor="@color/white"
+        android:textColor="?attr/primaryTextColor"
         android:textSize="20sp"
         android:visibility="gone" />
 
diff --git a/app/src/main/res/layout/activity_repo_stargazers.xml b/app/src/main/res/layout/activity_repo_stargazers.xml
index 47136de5..a2ee2c89 100644
--- a/app/src/main/res/layout/activity_repo_stargazers.xml
+++ b/app/src/main/res/layout/activity_repo_stargazers.xml
@@ -49,6 +49,7 @@
         android:numColumns="4"
         android:columnWidth="80dp"
         android:stretchMode="columnWidth"
+        android:background="?attr/primaryBackgroundColor"
         android:gravity="center"/>
 
     <TextView
diff --git a/app/src/main/res/layout/activity_repo_watchers.xml b/app/src/main/res/layout/activity_repo_watchers.xml
index 641b75e4..4766471c 100644
--- a/app/src/main/res/layout/activity_repo_watchers.xml
+++ b/app/src/main/res/layout/activity_repo_watchers.xml
@@ -49,6 +49,7 @@
         android:numColumns="4"
         android:columnWidth="80dp"
         android:stretchMode="columnWidth"
+        android:background="?attr/primaryBackgroundColor"
         android:gravity="center"/>
 
     <TextView
diff --git a/app/src/main/res/layout/fragment_explore_repo.xml b/app/src/main/res/layout/fragment_explore_repo.xml
index 5147d415..18295130 100644
--- a/app/src/main/res/layout/fragment_explore_repo.xml
+++ b/app/src/main/res/layout/fragment_explore_repo.xml
@@ -19,10 +19,11 @@
         android:inputType="text"
         android:background="@drawable/shape_inputs"
         android:textColor="?attr/inputTextColor"
-        android:textColorHint="?attr/primaryBackgroundColor"
+        android:textColorHint="?attr/hintColor"
         android:hint="@string/exploreTextBoxHint"
         android:textColorHighlight="?attr/primaryTextColor"
-        android:imeOptions="actionSend" />
+        android:imeOptions="actionSend"
+        android:autofillHints="@string/exploreTextBoxHint" />
 
     <TextView
         android:id="@+id/noData"
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index 37325ca1..60e73581 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -19,7 +19,7 @@
                 layout="@layout/layout_settings_appearance"/>
 
             <View
-                android:id="@+id/translationDivider"
+                android:id="@+id/fileViewDivider"
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
                 android:layout_marginStart="44dp"
@@ -29,6 +29,21 @@
                 android:layout_below="@id/timeLayout"
                 />
 
+            <include
+                android:id="@+id/fileViewLayout"
+                layout="@layout/layout_settings_fileview"/>
+
+            <View
+                android:id="@+id/translationDivider"
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginStart="44dp"
+                android:layout_marginEnd="5dp"
+                android:layout_marginTop="20dp"
+                android:layout_marginBottom="20dp"
+                android:layout_below="@id/fileViewLayout"
+                />
+
             <include
                 android:id="@+id/langLayout"
                 layout="@layout/layout_settings_languages"/>
diff --git a/app/src/main/res/layout/layout_settings_fileview.xml b/app/src/main/res/layout/layout_settings_fileview.xml
new file mode 100644
index 00000000..42b86b8d
--- /dev/null
+++ b/app/src/main/res/layout/layout_settings_fileview.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:id="@+id/layoutFileView"
+    android:orientation="vertical"
+    android:layout_below="@+id/fileViewDivider"
+    android:background="?attr/primaryBackgroundColor">
+
+    <TextView
+        android:id="@+id/fileViewAppearance"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="14sp"
+        android:drawableStart="@drawable/ic_file"
+        android:drawablePadding="20dp"
+        android:text="@string/fileViewerHeader"
+        android:textStyle="bold"
+        android:textColor="@color/colorDarkGreen"/>
+
+    <RelativeLayout
+        android:id="@+id/pdfMode"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="20dp"
+        android:orientation="horizontal">
+
+        <TextView
+            android:id="@+id/pdfModeHeader"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="16sp"
+            android:layout_marginStart="44dp"
+            android:layout_marginEnd="4dp"
+            android:text="@string/settingsPdfModeHeaderText"
+            android:textColor="?attr/primaryTextColor"/>
+
+        <Switch
+            android:id="@+id/switchPdfMode"
+            android:layout_toEndOf="@+id/pdfModeHeader"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:switchMinWidth="56dp"
+            android:layout_alignParentEnd="true"
+            android:gravity="end"
+            android:layout_gravity="end" />
+
+    </RelativeLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/members_by_team_by_org_list.xml b/app/src/main/res/layout/members_by_team_by_org_list.xml
index 36043111..32ac648c 100644
--- a/app/src/main/res/layout/members_by_team_by_org_list.xml
+++ b/app/src/main/res/layout/members_by_team_by_org_list.xml
@@ -4,7 +4,6 @@
     android:id="@+id/gridViewData"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?attr/primaryBackgroundColor"
     android:orientation="vertical">
 
     <ImageView
@@ -21,7 +20,6 @@
         android:gravity="top|center_horizontal"
         android:layout_marginTop="1dp"
         android:text="@string/orgMember"
-        android:textSize="14sp"
-        android:textColor="?attr/primaryTextColor" />
+        android:textSize="14sp" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/repo_stargazers_list.xml b/app/src/main/res/layout/repo_stargazers_list.xml
index 407417fb..b82e12d1 100644
--- a/app/src/main/res/layout/repo_stargazers_list.xml
+++ b/app/src/main/res/layout/repo_stargazers_list.xml
@@ -4,7 +4,6 @@
     android:id="@+id/gridViewData"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?attr/primaryBackgroundColor"
     android:orientation="vertical">
 
     <ImageView
@@ -21,7 +20,6 @@
         android:gravity="top|center_horizontal"
         android:layout_marginTop="1dp"
         android:text="@string/starMember"
-        android:textSize="14sp"
-        android:textColor="?attr/primaryTextColor" />
+        android:textSize="14sp" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/repo_watchers_list.xml b/app/src/main/res/layout/repo_watchers_list.xml
index 33d74779..1c38c5b1 100644
--- a/app/src/main/res/layout/repo_watchers_list.xml
+++ b/app/src/main/res/layout/repo_watchers_list.xml
@@ -4,7 +4,6 @@
     android:id="@+id/gridViewData"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?attr/primaryBackgroundColor"
     android:orientation="vertical">
 
     <ImageView
@@ -21,7 +20,6 @@
         android:gravity="top|center_horizontal"
         android:layout_marginTop="1dp"
         android:text="@string/watcherMember"
-        android:textSize="14sp"
-        android:textColor="?attr/primaryTextColor" />
+        android:textSize="14sp" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index de0225ab..1af444d0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -265,6 +265,8 @@
     <string name="themeSelectorDialogTitle">Select App Theme</string>
     <string name="themeSelectionHeaderText">Theme</string>
     <string name="themeSelectionSelectedText" translatable="false">Dark</string>
+    <string name="settingsPdfModeHeaderText">PDF Night Mode</string>
+    <string name="fileViewerHeader">File Viewer</string>
     <!-- settings -->
 
     <string name="noMoreData">No more data available</string>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 4c5c432d..98ca895a 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -4,7 +4,6 @@
     <!-- Dark theme - default -->
     <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="android:statusBarColor">@color/colorPrimary</item>
-        <item name="android:windowBackground">@color/colorPrimary</item>
         <item name="android:typeface">monospace</item>
         <item name="colorAccent">@color/colorAccent</item>
 
@@ -19,13 +18,13 @@
         <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back_24dp</item>
         <item name="autoCompleteTextViewStyle">@style/AppThemeDarkSearchAutoCompleteTextView</item>
         <item name="hintColor">@color/hintColor</item>
+        <item name="colorControlActivated">@color/darkGreen</item>
     </style>
     <!-- Dark theme - default -->
 
     <!-- Light theme -->
     <style name="AppThemeLight" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="android:statusBarColor">@color/colorPrimary</item>
-        <item name="android:windowBackground">@color/lightThemeBackground</item>
         <item name="android:typeface">monospace</item>
         <item name="colorAccent">@color/colorAccent</item>
 
@@ -40,6 +39,7 @@
         <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back_24dp</item>
         <item name="autoCompleteTextViewStyle">@style/AppThemeLightSearchAutoCompleteTextView</item>
         <item name="hintColor">@color/hintColor</item>
+        <item name="colorControlActivated">@color/darkGreen</item>
     </style>
     <!-- Light theme -->
 

From 900b060c310d4b83bf9c7f4dff07be4f2da7f55b Mon Sep 17 00:00:00 2001
From: M M Arif <mmarif@swatian.com>
Date: Sat, 7 Mar 2020 01:07:54 +0500
Subject: [PATCH 12/14] Use only one statement for new theme.

---
 .../main/java/org/mian/gitnex/activities/BaseActivity.java | 5 +----
 .../org/mian/gitnex/adapters/RepoStargazersAdapter.java    | 7 ++-----
 .../java/org/mian/gitnex/adapters/RepoWatchersAdapter.java | 7 ++-----
 .../org/mian/gitnex/adapters/TeamMembersByOrgAdapter.java  | 7 ++-----
 4 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java b/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java
index 77138600..cd6fb798 100644
--- a/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/BaseActivity.java
@@ -17,10 +17,7 @@ public abstract class BaseActivity extends AppCompatActivity {
 
         final TinyDB tinyDb = new TinyDB(getApplicationContext());
 
-        if(tinyDb.getInt("themeId") == 0) {
-            setTheme(R.style.AppTheme);
-        }
-        else if(tinyDb.getInt("themeId") == 1) {
+        if(tinyDb.getInt("themeId") == 1) {
             setTheme(R.style.AppThemeLight);
         }
         else {
diff --git a/app/src/main/java/org/mian/gitnex/adapters/RepoStargazersAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/RepoStargazersAdapter.java
index 6eb3c1cc..afa1fe26 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/RepoStargazersAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/RepoStargazersAdapter.java
@@ -114,13 +114,10 @@ public class RepoStargazersAdapter extends BaseAdapter {
             viewHolder.memberName.setTypeface(myTypeface);
         }
 
-        if(tinyDb.getInt("themeId") == 0) { // dark
-            viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.white));
-        }
-        else if(tinyDb.getInt("themeId") == 1) { //light
+        if(tinyDb.getInt("themeId") == 1) { //light
             viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.lightThemeTextColor));
         }
-        else {
+        else { // dark
             viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.white));
         }
 
diff --git a/app/src/main/java/org/mian/gitnex/adapters/RepoWatchersAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/RepoWatchersAdapter.java
index 92a5515f..7d74514f 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/RepoWatchersAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/RepoWatchersAdapter.java
@@ -114,13 +114,10 @@ public class RepoWatchersAdapter extends BaseAdapter {
             viewHolder.memberName.setTypeface(myTypeface);
         }
 
-        if(tinyDb.getInt("themeId") == 0) { // dark
-            viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.white));
-        }
-        else if(tinyDb.getInt("themeId") == 1) { //light
+        if(tinyDb.getInt("themeId") == 1) { //light
             viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.lightThemeTextColor));
         }
-        else {
+        else { // dark
             viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.white));
         }
 
diff --git a/app/src/main/java/org/mian/gitnex/adapters/TeamMembersByOrgAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/TeamMembersByOrgAdapter.java
index 7efbbabf..0aac76c4 100644
--- a/app/src/main/java/org/mian/gitnex/adapters/TeamMembersByOrgAdapter.java
+++ b/app/src/main/java/org/mian/gitnex/adapters/TeamMembersByOrgAdapter.java
@@ -115,13 +115,10 @@ public class TeamMembersByOrgAdapter extends BaseAdapter {
             viewHolder.memberName.setTypeface(myTypeface);
         }
 
-        if(tinyDb.getInt("themeId") == 0) { // dark
-            viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.white));
-        }
-        else if(tinyDb.getInt("themeId") == 1) { //light
+        if(tinyDb.getInt("themeId") == 1) { //light
             viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.lightThemeTextColor));
         }
-        else {
+        else { // dark
             viewHolder.memberName.setTextColor(mCtx.getResources().getColor(R.color.white));
         }
 

From 9a9b836c400595c9cd20079f3c7919cd9e3efdd7 Mon Sep 17 00:00:00 2001
From: M M Arif <mmarif@swatian.com>
Date: Sat, 7 Mar 2020 13:30:45 +0500
Subject: [PATCH 13/14] Fix file diff background

---
 app/src/main/res/layout/activity_file_diff.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/activity_file_diff.xml b/app/src/main/res/layout/activity_file_diff.xml
index 62a7225c..3b1b7a60 100644
--- a/app/src/main/res/layout/activity_file_diff.xml
+++ b/app/src/main/res/layout/activity_file_diff.xml
@@ -55,7 +55,7 @@
             android:id="@+id/recyclerView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@color/colorPrimary"
+            android:background="?attr/primaryBackgroundColor"
             android:padding="4dp"
             android:scrollbars="vertical" />
 

From 5b8c4858830d73c9a3f8bcdeae8810740a6ea16b Mon Sep 17 00:00:00 2001
From: M M Arif <mmarif@swatian.com>
Date: Sun, 8 Mar 2020 10:54:33 +0500
Subject: [PATCH 14/14] Fix variable name

---
 .../java/org/mian/gitnex/activities/FileViewActivity.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/mian/gitnex/activities/FileViewActivity.java b/app/src/main/java/org/mian/gitnex/activities/FileViewActivity.java
index ba336ed6..19ed4c6b 100644
--- a/app/src/main/java/org/mian/gitnex/activities/FileViewActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/FileViewActivity.java
@@ -50,7 +50,7 @@ public class FileViewActivity extends BaseActivity {
     private PDFView pdfView;
     private LinearLayout pdfViewFrame;
     private byte[] decodedPdf;
-    private Boolean $nightMode;
+    private Boolean pdfNightMode;
 
     @Override
     protected int getLayoutResourceId(){
@@ -165,7 +165,7 @@ public class FileViewActivity extends BaseActivity {
                             singleCodeContents.setVisibility(View.GONE);
                             pdfViewFrame.setVisibility(View.VISIBLE);
 
-                            $nightMode = tinyDb.getBoolean("enablePdfMode");
+                            pdfNightMode = tinyDb.getBoolean("enablePdfMode");
 
                             decodedPdf = Base64.decode(response.body().getContent(), Base64.DEFAULT);
                             pdfView.fromBytes(decodedPdf)
@@ -183,7 +183,7 @@ public class FileViewActivity extends BaseActivity {
                                     .fitEachPage(true)
                                     .pageSnap(false)
                                     .pageFling(true)
-                                    .nightMode($nightMode)
+                                    .nightMode(pdfNightMode)
                                     .load();
 
                         }