Merge branch 'dev'

Author: Evgenii Kanivets

app/src/main/java/com/blogspot/e_kanivets/moneytracker/MtApp.java

@@ -6,7 +6,6 @@
 import com.blogspot.e_kanivets.moneytracker.di.DaggerAppComponent;
 import com.blogspot.e_kanivets.moneytracker.di.module.ControllerModule;
 import com.blogspot.e_kanivets.moneytracker.di.module.repo.CachedRepoModule;
-
 import com.blogspot.e_kanivets.moneytracker.util.AnswersProxy;
 import com.crashlytics.android.Crashlytics;
 

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

@@ -74,7 +74,7 @@ protected void initViews() {
         initSpinnerCurrency();
 
         shortSummaryPresenter = new ShortSummaryPresenter(ReportActivity.this);
-        expandableListView.addHeaderView(shortSummaryPresenter.create(false));
+        expandableListView.addHeaderView(shortSummaryPresenter.create(false, null));
     }
 
     private void update(String currency) {

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

@@ -22,30 +22,36 @@
 import butterknife.OnItemClick;
 
 public class AccountsActivity extends BaseBackActivity {
-    @SuppressWarnings("unused") private static final String TAG = "AccountsActivity";
+    @SuppressWarnings("unused")
+    private static final String TAG = "AccountsActivity";
 
     private static final int REQUEST_ADD_ACCOUNT = 1;
     private static final int REQUEST_TRANSFER = 2;
     private static final int REQUEST_EDIT_ACCOUNT = 3;
 
-    @Inject AccountController accountController;
+    @Inject
+    AccountController accountController;
 
     private AccountsSummaryPresenter summaryPresenter;
 
-    @BindView(R.id.list_view) ListView listView;
+    @BindView(R.id.listView)
+    ListView listView;
 
-    @Override protected int getContentViewId() {
+    @Override
+    protected int getContentViewId() {
         return R.layout.activity_accounts;
     }
 
-    @Override protected boolean initData() {
+    @Override
+    protected boolean initData() {
         boolean result = super.initData();
         getAppComponent().inject(AccountsActivity.this);
         summaryPresenter = new AccountsSummaryPresenter(AccountsActivity.this);
         return result;
     }
 
-    @Override protected void initViews() {
+    @Override
+    protected void initViews() {
         super.initViews();
 
         listView.addHeaderView(summaryPresenter.create());
@@ -54,23 +60,23 @@ public class AccountsActivity extends BaseBackActivity {
         update();
     }
 
-    @Override public boolean onCreateOptionsMenu(Menu menu) {
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.menu_accounts, menu);
         return true;
     }
 
-    @Override public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.action_transfer:
-                makeTransfer();
-                return true;
-
-            default:
-                return super.onOptionsItemSelected(item);
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == R.id.action_transfer) {
+            makeTransfer();
+            return true;
         }
+        return super.onOptionsItemSelected(item);
     }
 
-    @OnItemClick(R.id.list_view) public void onAccountClick(int position) {
+    @OnItemClick(R.id.listView)
+    public void onAccountClick(int position) {
         Account account = accountController.readAll().get(position - 1);
         startActivityForResult(EditAccountActivity.Companion.newIntent(this, account), REQUEST_EDIT_ACCOUNT);
     }
@@ -80,13 +86,15 @@ public void makeTransfer() {
         startActivityForResult(new Intent(AccountsActivity.this, TransferActivity.class), REQUEST_TRANSFER);
     }
 
-    @OnClick(R.id.btn_add_account) public void addAccount() {
+    @OnClick(R.id.btn_add_account)
+    public void addAccount() {
         AnswersProxy.get().logButton("Add Account");
         Intent intent = new Intent(AccountsActivity.this, AddAccountActivity.class);
         startActivityForResult(intent, REQUEST_ADD_ACCOUNT);
     }
 
-    @Override public void onActivityResult(int requestCode, int resultCode, Intent data) {
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
 
         if (resultCode == AppCompatActivity.RESULT_OK) {

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

@@ -7,6 +7,7 @@ import android.content.Intent
 import android.support.v4.view.ViewPager.OnPageChangeListener
 import android.view.Menu
 import android.view.MenuItem
+import android.view.View
 import com.blogspot.e_kanivets.moneytracker.R
 import com.blogspot.e_kanivets.moneytracker.activity.account.edit.fragment.AccountOperationsFragment
 import com.blogspot.e_kanivets.moneytracker.activity.account.edit.fragment.EditAccountFragment
@@ -18,6 +19,8 @@ import kotlinx.android.synthetic.main.activity_edit_account.fabDone
 import kotlinx.android.synthetic.main.activity_edit_account.tabLayout
 import kotlinx.android.synthetic.main.activity_edit_account.viewPager
 import javax.inject.Inject
+import android.view.inputmethod.InputMethodManager
+import kotlinx.android.synthetic.main.fragment_edit_account.*
 
 class EditAccountActivity : BaseBackActivity() {
 
@@ -55,12 +58,30 @@ class EditAccountActivity : BaseBackActivity() {
             override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) {}
 
             override fun onPageSelected(position: Int) {
-                if (position == 0) fabDone.show() else fabDone.hide()
+                if (position == 0) {
+                    fabDone.show()
+                    showKeyboard()
+                } else {
+                    fabDone.hide()
+                    hideKeyboard()
+                }
             }
-
         })
     }
 
+    private fun hideKeyboard() {
+        val view: View? = currentFocus
+        if (view != null) {
+            val imm = getSystemService(Activity.INPUT_METHOD_SERVICE) as InputMethodManager
+            imm.hideSoftInputFromWindow(view.windowToken, 0)
+        }
+    }
+
+    private fun showKeyboard() {
+        val imm = getSystemService(Activity.INPUT_METHOD_SERVICE) as InputMethodManager
+        imm.showSoftInput(etTitle, 0)
+    }
+
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         menuInflater.inflate(if (account.isArchived) R.menu.menu_archived_account else R.menu.menu_account, menu)
         return true

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

@@ -30,11 +30,11 @@ class AccountOperationsFragment : BaseFragment() {
 
     override fun initData() {
         appComponent.inject(this@AccountOperationsFragment)
-        arguments?.let { arguments -> account = arguments.getParcelable(AccountOperationsFragment.KEY_ACCOUNT) }
+        arguments?.let { arguments -> account = arguments.getParcelable(KEY_ACCOUNT) }
     }
 
     override fun initViews(view: View) {
-        listView.adapter = RecordAdapter(activity, getRecords())
+        recyclerView.adapter = RecordAdapter(requireContext(), getRecords(), false, null)
     }
 
     private fun getRecords(): List<Record> {
@@ -83,4 +83,5 @@ class AccountOperationsFragment : BaseFragment() {
         }
 
     }
+
 }

app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/charts/fragment/GraphFragment.java

@@ -107,5 +107,4 @@ private void initViews(@Nullable View rootView) {
             barChart.setHighlightPerTapEnabled(false);
         }
     }
-
 }

app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/charts/fragment/SummaryFragment.java

@@ -26,7 +26,7 @@ public class SummaryFragment extends Fragment {
     @Nullable
     private IMonthReport monthReport;
 
-    @BindView(R.id.list_view)
+    @BindView(R.id.listView)
     ListView listView;
 
     public SummaryFragment() {
@@ -72,5 +72,4 @@ private void initViews(@Nullable View rootView) {
             listView.setAdapter(new MonthSummaryAdapter(getActivity(), monthReport));
         }
     }
-
 }

app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/exchange_rate/ExchangeRatesActivity.java

@@ -37,7 +37,7 @@ public class ExchangeRatesActivity extends BaseBackActivity {
 
     private List<ExchangeRatePair> exchangeRateList;
 
-    @BindView(R.id.list_view)
+    @BindView(R.id.listView)
     ListView listView;
 
     @Override
@@ -93,7 +93,7 @@ public void addExchangeRate() {
         startActivityForResult(intent, REQUEST_ADD_EXCHANGE_RATE);
     }
 
-    @OnItemClick(R.id.list_view)
+    @OnItemClick(R.id.listView)
     public void addExchangeRateOnBaseOfExisted(int position) {
         AnswersProxy.get().logButton("Edit Exchange Rate");
         if (position < 0 || position >= exchangeRateList.size()) return;

app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/external/BackupActivity.java

@@ -38,7 +38,7 @@ public class BackupActivity extends BaseBackActivity
     private DbxClientV2 dbClient;
 
     @BindView(R.id.btn_backup_now) View btnBackupNow;
-    @BindView(R.id.list_view) ListView listView;
+    @BindView(R.id.listView) ListView listView;
 
     @Override protected int getContentViewId() {
         return R.layout.activity_backup;
@@ -180,7 +180,7 @@ public class BackupActivity extends BaseBackActivity
         backupController.makeBackup(dbClient);
     }
 
-    @OnItemClick(R.id.list_view) public void restoreBackupClicked(int position) {
+    @OnItemClick(R.id.listView) public void restoreBackupClicked(int position) {
         AnswersProxy.get().logButton("Restore backup");
         final String backupName = listView.getAdapter().getItem(position).toString();