feat: extract extra names to variables #32

Author: FAUSheppy

app/src/main/java/com/example/nutritionapp/customFoods/CreateNewFoodItem.java

@@ -16,6 +16,7 @@
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.example.nutritionapp.R;
+import com.example.nutritionapp.other.ActivityExtraNames;
 import com.example.nutritionapp.other.Database;
 import com.example.nutritionapp.other.Food;
 import com.example.nutritionapp.other.Nutrition;
@@ -59,7 +60,7 @@ public void onCreate(Bundle savedInstanceState) {
 
         Nutrition n;
         Food editFood = null;
-        String fdc_id = this.getIntent().getStringExtra("fdc_id");
+        String fdc_id = this.getIntent().getStringExtra(ActivityExtraNames.FDC_ID);
         if(fdc_id != null){
             Log.wtf("YES", "EDIT MODE");
             this.editMode = true;

app/src/main/java/com/example/nutritionapp/customFoods/FoodOverviewAdapter.java

@@ -12,6 +12,7 @@
 
 import com.example.nutritionapp.R;
 import com.example.nutritionapp.foodJournal.FoodGroupOverview;
+import com.example.nutritionapp.other.ActivityExtraNames;
 import com.example.nutritionapp.other.Database;
 
 import java.util.ArrayList;
@@ -66,14 +67,14 @@ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int positi
                     /* open indent from journal to edit a group of goods */
                     CustomGroupOverviewItem groupItem = (CustomGroupOverviewItem) item;
                     Intent editCustomFoodGroup = new Intent(context, FoodGroupOverview.class);
-                    editCustomFoodGroup.putExtra("groupId", groupItem.groupId);
-                    editCustomFoodGroup.putExtra("isTemplateMode", true);
+                    editCustomFoodGroup.putExtra(ActivityExtraNames.GROUP_ID, groupItem.groupId);
+                    editCustomFoodGroup.putExtra(ActivityExtraNames.IS_TEMPLATED_MODE, true);
                     context.startActivity(editCustomFoodGroup);
                 }else {
                     /* open indent for editing a single food */
                     CustomFoodOverviewItem foodItem = (CustomFoodOverviewItem) item;
                     Intent editCustomFood = new Intent(context, CreateNewFoodItem.class);
-                    editCustomFood.putExtra("fdc_id", foodItem.food.id);
+                    editCustomFood.putExtra(ActivityExtraNames.FDC_ID, foodItem.food.id);
                     context.startActivity(editCustomFood);
                 }
             });

app/src/main/java/com/example/nutritionapp/foodJournal/FoodGroupOverview.java

@@ -29,6 +29,7 @@
 import com.example.nutritionapp.foodJournal.overviewFoodsLists.DialogAmountSelector;
 import com.example.nutritionapp.foodJournal.overviewFoodsLists.NutritionOverviewAdapter;
 import com.example.nutritionapp.foodJournal.overviewFoodsLists.SelectorDialogAdapterAmount;
+import com.example.nutritionapp.other.ActivityExtraNames;
 import com.example.nutritionapp.other.Database;
 import com.example.nutritionapp.other.Food;
 import com.example.nutritionapp.other.NutritionAnalysis;
@@ -106,10 +107,10 @@ protected void onCreate(Bundle savedInstanceState) {
         db = new Database(this);
 
         /* set existing items if edit mode */
-        groupId = this.getIntent().getIntExtra("groupId", -1);
+        groupId = this.getIntent().getIntExtra(ActivityExtraNames.GROUP_ID, -1);
 
         /* see if we are creating or editing a pure template */
-        isTemplateMode = this.getIntent().getBooleanExtra("isTemplateMode", false);
+        isTemplateMode = this.getIntent().getBooleanExtra(ActivityExtraNames.GROUP_ID, false);
 
         if (groupId >= 0) {
             this.editMode = true;
@@ -336,8 +337,8 @@ public void onBackPressed() {
 
         /* report back a dirty date if necessary */
         Intent resultIntent = new Intent();
-        resultIntent.putExtra("dateTimeString", computedLoggedAt.format(Utils.sqliteDatetimeFormat));
-        resultIntent.putExtra("groupId", groupId);
+        resultIntent.putExtra(ActivityExtraNames.DATE_RESULT, computedLoggedAt.format(Utils.sqliteDatetimeFormat));
+        resultIntent.putExtra(ActivityExtraNames.GROUP_ID, groupId);
         setResult(Activity.RESULT_OK, resultIntent);
 
         finishAfterTransition();

app/src/main/java/com/example/nutritionapp/foodJournal/FoodJournalOverview.java

@@ -14,6 +14,7 @@
 
 import com.example.nutritionapp.foodJournal.overviewFoodsLists.FoodOverviewAdapter;
 import com.example.nutritionapp.foodJournal.overviewFoodsLists.FoodOverviewListItem;
+import com.example.nutritionapp.other.ActivityExtraNames;
 import com.example.nutritionapp.other.Database;
 import com.example.nutritionapp.R;
 import com.example.nutritionapp.other.Utils;
@@ -80,8 +81,8 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (requestCode == Utils.FOOD_GROUP_DETAILS_ID) {
             if (resultCode == Activity.RESULT_OK) {
 
-                String returnValue = data.getStringExtra("dateTimeString");
-                int groupIdValue = data.getIntExtra("groupId", -1);
+                String returnValue = data.getStringExtra(ActivityExtraNames.DATE_RESULT);
+                int groupIdValue = data.getIntExtra(ActivityExtraNames.DATE_RESULT, -1);
                 assert groupIdValue != -1;
 
                 LocalDateTime dateTime = LocalDateTime.parse(returnValue, Utils.sqliteDatetimeFormat);

app/src/main/java/com/example/nutritionapp/foodJournal/overviewFoodsLists/FoodOverviewAdapter.java

@@ -22,6 +22,7 @@
 
 import com.example.nutritionapp.R;
 import com.example.nutritionapp.foodJournal.FoodGroupOverview;
+import com.example.nutritionapp.other.ActivityExtraNames;
 import com.example.nutritionapp.other.Database;
 import com.example.nutritionapp.other.Food;
 import com.example.nutritionapp.other.NutritionAnalysis;
@@ -164,7 +165,7 @@ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int positi
 
         castedHolder.dateText.setOnClickListener(view -> {
             Intent target = new Intent(view.getContext(), Recommendations.class);
-            target.putExtra("startDate", items.get(position).date.format(Utils.sqliteDateFormat));
+            target.putExtra(ActivityExtraNames.START_DATE, items.get(position).date.format(Utils.sqliteDateFormat));
             context.startActivity(target);
         });
 
@@ -268,7 +269,7 @@ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int positi
             foodsTextView.setText(allFoodsStringBuilder.toString());
             foodsTextView.setOnClickListener(view -> {
                 Intent target = new Intent(view.getContext(), FoodGroupOverview.class);
-                target.putExtra("groupId", item.groupId);
+                target.putExtra(ActivityExtraNames.GROUP_ID, item.groupId);
                 parentActivity.startActivityForResult(target, Utils.FOOD_GROUP_DETAILS_ID);
             });
             foodsTextView.setOnLongClickListener(

app/src/main/java/com/example/nutritionapp/nutritionOverview/NutritionOverview.java

@@ -7,6 +7,7 @@
 import androidx.appcompat.app.AppCompatActivity;
 
 import com.example.nutritionapp.R;
+import com.example.nutritionapp.other.ActivityExtraNames;
 import com.example.nutritionapp.other.Database;
 import com.example.nutritionapp.other.Utils;
 
@@ -22,11 +23,11 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.journal);
 
         Intent intent = getIntent();
-        String startDate = intent.getStringExtra("startDate");
-        String endDate = intent.getStringExtra("endDate");
+        String startDate = intent.getStringExtra(ActivityExtraNames.START_DATE);
+        String endDate = intent.getStringExtra(ActivityExtraNames.END_DATE);
 
-        String foodIds = intent.getStringExtra("foodIds");
-        String foodAmount = intent.getStringExtra("amounts");
+        String foodIds = intent.getStringExtra(ActivityExtraNames.MULTI_FOOD_ID);
+        String foodAmount = intent.getStringExtra(ActivityExtraNames.MULTI_FOOD_AMOUNTS);
 
         Database db = new Database(this);
 
@@ -45,8 +46,6 @@ protected void onCreate(Bundle savedInstanceState) {
             throw new AssertionError("No food ids and amount or dates given in intent extras!?");
         }
 
-
         Log.wtf("INFO", startDate);
-
     }
 }

app/src/main/java/com/example/nutritionapp/other/ActivityExtraNames.java

@@ -0,0 +1,13 @@
+package com.example.nutritionapp.other;
+
+public abstract class ActivityExtraNames {
+        public static final String START_DATE = "startDate";
+        public static final String END_DATE = "endDate";
+        public static final String GROUP_ID = "groupId";
+        public static final String IS_TEMPLATED_MODE = "isTemplateMode";
+        public static final String FDC_ID = "fdc_id";
+        public static final String DATE_RESULT = "dateTimeString";
+        public static final String NUTRITION_ELEMENT = "nutritionElement";
+        public static final String MULTI_FOOD_ID = "foodIds";
+        public static final String MULTI_FOOD_AMOUNTS = "amounts";
+}

app/src/main/java/com/example/nutritionapp/other/Database.java

@@ -74,7 +74,7 @@ public class Database {
     public Database(Activity srcActivity) {
         this.srcActivity = srcActivity;
         if (db == null) {
-            createDatabase(false);
+            createDatabase(true);
             db = SQLiteDatabase.openDatabase(targetPath, null, NO_LOCALIZED_COLLATORS | OPEN_READWRITE);
         }
         if (fdcIdToDbNumber.isEmpty()) {

app/src/main/java/com/example/nutritionapp/recommendation/RecommendationAdapter.java

@@ -1,4 +1,5 @@
 package com.example.nutritionapp.recommendation;
+import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.ColorStateList;
@@ -9,6 +10,7 @@
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
+import com.example.nutritionapp.other.ActivityExtraNames;
 import com.example.nutritionapp.other.Conversions;
 import com.example.nutritionapp.other.Database;
 import com.example.nutritionapp.other.Nutrition;
@@ -78,8 +80,7 @@ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int positi
 
         lvh.itemView.setOnClickListener(v -> {
             Intent myIntent = new Intent(v.getContext(), RecommendationsElement.class);
-            /* FIXME: arbitrary name/naming scheme for extra */
-            myIntent.putExtra("nutritionelement", curItem.nutritionElement);
+            myIntent.putExtra(ActivityExtraNames.NUTRITION_ELEMENT, curItem.nutritionElement);
             myIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             v.getContext().startActivity(myIntent);
         });

app/src/main/java/com/example/nutritionapp/recommendation/Recommendations.java

@@ -20,6 +20,7 @@
 import com.example.nutritionapp.DividerItemDecorator;
 import com.example.nutritionapp.R;
 import com.example.nutritionapp.configuration.PersonalInformation;
+import com.example.nutritionapp.other.ActivityExtraNames;
 import com.example.nutritionapp.other.Database;
 import com.example.nutritionapp.other.Food;
 import com.example.nutritionapp.other.Nutrition;
@@ -68,7 +69,7 @@ public void onCreate(Bundle savedInstanceState) {
         db = new Database(this);
 
         /* see if a date was specified during activity start */
-        String dateFromExtra = this.getIntent().getStringExtra("startDate");
+        String dateFromExtra = this.getIntent().getStringExtra(ActivityExtraNames.START_DATE);
         if(dateFromExtra != null){
             currentDateParsed = LocalDate.parse(dateFromExtra, Utils.sqliteDateFormat);
         }