From 6f4e311786222f81f9c2b103b42d1daf51c5b969 Mon Sep 17 00:00:00 2001
From: Vikramaditya Kukreja <kukreja.vikramaditya@gmail.com>
Date: Thu, 19 Apr 2018 19:11:23 +0530
Subject: [PATCH] Issue #159: Segregate layout files into folders

---
 app/build.gradle                              |  20 +-
 .../ard/activities/AnnActivity.java           |  14 +-
 .../ard/activities/PostDetailsActivity.java   |   5 -
 .../ard/adapters/AboutMacAdapter.java         |   2 +-
 .../macbitsgoa/ard/adapters/AnnAdapter.java   |  10 +-
 .../macbitsgoa/ard/adapters/ForumAdapter.java |   7 +-
 .../macbitsgoa/ard/adapters/HomeAdapter.java  |  11 +-
 .../ard/adapters/PostDetailsAdapter.java      |   6 -
 .../ard/fragments/DetailsFragment.java        |   4 -
 .../macbitsgoa/ard/services/ForumService.java |   3 +-
 .../macbitsgoa/ard/services/HomeService.java  | 170 ++++++------
 .../ard/services/MaintenanceService.java      |   6 +-
 .../ard/utils/CenterCropDrawable.java         |   2 +-
 .../ard/viewholders/FaqViewHolder.java        |   5 +-
 .../ard/viewholders/HomeItemViewHolder.java   |   9 +-
 .../layout}/activity_about_mac.xml            |   0
 .../{ => activities/layout}/activity_ann.xml  |   0
 .../{ => activities/layout}/activity_auth.xml |   0
 .../{ => activities/layout}/activity_chat.xml |   0
 .../{ => activities/layout}/activity_main.xml |   0
 .../layout}/activity_new_chat.xml             |   0
 .../layout}/activity_post_details.xml         |   0
 .../{ => activities/layout}/app_bar_main.xml  |   0
 .../{ => fragments/layout}/fragment_chat.xml  |   0
 .../layout}/fragment_detail.xml               |   0
 .../{ => fragments/layout}/fragment_forum.xml |   0
 .../layout}/fragment_forum_content.xml        |   0
 .../layout}/fragment_forum_general.xml        |   0
 .../{ => fragments/layout}/fragment_home.xml  |   0
 .../layout}/vh_activity_chat_chatmsg.xml      |   0
 .../layout}/vh_ann_activity_item.xml          |   0
 .../layout}/vh_ann_card_fragment_home.xml     |   0
 .../vh_announcement_slideshow_title.xml       |   0
 .../{ => viewholders/layout}/vh_big_image.xml |   0
 .../{ => viewholders/layout}/vh_big_text.xml  |   0
 .../layout}/vh_chat_document.xml              |   0
 .../layout}/vh_chat_fragment_chats.xml        |   0
 .../{ => viewholders/layout}/vh_developer.xml |   0
 .../layout}/vh_fg_forum_general.xml           |   0
 .../{ => viewholders/layout}/vh_home_item.xml |   0
 .../{ => viewholders/layout}/vh_mac_desc.xml  |   0
 .../{ => viewholders/layout}/vh_newchat.xml   |   0
 .../layout}/vh_slideshow_fragment_home.xml    |   0
 .../{ => viewholders/layout}/vh_text.xml      |   0
 app/src/main/res/values/colors.xml            | 262 ++++++++++++++++++
 45 files changed, 381 insertions(+), 155 deletions(-)
 rename app/src/main/res/layout/{ => activities/layout}/activity_about_mac.xml (100%)
 rename app/src/main/res/layout/{ => activities/layout}/activity_ann.xml (100%)
 rename app/src/main/res/layout/{ => activities/layout}/activity_auth.xml (100%)
 rename app/src/main/res/layout/{ => activities/layout}/activity_chat.xml (100%)
 rename app/src/main/res/layout/{ => activities/layout}/activity_main.xml (100%)
 rename app/src/main/res/layout/{ => activities/layout}/activity_new_chat.xml (100%)
 rename app/src/main/res/layout/{ => activities/layout}/activity_post_details.xml (100%)
 rename app/src/main/res/layout/{ => activities/layout}/app_bar_main.xml (100%)
 rename app/src/main/res/layout/{ => fragments/layout}/fragment_chat.xml (100%)
 rename app/src/main/res/layout/{ => fragments/layout}/fragment_detail.xml (100%)
 rename app/src/main/res/layout/{ => fragments/layout}/fragment_forum.xml (100%)
 rename app/src/main/res/layout/{ => fragments/layout}/fragment_forum_content.xml (100%)
 rename app/src/main/res/layout/{ => fragments/layout}/fragment_forum_general.xml (100%)
 rename app/src/main/res/layout/{ => fragments/layout}/fragment_home.xml (100%)
 rename app/src/main/res/layout/{ => viewholders/layout}/vh_activity_chat_chatmsg.xml (100%)
 rename app/src/main/res/layout/{ => viewholders/layout}/vh_ann_activity_item.xml (100%)
 rename app/src/main/res/layout/{ => viewholders/layout}/vh_ann_card_fragment_home.xml (100%)
 rename app/src/main/res/layout/{ => viewholders/layout}/vh_announcement_slideshow_title.xml (100%)
 rename app/src/main/res/layout/{ => viewholders/layout}/vh_big_image.xml (100%)
 rename app/src/main/res/layout/{ => viewholders/layout}/vh_big_text.xml (100%)
 rename app/src/main/res/layout/{ => viewholders/layout}/vh_chat_document.xml (100%)
 rename app/src/main/res/layout/{ => viewholders/layout}/vh_chat_fragment_chats.xml (100%)
 rename app/src/main/res/layout/{ => viewholders/layout}/vh_developer.xml (100%)
 rename app/src/main/res/layout/{ => viewholders/layout}/vh_fg_forum_general.xml (100%)
 rename app/src/main/res/layout/{ => viewholders/layout}/vh_home_item.xml (100%)
 rename app/src/main/res/layout/{ => viewholders/layout}/vh_mac_desc.xml (100%)
 rename app/src/main/res/layout/{ => viewholders/layout}/vh_newchat.xml (100%)
 rename app/src/main/res/layout/{ => viewholders/layout}/vh_slideshow_fragment_home.xml (100%)
 rename app/src/main/res/layout/{ => viewholders/layout}/vh_text.xml (100%)

diff --git a/app/build.gradle b/app/build.gradle
index 498c86c..700406f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,14 +10,14 @@ ext {
     butterknifeVer = "8.8.1"
     checkstyleVer = '7.7'
     compileSdkVer = 26
-    constraintVer = "1.0.2"
+    constraintVer = "1.1.0"
     crashAnalytics = "2.9.1"
     dexMakerVer = "1.2"
     espContVer = "2.2.2"
     espCoreVer = "2.2.2"
     espIntVer = "2.2.2"
     espUIAVer = "2.1.2"
-    firebaseVer = "12.0.1"
+    firebaseVer = "15.0.0"
     flexboxVer = "0.3.1"
     glideVer = "4.0.0-RC0"
     playServicesVer = firebaseVer
@@ -30,7 +30,7 @@ ext {
     roboElecVer = "3.4.2"
     rxJavaVer = "1.3.0"
     rxJava2Ver = "2.1.6"
-    supportVer = "27.1.0"
+    supportVer = "27.1.1"
     targetSdkVer = 26
     verCode = 9
     verName = "1.7-beta"
@@ -106,6 +106,17 @@ android {
         targetCompatibility 1.8
         sourceCompatibility 1.8
     }
+    sourceSets {
+        main {
+            res.srcDirs = [
+                    'src/main/res/layout/activities',
+                    'src/main/res/layout/viewholders',
+                    'src/main/res/layout/fragments',
+                    'src/main/res/layout',
+                    'src/main/res'
+            ]
+        }
+    }
 }
 
 dependencies {
@@ -119,7 +130,6 @@ dependencies {
     implementation "com.android.support:cardview-v7:${supportVer}"
     implementation "com.android.support:support-compat:${supportVer}"
 
-    implementation 'com.android.support.constraint:constraint-layout:1.0.2'
     implementation "com.google.firebase:firebase-core:${firebaseVer}"
     implementation "com.google.firebase:firebase-database:${firebaseVer}"
     implementation "com.google.firebase:firebase-storage:${firebaseVer}"
@@ -182,7 +192,7 @@ dependencies {
 
 }
 
-def getDate() {
+static def getDate() {
     new Date().format('yyyyMMdd')
 }
 
diff --git a/app/src/main/java/com/macbitsgoa/ard/activities/AnnActivity.java b/app/src/main/java/com/macbitsgoa/ard/activities/AnnActivity.java
index 87cd577..e9e0e62 100644
--- a/app/src/main/java/com/macbitsgoa/ard/activities/AnnActivity.java
+++ b/app/src/main/java/com/macbitsgoa/ard/activities/AnnActivity.java
@@ -36,34 +36,28 @@ public class AnnActivity extends BaseActivity implements AdapterNotificationList
      * TAG for class.
      */
     public static final String TAG = AnnActivity.class.getSimpleName();
-
+    /**
+     * Static boolean variable to prevent notification service to show when activity is visible.
+     */
+    public static boolean inForeground = false;
     /**
      * Toolbar for this activity.
      */
     @BindView(R.id.toolbar_activity_ann)
     Toolbar toolbar;
-
     /**
      * Recyclerview for displaying announcements.
      */
     @BindView(R.id.rv_activity_ann)
     RecyclerView annRV;
-
     /**
      * TextView to display info message when recyclerview is empty.
      */
     @BindView(R.id.tv_activity_ann_empty)
     TextView emptyListTV;
-
     private DatabaseReference annRef = getRootReference().child(AHC.FDR_ANN);
-
     private ValueEventListener annRefVEL;
 
-    /**
-     * Static boolean variable to prevent notification service to show when activity is visible.
-     */
-    public static boolean inForeground = false;
-
     @Override
     protected void onCreate(final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
diff --git a/app/src/main/java/com/macbitsgoa/ard/activities/PostDetailsActivity.java b/app/src/main/java/com/macbitsgoa/ard/activities/PostDetailsActivity.java
index 22074d0..5a96e9b 100644
--- a/app/src/main/java/com/macbitsgoa/ard/activities/PostDetailsActivity.java
+++ b/app/src/main/java/com/macbitsgoa/ard/activities/PostDetailsActivity.java
@@ -5,20 +5,15 @@
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.Toolbar;
 import android.view.View;
-import android.widget.FrameLayout;
-import android.widget.Toast;
 
 import com.macbitsgoa.ard.R;
 import com.macbitsgoa.ard.adapters.PostDetailsAdapter;
-import com.macbitsgoa.ard.keys.AnnItemKeys;
 import com.macbitsgoa.ard.keys.HomeItemKeys;
-import com.macbitsgoa.ard.models.AnnItem;
 import com.macbitsgoa.ard.models.TypeItem;
 import com.macbitsgoa.ard.models.home.HomeItem;
 import com.macbitsgoa.ard.models.home.PhotoItem;
 import com.macbitsgoa.ard.models.home.TextItem;
 import com.macbitsgoa.ard.types.HomeType;
-import com.macbitsgoa.ard.types.PostType;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/main/java/com/macbitsgoa/ard/adapters/AboutMacAdapter.java b/app/src/main/java/com/macbitsgoa/ard/adapters/AboutMacAdapter.java
index ee85196..8df546f 100644
--- a/app/src/main/java/com/macbitsgoa/ard/adapters/AboutMacAdapter.java
+++ b/app/src/main/java/com/macbitsgoa/ard/adapters/AboutMacAdapter.java
@@ -34,7 +34,7 @@ public class AboutMacAdapter extends RecyclerView.Adapter<DeveloperViewHolder> i
 
     private Activity activity;
 
-    public AboutMacAdapter( BaseActivity activity) {
+    public AboutMacAdapter(BaseActivity activity) {
         this.activity = activity;
         DatabaseReference devRef = activity.getRootReference()
                 .child(AHC.FDR_ABOUT_MAC)
diff --git a/app/src/main/java/com/macbitsgoa/ard/adapters/AnnAdapter.java b/app/src/main/java/com/macbitsgoa/ard/adapters/AnnAdapter.java
index 90b89c4..81e191a 100644
--- a/app/src/main/java/com/macbitsgoa/ard/adapters/AnnAdapter.java
+++ b/app/src/main/java/com/macbitsgoa/ard/adapters/AnnAdapter.java
@@ -34,16 +34,14 @@ public class AnnAdapter extends BaseAdapter<AnnViewHolder>
      * TAG for class.
      */
     public static final String TAG = AnnAdapter.class.getSimpleName();
-
-    /**
-     * List to hold all annItems.
-     */
-    private RealmResults<AnnItem> annItems;
-
     /**
      * Listener object for item changes.
      */
     private final AdapterNotificationListener anl;
+    /**
+     * List to hold all annItems.
+     */
+    private RealmResults<AnnItem> annItems;
 
     /**
      * Constructor to set listener as well.
diff --git a/app/src/main/java/com/macbitsgoa/ard/adapters/ForumAdapter.java b/app/src/main/java/com/macbitsgoa/ard/adapters/ForumAdapter.java
index fc89a12..7b2a295 100644
--- a/app/src/main/java/com/macbitsgoa/ard/adapters/ForumAdapter.java
+++ b/app/src/main/java/com/macbitsgoa/ard/adapters/ForumAdapter.java
@@ -29,16 +29,13 @@
 public class ForumAdapter extends BaseAdapter<FaqViewHolder>
         implements OrderedRealmCollectionChangeListener<RealmResults<FaqItem>> {
 
+    private final String section;
+    private final AdapterNotificationListener anl;
     /**
      * Item list to use as data source.
      */
     private RealmResults<FaqItem> faqItems;
-
-    private final String section;
-
     private Sort defaultSort;
-
-    private final AdapterNotificationListener anl;
     /**
      * Maintains expanded text info.
      */
diff --git a/app/src/main/java/com/macbitsgoa/ard/adapters/HomeAdapter.java b/app/src/main/java/com/macbitsgoa/ard/adapters/HomeAdapter.java
index 9f1cbd1..da33334 100644
--- a/app/src/main/java/com/macbitsgoa/ard/adapters/HomeAdapter.java
+++ b/app/src/main/java/com/macbitsgoa/ard/adapters/HomeAdapter.java
@@ -39,21 +39,18 @@ public class HomeAdapter extends BaseAdapter<HomeItemViewHolder> implements
      * TAG for class.
      */
     public static final String TAG = HomeAdapter.class.getSimpleName();
-
-    /**
-     * List to hold all data.
-     */
-    private RealmResults<HomeItem> homeItems;
-
     /**
      * Context for use with glide.
      */
     private final Context context;
-
     /**
      * Notification listener.
      */
     private final AdapterNotificationListener anl;
+    /**
+     * List to hold all data.
+     */
+    private RealmResults<HomeItem> homeItems;
 
     /**
      * Constructor that populates recyclerView.
diff --git a/app/src/main/java/com/macbitsgoa/ard/adapters/PostDetailsAdapter.java b/app/src/main/java/com/macbitsgoa/ard/adapters/PostDetailsAdapter.java
index 2645a75..59c2da8 100644
--- a/app/src/main/java/com/macbitsgoa/ard/adapters/PostDetailsAdapter.java
+++ b/app/src/main/java/com/macbitsgoa/ard/adapters/PostDetailsAdapter.java
@@ -6,8 +6,6 @@
 import android.net.Uri;
 import android.support.annotation.NonNull;
 import android.support.v7.widget.RecyclerView;
-import android.text.Html;
-import android.text.method.LinkMovementMethod;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -15,14 +13,10 @@
 import android.widget.Toast;
 
 import com.macbitsgoa.ard.R;
-import com.macbitsgoa.ard.models.AnnItem;
 import com.macbitsgoa.ard.models.TypeItem;
 import com.macbitsgoa.ard.models.home.PhotoItem;
 import com.macbitsgoa.ard.models.home.TextItem;
 import com.macbitsgoa.ard.types.HomeType;
-import com.macbitsgoa.ard.types.PostType;
-import com.macbitsgoa.ard.utils.AHC;
-import com.macbitsgoa.ard.viewholders.AnnViewHolder;
 import com.macbitsgoa.ard.viewholders.ImageViewHolder;
 import com.macbitsgoa.ard.viewholders.TextViewHolder;
 
diff --git a/app/src/main/java/com/macbitsgoa/ard/fragments/DetailsFragment.java b/app/src/main/java/com/macbitsgoa/ard/fragments/DetailsFragment.java
index 14ac2ca..73ec11a 100644
--- a/app/src/main/java/com/macbitsgoa/ard/fragments/DetailsFragment.java
+++ b/app/src/main/java/com/macbitsgoa/ard/fragments/DetailsFragment.java
@@ -13,16 +13,13 @@
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions;
 import com.bumptech.glide.request.RequestOptions;
-import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.database.DataSnapshot;
 import com.google.firebase.database.DatabaseError;
 import com.google.firebase.database.DatabaseReference;
 import com.google.firebase.database.ValueEventListener;
 import com.macbitsgoa.ard.R;
 import com.macbitsgoa.ard.activities.AboutMacActivity;
-import com.macbitsgoa.ard.activities.AuthActivity;
 import com.macbitsgoa.ard.keys.UserItemKeys;
-import com.macbitsgoa.ard.services.ForumService;
 import com.macbitsgoa.ard.utils.AHC;
 import com.macbitsgoa.ard.utils.Browser;
 
@@ -30,7 +27,6 @@
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import butterknife.Unbinder;
-import io.realm.exceptions.RealmException;
 
 /**
  * A simple {@link Fragment} subclass.
diff --git a/app/src/main/java/com/macbitsgoa/ard/services/ForumService.java b/app/src/main/java/com/macbitsgoa/ard/services/ForumService.java
index 36c0305..cb280f1 100644
--- a/app/src/main/java/com/macbitsgoa/ard/services/ForumService.java
+++ b/app/src/main/java/com/macbitsgoa/ard/services/ForumService.java
@@ -28,13 +28,12 @@ public class ForumService extends BaseIntentService {
      * Tag for this class.
      */
     public static final String TAG = ForumService.class.getSimpleName();
+    DatabaseReference forumRef;
 
     public ForumService() {
         super(TAG);
     }
 
-    DatabaseReference forumRef;
-
     @Override
     protected void onHandleIntent(@Nullable final Intent intent) {
         super.onHandleIntent(intent);
diff --git a/app/src/main/java/com/macbitsgoa/ard/services/HomeService.java b/app/src/main/java/com/macbitsgoa/ard/services/HomeService.java
index 8b84dbf..23faa92 100644
--- a/app/src/main/java/com/macbitsgoa/ard/services/HomeService.java
+++ b/app/src/main/java/com/macbitsgoa/ard/services/HomeService.java
@@ -35,20 +35,95 @@ public class HomeService extends BaseJobService {
      * TAG for class.
      */
     public static final String TAG = HomeService.class.getSimpleName();
-
-    private boolean completedHome = false;
-    private boolean completedAnn = false;
-    private boolean completedSlideshow = false;
-
-    private JobParameters job;
-
     DatabaseReference homeRef;
     DatabaseReference annRef;
     DatabaseReference imageSlideshowRef;
-
     ValueEventListener homeRefVEL;
     ValueEventListener annRefVEL;
     ValueEventListener imageRefVEL;
+    private boolean completedHome = false;
+    private boolean completedAnn = false;
+    private boolean completedSlideshow = false;
+    private JobParameters job;
+
+    @SuppressWarnings("OverlyLongMethod")
+    private static void saveHomeSnapshotToRealm(@Nullable final DataSnapshot dataSnapshot) {
+        if (dataSnapshot == null) return;
+        final Realm database = Realm.getDefaultInstance();
+        for (DataSnapshot child : dataSnapshot.getChildren()) {
+            final String key = child.getKey();
+            final String author = child.child(HomeItemKeys.AUTHOR).getValue(String.class);
+            final Date date = child.child(HomeItemKeys.DATE).getValue(Date.class);
+            if (date == null || !child.hasChild(HomeItemKeys.SUB_SECTIONS)) continue;
+            database.executeTransaction(r -> {
+                HomeItem hi = r
+                        .where(HomeItem.class)
+                        .equalTo(HomeItemKeys.KEY, key)
+                        .findFirst();
+                if (hi == null) {
+                    hi = r.createObject(HomeItem.class, key);
+                    AHC.logd(TAG, "Creating new home item");
+                } else if (hi.getDate().getTime() == date.getTime()) {
+                    return;
+                }
+                hi.setAuthor(author);
+                hi.setDate(date);
+                final RealmList<PhotoItem> images = new RealmList<>();
+                final RealmList<TextItem> texts = new RealmList<>();
+                for (final DataSnapshot subSectionDS
+                        : child.child(HomeItemKeys.SUB_SECTIONS).getChildren()) {
+                    final int type = subSectionDS.child(HomeItemKeys.TYPE).getValue(Integer.class);
+                    final String data = subSectionDS.child(HomeItemKeys.DATA).getValue(String.class);
+                    switch (type) {
+                        case HomeType.FDR_PHOTO_ITEM:
+                            final PhotoItem pi = r.createObject(PhotoItem.class);
+                            pi.setPhotoUrl(data);
+                            pi.setPriority(subSectionDS.getKey());
+                            images.add(pi);
+                            break;
+                        case HomeType.FDR_TEXT_ITEM:
+                            final TextItem ti = r.createObject(TextItem.class);
+                            ti.setData(data);
+                            ti.setPriority(subSectionDS.getKey());
+                            texts.add(ti);
+                            break;
+                    }
+                }
+                hi.setImages(images);
+                hi.setTexts(texts);
+            });
+        }
+        database.close();
+    }
+
+    public static void saveAnnSnapshotToRealm(@Nullable final DataSnapshot dataSnapshot) {
+        if (dataSnapshot == null) return;
+        final Realm database = Realm.getDefaultInstance();
+        for (final DataSnapshot child : dataSnapshot.getChildren()) {
+            final String key = child.getKey();
+            final String data = child.child(AnnItemKeys.DATA).getValue(String.class);
+            final Date date = child.child(AnnItemKeys.DATE).getValue(Date.class);
+            final String author = child.child(AnnItemKeys.AUTHOR).getValue(String.class);
+            if (data == null || date == null || data.length() == 0) {
+                continue;
+            }
+            database.executeTransaction(r -> {
+                AnnItem annItem = r.where(AnnItem.class)
+                        .equalTo(AnnItemKeys.KEY, key)
+                        .findFirst();
+                if (annItem == null) {
+                    annItem = r.createObject(AnnItem.class, key);
+                } else {
+                    if (annItem.getDate().getTime() == date.getTime())
+                        return;
+                }
+                annItem.setAuthor(author);
+                annItem.setDate(date);
+                annItem.setData(data);
+            });
+        }
+        database.close();
+    }
 
     @Override
     public boolean onStartJob(JobParameters job) {
@@ -159,85 +234,6 @@ private void saveSlideshowSnapshotToRealm(@NonNull DataSnapshot dataSnapshot) {
         database.close();
     }
 
-    @SuppressWarnings("OverlyLongMethod")
-    private static void saveHomeSnapshotToRealm(@Nullable final DataSnapshot dataSnapshot) {
-        if (dataSnapshot == null) return;
-        final Realm database = Realm.getDefaultInstance();
-        for (DataSnapshot child : dataSnapshot.getChildren()) {
-            final String key = child.getKey();
-            final String author = child.child(HomeItemKeys.AUTHOR).getValue(String.class);
-            final Date date = child.child(HomeItemKeys.DATE).getValue(Date.class);
-            if (date == null || !child.hasChild(HomeItemKeys.SUB_SECTIONS)) continue;
-            database.executeTransaction(r -> {
-                HomeItem hi = r
-                        .where(HomeItem.class)
-                        .equalTo(HomeItemKeys.KEY, key)
-                        .findFirst();
-                if (hi == null) {
-                    hi = r.createObject(HomeItem.class, key);
-                    AHC.logd(TAG, "Creating new home item");
-                } else if (hi.getDate().getTime() == date.getTime()) {
-                    return;
-                }
-                hi.setAuthor(author);
-                hi.setDate(date);
-                final RealmList<PhotoItem> images = new RealmList<>();
-                final RealmList<TextItem> texts = new RealmList<>();
-                for (final DataSnapshot subSectionDS
-                        : child.child(HomeItemKeys.SUB_SECTIONS).getChildren()) {
-                    final int type = subSectionDS.child(HomeItemKeys.TYPE).getValue(Integer.class);
-                    final String data = subSectionDS.child(HomeItemKeys.DATA).getValue(String.class);
-                    switch (type) {
-                        case HomeType.FDR_PHOTO_ITEM:
-                            final PhotoItem pi = r.createObject(PhotoItem.class);
-                            pi.setPhotoUrl(data);
-                            pi.setPriority(subSectionDS.getKey());
-                            images.add(pi);
-                            break;
-                        case HomeType.FDR_TEXT_ITEM:
-                            final TextItem ti = r.createObject(TextItem.class);
-                            ti.setData(data);
-                            ti.setPriority(subSectionDS.getKey());
-                            texts.add(ti);
-                            break;
-                    }
-                }
-                hi.setImages(images);
-                hi.setTexts(texts);
-            });
-        }
-        database.close();
-    }
-
-    public static void saveAnnSnapshotToRealm(@Nullable final DataSnapshot dataSnapshot) {
-        if (dataSnapshot == null) return;
-        final Realm database = Realm.getDefaultInstance();
-        for (final DataSnapshot child : dataSnapshot.getChildren()) {
-            final String key = child.getKey();
-            final String data = child.child(AnnItemKeys.DATA).getValue(String.class);
-            final Date date = child.child(AnnItemKeys.DATE).getValue(Date.class);
-            final String author = child.child(AnnItemKeys.AUTHOR).getValue(String.class);
-            if (data == null || date == null || data.length() == 0) {
-                continue;
-            }
-            database.executeTransaction(r -> {
-                AnnItem annItem = r.where(AnnItem.class)
-                        .equalTo(AnnItemKeys.KEY, key)
-                        .findFirst();
-                if (annItem == null) {
-                    annItem = r.createObject(AnnItem.class, key);
-                } else {
-                    if (annItem.getDate().getTime() == date.getTime())
-                        return;
-                }
-                annItem.setAuthor(author);
-                annItem.setDate(date);
-                annItem.setData(data);
-            });
-        }
-        database.close();
-    }
-
     private void checkJobStatus() {
         AHC.logd(TAG, "Status of jobs is " + completedAnn + " and " + completedHome);
         if (completedAnn && completedHome && completedSlideshow) {
diff --git a/app/src/main/java/com/macbitsgoa/ard/services/MaintenanceService.java b/app/src/main/java/com/macbitsgoa/ard/services/MaintenanceService.java
index 9f8bac9..84c4ae9 100644
--- a/app/src/main/java/com/macbitsgoa/ard/services/MaintenanceService.java
+++ b/app/src/main/java/com/macbitsgoa/ard/services/MaintenanceService.java
@@ -28,15 +28,13 @@ public class MaintenanceService extends BaseJobService {
      * Tag for this class.
      */
     public static final String TAG = MaintenanceService.class.getSimpleName();
-
+    DatabaseReference deleteRef;
+    ValueEventListener deleteRefVEL;
     /**
      * Current job parameters.
      */
     private JobParameters jobParameters;
 
-    DatabaseReference deleteRef;
-    ValueEventListener deleteRefVEL;
-
     @Override
     public boolean onStartJob(final JobParameters job) {
         jobParameters = job;
diff --git a/app/src/main/java/com/macbitsgoa/ard/utils/CenterCropDrawable.java b/app/src/main/java/com/macbitsgoa/ard/utils/CenterCropDrawable.java
index e074269..3e1cbeb 100644
--- a/app/src/main/java/com/macbitsgoa/ard/utils/CenterCropDrawable.java
+++ b/app/src/main/java/com/macbitsgoa/ard/utils/CenterCropDrawable.java
@@ -15,7 +15,7 @@
 
 /**
  * Drawable decorator which draws the target drawable similarly to an ImageView with scaleType=centerCrop.
- *
+ * <p>
  * <p>Example usage:
  * final Drawable bg = getResources().getDrawable(R.drawable.screen);
  * getWindow().setBackgroundDrawable(new CenterCropDrawable(bg));
diff --git a/app/src/main/java/com/macbitsgoa/ard/viewholders/FaqViewHolder.java b/app/src/main/java/com/macbitsgoa/ard/viewholders/FaqViewHolder.java
index a6c2f6c..19dac1a 100644
--- a/app/src/main/java/com/macbitsgoa/ard/viewholders/FaqViewHolder.java
+++ b/app/src/main/java/com/macbitsgoa/ard/viewholders/FaqViewHolder.java
@@ -27,23 +27,20 @@
  */
 public class FaqViewHolder extends RecyclerView.ViewHolder {
 
+    private final SparseBooleanArray sba;
     /**
      * TextView to display question data.
      */
     @BindView(R.id.tv_vh_fg_forum_general_question)
     TextView questionTV;
-
     /**
      * Expandable text view to display answer data.
      */
     @BindView(R.id.tv_vh_fg_forum_general_answer)
     TextView answerTV;
-
     @BindView(R.id.tv_vh_fg_forum_general_sub_section)
     TextView subSectionTV;
 
-    private final SparseBooleanArray sba;
-
     /**
      * Default constructor.
      *
diff --git a/app/src/main/java/com/macbitsgoa/ard/viewholders/HomeItemViewHolder.java b/app/src/main/java/com/macbitsgoa/ard/viewholders/HomeItemViewHolder.java
index 48ba4e5..2eca317 100644
--- a/app/src/main/java/com/macbitsgoa/ard/viewholders/HomeItemViewHolder.java
+++ b/app/src/main/java/com/macbitsgoa/ard/viewholders/HomeItemViewHolder.java
@@ -28,37 +28,30 @@
  * @author Vikramaditya Kukreja
  */
 public class HomeItemViewHolder extends RecyclerView.ViewHolder {
+    private final Context context;
     @BindView(R.id.imgView_home_item)
     ImageView imageView;
-
     @BindView(R.id.tv_vh_home_item_1)
     TextView textView1;
-
     @BindView(R.id.tv_vh_home_item_2)
     TextView textView2;
-
     /**
      * Status bar that contains useful info. Use this view for visibility work only.
      */
     @BindView(R.id.ll_vh_home_status)
     LinearLayout statusBar;
-
     /**
      * Textview that handles # of images in the news.
      */
     @BindView(R.id.tv_vh_home_item_image_count)
     TextView imageCount;
-
     /**
      * Textview that handles # of comments.
      */
     @BindView(R.id.tv_vh_home_item_comment_count)
     TextView commentCount;
-
     private HomeItem hi;
 
-    private final Context context;
-
     /**
      * Constructor taking item view as param
      *
diff --git a/app/src/main/res/layout/activity_about_mac.xml b/app/src/main/res/layout/activities/layout/activity_about_mac.xml
similarity index 100%
rename from app/src/main/res/layout/activity_about_mac.xml
rename to app/src/main/res/layout/activities/layout/activity_about_mac.xml
diff --git a/app/src/main/res/layout/activity_ann.xml b/app/src/main/res/layout/activities/layout/activity_ann.xml
similarity index 100%
rename from app/src/main/res/layout/activity_ann.xml
rename to app/src/main/res/layout/activities/layout/activity_ann.xml
diff --git a/app/src/main/res/layout/activity_auth.xml b/app/src/main/res/layout/activities/layout/activity_auth.xml
similarity index 100%
rename from app/src/main/res/layout/activity_auth.xml
rename to app/src/main/res/layout/activities/layout/activity_auth.xml
diff --git a/app/src/main/res/layout/activity_chat.xml b/app/src/main/res/layout/activities/layout/activity_chat.xml
similarity index 100%
rename from app/src/main/res/layout/activity_chat.xml
rename to app/src/main/res/layout/activities/layout/activity_chat.xml
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activities/layout/activity_main.xml
similarity index 100%
rename from app/src/main/res/layout/activity_main.xml
rename to app/src/main/res/layout/activities/layout/activity_main.xml
diff --git a/app/src/main/res/layout/activity_new_chat.xml b/app/src/main/res/layout/activities/layout/activity_new_chat.xml
similarity index 100%
rename from app/src/main/res/layout/activity_new_chat.xml
rename to app/src/main/res/layout/activities/layout/activity_new_chat.xml
diff --git a/app/src/main/res/layout/activity_post_details.xml b/app/src/main/res/layout/activities/layout/activity_post_details.xml
similarity index 100%
rename from app/src/main/res/layout/activity_post_details.xml
rename to app/src/main/res/layout/activities/layout/activity_post_details.xml
diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/activities/layout/app_bar_main.xml
similarity index 100%
rename from app/src/main/res/layout/app_bar_main.xml
rename to app/src/main/res/layout/activities/layout/app_bar_main.xml
diff --git a/app/src/main/res/layout/fragment_chat.xml b/app/src/main/res/layout/fragments/layout/fragment_chat.xml
similarity index 100%
rename from app/src/main/res/layout/fragment_chat.xml
rename to app/src/main/res/layout/fragments/layout/fragment_chat.xml
diff --git a/app/src/main/res/layout/fragment_detail.xml b/app/src/main/res/layout/fragments/layout/fragment_detail.xml
similarity index 100%
rename from app/src/main/res/layout/fragment_detail.xml
rename to app/src/main/res/layout/fragments/layout/fragment_detail.xml
diff --git a/app/src/main/res/layout/fragment_forum.xml b/app/src/main/res/layout/fragments/layout/fragment_forum.xml
similarity index 100%
rename from app/src/main/res/layout/fragment_forum.xml
rename to app/src/main/res/layout/fragments/layout/fragment_forum.xml
diff --git a/app/src/main/res/layout/fragment_forum_content.xml b/app/src/main/res/layout/fragments/layout/fragment_forum_content.xml
similarity index 100%
rename from app/src/main/res/layout/fragment_forum_content.xml
rename to app/src/main/res/layout/fragments/layout/fragment_forum_content.xml
diff --git a/app/src/main/res/layout/fragment_forum_general.xml b/app/src/main/res/layout/fragments/layout/fragment_forum_general.xml
similarity index 100%
rename from app/src/main/res/layout/fragment_forum_general.xml
rename to app/src/main/res/layout/fragments/layout/fragment_forum_general.xml
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragments/layout/fragment_home.xml
similarity index 100%
rename from app/src/main/res/layout/fragment_home.xml
rename to app/src/main/res/layout/fragments/layout/fragment_home.xml
diff --git a/app/src/main/res/layout/vh_activity_chat_chatmsg.xml b/app/src/main/res/layout/viewholders/layout/vh_activity_chat_chatmsg.xml
similarity index 100%
rename from app/src/main/res/layout/vh_activity_chat_chatmsg.xml
rename to app/src/main/res/layout/viewholders/layout/vh_activity_chat_chatmsg.xml
diff --git a/app/src/main/res/layout/vh_ann_activity_item.xml b/app/src/main/res/layout/viewholders/layout/vh_ann_activity_item.xml
similarity index 100%
rename from app/src/main/res/layout/vh_ann_activity_item.xml
rename to app/src/main/res/layout/viewholders/layout/vh_ann_activity_item.xml
diff --git a/app/src/main/res/layout/vh_ann_card_fragment_home.xml b/app/src/main/res/layout/viewholders/layout/vh_ann_card_fragment_home.xml
similarity index 100%
rename from app/src/main/res/layout/vh_ann_card_fragment_home.xml
rename to app/src/main/res/layout/viewholders/layout/vh_ann_card_fragment_home.xml
diff --git a/app/src/main/res/layout/vh_announcement_slideshow_title.xml b/app/src/main/res/layout/viewholders/layout/vh_announcement_slideshow_title.xml
similarity index 100%
rename from app/src/main/res/layout/vh_announcement_slideshow_title.xml
rename to app/src/main/res/layout/viewholders/layout/vh_announcement_slideshow_title.xml
diff --git a/app/src/main/res/layout/vh_big_image.xml b/app/src/main/res/layout/viewholders/layout/vh_big_image.xml
similarity index 100%
rename from app/src/main/res/layout/vh_big_image.xml
rename to app/src/main/res/layout/viewholders/layout/vh_big_image.xml
diff --git a/app/src/main/res/layout/vh_big_text.xml b/app/src/main/res/layout/viewholders/layout/vh_big_text.xml
similarity index 100%
rename from app/src/main/res/layout/vh_big_text.xml
rename to app/src/main/res/layout/viewholders/layout/vh_big_text.xml
diff --git a/app/src/main/res/layout/vh_chat_document.xml b/app/src/main/res/layout/viewholders/layout/vh_chat_document.xml
similarity index 100%
rename from app/src/main/res/layout/vh_chat_document.xml
rename to app/src/main/res/layout/viewholders/layout/vh_chat_document.xml
diff --git a/app/src/main/res/layout/vh_chat_fragment_chats.xml b/app/src/main/res/layout/viewholders/layout/vh_chat_fragment_chats.xml
similarity index 100%
rename from app/src/main/res/layout/vh_chat_fragment_chats.xml
rename to app/src/main/res/layout/viewholders/layout/vh_chat_fragment_chats.xml
diff --git a/app/src/main/res/layout/vh_developer.xml b/app/src/main/res/layout/viewholders/layout/vh_developer.xml
similarity index 100%
rename from app/src/main/res/layout/vh_developer.xml
rename to app/src/main/res/layout/viewholders/layout/vh_developer.xml
diff --git a/app/src/main/res/layout/vh_fg_forum_general.xml b/app/src/main/res/layout/viewholders/layout/vh_fg_forum_general.xml
similarity index 100%
rename from app/src/main/res/layout/vh_fg_forum_general.xml
rename to app/src/main/res/layout/viewholders/layout/vh_fg_forum_general.xml
diff --git a/app/src/main/res/layout/vh_home_item.xml b/app/src/main/res/layout/viewholders/layout/vh_home_item.xml
similarity index 100%
rename from app/src/main/res/layout/vh_home_item.xml
rename to app/src/main/res/layout/viewholders/layout/vh_home_item.xml
diff --git a/app/src/main/res/layout/vh_mac_desc.xml b/app/src/main/res/layout/viewholders/layout/vh_mac_desc.xml
similarity index 100%
rename from app/src/main/res/layout/vh_mac_desc.xml
rename to app/src/main/res/layout/viewholders/layout/vh_mac_desc.xml
diff --git a/app/src/main/res/layout/vh_newchat.xml b/app/src/main/res/layout/viewholders/layout/vh_newchat.xml
similarity index 100%
rename from app/src/main/res/layout/vh_newchat.xml
rename to app/src/main/res/layout/viewholders/layout/vh_newchat.xml
diff --git a/app/src/main/res/layout/vh_slideshow_fragment_home.xml b/app/src/main/res/layout/viewholders/layout/vh_slideshow_fragment_home.xml
similarity index 100%
rename from app/src/main/res/layout/vh_slideshow_fragment_home.xml
rename to app/src/main/res/layout/viewholders/layout/vh_slideshow_fragment_home.xml
diff --git a/app/src/main/res/layout/vh_text.xml b/app/src/main/res/layout/viewholders/layout/vh_text.xml
similarity index 100%
rename from app/src/main/res/layout/vh_text.xml
rename to app/src/main/res/layout/viewholders/layout/vh_text.xml
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 86cef61..130c008 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -5,24 +5,278 @@
     <color name="colorPrimaryDark">@color/blue_700</color>
     <color name="colorAccent">@color/orange_A400</color>
 
+    <color name="red_50">#FFEBEE</color>
+    <color name="red_100">#FFCDD2</color>
+    <color name="red_200">#EF9A9A</color>
+    <color name="red_300">#E57373</color>
+    <color name="red_400">#EF5350</color>
+    <color name="red_500">#F44336</color>
+    <color name="red_600">#E53935</color>
     <color name="red_700">#D32F2F</color>
+    <color name="red_800">#C62828</color>
+    <color name="red_900">#B71C1C</color>
+    <color name="red_A100">#FF8A80</color>
+    <color name="red_A200">#FF5252</color>
+    <color name="red_A400">#FF1744</color>
+    <color name="red_A700">#D50000</color>
+
+    <color name="deep_purple_50">#EDE7F6</color>
+    <color name="deep_purple_100">#D1C4E9</color>
+    <color name="deep_purple_200">#B39DDB</color>
+    <color name="deep_purple_300">#9575CD</color>
+    <color name="deep_purple_400">#7E57C2</color>
+    <color name="deep_purple_500">#673AB7</color>
+    <color name="deep_purple_600">#5E35B1</color>
+    <color name="deep_purple_700">#512DA8</color>
+    <color name="deep_purple_800">#4527A0</color>
+    <color name="deep_purple_900">#311B92</color>
+    <color name="deep_purple_A100">#B388FF</color>
+    <color name="deep_purple_A200">#7C4DFF</color>
+    <color name="deep_purple_A400">#651FFF</color>
+    <color name="deep_purple_A700">#6200EA</color>
+
+    <color name="light_blue_50">#E1F5FE</color>
+    <color name="light_blue_100">#B3E5FC</color>
+    <color name="light_blue_200">#81D4FA</color>
+    <color name="light_blue_300">#4FC3F7</color>
+    <color name="light_blue_400">#29B6F6</color>
+    <color name="light_blue_500">#03A9F4</color>
+    <color name="light_blue_600">#039BE5</color>
+    <color name="light_blue_700">#0288D1</color>
+    <color name="light_blue_800">#0277BD</color>
+    <color name="light_blue_900">#01579B</color>
+    <color name="light_blue_A100">#80D8FF</color>
+    <color name="light_blue_A200">#40C4FF</color>
+    <color name="light_blue_A400">#00B0FF</color>
+    <color name="light_blue_A700">#0091EA</color>
 
     <color name="green_50">#E8F5E9</color>
+    <color name="green_100">#C8E6C9</color>
+    <color name="green_200">#A5D6A7</color>
+    <color name="green_300">#81C784</color>
+    <color name="green_400">#66BB6A</color>
+    <color name="green_500">#4CAF50</color>
+    <color name="green_600">#43A047</color>
     <color name="green_700">#388E3C</color>
+    <color name="green_800">#2E7D32</color>
     <color name="green_900">#1B5E20</color>
+    <color name="green_A100">#B9F6CA</color>
+    <color name="green_A200">#69F0AE</color>
+    <color name="green_A400">#00E676</color>
+    <color name="green_A700">#00C853</color>
+
+    <color name="yellow_50">#FFFDE7</color>
+    <color name="yellow_100">#FFF9C4</color>
+    <color name="yellow_200">#FFF59D</color>
+    <color name="yellow_300">#FFF176</color>
+    <color name="yellow_400">#FFEE58</color>
+    <color name="yellow_500">#FFEB3B</color>
+    <color name="yellow_600">#FDD835</color>
+    <color name="yellow_700">#FBC02D</color>
+    <color name="yellow_800">#F9A825</color>
+    <color name="yellow_900">#F57F17</color>
+    <color name="yellow_A100">#FFFF8D</color>
+    <color name="yellow_A200">#FFFF00</color>
+    <color name="yellow_A400">#FFEA00</color>
+    <color name="yellow_A700">#FFD600</color>
+
+    <color name="deep_orange_50">#FBE9E7</color>
+    <color name="deep_orange_100">#FFCCBC</color>
+    <color name="deep_orange_200">#FFAB91</color>
+    <color name="deep_orange_300">#FF8A65</color>
+    <color name="deep_orange_400">#FF7043</color>
+    <color name="deep_orange_500">#FF5722</color>
+    <color name="deep_orange_600">#F4511E</color>
+    <color name="deep_orange_700">#E64A19</color>
+    <color name="deep_orange_800">#D84315</color>
+    <color name="deep_orange_900">#BF360C</color>
+    <color name="deep_orange_A100">#FF9E80</color>
+    <color name="deep_orange_A200">#FF6E40</color>
+    <color name="deep_orange_A400">#FF3D00</color>
+    <color name="deep_orange_A700">#DD2C00</color>
+
+    <color name="blue_grey_50">#ECEFF1</color>
+    <color name="blue_grey_100">#CFD8DC</color>
+    <color name="blue_grey_200">#B0BEC5</color>
+    <color name="blue_grey_300">#90A4AE</color>
+    <color name="blue_grey_400">#78909C</color>
+    <color name="blue_grey_500">#607D8B</color>
+    <color name="blue_grey_600">#546E7A</color>
+    <color name="blue_grey_700">#455A64</color>
+    <color name="blue_grey_800">#37474F</color>
+    <color name="blue_grey_900">#263238</color>
+
+    <color name="pink_50">#FCE4EC</color>
+    <color name="pink_100">#F8BBD0</color>
+    <color name="pink_200">#F48FB1</color>
+    <color name="pink_300">#F06292</color>
+    <color name="pink_400">#EC407A</color>
+    <color name="pink_500">#E91E63</color>
+    <color name="pink_600">#D81B60</color>
+    <color name="pink_700">#C2185B</color>
+    <color name="pink_800">#AD1457</color>
+    <color name="pink_900">#880E4F</color>
+    <color name="pink_A100">#FF80AB</color>
+    <color name="pink_A200">#FF4081</color>
+    <color name="pink_A400">#F50057</color>
+    <color name="pink_A700">#C51162</color>
+
+    <color name="indigo_50">#E8EAF6</color>
+    <color name="indigo_100">#C5CAE9</color>
+    <color name="indigo_200">#9FA8DA</color>
+    <color name="indigo_300">#7986CB</color>
+    <color name="indigo_400">#5C6BC0</color>
+    <color name="indigo_500">#3F51B5</color>
+    <color name="indigo_600">#3949AB</color>
+    <color name="indigo_700">#303F9F</color>
+    <color name="indigo_800">#283593</color>
+    <color name="indigo_900">#1A237E</color>
+    <color name="indigo_A100">#8C9EFF</color>
+    <color name="indigo_A200">#536DFE</color>
+    <color name="indigo_A400">#3D5AFE</color>
+    <color name="indigo_A700">#304FFE</color>
 
+    <color name="cyan_50">#E0F7FA</color>
+    <color name="cyan_100">#B2EBF2</color>
+    <color name="cyan_200">#80DEEA</color>
+    <color name="cyan_300">#4DD0E1</color>
+    <color name="cyan_400">#26C6DA</color>
+    <color name="cyan_500">#00BCD4</color>
+    <color name="cyan_600">#00ACC1</color>
+    <color name="cyan_700">#0097A7</color>
+    <color name="cyan_800">#00838F</color>
+    <color name="cyan_900">#006064</color>
+    <color name="cyan_A100">#84FFFF</color>
+    <color name="cyan_A200">#18FFFF</color>
+    <color name="cyan_A400">#00E5FF</color>
+    <color name="cyan_A700">#00B8D4</color>
+
+    <color name="light_green_50">#F1F8E9</color>
+    <color name="light_green_100">#DCEDC8</color>
+    <color name="light_green_200">#C5E1A5</color>
+    <color name="light_green_300">#AED581</color>
+    <color name="light_green_400">#9CCC65</color>
+    <color name="light_green_500">#8BC34A</color>
+    <color name="light_green_600">#7CB342</color>
+    <color name="light_green_700">#689F38</color>
+    <color name="light_green_800">#558B2F</color>
+    <color name="light_green_900">#33691E</color>
+    <color name="light_green_A100">#CCFF90</color>
+    <color name="light_green_A200">#B2FF59</color>
+    <color name="light_green_A400">#76FF03</color>
+    <color name="light_green_A700">#64DD17</color>
+
+    <color name="amber_50">#FFF8E1</color>
+    <color name="amber_100">#FFECB3</color>
+    <color name="amber_200">#FFE082</color>
+    <color name="amber_300">#FFD54F</color>
+    <color name="amber_400">#FFCA28</color>
+    <color name="amber_500">#FFC107</color>
+    <color name="amber_600">#FFB300</color>
+    <color name="amber_700">#FFA000</color>
+    <color name="amber_800">#FF8F00</color>
+    <color name="amber_900">#FF6F00</color>
+    <color name="amber_A100">#FFE57F</color>
+    <color name="amber_A200">#FFD740</color>
+    <color name="amber_A400">#FFC400</color>
+    <color name="amber_A700">#FFAB00</color>
+
+    <color name="brown_50">#EFEBE9</color>
+    <color name="brown_100">#D7CCC8</color>
+    <color name="brown_200">#BCAAA4</color>
+    <color name="brown_300">#A1887F</color>
+    <color name="brown_400">#8D6E63</color>
+    <color name="brown_500">#795548</color>
+    <color name="brown_600">#6D4C41</color>
+    <color name="brown_700">#5D4037</color>
+    <color name="brown_800">#4E342E</color>
+    <color name="brown_900">#3E2723</color>
+
+    <color name="purple_50">#F3E5F5</color>
+    <color name="purple_100">#E1BEE7</color>
+    <color name="purple_200">#CE93D8</color>
+    <color name="purple_300">#BA68C8</color>
+    <color name="purple_400">#AB47BC</color>
+    <color name="purple_500">#9C27B0</color>
+    <color name="purple_600">#8E24AA</color>
+    <color name="purple_700">#7B1FA2</color>
+    <color name="purple_800">#6A1B9A</color>
+    <color name="purple_900">#4A148C</color>
+    <color name="purple_A100">#EA80FC</color>
+    <color name="purple_A200">#E040FB</color>
+    <color name="purple_A400">#D500F9</color>
+    <color name="purple_A700">#AA00FF</color>
+
+    <color name="blue_50">#E3F2FD</color>
+    <color name="blue_100">#BBDEFB</color>
+    <color name="blue_200">#90CAF9</color>
     <color name="blue_300">#64B5F6</color>
+    <color name="blue_400">#42A5F5</color>
     <color name="blue_500">#2196F3</color>
+    <color name="blue_600">#1E88E5</color>
     <color name="blue_700">#1976D2</color>
+    <color name="blue_800">#1565C0</color>
     <color name="blue_900">#0D47A1</color>
+    <color name="blue_A100">#82B1FF</color>
+    <color name="blue_A200">#448AFF</color>
+    <color name="blue_A400">#2979FF</color>
+    <color name="blue_A700">#2962FF</color>
+
+    <color name="teal_50">#E0F2F1</color>
+    <color name="teal_100">#B2DFDB</color>
+    <color name="teal_200">#80CBC4</color>
+    <color name="teal_300">#4DB6AC</color>
+    <color name="teal_400">#26A69A</color>
+    <color name="teal_500">#009688</color>
+    <color name="teal_600">#00897B</color>
+    <color name="teal_700">#00796B</color>
+    <color name="teal_800">#00695C</color>
+    <color name="teal_900">#004D40</color>
+    <color name="teal_A100">#A7FFEB</color>
+    <color name="teal_A200">#64FFDA</color>
+    <color name="teal_A400">#1DE9B6</color>
+    <color name="teal_A700">#00BFA5</color>
+
+    <color name="lime_50">#F9FBE7</color>
+    <color name="lime_100">#F0F4C3</color>
+    <color name="lime_200">#E6EE9C</color>
+    <color name="lime_300">#DCE775</color>
+    <color name="lime_400">#D4E157</color>
+    <color name="lime_500">#CDDC39</color>
+    <color name="lime_600">#C0CA33</color>
+    <color name="lime_700">#AFB42B</color>
+    <color name="lime_800">#9E9D24</color>
+    <color name="lime_900">#827717</color>
+    <color name="lime_A100">#F4FF81</color>
+    <color name="lime_A200">#EEFF41</color>
+    <color name="lime_A400">#C6FF00</color>
+    <color name="lime_A700">#AEEA00</color>
 
+    <color name="orange_50">#FFF3E0</color>
+    <color name="orange_100">#FFE0B2</color>
+    <color name="orange_200">#FFCC80</color>
+    <color name="orange_300">#FFB74D</color>
+    <color name="orange_400">#FFA726</color>
+    <color name="orange_500">#FF9800</color>
+    <color name="orange_600">#FB8C00</color>
+    <color name="orange_700">#F57C00</color>
     <color name="orange_800">#EF6C00</color>
+    <color name="orange_900">#E65100</color>
+    <color name="orange_A100">#FFD180</color>
+    <color name="orange_A200">#FFAB40</color>
     <color name="orange_A400">#FF9100</color>
+    <color name="orange_A700">#FF6D00</color>
 
     <color name="grey_50">#FAFAFA</color>
     <color name="grey_100">#F5F5F5</color>
+    <color name="grey_200">#EEEEEE</color>
+    <color name="grey_300">#E0E0E0</color>
+    <color name="grey_400">#BDBDBD</color>
     <color name="grey_500">#9E9E9E</color>
+    <color name="grey_600">#757575</color>
     <color name="grey_700">#616161</color>
+    <color name="grey_800">#424242</color>
+    <color name="grey_900">#212121</color>
 
     <color name="black">#000000</color>
     <color name="white">#FFFFFF</color>
@@ -30,8 +284,16 @@
     <color name="base">#FFEEEEEE</color>
 
     <!--Light Background Dark Text-->
+    <color name="light_bg_dark_primary_text">#DE000000</color>
+    <color name="light_bg_dark_secondary_text">#8A000000</color>
+    <color name="light_bg_dark_disabled_text">#61000000</color>
+    <color name="light_bg_dark_hint_text">#61000000</color>
 
     <!--Dark Background Light Text-->
+    <color name="dark_bg_light_primary_text">#FFFFFFFF</color>
+    <color name="dark_bg_light_secondary_text">#B3FFFFFF</color>
+    <color name="dark_bg_light_disabled_text">#80FFFFFF</color>
+    <color name="dark_bg_light_hint_text">#80FFFFFF</color>
 
     <!--Google sign in button background-->
     <color name="bg_google_sign_in">#CDFFFFFF</color>