#2[30m]. Refactor AddAccount fragment to activity.

Author: Evgenii Kanivets

app/src/main/AndroidManifest.xml

@@ -17,7 +17,6 @@
             android:name=".activity.ReportActivity"
             android:screenOrientation="portrait"
             android:theme="@style/Theme.Default" />
-
         <activity
             android:name=".activity.NavDrawerActivity"
             android:label="@string/app_name"
@@ -39,6 +38,10 @@
             android:label="@string/title_add_income"
             android:screenOrientation="portrait"
             android:theme="@style/Theme.Default" />
+        <activity
+            android:name=".activity.AddAccountActivity"
+            android:label="@string/title_add_account"
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme.Default" />
     </application>
-
-</manifest>
+</manifest>

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

@@ -0,0 +1,63 @@
+package com.blogspot.e_kanivets.moneytracker.activity;
+
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.widget.EditText;
+
+import com.blogspot.e_kanivets.moneytracker.R;
+import com.blogspot.e_kanivets.moneytracker.helper.MTHelper;
+
+public class AddAccountActivity extends AppCompatActivity {
+    @SuppressWarnings("unused")
+    private static final String TAG = "AddAccountActivity";
+
+    private EditText etTitle;
+    private EditText etInitSum;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_add_account);
+
+        initViews();
+        initActionBar();
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.menu_add_record, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.action_done:
+                String title = etTitle.getText().toString();
+                int initSum = Integer.parseInt(etInitSum.getText().toString());
+
+                MTHelper.getInstance().addAccount(title, initSum);
+
+                finish();
+                return true;
+
+            case R.id.action_close:
+                finish();
+                return true;
+
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+    }
+
+    private void initViews() {
+        etTitle = (EditText) findViewById(R.id.et_title);
+        etInitSum = (EditText) findViewById(R.id.et_init_sum);
+    }
+
+    private void initActionBar() {
+        if (getSupportActionBar() != null) getSupportActionBar().setCustomView(null);
+    }
+}

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

@@ -8,11 +8,9 @@
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
 import android.view.Menu;
-import android.view.MenuItem;
 
 import com.blogspot.e_kanivets.moneytracker.R;
 import com.blogspot.e_kanivets.moneytracker.fragment.AccountsFragment;
-import com.blogspot.e_kanivets.moneytracker.fragment.AddAccountFragment;
 import com.blogspot.e_kanivets.moneytracker.fragment.ExportFragment;
 import com.blogspot.e_kanivets.moneytracker.fragment.NavigationDrawerFragment;
 import com.blogspot.e_kanivets.moneytracker.fragment.RecordsFragment;
@@ -85,10 +83,6 @@ public void onSectionAttached(String tag) {
                 mTitle = getString(R.string.title_accounts);
                 break;
 
-            case AddAccountFragment.TAG:
-                mTitle = getString(R.string.title_add_account);
-                break;
-
             case ExportFragment.TAG:
                 mTitle = getString(R.string.title_export);
                 break;
@@ -124,17 +118,8 @@ public boolean onCreateOptionsMenu(Menu menu) {
             restoreActionBar();
             return true;
         }
-        return super.onCreateOptionsMenu(menu);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        // Handle action bar item clicks here. The action bar will
-        // automatically handle clicks on the Home/Up button, so long
-        // as you specify a parent activity in AndroidManifest.xml.
-        int id = item.getItemId();
 
-        return super.onOptionsItemSelected(item);
+        return super.onCreateOptionsMenu(menu);
     }
 
     @Override
@@ -149,19 +134,12 @@ public void onAddExpensePressed() {
 
     @Override
     public void onEditRecord(Record record) {
-        if (record.isIncome()) {
-            startAddIncomeActivity(record, AddIncomeActivity.Mode.MODE_EDIT);
-        } else {
-            startAddExpenseActivity(record, AddExpenseActivity.Mode.MODE_EDIT);
-        }
+        if (record.isIncome()) startAddIncomeActivity(record, AddIncomeActivity.Mode.MODE_EDIT);
+        else startAddExpenseActivity(record, AddExpenseActivity.Mode.MODE_EDIT);
     }
 
-    public void showAddAccountFragment() {
-        FragmentManager fragmentManager = getSupportFragmentManager();
-        fragmentManager.beginTransaction()
-                .replace(R.id.container, AddAccountFragment.newInstance())
-                .addToBackStack(AddAccountFragment.TAG)
-                .commit();
+    public void showAddAccountActivity() {
+        startActivity(new Intent(NavDrawerActivity.this, AddAccountActivity.class));
     }
 
     private void startAddIncomeActivity(Record record, AddIncomeActivity.Mode mode) {

app/src/main/java/com/blogspot/e_kanivets/moneytracker/fragment/AccountsFragment.java

@@ -71,7 +71,7 @@ public void onAttach(Activity activity) {
     public void onClick(View v) {
         switch (v.getId()) {
             case R.id.btn_add_account:
-                ((NavDrawerActivity) getActivity()).showAddAccountFragment();
+                ((NavDrawerActivity) getActivity()).showAddAccountActivity();
                 break;
 
             default:

app/src/main/java/com/blogspot/e_kanivets/moneytracker/fragment/AddAccountFragment.java

@@ -1,9 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context="com.blogspot.e_kanivets.moneytracker.fragment.AddAccountFragment">
+    tools:context="com.blogspot.e_kanivets.moneytracker.activity.AddAccountActivity">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -58,4 +59,4 @@
 
         </LinearLayout>
     </LinearLayout>
-</LinearLayout>
+</LinearLayout>