From 78974a82d6a059672325bdeaf5da7c90eb8ba1e2 Mon Sep 17 00:00:00 2001
From: Natalie Chouinard <chouinard.nm@gmail.com>
Date: Sun, 12 Jul 2020 17:49:35 -0700
Subject: [PATCH] Package organization

---
 .../com/natalieperna/cupful/activities/MainActivity.java   | 2 +-
 .../cupful/{ => adapters}/IngredientAdapter.java           | 7 ++++---
 .../natalieperna/cupful/{ => views}/IngredientSpinner.java | 4 +++-
 app/src/main/res/layout/activity_main.xml                  | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)
 rename app/src/main/java/com/natalieperna/cupful/{ => adapters}/IngredientAdapter.java (95%)
 rename app/src/main/java/com/natalieperna/cupful/{ => views}/IngredientSpinner.java (95%)

diff --git a/app/src/main/java/com/natalieperna/cupful/activities/MainActivity.java b/app/src/main/java/com/natalieperna/cupful/activities/MainActivity.java
index a891a74..eabe393 100644
--- a/app/src/main/java/com/natalieperna/cupful/activities/MainActivity.java
+++ b/app/src/main/java/com/natalieperna/cupful/activities/MainActivity.java
@@ -13,7 +13,7 @@
 import androidx.appcompat.app.AppCompatActivity;
 
 import com.natalieperna.cupful.R;
-import com.natalieperna.cupful.IngredientSpinner;
+import com.natalieperna.cupful.views.IngredientSpinner;
 import com.natalieperna.cupful.data.IngredientReader;
 import com.natalieperna.cupful.data.Units;
 import com.natalieperna.cupful.models.DisplayUnit;
diff --git a/app/src/main/java/com/natalieperna/cupful/IngredientAdapter.java b/app/src/main/java/com/natalieperna/cupful/adapters/IngredientAdapter.java
similarity index 95%
rename from app/src/main/java/com/natalieperna/cupful/IngredientAdapter.java
rename to app/src/main/java/com/natalieperna/cupful/adapters/IngredientAdapter.java
index 54f885a..c8058bb 100644
--- a/app/src/main/java/com/natalieperna/cupful/IngredientAdapter.java
+++ b/app/src/main/java/com/natalieperna/cupful/adapters/IngredientAdapter.java
@@ -1,4 +1,4 @@
-package com.natalieperna.cupful;
+package com.natalieperna.cupful.adapters;
 
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -10,12 +10,13 @@
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.natalieperna.cupful.R;
 import com.natalieperna.cupful.models.Ingredient;
 
 import java.util.ArrayList;
 import java.util.List;
 
-class IngredientAdapter extends RecyclerView.Adapter<IngredientAdapter.ViewHolder> {
+public class IngredientAdapter extends RecyclerView.Adapter<IngredientAdapter.ViewHolder> {
     private static final String TAG = "IngredientAdapter";
 
     private final List<Ingredient> allIngredients;
@@ -114,7 +115,7 @@ public ViewHolder(@NonNull View itemView) {
         }
     }
 
-    interface OnItemSelectedListener {
+    public interface OnItemSelectedListener {
         void onItemSelected(int position);
     }
 }
diff --git a/app/src/main/java/com/natalieperna/cupful/IngredientSpinner.java b/app/src/main/java/com/natalieperna/cupful/views/IngredientSpinner.java
similarity index 95%
rename from app/src/main/java/com/natalieperna/cupful/IngredientSpinner.java
rename to app/src/main/java/com/natalieperna/cupful/views/IngredientSpinner.java
index 77acd05..c510ede 100644
--- a/app/src/main/java/com/natalieperna/cupful/IngredientSpinner.java
+++ b/app/src/main/java/com/natalieperna/cupful/views/IngredientSpinner.java
@@ -1,4 +1,4 @@
-package com.natalieperna.cupful;
+package com.natalieperna.cupful.views;
 
 import android.content.Context;
 import android.util.AttributeSet;
@@ -15,6 +15,8 @@
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.natalieperna.cupful.R;
+import com.natalieperna.cupful.adapters.IngredientAdapter;
 import com.natalieperna.cupful.models.Ingredient;
 
 import java.util.List;
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index cbc05dd..ee5eb2a 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -14,7 +14,7 @@
         android:elevation="4dp"
         android:orientation="vertical">
 
-        <com.natalieperna.cupful.IngredientSpinner
+        <com.natalieperna.cupful.views.IngredientSpinner
             android:id="@+id/ingredient"
             android:layout_width="match_parent"
             android:layout_height="0dp"