v1.5.0

app/build.gradle

@@ -47,6 +47,7 @@ dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile 'com.android.support:support-v4:23.0.0'
     compile 'com.android.support:appcompat-v7:23.0.0'
+    compile 'com.android.support:design:23.1.1'
     compile 'com.jakewharton:butterknife:7.0.1'
     compile 'com.google.dagger:dagger:2.0.1'
 

app/src/main/AndroidManifest.xml

@@ -19,7 +19,7 @@
             android:screenOrientation="portrait"
             android:theme="@style/Theme.Default" />
         <activity
-            android:name=".activity.NavDrawerActivity"
+            android:name=".activity.MainActivity"
             android:label="@string/app_name"
             android:screenOrientation="portrait"
             android:theme="@style/Theme.Default">

app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/AddAccountActivity.java

@@ -7,8 +7,8 @@
 import android.widget.EditText;
 
 import com.blogspot.e_kanivets.moneytracker.R;
-import com.blogspot.e_kanivets.moneytracker.activity.base.BaseActivity;
 import com.blogspot.e_kanivets.moneytracker.DbHelper;
+import com.blogspot.e_kanivets.moneytracker.activity.base.BaseBackActivity;
 import com.blogspot.e_kanivets.moneytracker.controller.AccountController;
 import com.blogspot.e_kanivets.moneytracker.entity.Account;
 import com.blogspot.e_kanivets.moneytracker.repo.AccountRepo;
@@ -18,7 +18,7 @@
 
 import butterknife.Bind;
 
-public class AddAccountActivity extends BaseActivity {
+public class AddAccountActivity extends BaseBackActivity {
     @SuppressWarnings("unused")
     private static final String TAG = "AddAccountActivity";
 
@@ -59,10 +59,6 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 finish();
                 return true;
 
-            case R.id.action_close:
-                finish();
-                return true;
-
             default:
                 return super.onOptionsItemSelected(item);
         }

app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/AddExchangeRateActivity.java

@@ -8,7 +8,7 @@
 
 import com.blogspot.e_kanivets.moneytracker.DbHelper;
 import com.blogspot.e_kanivets.moneytracker.R;
-import com.blogspot.e_kanivets.moneytracker.activity.base.BaseActivity;
+import com.blogspot.e_kanivets.moneytracker.activity.base.BaseBackActivity;
 import com.blogspot.e_kanivets.moneytracker.controller.ExchangeRateController;
 import com.blogspot.e_kanivets.moneytracker.entity.ExchangeRate;
 import com.blogspot.e_kanivets.moneytracker.repo.ExchangeRateRepo;
@@ -18,7 +18,7 @@
 
 import butterknife.Bind;
 
-public class AddExchangeRateActivity extends BaseActivity {
+public class AddExchangeRateActivity extends BaseBackActivity {
     @SuppressWarnings("unused")
     private static final String TAG = "AddExchangeRateActivity";
 
@@ -63,10 +63,6 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 }
                 return true;
 
-            case R.id.action_close:
-                finish();
-                return true;
-
             default:
                 return super.onOptionsItemSelected(item);
         }

app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/AddRecordActivity.java

@@ -13,7 +13,7 @@
 import android.widget.Spinner;
 
 import com.blogspot.e_kanivets.moneytracker.R;
-import com.blogspot.e_kanivets.moneytracker.activity.base.BaseActivity;
+import com.blogspot.e_kanivets.moneytracker.activity.base.BaseBackActivity;
 import com.blogspot.e_kanivets.moneytracker.controller.AccountController;
 import com.blogspot.e_kanivets.moneytracker.controller.CategoryController;
 import com.blogspot.e_kanivets.moneytracker.DbHelper;
@@ -36,7 +36,7 @@
  *
  * @author Evgenii Kanivets
  */
-public class AddRecordActivity extends BaseActivity {
+public class AddRecordActivity extends BaseBackActivity {
     @SuppressWarnings("unused")
     private static final String TAG = "AddRecordActivity";
 
@@ -147,10 +147,6 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 } else showToast(R.string.wrong_number_text);
                 return true;
 
-            case R.id.action_close:
-                finish();
-                return true;
-
             default:
                 return super.onOptionsItemSelected(item);
         }

app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/MainActivity.java

@@ -0,0 +1,111 @@
+package com.blogspot.e_kanivets.moneytracker.activity;
+
+import android.support.design.widget.NavigationView;
+import android.support.design.widget.TabLayout;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentPagerAdapter;
+import android.support.v4.view.GravityCompat;
+import android.support.v4.view.ViewPager;
+import android.support.v4.widget.DrawerLayout;
+import android.support.v7.app.ActionBarDrawerToggle;
+import android.support.v7.widget.Toolbar;
+import android.view.MenuItem;
+
+import com.blogspot.e_kanivets.moneytracker.R;
+import com.blogspot.e_kanivets.moneytracker.activity.base.BaseActivity;
+import com.blogspot.e_kanivets.moneytracker.fragment.AccountsFragment;
+import com.blogspot.e_kanivets.moneytracker.fragment.ExchangeRatesFragment;
+import com.blogspot.e_kanivets.moneytracker.fragment.ExportFragment;
+import com.blogspot.e_kanivets.moneytracker.fragment.RecordsFragment;
+import com.blogspot.e_kanivets.moneytracker.util.PrefUtils;
+
+import butterknife.Bind;
+
+public class MainActivity extends BaseActivity implements NavigationView.OnNavigationItemSelectedListener {
+    @SuppressWarnings("unused")
+    private static final String TAG = "MainActivity";
+
+    @Bind(R.id.drawer_layout)
+    DrawerLayout drawer;
+
+    @Override
+    protected int getContentViewId() {
+        return R.layout.activity_main;
+    }
+
+    @Override
+    protected boolean initData() {
+        PrefUtils.addLaunchCount();
+        return true;
+    }
+
+    @Override
+    protected void initViews() {
+        super.initViews();
+
+        NavigationView navigationView = (NavigationView) findViewById(R.id.nav_view);
+        navigationView.setNavigationItemSelectedListener(this);
+
+        FragmentManager fragmentManager = getSupportFragmentManager();
+        fragmentManager.beginTransaction()
+                .replace(R.id.container, RecordsFragment.newInstance())
+                .commit();
+    }
+
+    @Override
+    public void onBackPressed() {
+        if (drawer != null && drawer.isDrawerOpen(GravityCompat.START))
+            drawer.closeDrawer(GravityCompat.START);
+        else super.onBackPressed();
+    }
+
+    @Override
+    protected Toolbar initToolbar() {
+        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+
+        DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
+        ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(
+                this, drawer, toolbar, R.string.navigation_drawer_open,
+                R.string.navigation_drawer_close);
+        drawer.setDrawerListener(toggle);
+        toggle.syncState();
+
+        return toolbar;
+    }
+
+    @Override
+    public boolean onNavigationItemSelected(MenuItem item) {
+        Fragment fragment = new Fragment();
+
+        switch (item.getItemId()) {
+            case R.id.nav_records:
+                fragment = RecordsFragment.newInstance();
+                break;
+
+            case R.id.nav_accounts:
+                fragment = AccountsFragment.newInstance();
+                break;
+
+            case R.id.nav_rates:
+                fragment = ExchangeRatesFragment.newInstance();
+                break;
+
+            case R.id.nav_export:
+                fragment = ExportFragment.newInstance();
+                break;
+
+            default:
+                break;
+        }
+
+        FragmentManager fragmentManager = getSupportFragmentManager();
+        fragmentManager.beginTransaction()
+                .replace(R.id.container, fragment)
+                .commit();
+
+        drawer.closeDrawer(GravityCompat.START);
+        return false;
+    }
+}

app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/ReportActivity.java

@@ -5,7 +5,7 @@
 import android.widget.ExpandableListView;
 
 import com.blogspot.e_kanivets.moneytracker.R;
-import com.blogspot.e_kanivets.moneytracker.activity.base.BaseActivity;
+import com.blogspot.e_kanivets.moneytracker.activity.base.BaseBackActivity;
 import com.blogspot.e_kanivets.moneytracker.adapter.ExpandableListReportAdapter;
 import com.blogspot.e_kanivets.moneytracker.controller.AccountController;
 import com.blogspot.e_kanivets.moneytracker.controller.ExchangeRateController;
@@ -23,7 +23,7 @@
 
 import butterknife.Bind;
 
-public class ReportActivity extends BaseActivity {
+public class ReportActivity extends BaseBackActivity {
     @SuppressWarnings("unused")
     private static final String TAG = "ReportActivity";