Update for latest build tools

app/build.gradle

@@ -1,28 +1,31 @@
+plugins {
+    id 'com.android.application'
+    id 'kotlin-android'
+    id 'kotlin-kapt'
+}
+
 def version = "1"
 def milestone = "0"
-def build = "0"
+def build = "1"
 
 def versionNum = version.toInteger() * 10000 + milestone.toInteger() * 100 + build.toInteger()
 def versionText = version + "." + milestone + "." + build
 
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
-apply plugin: 'kotlin-kapt'
-
 android {
-    compileSdkVersion 28
+    compileSdkVersion 31
     defaultConfig {
         applicationId "info.megahard.epshowcase"
         minSdkVersion 15
-        targetSdkVersion 28
+        targetSdkVersion 31
         versionCode versionNum
         versionName versionText
         resValue "string", "app_version", 'v ' + versionText
+        multiDexEnabled true
 
         javaCompileOptions {
             annotationProcessorOptions {
-                arguments = [toothpick_registry_package_name: 'info.megahard.epshowcase.toothpick']
+                arguments = [toothpick_registry_package_name:
+                                     'info.megahard.epshowcase.toothpick']
             }
         }
     }
@@ -35,9 +38,14 @@ android {
     buildTypes {
         release {
             minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android.txt'),
+                    'proguard-rules.pro'
         }
     }
+    buildFeatures {
+
+        viewBinding true
+    }
     applicationVariants.all { variant ->
         variant.outputs.all { output ->
             def newName = name + "-" + versionText + ".apk"
@@ -48,42 +56,52 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+
     // Support
-    implementation 'androidx.appcompat:appcompat:1.0.0-beta01'
-    implementation 'com.google.android.material:material:1.0.0-beta01'
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0-beta01'
-    implementation 'androidx.recyclerview:recyclerview:1.0.0-beta01'
-    implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'android.arch.navigation:navigation-fragment:1.0.0-alpha09'
-    implementation 'android.arch.navigation:navigation-ui:1.0.0-alpha09'
+    implementation 'androidx.appcompat:appcompat:1.4.0'
+    implementation 'com.google.android.material:material:1.6.0-alpha01'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'androidx.recyclerview:recyclerview:1.3.0-alpha01'
+    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.2'
+    implementation 'android.arch.navigation:navigation-fragment:1.0.0'
+    implementation 'android.arch.navigation:navigation-ui:1.0.0'
+    implementation 'androidx.fragment:fragment-ktx:1.4.0'
+    implementation 'androidx.multidex:multidex:2.0.1'
 
     // Toothpick
     implementation 'com.github.stephanenicolas.toothpick:toothpick-runtime:1.1.3'
     kapt "com.github.stephanenicolas.toothpick:toothpick-compiler:1.1.3"
+
     // Timber
-    implementation 'com.jakewharton.timber:timber:4.7.1'
+    implementation 'com.jakewharton.timber:timber:5.0.1'
+
     // Retrofit
-    implementation 'com.squareup.retrofit2:retrofit:2.3.0'
-    implementation 'com.squareup.retrofit2:converter-gson:2.3.0'
-    implementation 'com.squareup.retrofit2:adapter-rxjava2:2.3.0'
+    implementation 'com.squareup.retrofit2:retrofit:2.9.0'
+    implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
+    implementation 'com.squareup.retrofit2:adapter-rxjava2:2.9.0'
+
     // Rx
-    implementation 'io.reactivex.rxjava2:rxjava:2.2.2'
-    implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'
+    implementation 'io.reactivex.rxjava2:rxjava:2.2.21'
+    implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
     implementation 'com.jakewharton.rxbinding2:rxbinding-appcompat-v7:2.0.0'
+
     // OkHttp
-    implementation 'com.squareup.okhttp3:okhttp:3.12.0'
+    implementation 'com.squareup.okhttp3:okhttp:3.14.9'
     implementation 'com.squareup.okhttp3:logging-interceptor:3.9.0'
+
     // Glide
-    implementation 'com.github.bumptech.glide:glide:4.8.0'
-    kapt 'com.github.bumptech.glide:compiler:4.8.0'
-    implementation 'com.github.bumptech.glide:okhttp3-integration:4.8.0'
+    implementation 'com.github.bumptech.glide:glide:4.11.0'
+    kapt 'com.github.bumptech.glide:compiler:4.11.0'
+    implementation 'com.github.bumptech.glide:okhttp3-integration:4.11.0'
+
     // FragmentWithArgs
     implementation 'com.hannesdorfmann.fragmentargs:annotation:3.0.2'
     kapt 'com.hannesdorfmann.fragmentargs:processor:3.0.2'
+
     // Tests
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test:runner:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test:runner:1.4.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 }

app/src/main/AndroidManifest.xml

@@ -17,12 +17,14 @@
         android:theme="@style/AppTheme"
         android:hardwareAccelerated="true"
         android:networkSecurityConfig="@xml/network_security_config"
-        tools:ignore="GoogleAppIndexingWarning">
+        tools:ignore="GoogleAppIndexingWarning"
+        android:fullBackupContent="@xml/backup_descriptor">
 
         <activity
             android:name=".main.MainActivity"
             android:label="@string/app_name"
-            android:theme="@style/AppTheme.NoActionBar">
+            android:theme="@style/AppTheme.NoActionBar"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

app/src/main/java/info/megahard/epshowcase/app/App.kt

@@ -1,6 +1,7 @@
 package info.megahard.epshowcase.app
 
 import android.app.Application
+import androidx.multidex.MultiDexApplication
 import info.megahard.epshowcase.BuildConfig
 import timber.log.Timber
 import toothpick.Toothpick
@@ -10,7 +11,8 @@ import toothpick.configuration.Configuration.forProduction
 import toothpick.registries.FactoryRegistryLocator
 import toothpick.registries.MemberInjectorRegistryLocator
 
-class App : Application() {
+class App : MultiDexApplication() {
+
     override fun onCreate() {
         super.onCreate()
 

app/src/main/java/info/megahard/epshowcase/bio/BioFragment.kt

@@ -5,6 +5,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.databinding.DataBindingUtil
+import androidx.fragment.app.viewModels
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProviders
 import info.megahard.epshowcase.R
@@ -13,14 +14,14 @@ import info.megahard.epshowcase.databinding.BioFragmentBinding
 
 class BioFragment : BaseFragment() {
 
+    private val viewModel: BioViewModel by viewModels()
+
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
+    ): View {
         super.onCreateView(inflater, container, savedInstanceState)
 
-        val viewModel = ViewModelProviders.of(activity!!).get(BioViewModel::class.java)
-
         val binding: BioFragmentBinding = DataBindingUtil.inflate(inflater, R.layout.bio_fragment, container, false)
 
         lifecycle.addObserver(viewModel)

app/src/main/java/info/megahard/epshowcase/experience/ExperienceFragment.kt

@@ -5,12 +5,13 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
+import info.megahard.epshowcase.R
 import info.megahard.epshowcase.databinding.PlaceholderFragmentBinding
 
 class ExperienceFragment : Fragment() {
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         val binding = PlaceholderFragmentBinding.inflate(inflater)
-        binding.name = "Experience"
+        binding.name = getString(R.string.experience)
         return binding.root
     }
 }

app/src/main/java/info/megahard/epshowcase/main/MainActivity.kt

@@ -10,38 +10,41 @@ import androidx.navigation.ui.NavigationUI
 import com.google.android.material.navigation.NavigationView
 import info.megahard.epshowcase.R
 import info.megahard.epshowcase.base.BaseActivity
-import kotlinx.android.synthetic.main.activity_main.*
-import kotlinx.android.synthetic.main.app_bar_main.*
-import kotlinx.android.synthetic.main.content_main.*
+import info.megahard.epshowcase.databinding.ActivityMainBinding
 
 
 class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedListener {
 
+    private lateinit var binding: ActivityMainBinding
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
+        binding = ActivityMainBinding.inflate(layoutInflater)
 
-        setContentView(R.layout.activity_main)
-        setSupportActionBar(toolbar)
+        setContentView(binding.root)
+        setSupportActionBar(binding.appBarMain.toolbar)
 
         val toggle = ActionBarDrawerToggle(
-            this, drawer_layout, toolbar,
+            this, binding.drawerLayout, binding.appBarMain.toolbar,
             R.string.navigation_drawer_open, R.string.navigation_drawer_close
         )
-        drawer_layout.addDrawerListener(toggle)
+        binding.drawerLayout.addDrawerListener(toggle)
         toggle.syncState()
 
-        nav_view.setNavigationItemSelectedListener(this)
+        binding.navView.setNavigationItemSelectedListener(this)
 
         NavigationUI.setupWithNavController(
-            bottom_navigation,
+            binding.appBarMain.contentMain.bottomNavigation,
             Navigation.findNavController(this, R.id.bottom_nav_host_fragment)
         )
     }
 
     override fun onBackPressed() {
-        if (drawer_layout.isDrawerOpen(GravityCompat.START)) {
-            drawer_layout.closeDrawer(GravityCompat.START)
+        if (binding.drawerLayout.isDrawerOpen(GravityCompat.START)) {
+            binding.drawerLayout.closeDrawer(GravityCompat.START)
+        } else {
+            super.onBackPressed()
         }
     }
 
@@ -59,27 +62,27 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
 
     override fun onNavigationItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
-            R.id.nav_camera -> {
-                // Handle the camera action
-            }
-            R.id.nav_gallery -> {
-
-            }
-            R.id.nav_slideshow -> {
-
-            }
-            R.id.nav_manage -> {
-
-            }
+//            R.id.nav_camera -> {
+//                // Handle the camera action
+//            }
+//            R.id.nav_gallery -> {
+//
+//            }
+//            R.id.nav_slideshow -> {
+//
+//            }
+//            R.id.nav_manage -> {
+//
+//            }
             R.id.nav_share -> {
 
             }
-            R.id.nav_send -> {
-
-            }
+//            R.id.nav_send -> {
+//
+//            }
         }
 
-        drawer_layout.closeDrawer(GravityCompat.START)
+        binding.drawerLayout.closeDrawer(GravityCompat.START)
         return true
     }
 }

app/src/main/java/info/megahard/epshowcase/projects/ProjectsFragment.kt

@@ -5,12 +5,13 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
+import info.megahard.epshowcase.R
 import info.megahard.epshowcase.databinding.PlaceholderFragmentBinding
 
 class ProjectsFragment : Fragment() {
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         val binding = PlaceholderFragmentBinding.inflate(inflater)
-        binding.name = "Projects"
+        binding.name = getString(R.string.projects)
         return binding.root
     }
 }

app/src/main/java/info/megahard/epshowcase/skills/SkillsFragment.kt

@@ -5,12 +5,13 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
+import info.megahard.epshowcase.R
 import info.megahard.epshowcase.databinding.PlaceholderFragmentBinding
 
 class SkillsFragment : Fragment() {
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         val binding = PlaceholderFragmentBinding.inflate(inflater)
-        binding.name = "Skills"
+        binding.name = getString(R.string.skills)
         return binding.root
     }
 }

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

@@ -9,6 +9,7 @@
     tools:openDrawer="start">
 
     <include
+        android:id="@+id/app_bar_main"
         layout="@layout/app_bar_main"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />

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

@@ -20,6 +20,8 @@
 
     </com.google.android.material.appbar.AppBarLayout>
 
-    <include layout="@layout/content_main" />
+    <include
+        android:id="@+id/content_main"
+        layout="@layout/content_main" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>