closed #43 - removed Context where not necessary % MainActivity renamed

piskula · Jul 20, 2017 · 9820133 · 9820133
1 parent 21e135f
commit 9820133
Show file tree

Hide file tree

Showing 23 changed files with 93 additions and 91 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -10,7 +10,7 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity
-            android:name=".screens.VehicleListActivity"
+            android:name=".screens.MainActivity"
             android:label="@string/app_name"
             android:launchMode="singleTop"
             android:theme="@style/AppTheme.NoActionBar">
@@ -24,11 +24,11 @@
             android:name=".screens.VehicleTabbedDetailActivity"
             android:label="Detail"
             android:launchMode="singleTop"
-            android:parentActivityName=".screens.VehicleListActivity"
+            android:parentActivityName=".screens.MainActivity"
             android:theme="@style/AppTheme.NoActionBar">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="sk.piskula.fuelup.screens.VehicleListActivity" />
+                android:value="sk.piskula.fuelup.screens.MainActivity" />
         </activity>
         <activity
             android:name=".screens.VehicleStatisticsActivity"
@@ -47,7 +47,7 @@
         <activity
             android:name=".screens.edit.AddVehicleActivity"
             android:label="Add Vehicle"
-            android:parentActivityName=".screens.VehicleListActivity">
+            android:parentActivityName=".screens.MainActivity">
         </activity>
         <activity
             android:name=".screens.edit.EditVehicleActivity"

diff --git a/app/src/main/java/sk/piskula/fuelup/adapters/ListExpensesAdapter.java b/app/src/main/java/sk/piskula/fuelup/adapters/ListExpensesAdapter.java
@@ -24,7 +24,6 @@ public class ListExpensesAdapter extends RecyclerView.Adapter<ListExpensesAdapte
 
     private static final String TAG = "ListExpensesAdapter";
 
-    private Context context;
     private List<Expense> items;
     private Callback callback;
 
@@ -41,8 +40,7 @@ public interface Callback {
 
     @Override
     public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        this.context = parent.getContext();
-        View view = LayoutInflater.from(this.context).inflate(R.layout.list_item_expense, parent, false);
+        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_item_expense, parent, false);
         return new ViewHolder(view);
     }
 
@@ -51,7 +49,7 @@ public void onBindViewHolder(final ViewHolder holder, final int position) {
         Expense currentItem = items.get(position);
         if (currentItem != null) {
             holder.txtInfo.setText(currentItem.getInfo());
-            holder.txtPrice.setText(CurrencyUtil.getPrice(currentItem.getVehicle().getCurrency(), currentItem.getPrice(), context));
+            holder.txtPrice.setText(CurrencyUtil.getPrice(currentItem.getVehicle().getCurrency(), currentItem.getPrice()));
             holder.txtDate.setText(DateUtil.getDateLocalized(currentItem.getDate()));
         }
 

diff --git a/app/src/main/java/sk/piskula/fuelup/adapters/ListFillUpsAdapter.java b/app/src/main/java/sk/piskula/fuelup/adapters/ListFillUpsAdapter.java
@@ -17,6 +17,7 @@
 import sk.piskula.fuelup.entity.enums.DistanceUnit;
 import sk.piskula.fuelup.entity.util.CurrencyUtil;
 import sk.piskula.fuelup.entity.util.DateUtil;
+import sk.piskula.fuelup.screens.MainActivity;
 
 /**
  * Created by Martin Styk on 19.06.2017.
@@ -25,7 +26,6 @@ public class ListFillUpsAdapter extends RecyclerView.Adapter<ListFillUpsAdapter.
 
     private List<FillUp> items;
     private Callback callback;
-    private Context context;
 
     public ListFillUpsAdapter(Callback callback) {
         super();
@@ -39,8 +39,7 @@ public interface Callback {
 
     @Override
     public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        this.context = parent.getContext();
-        View view = LayoutInflater.from(this.context).inflate(R.layout.list_item_fillup, parent, false);
+        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_item_fillup, parent, false);
         return new ViewHolder(view);
     }
 
@@ -51,15 +50,14 @@ public void onBindViewHolder(final ViewHolder holder, final int position) {
             //set views
             holder.txtDistanceFromLastFillUp.setText(currentItem.getDistanceFromLastFillUp().toString());
             holder.txtDistanceUnit.setText(currentItem.getVehicle().getDistanceUnit().toString());
-            holder.txtConsumptionUnit.setText(currentItem.getVehicle().getConsumptionUnit(context));
+            holder.txtConsumptionUnit.setText(currentItem.getVehicle().getConsumptionUnit());
             holder.txtDate.setText(DateUtil.getDateLocalized(currentItem.getDate()));
-            holder.imgFullnessFillUpSymbol.setImageResource(context.getResources().getIdentifier(
-                    currentItem.isFullFillUp() ? "ic_gasolinedrop_full" : "ic_gasolinedrop_empty", "drawable", context.getPackageName()));
+            holder.imgFullnessFillUpSymbol.setImageResource(getImageResourceId(currentItem.isFullFillUp()));
             holder.txtPriceTotal.setText(CurrencyUtil.getPrice(
-                    currentItem.getVehicle().getCurrency(), currentItem.getFuelPriceTotal(), context));
+                    currentItem.getVehicle().getCurrency(), currentItem.getFuelPriceTotal()));
             holder.txtPricePerLitre.setText(CurrencyUtil.getPricePerLitre(
-                    currentItem.getVehicle().getCurrency(), currentItem.getFuelPricePerLitre(), context));
-            holder.txtPricePerLitreSymbol.setText("/" + context.getString(R.string.litre));
+                    currentItem.getVehicle().getCurrency(), currentItem.getFuelPricePerLitre()));
+            holder.txtPricePerLitreSymbol.setText("/" + MainActivity.getInstance().getString(R.string.litre));
 
             DecimalFormat bddf = new DecimalFormat();
             bddf.setGroupingUsed(false);
@@ -87,6 +85,12 @@ public void onClick(View v) {
         });
     }
 
+    private int getImageResourceId(boolean isFullFillup) {
+        String fileName = isFullFillup ? "ic_gasolinedrop_full" : "ic_gasolinedrop_empty";
+        return MainActivity.getInstance().getResources()
+                .getIdentifier(fileName, "drawable", MainActivity.getInstance().getPackageName());
+    }
+
     @Override
     public int getItemCount() {
         return items.size();

diff --git a/app/src/main/java/sk/piskula/fuelup/adapters/ListVehiclesAdapter.java b/app/src/main/java/sk/piskula/fuelup/adapters/ListVehiclesAdapter.java
@@ -13,6 +13,8 @@
 
 import sk.piskula.fuelup.R;
 import sk.piskula.fuelup.entity.Vehicle;
+import sk.piskula.fuelup.entity.VehicleType;
+import sk.piskula.fuelup.screens.MainActivity;
 
 /**
  * @author Ondrej Oravcok
@@ -23,7 +25,6 @@ public class ListVehiclesAdapter extends RecyclerView.Adapter<ListVehiclesAdapte
     private static final String TAG = ListVehiclesAdapter.class.getSimpleName();
 
     private List<Vehicle> mItems;
-    private Context context;
     private Callback callback;
 
     public ListVehiclesAdapter(Callback callback) {
@@ -42,8 +43,7 @@ public List<Vehicle> getItems() {
 
     @Override
     public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        this.context = parent.getContext();
-        View itemView = LayoutInflater.from(this.context).inflate(R.layout.list_item_vehicle, parent, false);
+        View itemView = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_item_vehicle, parent, false);
         return new ViewHolder(itemView);
     }
 
@@ -54,9 +54,7 @@ public void onBindViewHolder(final ViewHolder holder, final int position) {
         holder.title.setText(vehicle.getName());
         holder.count.setText(vehicle.getVehicleMaker());
         holder.thumbnail.setImageBitmap(vehicle.getPicture());
-        holder.overflow.setImageResource(context.getResources()
-                .getIdentifier("ic_type_" + vehicle.getType().getName().toLowerCase(),
-                        "drawable", context.getPackageName()));
+        holder.overflow.setImageResource(getImageResourceId(vehicle.getType()));
 
         holder.itemView.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -66,6 +64,12 @@ public void onClick(View v) {
         });
     }
 
+    private int getImageResourceId(VehicleType type) {
+        Context cxt = MainActivity.getInstance();
+        return cxt.getResources().getIdentifier(
+                "ic_type_" + type.getName().toLowerCase(), "drawable", cxt.getPackageName());
+    }
+
     @Override
     public int getItemCount() {
         return mItems.size();

diff --git a/app/src/main/java/sk/piskula/fuelup/adapters/PagerStatisticsAdapter.java b/app/src/main/java/sk/piskula/fuelup/adapters/PagerStatisticsAdapter.java
@@ -7,6 +7,7 @@
 
 import sk.piskula.fuelup.R;
 import sk.piskula.fuelup.entity.Vehicle;
+import sk.piskula.fuelup.screens.MainActivity;
 import sk.piskula.fuelup.screens.statisticfragments.StatisticsChartConsumptionFragment;
 import sk.piskula.fuelup.screens.statisticfragments.StatisticsChartConsumptionPreviewFragment;
 
@@ -16,12 +17,10 @@
 public class PagerStatisticsAdapter extends FragmentStatePagerAdapter {
 
     private Vehicle vehicle;
-    private Context context;
 
-    public PagerStatisticsAdapter(FragmentManager fm, Vehicle vehicle, Context context) {
+    public PagerStatisticsAdapter(FragmentManager fm, Vehicle vehicle) {
         super(fm);
         this.vehicle = vehicle;
-        this.context = context;
     }
 
     @Override
@@ -45,9 +44,9 @@ public int getCount() {
     public CharSequence getPageTitle(int position) {
         switch (position) {
             case 0:
-                return context.getString(R.string.statistics_fuel_consumption);
+                return MainActivity.getInstance().getString(R.string.statistics_fuel_consumption);
             case 1:
-                return context.getString(R.string.statistics_fuel_consumption);
+                return MainActivity.getInstance().getString(R.string.statistics_fuel_consumption);
             default:
                 return "Fragment" + position;
         }

diff --git a/app/src/main/java/sk/piskula/fuelup/adapters/SpinnerCurrencyAdapter.java b/app/src/main/java/sk/piskula/fuelup/adapters/SpinnerCurrencyAdapter.java
@@ -30,7 +30,7 @@ public class SpinnerCurrencyAdapter extends BaseAdapter implements SpinnerAdapte
 
     public SpinnerCurrencyAdapter(Activity activity) {
         this.activity = activity;
-        this.currencies = CurrencyUtil.getSupportedCurrencies(activity);
+        this.currencies = CurrencyUtil.getSupportedCurrencies();
     }
 
     @Override
@@ -62,7 +62,7 @@ public View getView(int position, View view, ViewGroup viewGroup) {
 
         //TODO getDisplayName() API level 19
         currencyName.setText(currencies.get(position).getCurrencyCode());
-        currencySymbol.setText(CurrencyUtil.getCurrencySymbol(currencies.get(position), activity.getApplicationContext()));
+        currencySymbol.setText(CurrencyUtil.getCurrencySymbol(currencies.get(position)));
 
         return spinView;
     }

diff --git a/app/src/main/java/sk/piskula/fuelup/business/ExpenseService.java b/app/src/main/java/sk/piskula/fuelup/business/ExpenseService.java
@@ -20,11 +20,9 @@ public class ExpenseService {
 
     private static final String TAG = ExpenseService.class.getSimpleName();
 
-    private Context context;
     private Dao<Expense, Long> expensesDao;
 
     public ExpenseService(Context context) {
-        this.context = context;
         this.expensesDao = DatabaseProvider.get(context).getExpenseDao();
     }
 

diff --git a/app/src/main/java/sk/piskula/fuelup/business/FillUpService.java b/app/src/main/java/sk/piskula/fuelup/business/FillUpService.java
@@ -27,11 +27,9 @@ public class FillUpService {
 
     private static final String TAG = FillUpService.class.getSimpleName();
 
-    private Context context;
     private Dao<FillUp, Long> fillUpDao;
 
     public FillUpService(Context context) {
-        this.context = context;
         this.fillUpDao = DatabaseProvider.get(context).getFillUpDao();
     }
 

diff --git a/app/src/main/java/sk/piskula/fuelup/business/VehicleService.java b/app/src/main/java/sk/piskula/fuelup/business/VehicleService.java
@@ -21,12 +21,10 @@ public class VehicleService {
 
     private static final String TAG = VehicleService.class.getSimpleName();
 
-    private Context context;
     private Dao<Vehicle, Long> vehicleDao;
     private VehicleTypeService vehicleTypeService;
 
     public VehicleService(Context context) {
-        this.context = context;
         this.vehicleDao = DatabaseProvider.get(context).getVehicleDao();
         vehicleTypeService = new VehicleTypeService(context);
     }

diff --git a/app/src/main/java/sk/piskula/fuelup/business/VehicleTypeService.java b/app/src/main/java/sk/piskula/fuelup/business/VehicleTypeService.java
@@ -17,11 +17,9 @@ public class VehicleTypeService {
 
     private static final String TAG = VehicleTypeService.class.getSimpleName();
 
-    private Context context;
     private Dao<VehicleType, Long> vehicleTypeDao;
 
     public VehicleTypeService(Context context) {
-        this.context = context;
         this.vehicleTypeDao = DatabaseProvider.get(context).getVehicleTypeDao();
     }
 

diff --git a/app/src/main/java/sk/piskula/fuelup/entity/Vehicle.java b/app/src/main/java/sk/piskula/fuelup/entity/Vehicle.java
@@ -15,6 +15,7 @@
 import sk.piskula.fuelup.entity.enums.DistanceUnit;
 import sk.piskula.fuelup.entity.enums.VolumeUnit;
 import sk.piskula.fuelup.entity.util.CurrencyUtil;
+import sk.piskula.fuelup.screens.MainActivity;
 
 /**
  * @author Ondrej Oravcok
@@ -167,8 +168,8 @@ public void setPathToPicture(String pathToPicture) {
         this.pathToPicture = pathToPicture;
     }
 
-    public String getCurrencySymbol(Context context) {
-        return CurrencyUtil.getCurrencySymbol(this.getCurrency(), context);
+    public String getCurrencySymbol() {
+        return CurrencyUtil.getCurrencySymbol(this.getCurrency());
     }
 
     public Vehicle() {
@@ -218,11 +219,11 @@ public Vehicle[] newArray(int size) {
         }
     };
 
-    public String getConsumptionUnit(Context context) {
+    public String getConsumptionUnit() {
         if (this.getDistanceUnit() == DistanceUnit.mi) {
-            return context.getString(R.string.units_mpg);
+            return MainActivity.getInstance().getString(R.string.units_mpg);
         } else {
-            return context.getString(R.string.units_litreper100km);
+            return MainActivity.getInstance().getString(R.string.units_litreper100km);
         }
     }
 }
diff --git a/app/src/main/java/sk/piskula/fuelup/entity/util/CurrencyUtil.java b/app/src/main/java/sk/piskula/fuelup/entity/util/CurrencyUtil.java
@@ -14,6 +14,8 @@
 import java.util.List;
 import java.util.Properties;
 
+import sk.piskula.fuelup.screens.MainActivity;
+
 /**
  * @author Ondrej Oravcok
  * @version 28.6.2017
@@ -35,31 +37,31 @@ public class CurrencyUtil {
 
     private static Properties properties = new Properties();;
 
-    public static String getCurrencySymbol(Currency currency, Context context) {
-        checkPropertiesAreLoaded(context);
-        return getCurrencySymbol(currency);
+    public static String getCurrencySymbol(Currency currency) {
+        checkPropertiesAreLoaded();
+        return getCurrencySymbolFromProperties(currency);
     }
 
-    private static void checkPropertiesAreLoaded(Context context) {
+    private static void checkPropertiesAreLoaded() {
         if (properties.isEmpty()) {
             try {
-                properties.load(context.getAssets().open(PROPERTY_FILE));
+                properties.load(MainActivity.getInstance().getAssets().open(PROPERTY_FILE));
             } catch (IOException e) {
                 Log.e(TAG, "Cannot load currencies from " + PROPERTY_FILE, e);
             }
         }
     }
 
-    private static String getCurrencySymbol(Currency currency) {
+    private static String getCurrencySymbolFromProperties(Currency currency) {
         if (properties.containsKey(currency.getCurrencyCode())) {
             return properties.getProperty(currency.getCurrencyCode()).split(DELIMETER)[CODE];
         } else {
             return currency.getSymbol();
         }
     }
 
-    public static List<Currency> getSupportedCurrencies(Context context) {
-        checkPropertiesAreLoaded(context);
+    public static List<Currency> getSupportedCurrencies() {
+        checkPropertiesAreLoaded();
 
         List<Currency> currencies = new ArrayList<>();
         for (String currencyString : properties.stringPropertyNames())
@@ -81,8 +83,8 @@ private static String getPriceFormatted(double value, int coefficient, boolean i
         }
     }
 
-    public static String getPrice(Currency currency, double value, Context context) {
-        checkPropertiesAreLoaded(context);
+    public static String getPrice(Currency currency, double value) {
+        checkPropertiesAreLoaded();
         if (properties.containsKey(currency.getCurrencyCode())) {
             String[] currencyStrings = properties.getProperty(currency.getCurrencyCode()).split(DELIMETER);
 
@@ -96,8 +98,8 @@ public static String getPrice(Currency currency, double value, Context context)
         }
     }
 
-    public static String getPricePerLitre(Currency currency, double value, Context context) {
-        checkPropertiesAreLoaded(context);
+    public static String getPricePerLitre(Currency currency, double value) {
+        checkPropertiesAreLoaded();
         if (properties.containsKey(currency.getCurrencyCode())) {
             String[] currencyStrings = properties.getProperty(currency.getCurrencyCode()).split(DELIMETER);
 
@@ -112,12 +114,12 @@ public static String getPricePerLitre(Currency currency, double value, Context c
         }
     }
 
-    public static String getPrice(Currency currency, BigDecimal value, Context context) {
-        return getPrice(currency, value.doubleValue(), context);
+    public static String getPrice(Currency currency, BigDecimal value) {
+        return getPrice(currency, value.doubleValue());
     }
 
-    public static String getPricePerLitre(Currency currency, BigDecimal value, Context context) {
-        return getPricePerLitre(currency, value.doubleValue(), context);
+    public static String getPricePerLitre(Currency currency, BigDecimal value) {
+        return getPricePerLitre(currency, value.doubleValue());
     }
 
 }