Issue #159: Segregate layout files into folders

Devsoc-BPGC · Apr 19, 2018 · 6f4e311 · 6f4e311
1 parent 8a6d012
commit 6f4e311
Show file tree

Hide file tree

Showing 45 changed files with 381 additions and 155 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -6,23 +6,17 @@
 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;
 import android.view.ViewGroup;
 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
@@ -13,24 +13,20 @@
 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;
 
 import butterknife.BindView;
 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
@@ -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);