Merge pull request #37 from xorum-io/36-upgrade-deps

Upgrade dependencies, migrate to ViewBinding

Author: yev-kanivets

app/build.gradle

@@ -1,20 +1,21 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 apply plugin: 'com.google.gms.google-services'
 apply plugin: 'com.google.firebase.crashlytics'
 
 android {
-    compileSdkVersion 33
-    buildToolsVersion '30.0.3'
+    namespace = "com.blogspot.e_kanivets.moneytracker"
+
+    compileSdkVersion 34
     defaultConfig {
         applicationId 'com.blogspot.e_kanivets.moneytracker'
         minSdkVersion 21
-        targetSdkVersion 33
+        targetSdkVersion 34
 
         versionCode 38
         versionName '2.2.0'
     }
+
     signingConfigs {
         releaseConfig {
             storeFile file('mt_keystore.jks')
@@ -23,6 +24,7 @@ android {
             keyPassword 'moneytracker'
         }
     }
+
     buildTypes {
         release {
             debuggable false
@@ -47,29 +49,27 @@ android {
         }
     }
 
-    lintOptions {
-        checkReleaseBuilds false
+    lint {
         abortOnError false
-    }
-    dexOptions {
-        preDexLibraries = false
-    }
-    productFlavors {
+        checkReleaseBuilds false
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_21
+        targetCompatibility JavaVersion.VERSION_21
+    }
+
+    buildFeatures {
+        viewBinding true
+        buildConfig true
     }
 }
 
 dependencies {
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.appcompat:appcompat:1.3.1'
     implementation 'com.google.android.material:material:1.4.0'
-    implementation 'com.jakewharton:butterknife:10.2.3' // View annotation bindings
-    annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.3' // ButterKnife compiler
-    implementation 'com.google.dagger:dagger:2.35.1' // Dependency injection tool
+    implementation 'com.google.dagger:dagger:2.51.1' // Dependency injection tool
     implementation 'com.github.PhilJay:MPAndroidChart:v2.2.4' // Charts
     implementation 'com.jakewharton.timber:timber:4.7.1' // Advanced logging tool
     implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
@@ -80,7 +80,7 @@ dependencies {
     androidTestImplementation 'com.crittercism.dexmaker:dexmaker:1.4'
     androidTestImplementation 'com.crittercism.dexmaker:dexmaker-dx:1.4'
     androidTestImplementation 'com.crittercism.dexmaker:dexmaker-mockito:1.4'
-    annotationProcessor 'com.google.dagger:dagger-compiler:2.35.1'
+    annotationProcessor 'com.google.dagger:dagger-compiler:2.51.1'
     compileOnly 'org.glassfish:javax.annotation:10.0-b28'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'androidx.cardview:cardview:1.0.0'

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

@@ -1,25 +1,26 @@
 package com.blogspot.e_kanivets.moneytracker.activity;
 
 import android.text.method.LinkMovementMethod;
-import android.widget.TextView;
 
-import com.blogspot.e_kanivets.moneytracker.R;
 import com.blogspot.e_kanivets.moneytracker.activity.base.BaseBackActivity;
-
-import butterknife.BindView;
+import com.blogspot.e_kanivets.moneytracker.databinding.ActivityAboutBinding;
 
 public class AboutActivity extends BaseBackActivity {
-    @BindView(R.id.tv_about)
-    TextView tvAbout;
+
+    private ActivityAboutBinding binding;
 
     @Override
-    protected int getContentViewId() {
-        return R.layout.activity_about;
+    protected void onCreate(android.os.Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        
+        binding = ActivityAboutBinding.inflate(getLayoutInflater());
+        setContentView(binding.getRoot());
+
+        initToolbar();
+        initViews();
     }
 
-    @Override
-    protected void initViews() {
-        super.initViews();
-        tvAbout.setMovementMethod(LinkMovementMethod.getInstance());
+    private void initViews() {
+        binding.tvAbout.setMovementMethod(LinkMovementMethod.getInstance());
     }
 }

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

@@ -1,5 +1,6 @@
 package com.blogspot.e_kanivets.moneytracker.activity
 
+import android.os.Bundle
 import android.view.View
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
@@ -11,13 +12,13 @@ import com.blogspot.e_kanivets.moneytracker.controller.CurrencyController
 import com.blogspot.e_kanivets.moneytracker.controller.FormatController
 import com.blogspot.e_kanivets.moneytracker.controller.data.ExchangeRateController
 import com.blogspot.e_kanivets.moneytracker.controller.data.RecordController
+import com.blogspot.e_kanivets.moneytracker.databinding.ActivityReportBinding
 import com.blogspot.e_kanivets.moneytracker.entity.Period
 import com.blogspot.e_kanivets.moneytracker.entity.RecordReportItem
 import com.blogspot.e_kanivets.moneytracker.entity.data.Record
 import com.blogspot.e_kanivets.moneytracker.report.ReportMaker
 import com.blogspot.e_kanivets.moneytracker.report.record.IRecordReport
 import com.blogspot.e_kanivets.moneytracker.ui.presenter.ShortSummaryPresenter
-import kotlinx.android.synthetic.main.activity_report.*
 import java.util.*
 import javax.inject.Inject
 
@@ -37,10 +38,20 @@ class ReportActivity : BaseBackActivity() {
 
     private lateinit var shortSummaryPresenter: ShortSummaryPresenter
 
-    override fun getContentViewId() = R.layout.activity_report
+    private lateinit var binding: ActivityReportBinding
 
-    override fun initData(): Boolean {
-        super.initData()
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        binding = ActivityReportBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+
+        initData()
+        initToolbar()
+        initViews()
+    }
+
+    private fun initData(): Boolean {
         appComponent.inject(this)
 
         period = intent.getParcelableExtra(KEY_PERIOD)
@@ -54,13 +65,11 @@ class ReportActivity : BaseBackActivity() {
         return true
     }
 
-    override fun initViews() {
-        super.initViews()
-
+    private fun initViews() {
         initSpinnerCurrency()
 
         adapter.setSummaryView(shortSummaryPresenter.create(false, null))
-        recyclerView.adapter = adapter
+        binding.recyclerView.adapter = adapter
     }
 
     private fun update(currency: String) {
@@ -74,17 +83,17 @@ class ReportActivity : BaseBackActivity() {
     private fun initSpinnerCurrency() {
         val currencyList = currencyController.readAll()
 
-        spinnerCurrency.adapter = ArrayAdapter(this, R.layout.view_spinner_item, currencyList)
-        spinnerCurrency.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+        binding.spinnerCurrency.adapter = ArrayAdapter(this, R.layout.view_spinner_item, currencyList)
+        binding.spinnerCurrency.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
             override fun onItemSelected(p0: AdapterView<*>?, p1: View?, p2: Int, p3: Long) =
-                    update(spinnerCurrency.selectedItem.toString())
+                    update(binding.spinnerCurrency.selectedItem.toString())
 
             override fun onNothingSelected(p0: AdapterView<*>?) {}
         }
 
         val currency = currencyController.readDefaultCurrency()
 
-        spinnerCurrency.setSelection(currencyList.indexOf(currency))
+        binding.spinnerCurrency.setSelection(currencyList.indexOf(currency))
     }
 
     class RecordReportConverter {

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

@@ -6,6 +6,8 @@
 import android.preference.Preference;
 import android.preference.PreferenceFragment;
 
+import androidx.annotation.Nullable;
+
 import com.blogspot.e_kanivets.moneytracker.BuildConfig;
 import com.blogspot.e_kanivets.moneytracker.MtApp;
 import com.blogspot.e_kanivets.moneytracker.R;
@@ -14,6 +16,7 @@
 import com.blogspot.e_kanivets.moneytracker.controller.PreferenceController;
 import com.blogspot.e_kanivets.moneytracker.controller.data.AccountController;
 import com.blogspot.e_kanivets.moneytracker.controller.CurrencyController;
+import com.blogspot.e_kanivets.moneytracker.databinding.ActivitySettingsBinding;
 import com.blogspot.e_kanivets.moneytracker.entity.data.Account;
 
 import java.util.ArrayList;
@@ -24,15 +27,22 @@
 public class SettingsActivity extends BaseBackActivity {
     @SuppressWarnings("unused") private static final String TAG = "SettingsActivity";
 
-    @Override protected int getContentViewId() {
-        return R.layout.activity_settings;
-    }
+    private ActivitySettingsBinding binding;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
 
-    @Override protected void initViews() {
-        super.initViews();
+        binding = ActivitySettingsBinding.inflate(getLayoutInflater());
+        setContentView(binding.getRoot());
+
+        initToolbar();
+        initViews();
+    }
 
+    private void initViews() {
         // Display the fragment as the main content.
-        getFragmentManager().beginTransaction().replace(R.id.contentView, new SettingsFragment()).commit();
+        getFragmentManager().beginTransaction().replace(binding.contentView.getId(), new SettingsFragment()).commit();
     }
 
     public static class SettingsFragment extends PreferenceFragment {

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

@@ -1,26 +1,26 @@
 package com.blogspot.e_kanivets.moneytracker.activity.account;
 
 import android.content.Intent;
+
+import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
+
+import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
-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;
+import com.blogspot.e_kanivets.moneytracker.databinding.ActivityAccountsBinding;
 import com.blogspot.e_kanivets.moneytracker.entity.data.Account;
 import com.blogspot.e_kanivets.moneytracker.ui.presenter.AccountsSummaryPresenter;
 import com.blogspot.e_kanivets.moneytracker.util.CrashlyticsProxy;
 
 import javax.inject.Inject;
 
-import butterknife.BindView;
-import butterknife.OnClick;
-import butterknife.OnItemClick;
-
 public class AccountsActivity extends BaseBackActivity {
     @SuppressWarnings("unused")
     private static final String TAG = "AccountsActivity";
@@ -34,29 +34,32 @@ public class AccountsActivity extends BaseBackActivity {
 
     private AccountsSummaryPresenter summaryPresenter;
 
-    @BindView(R.id.listView)
-    ListView listView;
+    private ActivityAccountsBinding binding;
 
     @Override
-    protected int getContentViewId() {
-        return R.layout.activity_accounts;
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        binding = ActivityAccountsBinding.inflate(getLayoutInflater());
+        setContentView(binding.getRoot());
+
+        initData();
+        initToolbar();
+        initViews();
     }
 
-    @Override
-    protected boolean initData() {
-        boolean result = super.initData();
+    private boolean initData() {
         getAppComponent().inject(AccountsActivity.this);
         summaryPresenter = new AccountsSummaryPresenter(AccountsActivity.this);
-        return result;
+        return true;
     }
 
-    @Override
-    protected void initViews() {
-        super.initViews();
-
-        listView.addHeaderView(summaryPresenter.create());
+    private void initViews() {
+        binding.listView.addHeaderView(summaryPresenter.create());
+        binding.listView.setOnItemClickListener((adapterView, view, i, l) -> onAccountClick(i));
+        binding.btnAddAccount.setOnClickListener(view -> addAccount());
 
-        registerForContextMenu(listView);
+        registerForContextMenu(binding.listView);
         update();
     }
 
@@ -75,7 +78,6 @@ public boolean onOptionsItemSelected(MenuItem item) {
         return super.onOptionsItemSelected(item);
     }
 
-    @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);
@@ -86,7 +88,6 @@ public void makeTransfer() {
         startActivityForResult(new Intent(AccountsActivity.this, TransferActivity.class), REQUEST_TRANSFER);
     }
 
-    @OnClick(R.id.btn_add_account)
     public void addAccount() {
         CrashlyticsProxy.get().logButton("Add Account");
         Intent intent = new Intent(AccountsActivity.this, AddAccountActivity.class);
@@ -117,7 +118,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
     }
 
     private void update() {
-        listView.setAdapter(new AccountAdapter(AccountsActivity.this, accountController.readAll()));
+        binding.listView.setAdapter(new AccountAdapter(AccountsActivity.this, accountController.readAll()));
         summaryPresenter.update();
     }
 }