#95. Completely move all logic to EditAccountFragment.

app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/edit/EditAccountActivity.kt

@@ -8,6 +8,7 @@ import android.view.Menu
 import android.view.MenuItem
 
 import com.blogspot.e_kanivets.moneytracker.R
+import com.blogspot.e_kanivets.moneytracker.activity.account.edit.adapter.EditAccountFragmentPagerAdapter
 import com.blogspot.e_kanivets.moneytracker.activity.base.BaseBackActivity
 import com.blogspot.e_kanivets.moneytracker.controller.data.AccountController
 import com.blogspot.e_kanivets.moneytracker.entity.data.Account
@@ -38,15 +39,11 @@ class EditAccountActivity : BaseBackActivity() {
     override fun initViews() {
         super.initViews()
 
-        fabDone.setOnClickListener { /*done()*/ }
+        viewPager.adapter = EditAccountFragmentPagerAdapter(supportFragmentManager, account)
     }
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
-        if (account.isArchived) {
-            menuInflater.inflate(R.menu.menu_archived_account, menu)
-        } else {
-            menuInflater.inflate(R.menu.menu_account, menu)
-        }
+        menuInflater.inflate(if (account.isArchived) R.menu.menu_archived_account else R.menu.menu_account, menu)
         return true
     }
 
@@ -59,18 +56,6 @@ class EditAccountActivity : BaseBackActivity() {
         }
     }
 
-    private fun done(title: String) {
-        val newAccount = Account(
-            account.id, title, account.curSum.toDouble(),
-            account.currency, account.goal, account.isArchived, account.color
-        )
-        val updated = accountController.update(newAccount) != null
-        if (updated) {
-            setResult(Activity.RESULT_OK)
-            finish()
-        }
-    }
-
     private fun archive(): Boolean {
         if (account == accountController.readDefaultAccount()) {
             showToast(R.string.cant_archive_default_account)

app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/edit/adapter/EditAccountFragmentPagerAdapter.kt

@@ -0,0 +1,21 @@
+package com.blogspot.e_kanivets.moneytracker.activity.account.edit.adapter
+
+import android.support.v4.app.Fragment
+import android.support.v4.app.FragmentManager
+import android.support.v4.app.FragmentPagerAdapter
+import com.blogspot.e_kanivets.moneytracker.activity.account.edit.fragment.EditAccountFragment
+import com.blogspot.e_kanivets.moneytracker.entity.data.Account
+
+class EditAccountFragmentPagerAdapter(fragmentManager: FragmentManager, private val account: Account) :
+    FragmentPagerAdapter(fragmentManager) {
+
+    override fun getItem(position: Int): Fragment {
+        return when (position) {
+            0 -> EditAccountFragment.newInstance(account)
+            else -> Fragment()
+        }
+    }
+
+    override fun getCount(): Int = 1
+
+}

app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/edit/fragment/EditAccountFragment.kt

@@ -1,33 +1,38 @@
 package com.blogspot.e_kanivets.moneytracker.activity.account.edit.fragment
 
+import android.app.Activity
 import android.os.Bundle
-import android.support.v4.app.Fragment
-import android.view.LayoutInflater
+import android.support.design.widget.FloatingActionButton
 import android.view.View
-import android.view.ViewGroup
 import com.blogspot.e_kanivets.moneytracker.R
+import com.blogspot.e_kanivets.moneytracker.R.layout
+import com.blogspot.e_kanivets.moneytracker.activity.base.BaseFragment
+import com.blogspot.e_kanivets.moneytracker.controller.data.AccountController
 import com.blogspot.e_kanivets.moneytracker.entity.data.Account
 import kotlinx.android.synthetic.main.fragment_edit_account.*
+import javax.inject.Inject
 
-class EditAccountFragment() : Fragment() {
+class EditAccountFragment : BaseFragment() {
+
+    @Inject
+    internal lateinit var accountController: AccountController
 
     private lateinit var account: Account
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        arguments?.let { arguments -> account = arguments.getParcelable(KEY_ACCOUNT) }
-    }
+    override val contentViewId: Int = layout.fragment_edit_account
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        val rootView = inflater.inflate(R.layout.fragment_edit_account, container, false)
-        initViews()
-        return rootView
+    override fun initData() {
+        appComponent.inject(this@EditAccountFragment)
+        arguments?.let { arguments -> account = arguments.getParcelable(KEY_ACCOUNT) }
     }
 
-    fun initViews() {
+    override fun initViews(view: View) {
         etTitle.setText(account.title)
         etGoal.setText(account.goal.toString())
         viewColor.setBackgroundColor(account.color)
+
+        val fabDone = view.rootView.findViewById<FloatingActionButton>(R.id.fabDone)
+        fabDone.setOnClickListener { done() }
     }
 
     private fun done() {
@@ -40,6 +45,11 @@ class EditAccountFragment() : Fragment() {
                 account.id, title, account.curSum.toDouble(),
                 account.currency, account.goal, account.isArchived, account.color
             )
+            val updated = accountController.update(newAccount) != null
+            if (updated) {
+                activity?.setResult(Activity.RESULT_OK)
+                activity?.finish()
+            }
         }
     }
 

app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/base/BaseFragment.kt

@@ -0,0 +1,33 @@
+package com.blogspot.e_kanivets.moneytracker.activity.base
+
+import android.os.Bundle
+import android.support.v4.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import com.blogspot.e_kanivets.moneytracker.MtApp
+import com.blogspot.e_kanivets.moneytracker.di.AppComponent
+
+abstract class BaseFragment : Fragment() {
+
+    protected val appComponent: AppComponent = MtApp.get().appComponent
+
+    protected abstract val contentViewId: Int
+
+    protected abstract fun initData()
+
+    protected abstract fun initViews(view: View)
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        initData()
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? =
+        inflater.inflate(contentViewId, container, false)
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        initViews(view)
+    }
+}

app/src/main/java/com/blogspot/e_kanivets/moneytracker/di/AppComponent.java

@@ -1,6 +1,7 @@
 package com.blogspot.e_kanivets.moneytracker.di;
 
 import com.blogspot.e_kanivets.moneytracker.activity.account.edit.EditAccountActivity;
+import com.blogspot.e_kanivets.moneytracker.activity.account.edit.fragment.EditAccountFragment;
 import com.blogspot.e_kanivets.moneytracker.activity.charts.ChartsActivity;
 import com.blogspot.e_kanivets.moneytracker.activity.external.BackupActivity;
 import com.blogspot.e_kanivets.moneytracker.activity.external.ImportExportActivity;
@@ -81,4 +82,6 @@ public interface AppComponent {
     void inject(MonthSummaryAdapter monthSummaryAdapter);
 
     void inject(EditAccountActivity editAccountActivity);
+
+    void inject(EditAccountFragment editAccountFragment);
 }