chore: All hail the great cleanup

Author: feildmaster

app/src/main/java/tech/akpmakes/android/taskkeeper/MainActivity.java

@@ -1,6 +1,5 @@
 package tech.akpmakes.android.taskkeeper;
 
-import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
@@ -14,8 +13,6 @@
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
 
 import com.crashlytics.android.Crashlytics;
 import com.firebase.ui.database.FirebaseRecyclerAdapter;
@@ -31,11 +28,12 @@
 import com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings;
 
 import io.fabric.sdk.android.Fabric;
+import tech.akpmakes.android.taskkeeper.firebase.WhenAdapter;
 import tech.akpmakes.android.taskkeeper.models.WhenEvent;
 
 public class MainActivity extends AppCompatActivity implements FirebaseAuth.AuthStateListener {
+    public static final int WHEN_EVENT_REQUEST = 6900;
     private static final String TAG = "MainActivity";
-    private static final int WHEN_EVENT_REQUEST = 6900;
     private FirebaseAuth mAuth;
     private FirebaseRemoteConfig mRemoteConfig;
     private Query mDBQuery;
@@ -145,39 +143,9 @@ private void updateUI(FirebaseUser user) {
             return; // TODO: display an error
         }
 
-        final Activity activity = this;
         mDBQuery = FirebaseDatabase.getInstance().getReference("events/" + user.getUid()).orderByChild("when");
         mDBQuery.keepSynced(true);
-        mAdapter = new FirebaseRecyclerAdapter<WhenEvent, WhenEventViewHolder>(
-                WhenEvent.class,
-                R.layout.item_whenevent,
-                WhenEventViewHolder.class,
-                mDBQuery) {
-            @Override
-            public void populateViewHolder(WhenEventViewHolder holder, WhenEvent evt, int position) {
-                holder.setName(evt.getName());
-                holder.setWhen(evt.getWhen());
-            }
-            @Override
-            public WhenEventViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-                WhenEventViewHolder viewHolder = super.onCreateViewHolder(parent, viewType);
-                viewHolder.setOnClickListener(new WhenEventViewHolder.ClickListener() {
-                    @Override
-                    public void onItemClick(View view, int position) {}
-
-                    @Override
-                    public void onItemLongClick(View view, int position) {
-                        Intent i = new Intent(activity, TaskViewActivity.class);
-                        WhenEvent evt = (WhenEvent) mAdapter.getItem(position);
-                        i.putExtra("whenName", evt.getName());
-                        i.putExtra("whenTime", evt.getWhen());
-                        i.putExtra("whenKey", mAdapter.getRef(position).getKey());
-                        startActivityForResult(i, WHEN_EVENT_REQUEST);
-                    }
-                });
-                return viewHolder;
-            }
-        };
+        mAdapter = new WhenAdapter(this, mDBQuery);
         mRecyclerView.setAdapter(mAdapter);
     }
 
@@ -206,10 +174,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (requestCode == WHEN_EVENT_REQUEST) {
             if (resultCode == RESULT_OK) {
-                WhenEvent evt = new WhenEvent(
-                        data.getStringExtra("whenName"),
-                        data.getLongExtra("whenTime", 0)
-                );
+                WhenEvent evt = new WhenEvent(data);
 
                 if(evt.getName().length() == 0) {
                     Snackbar.make(findViewById(android.R.id.content), "Your task could not be saved. Task name is required.",

app/src/main/java/tech/akpmakes/android/taskkeeper/SwipeHandler.java

@@ -1,7 +1,6 @@
 package tech.akpmakes.android.taskkeeper;
 
 import android.graphics.Canvas;
-import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Handler;
@@ -15,6 +14,7 @@
 
 import java.util.Date;
 
+import tech.akpmakes.android.taskkeeper.firebase.WhenEventViewHolder;
 import tech.akpmakes.android.taskkeeper.models.WhenEvent;
 
 class SwipeHandler extends ItemTouchHelper.SimpleCallback {

app/src/main/java/tech/akpmakes/android/taskkeeper/firebase/WhenAdapter.java

@@ -0,0 +1,49 @@
+package tech.akpmakes.android.taskkeeper.firebase;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.firebase.ui.database.FirebaseRecyclerAdapter;
+import com.google.firebase.database.Query;
+
+import tech.akpmakes.android.taskkeeper.MainActivity;
+import tech.akpmakes.android.taskkeeper.R;
+import tech.akpmakes.android.taskkeeper.TaskViewActivity;
+import tech.akpmakes.android.taskkeeper.models.WhenEvent;
+
+public final class WhenAdapter extends FirebaseRecyclerAdapter<WhenEvent, WhenEventViewHolder> {
+    private final Activity activity;
+
+    public WhenAdapter(Activity activity, Query query) {
+        super(WhenEvent.class, R.layout.item_whenevent, WhenEventViewHolder.class, query);
+        this.activity = activity;
+    }
+
+    @Override
+    protected void populateViewHolder(WhenEventViewHolder holder, WhenEvent evt, int pos) {
+        holder.setName(evt.getName());
+        holder.setWhen(evt.getWhen());
+    }
+
+    @Override
+    public WhenEventViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        WhenEventViewHolder viewHolder = super.onCreateViewHolder(parent, viewType);
+        viewHolder.setOnClickListener(new WhenEventViewHolder.ClickListener() {
+            @Override
+            public void onItemClick(View view, int position) {}
+
+            @Override
+            public void onItemLongClick(View view, int position) {
+                Intent i = new Intent(activity, TaskViewActivity.class);
+                WhenEvent evt = WhenAdapter.this.getItem(position);
+                i.putExtra("whenName", evt.getName());
+                i.putExtra("whenTime", evt.getWhen());
+                i.putExtra("whenKey", WhenAdapter.this.getRef(position).getKey());
+                activity.startActivityForResult(i, MainActivity.WHEN_EVENT_REQUEST);
+            }
+        });
+        return viewHolder;
+    }
+}

…roid/taskkeeper/WhenEventViewHolder.java …keeper/firebase/WhenEventViewHolder.javaapp/src/main/java/tech/akpmakes/android/taskkeeper/WhenEventViewHolder.java renamed to app/src/main/java/tech/akpmakes/android/taskkeeper/firebase/WhenEventViewHolder.java app/src/main/java/tech/akpmakes/android/taskkeeper/WhenEventViewHolder.java renamed to app/src/main/java/tech/akpmakes/android/taskkeeper/firebase/WhenEventViewHolder.java

@@ -1,4 +1,4 @@
-package tech.akpmakes.android.taskkeeper;
+package tech.akpmakes.android.taskkeeper.firebase;
 
 import android.os.Handler;
 import android.os.SystemClock;
@@ -10,6 +10,8 @@
 import java.util.Locale;
 import java.util.concurrent.TimeUnit;
 
+import tech.akpmakes.android.taskkeeper.R;
+
 public class WhenEventViewHolder extends RecyclerView.ViewHolder {
     private TextView name;
     private TextView whenText;

app/src/main/java/tech/akpmakes/android/taskkeeper/models/WhenEvent.java

@@ -1,16 +1,22 @@
 package tech.akpmakes.android.taskkeeper.models;
 
+import android.content.Intent;
 import android.support.annotation.NonNull;
 
 public class WhenEvent implements Comparable<WhenEvent> {
     public String name;
     public Long when;
 
-    public WhenEvent(String name, Long when) {
+    public WhenEvent(String name, long when) {
         this.name = name;
         this.when = when;
     }
 
+    public WhenEvent(Intent data) {
+        this.name = data.getStringExtra("whenName");
+        this.when = data.getLongExtra("whenTime", 0);
+    }
+
     public WhenEvent(){};
 
     public String getName() {
@@ -21,16 +27,16 @@ public void setName(String name) {
         this.name = name;
     }
 
-    public Long getWhen() {
+    public long getWhen() {
         return when;
     }
 
-    public void setWhen(Long when) {
+    public void setWhen(long when) {
         this.when = when;
     }
 
     @Override
     public int compareTo(@NonNull WhenEvent o) {
-        return o.when.compareTo(this.when);
+        return when.compareTo(o.when);
     }
 }