#95. Move EditAccountActivity to activity.account.edit package.

Author: Evgenii Kanivets

app/src/main/AndroidManifest.xml

@@ -87,7 +87,7 @@
             android:screenOrientation="portrait"
             android:theme="@style/Theme.Default" />
         <activity
-            android:name=".activity.account.EditAccountActivity"
+            android:name=".activity.account.edit.EditAccountActivity"
             android:label="@string/title_activity_edit_account"
             android:screenOrientation="portrait"
             android:theme="@style/Theme.Default"

app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/AccountsActivity.java

@@ -7,6 +7,7 @@
 import android.widget.ListView;
 
 import com.blogspot.e_kanivets.moneytracker.R;
+import com.blogspot.e_kanivets.moneytracker.activity.account.edit.EditAccountActivity;
 import com.blogspot.e_kanivets.moneytracker.activity.base.BaseBackActivity;
 import com.blogspot.e_kanivets.moneytracker.adapter.AccountAdapter;
 import com.blogspot.e_kanivets.moneytracker.controller.data.AccountController;

…/activity/account/EditAccountActivity.kt …vity/account/edit/EditAccountActivity.ktapp/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/EditAccountActivity.kt renamed to app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/edit/EditAccountActivity.kt app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/EditAccountActivity.kt renamed to app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/edit/EditAccountActivity.kt

@@ -1,4 +1,4 @@
-package com.blogspot.e_kanivets.moneytracker.activity.account
+package com.blogspot.e_kanivets.moneytracker.activity.account.edit
 
 import android.app.Activity
 import android.app.AlertDialog
@@ -22,9 +22,7 @@ class EditAccountActivity : BaseBackActivity() {
 
     private lateinit var account: Account
 
-    override fun getContentViewId(): Int {
-        return R.layout.activity_edit_account
-    }
+    override fun getContentViewId(): Int = R.layout.activity_edit_account
 
     override fun initData(): Boolean {
         appComponent.inject(this@EditAccountActivity)

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

@@ -1,6 +1,6 @@
 package com.blogspot.e_kanivets.moneytracker.di;
 
-import com.blogspot.e_kanivets.moneytracker.activity.account.EditAccountActivity;
+import com.blogspot.e_kanivets.moneytracker.activity.account.edit.EditAccountActivity;
 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;

app/src/main/res/layout/activity_edit_account.xml

@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
-    tools:context="com.blogspot.e_kanivets.moneytracker.activity.account.EditAccountActivity">
+    tools:context="com.blogspot.e_kanivets.moneytracker.activity.account.edit.EditAccountActivity">
 
     <android.support.design.widget.AppBarLayout
         android:layout_width="match_parent"