#4[30m]. Refactor finish.

Author: Evgenii Kanivets

app/src/main/AndroidManifest.xml

@@ -8,7 +8,7 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
     <application
-        android:name=".util.MtApp"
+        android:name=".MtApp"
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"

app/src/main/java/com/blogspot/e_kanivets/moneytracker/util/MTApp.java renamed to app/src/main/java/com/blogspot/e_kanivets/moneytracker/MtApp.java

@@ -1,4 +1,4 @@
-package com.blogspot.e_kanivets.moneytracker.util;
+package com.blogspot.e_kanivets.moneytracker;
 
 import android.app.Application;
 

app/src/main/java/com/blogspot/e_kanivets/moneytracker/model/Record.java

@@ -2,7 +2,7 @@
 
 import com.blogspot.e_kanivets.moneytracker.controller.CategoryController;
 import com.blogspot.e_kanivets.moneytracker.helper.DbHelper;
-import com.blogspot.e_kanivets.moneytracker.util.MtApp;
+import com.blogspot.e_kanivets.moneytracker.MtApp;
 
 import java.io.Serializable;
 

app/src/main/java/com/blogspot/e_kanivets/moneytracker/model/Report.java

@@ -3,7 +3,7 @@
 import android.util.Pair;
 
 import com.blogspot.e_kanivets.moneytracker.R;
-import com.blogspot.e_kanivets.moneytracker.util.MtApp;
+import com.blogspot.e_kanivets.moneytracker.MtApp;
 
 import java.util.ArrayList;
 import java.util.HashMap;

app/src/main/java/com/blogspot/e_kanivets/moneytracker/ui/AppRateDialog.java

@@ -12,6 +12,10 @@
 import com.blogspot.e_kanivets.moneytracker.util.PrefUtils;
 import com.blogspot.e_kanivets.moneytracker.util.Constants;
 
+import butterknife.Bind;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+
 public class AppRateDialog extends AlertDialog {
     private Context context;
 
@@ -23,38 +27,27 @@ public AppRateDialog(Context context) {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        setContentView(R.layout.dialog_rate);
+        ButterKnife.bind(AppRateDialog.this);
+    }
 
-        View view = getLayoutInflater().inflate(R.layout.dialog_rate, null);
-        setContentView(view);
-
-        Button yesButton = (Button) view.findViewById(R.id.yes_button);
-        Button maybeButton = (Button) view.findViewById(R.id.maybeButton);
-        Button thanksButton = (Button) view.findViewById(R.id.thanksButton);
-
-        yesButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                context.startActivity(new Intent(Intent.ACTION_VIEW,
-                        Uri.parse(Constants.GP_MARKET + context.getPackageName())));
-                PrefUtils.appRated();
-                dismiss();
-            }
-        });
+    @OnClick(R.id.yes_button)
+    public void yes() {
+        context.startActivity(new Intent(Intent.ACTION_VIEW,
+                Uri.parse(Constants.GP_MARKET + context.getPackageName())));
+        PrefUtils.appRated();
+        dismiss();
+    }
 
-        maybeButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                dismiss();
-            }
-        });
+    @OnClick(R.id.maybeButton)
+    public void maybe() {
+        dismiss();
+    }
 
-        thanksButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                PrefUtils.appRated();
-                dismiss();
-            }
-        });
+    @OnClick(R.id.thanksButton)
+    public void thanks() {
+        PrefUtils.appRated();
+        dismiss();
     }
 
     @Override

app/src/main/java/com/blogspot/e_kanivets/moneytracker/ui/ChangeDateDialog.java

@@ -3,26 +3,29 @@
 import android.app.AlertDialog;
 import android.content.Context;
 import android.os.Bundle;
-import android.view.View;
-import android.widget.Button;
 import android.widget.DatePicker;
 
 import com.blogspot.e_kanivets.moneytracker.R;
 
 import java.util.Calendar;
 import java.util.Date;
 
+import butterknife.Bind;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+
 /**
- * Created by eugene on 10/09/14.
+ * Created on 10/09/14.
+ *
+ * @author Evgenii Kanivets
  */
 public class ChangeDateDialog extends AlertDialog{
 
     private Date date;
     private OnDateChangedListener listener;
 
-    private DatePicker datePicker;
-    private Button btnOk;
-    private Button btnCancel;
+    @Bind(R.id.datePicker)
+    DatePicker datePicker;
 
     public ChangeDateDialog(Context context, Date date, OnDateChangedListener listener) {
         super(context);
@@ -34,38 +37,31 @@ public ChangeDateDialog(Context context, Date date, OnDateChangedListener listen
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.dialog_change_date);
+        ButterKnife.bind(ChangeDateDialog.this);
 
         Calendar cal = Calendar.getInstance();
         cal.setTime(date);
 
-        datePicker = (DatePicker) findViewById(R.id.datePicker);
-        btnOk = (Button) findViewById(R.id.b_ok);
-        btnCancel = (Button) findViewById(R.id.b_cancel);
-
         datePicker.init(cal.get(Calendar.YEAR), cal.get(Calendar.MONTH), cal.get(Calendar.DAY_OF_MONTH), null);
+    }
 
-        btnOk.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                Calendar cal = Calendar.getInstance();
-                cal.set(Calendar.YEAR, datePicker.getYear());
-                cal.set(Calendar.MONTH, datePicker.getMonth());
-                cal.set(Calendar.DAY_OF_MONTH, datePicker.getDayOfMonth());
+    @OnClick(R.id.b_ok)
+    public void ok() {
+        Calendar cal = Calendar.getInstance();
+        cal.set(Calendar.YEAR, datePicker.getYear());
+        cal.set(Calendar.MONTH, datePicker.getMonth());
+        cal.set(Calendar.DAY_OF_MONTH, datePicker.getDayOfMonth());
 
-                listener.OnDataChanged(cal.getTime());
-                dismiss();
-            }
-        });
+        listener.OnDataChanged(cal.getTime());
+        dismiss();
+    }
 
-        btnCancel.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                dismiss();
-            }
-        });
+    @OnClick(R.id.b_cancel)
+    public void cancel() {
+        dismiss();
     }
 
     public interface OnDateChangedListener {
-        public void OnDataChanged(Date date);
+        void OnDataChanged(Date date);
     }
-}
+}

app/src/main/java/com/blogspot/e_kanivets/moneytracker/util/PrefUtils.java

@@ -3,6 +3,8 @@
 import android.content.Context;
 import android.content.SharedPreferences;
 
+import com.blogspot.e_kanivets.moneytracker.MtApp;
+
 /**
  * Util class for application.
  * Created on 02/09/14.