From d309fed9719f18cbe36fbaf1bf7a211e829724b6 Mon Sep 17 00:00:00 2001
From: James Shvarts <jshvarts@squarespace.com>
Date: Sun, 19 May 2019 16:34:45 -0400
Subject: [PATCH] Convert to AndroidX and fix package structure

---
 app/build.gradle                                   | 14 +++++++++-----
 app/src/main/AndroidManifest.xml                   |  6 +++---
 .../App.kt                                         |  6 +++---
 .../common/data/CommonHelloService.kt              |  4 ++--
 .../di/ActivitiesModule.kt                         | 12 ++++++------
 .../di/AppComponent.kt                             |  6 +++---
 .../di/AppModule.kt                                |  6 +++---
 .../daggerandroidmvp/lobby/LobbyActivity.kt        | 11 +++++------
 .../lobby/LobbyActivityHelloService.kt             |  4 ++--
 .../daggerandroidmvp/lobby/LobbyActivityModule.kt  |  4 ++--
 .../daggerandroidmvp/lobby/LobbyFragment.kt        | 10 +++++-----
 .../lobby/LobbyFragmentHelloService.kt             |  4 ++--
 .../daggerandroidmvp/lobby/LobbyFragmentModule.kt  |  4 ++--
 app/src/main/res/layout/lobby_activity.xml         |  4 ++--
 build.gradle                                       |  1 +
 gradle.properties                                  |  2 ++
 16 files changed, 52 insertions(+), 46 deletions(-)
 rename app/src/main/kotlin/com/jshvarts/{daggerandroidsampleapp => daggerandroidmvp}/App.kt (84%)
 rename app/src/main/kotlin/com/jshvarts/{daggerandroidsampleapp => daggerandroidmvp}/common/data/CommonHelloService.kt (58%)
 rename app/src/main/kotlin/com/jshvarts/{daggerandroidsampleapp => daggerandroidmvp}/di/ActivitiesModule.kt (63%)
 rename app/src/main/kotlin/com/jshvarts/{daggerandroidsampleapp => daggerandroidmvp}/di/AppComponent.kt (75%)
 rename app/src/main/kotlin/com/jshvarts/{daggerandroidsampleapp => daggerandroidmvp}/di/AppModule.kt (73%)
 rename app/src/main/kotlin/com/jshvarts/{daggerandroidsampleapp/com/jshvarts => }/daggerandroidmvp/lobby/LobbyActivity.kt (87%)
 rename app/src/main/kotlin/com/jshvarts/{daggerandroidsampleapp/com/jshvarts => }/daggerandroidmvp/lobby/LobbyActivityHelloService.kt (65%)
 rename app/src/main/kotlin/com/jshvarts/{daggerandroidsampleapp/com/jshvarts => }/daggerandroidmvp/lobby/LobbyActivityModule.kt (76%)
 rename app/src/main/kotlin/com/jshvarts/{daggerandroidsampleapp/com/jshvarts => }/daggerandroidmvp/lobby/LobbyFragment.kt (91%)
 rename app/src/main/kotlin/com/jshvarts/{daggerandroidsampleapp/com/jshvarts => }/daggerandroidmvp/lobby/LobbyFragmentHelloService.kt (65%)
 rename app/src/main/kotlin/com/jshvarts/{daggerandroidsampleapp/com/jshvarts => }/daggerandroidmvp/lobby/LobbyFragmentModule.kt (76%)

diff --git a/app/build.gradle b/app/build.gradle
index aa109c8..9859dcc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,19 +9,19 @@ apply plugin: 'kotlin-android-extensions'
 project.ext {
     supportLibraryVersion = "28.0.0"
     daggerVersion = "2.22.1"
-    butterKnifeVersion = "8.5.1"
+    butterKnifeVersion = "10.1.0"
 }
 
 android {
     compileSdkVersion 28
     buildToolsVersion "28.0.3"
     defaultConfig {
-        applicationId "com.jshvarts.daggerandroidsampleapp"
+        applicationId "com.jshvarts.daggerandroidmvp"
         minSdkVersion 19
         targetSdkVersion 28
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
@@ -34,12 +34,16 @@ android {
         test.java.srcDirs += 'src/test/kotlin'
         androidTest.java.srcDirs += 'src/androidTest/kotlin'
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation "com.android.support:appcompat-v7:$project.supportLibraryVersion"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "androidx.appcompat:appcompat:1.0.2"
 
     // Dagger Core
     implementation "com.google.dagger:dagger:$project.daggerVersion"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b313909..93fabfc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.jshvarts.daggerandroidsampleapp">
+    package="com.jshvarts.daggerandroidmvp">
 
     <application
-        android:name=".App"
+        android:name="com.jshvarts.daggerandroidmvp.App"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".lobby.LobbyActivity">
+        <activity android:name="com.jshvarts.daggerandroidmvp.lobby.LobbyActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/app/src/main/kotlin/com/jshvarts/daggerandroidsampleapp/App.kt b/app/src/main/kotlin/com/jshvarts/daggerandroidmvp/App.kt
similarity index 84%
rename from app/src/main/kotlin/com/jshvarts/daggerandroidsampleapp/App.kt
rename to app/src/main/kotlin/com/jshvarts/daggerandroidmvp/App.kt
index 5929093..b04c86f 100644
--- a/app/src/main/kotlin/com/jshvarts/daggerandroidsampleapp/App.kt
+++ b/app/src/main/kotlin/com/jshvarts/daggerandroidmvp/App.kt
@@ -1,8 +1,8 @@
-package com.jshvarts.daggerandroidsampleapp
+package com.jshvarts.daggerandroidmvp
 
 import android.app.Activity
 import android.app.Application
-import com.jshvarts.daggerandroidsampleapp.di.DaggerAppComponent
+import com.jshvarts.daggerandroidmvp.di.DaggerAppComponent
 import dagger.android.AndroidInjector
 import dagger.android.HasActivityInjector
 import dagger.android.DispatchingAndroidInjector
@@ -22,4 +22,4 @@ class App : Application(), HasActivityInjector {
     }
 
     override fun activityInjector(): AndroidInjector<Activity> = activityInjector
-}
\ No newline at end of file
+}
diff --git a/app/src/main/kotlin/com/jshvarts/daggerandroidsampleapp/common/data/CommonHelloService.kt b/app/src/main/kotlin/com/jshvarts/daggerandroidmvp/common/data/CommonHelloService.kt
similarity index 58%
rename from app/src/main/kotlin/com/jshvarts/daggerandroidsampleapp/common/data/CommonHelloService.kt
rename to app/src/main/kotlin/com/jshvarts/daggerandroidmvp/common/data/CommonHelloService.kt
index 0abb53a..80eadf5 100644
--- a/app/src/main/kotlin/com/jshvarts/daggerandroidsampleapp/common/data/CommonHelloService.kt
+++ b/app/src/main/kotlin/com/jshvarts/daggerandroidmvp/common/data/CommonHelloService.kt
@@ -1,5 +1,5 @@
-package com.jshvarts.daggerandroidsampleapp.common.data
+package com.jshvarts.daggerandroidmvp.common.data
 
 class CommonHelloService {
     fun sayHello() = "Hello from CommonHelloService"
-}
\ No newline at end of file
+}
diff --git a/app/src/main/kotlin/com/jshvarts/daggerandroidsampleapp/di/ActivitiesModule.kt b/app/src/main/kotlin/com/jshvarts/daggerandroidmvp/di/ActivitiesModule.kt
similarity index 63%
rename from app/src/main/kotlin/com/jshvarts/daggerandroidsampleapp/di/ActivitiesModule.kt
rename to app/src/main/kotlin/com/jshvarts/daggerandroidmvp/di/ActivitiesModule.kt
index 8b09dc1..d2efae7 100644
--- a/app/src/main/kotlin/com/jshvarts/daggerandroidsampleapp/di/ActivitiesModule.kt
+++ b/app/src/main/kotlin/com/jshvarts/daggerandroidmvp/di/ActivitiesModule.kt
@@ -1,9 +1,9 @@
-package com.jshvarts.daggerandroidsampleapp.di
+package com.jshvarts.daggerandroidmvp.di
 
-import com.jshvarts.daggerandroidsampleapp.lobby.LobbyActivity
-import com.jshvarts.daggerandroidsampleapp.lobby.LobbyActivityModule
-import com.jshvarts.daggerandroidsampleapp.lobby.LobbyFragment
-import com.jshvarts.daggerandroidsampleapp.lobby.LobbyFragmentModule
+import com.jshvarts.daggerandroidmvp.lobby.LobbyActivity
+import com.jshvarts.daggerandroidmvp.lobby.LobbyActivityModule
+import com.jshvarts.daggerandroidmvp.lobby.LobbyFragment
+import com.jshvarts.daggerandroidmvp.lobby.LobbyFragmentModule
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
 
@@ -17,4 +17,4 @@ abstract class ActivitiesModule {
     // or access to lobby dependencies from fragment via:
     // @ContributesAndroidInjector(modules = {LobbyFragmentModule.class, LobbyActivityModule.class})
     abstract fun bindLobbyFragment(): LobbyFragment
-}
\ No newline at end of file
+}
diff --git a/app/src/main/kotlin/com/jshvarts/daggerandroidsampleapp/di/AppComponent.kt b/app/src/main/kotlin/com/jshvarts/daggerandroidmvp/di/AppComponent.kt
similarity index 75%
rename from app/src/main/kotlin/com/jshvarts/daggerandroidsampleapp/di/AppComponent.kt
rename to app/src/main/kotlin/com/jshvarts/daggerandroidmvp/di/AppComponent.kt
index 40e7203..a89ff85 100644
--- a/app/src/main/kotlin/com/jshvarts/daggerandroidsampleapp/di/AppComponent.kt
+++ b/app/src/main/kotlin/com/jshvarts/daggerandroidmvp/di/AppComponent.kt
@@ -1,6 +1,6 @@
-package com.jshvarts.daggerandroidsampleapp.di
+package com.jshvarts.daggerandroidmvp.di
 
-import com.jshvarts.daggerandroidsampleapp.App
+import com.jshvarts.daggerandroidmvp.App
 import dagger.Component
 import dagger.android.AndroidInjectionModule
 import javax.inject.Singleton
@@ -13,4 +13,4 @@ import javax.inject.Singleton
 ))
 interface AppComponent {
     fun inject(app: App)
-}
\ No newline at end of file
+}
diff --git a/app/src/main/kotlin/com/jshvarts/daggerandroidsampleapp/di/AppModule.kt b/app/src/main/kotlin/com/jshvarts/daggerandroidmvp/di/AppModule.kt
similarity index 73%
rename from app/src/main/kotlin/com/jshvarts/daggerandroidsampleapp/di/AppModule.kt
rename to app/src/main/kotlin/com/jshvarts/daggerandroidmvp/di/AppModule.kt
index 3aac966..f52709c 100644
--- a/app/src/main/kotlin/com/jshvarts/daggerandroidsampleapp/di/AppModule.kt
+++ b/app/src/main/kotlin/com/jshvarts/daggerandroidmvp/di/AppModule.kt
@@ -1,7 +1,7 @@
-package com.jshvarts.daggerandroidsampleapp.di
+package com.jshvarts.daggerandroidmvp.di
 
 import android.app.Application
-import com.jshvarts.daggerandroidsampleapp.common.data.CommonHelloService
+import com.jshvarts.daggerandroidmvp.common.data.CommonHelloService
 import dagger.Module
 import dagger.Provides
 import javax.inject.Singleton
@@ -15,4 +15,4 @@ class AppModule {
     @Singleton
     @Provides
     fun providesCommonHelloService() = CommonHelloService()
-}
\ No newline at end of file
+}
diff --git a/app/src/main/kotlin/com/jshvarts/daggerandroidsampleapp/com/jshvarts/daggerandroidmvp/lobby/LobbyActivity.kt b/app/src/main/kotlin/com/jshvarts/daggerandroidmvp/lobby/LobbyActivity.kt
similarity index 87%
rename from app/src/main/kotlin/com/jshvarts/daggerandroidsampleapp/com/jshvarts/daggerandroidmvp/lobby/LobbyActivity.kt
rename to app/src/main/kotlin/com/jshvarts/daggerandroidmvp/lobby/LobbyActivity.kt
index 1fb19c2..85a10fe 100644
--- a/app/src/main/kotlin/com/jshvarts/daggerandroidsampleapp/com/jshvarts/daggerandroidmvp/lobby/LobbyActivity.kt
+++ b/app/src/main/kotlin/com/jshvarts/daggerandroidmvp/lobby/LobbyActivity.kt
@@ -1,20 +1,19 @@
-package com.jshvarts.daggerandroidsampleapp.lobby
+package com.jshvarts.daggerandroidmvp.lobby
 
-import android.app.Fragment
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
-import com.jshvarts.daggerandroidsampleapp.R
-import com.jshvarts.daggerandroidsampleapp.common.data.CommonHelloService
+import com.jshvarts.daggerandroidmvp.R
+import com.jshvarts.daggerandroidmvp.common.data.CommonHelloService
 import dagger.android.AndroidInjection
 import dagger.android.AndroidInjector
 import dagger.android.HasFragmentInjector
 import javax.inject.Inject
 import dagger.android.DispatchingAndroidInjector
 import android.widget.TextView
+import android.app.Fragment
 import butterknife.BindView
 import butterknife.ButterKnife
 
-
 class LobbyActivity : AppCompatActivity(), HasFragmentInjector {
 
     @Inject
diff --git a/app/src/main/kotlin/com/jshvarts/daggerandroidsampleapp/com/jshvarts/daggerandroidmvp/lobby/LobbyActivityHelloService.kt b/app/src/main/kotlin/com/jshvarts/daggerandroidmvp/lobby/LobbyActivityHelloService.kt
similarity index 65%
rename from app/src/main/kotlin/com/jshvarts/daggerandroidsampleapp/com/jshvarts/daggerandroidmvp/lobby/LobbyActivityHelloService.kt
rename to app/src/main/kotlin/com/jshvarts/daggerandroidmvp/lobby/LobbyActivityHelloService.kt
index 0f72ab7..db5c57d 100644
--- a/app/src/main/kotlin/com/jshvarts/daggerandroidsampleapp/com/jshvarts/daggerandroidmvp/lobby/LobbyActivityHelloService.kt
+++ b/app/src/main/kotlin/com/jshvarts/daggerandroidmvp/lobby/LobbyActivityHelloService.kt
@@ -1,5 +1,5 @@
-package com.jshvarts.daggerandroidsampleapp.lobby
+package com.jshvarts.daggerandroidmvp.lobby
 
 class LobbyActivityHelloService {
     fun sayHello() = "Hello from LobbyActivityHelloService"
-}
\ No newline at end of file
+}
diff --git a/app/src/main/kotlin/com/jshvarts/daggerandroidsampleapp/com/jshvarts/daggerandroidmvp/lobby/LobbyActivityModule.kt b/app/src/main/kotlin/com/jshvarts/daggerandroidmvp/lobby/LobbyActivityModule.kt
similarity index 76%
rename from app/src/main/kotlin/com/jshvarts/daggerandroidsampleapp/com/jshvarts/daggerandroidmvp/lobby/LobbyActivityModule.kt
rename to app/src/main/kotlin/com/jshvarts/daggerandroidmvp/lobby/LobbyActivityModule.kt
index ec7d664..97e7370 100644
--- a/app/src/main/kotlin/com/jshvarts/daggerandroidsampleapp/com/jshvarts/daggerandroidmvp/lobby/LobbyActivityModule.kt
+++ b/app/src/main/kotlin/com/jshvarts/daggerandroidmvp/lobby/LobbyActivityModule.kt
@@ -1,4 +1,4 @@
-package com.jshvarts.daggerandroidsampleapp.lobby
+package com.jshvarts.daggerandroidmvp.lobby
 
 import dagger.Module
 import dagger.Provides
@@ -8,4 +8,4 @@ class LobbyActivityModule {
 
     @Provides
     fun provideLobbyActivityHelloService() = LobbyActivityHelloService()
-}
\ No newline at end of file
+}
diff --git a/app/src/main/kotlin/com/jshvarts/daggerandroidsampleapp/com/jshvarts/daggerandroidmvp/lobby/LobbyFragment.kt b/app/src/main/kotlin/com/jshvarts/daggerandroidmvp/lobby/LobbyFragment.kt
similarity index 91%
rename from app/src/main/kotlin/com/jshvarts/daggerandroidsampleapp/com/jshvarts/daggerandroidmvp/lobby/LobbyFragment.kt
rename to app/src/main/kotlin/com/jshvarts/daggerandroidmvp/lobby/LobbyFragment.kt
index 11621ae..d79ac18 100644
--- a/app/src/main/kotlin/com/jshvarts/daggerandroidsampleapp/com/jshvarts/daggerandroidmvp/lobby/LobbyFragment.kt
+++ b/app/src/main/kotlin/com/jshvarts/daggerandroidmvp/lobby/LobbyFragment.kt
@@ -1,6 +1,5 @@
-package com.jshvarts.daggerandroidsampleapp.lobby
+package com.jshvarts.daggerandroidmvp.lobby
 
-import android.app.Fragment
 import android.content.Context
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -9,9 +8,10 @@ import android.view.ViewGroup
 import dagger.android.AndroidInjection
 import javax.inject.Inject
 import android.widget.TextView
+import android.app.Fragment
 import butterknife.BindView
 import butterknife.ButterKnife
-import com.jshvarts.daggerandroidsampleapp.R
+import com.jshvarts.daggerandroidmvp.R
 import butterknife.Unbinder
 
 class LobbyFragment : Fragment() {
@@ -22,7 +22,7 @@ class LobbyFragment : Fragment() {
     @BindView(R.id.lobby_fragment_hello)
     lateinit var lobbyFragmentHelloTextView: TextView
 
-    lateinit var unbinder: Unbinder
+    private lateinit var unbinder: Unbinder
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         val view = inflater.inflate(R.layout.lobby_fragment, container, false)
@@ -49,4 +49,4 @@ class LobbyFragment : Fragment() {
     private fun sayFragmentHello() {
         lobbyFragmentHelloTextView.text = lobbyFragmentHelloService.sayHello()
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/kotlin/com/jshvarts/daggerandroidsampleapp/com/jshvarts/daggerandroidmvp/lobby/LobbyFragmentHelloService.kt b/app/src/main/kotlin/com/jshvarts/daggerandroidmvp/lobby/LobbyFragmentHelloService.kt
similarity index 65%
rename from app/src/main/kotlin/com/jshvarts/daggerandroidsampleapp/com/jshvarts/daggerandroidmvp/lobby/LobbyFragmentHelloService.kt
rename to app/src/main/kotlin/com/jshvarts/daggerandroidmvp/lobby/LobbyFragmentHelloService.kt
index 4eb37fe..4fbe050 100644
--- a/app/src/main/kotlin/com/jshvarts/daggerandroidsampleapp/com/jshvarts/daggerandroidmvp/lobby/LobbyFragmentHelloService.kt
+++ b/app/src/main/kotlin/com/jshvarts/daggerandroidmvp/lobby/LobbyFragmentHelloService.kt
@@ -1,5 +1,5 @@
-package com.jshvarts.daggerandroidsampleapp.lobby
+package com.jshvarts.daggerandroidmvp.lobby
 
 class LobbyFragmentHelloService {
     fun sayHello() = "Hello from LobbyFragmentHelloService"
-}
\ No newline at end of file
+}
diff --git a/app/src/main/kotlin/com/jshvarts/daggerandroidsampleapp/com/jshvarts/daggerandroidmvp/lobby/LobbyFragmentModule.kt b/app/src/main/kotlin/com/jshvarts/daggerandroidmvp/lobby/LobbyFragmentModule.kt
similarity index 76%
rename from app/src/main/kotlin/com/jshvarts/daggerandroidsampleapp/com/jshvarts/daggerandroidmvp/lobby/LobbyFragmentModule.kt
rename to app/src/main/kotlin/com/jshvarts/daggerandroidmvp/lobby/LobbyFragmentModule.kt
index ad14e15..6f62e4f 100644
--- a/app/src/main/kotlin/com/jshvarts/daggerandroidsampleapp/com/jshvarts/daggerandroidmvp/lobby/LobbyFragmentModule.kt
+++ b/app/src/main/kotlin/com/jshvarts/daggerandroidmvp/lobby/LobbyFragmentModule.kt
@@ -1,4 +1,4 @@
-package com.jshvarts.daggerandroidsampleapp.lobby
+package com.jshvarts.daggerandroidmvp.lobby
 
 import dagger.Module
 import dagger.Provides
@@ -8,4 +8,4 @@ class LobbyFragmentModule {
 
     @Provides
     fun provideLobbyFragmentHelloService() = LobbyFragmentHelloService()
-}
\ No newline at end of file
+}
diff --git a/app/src/main/res/layout/lobby_activity.xml b/app/src/main/res/layout/lobby_activity.xml
index c63bd46..09db808 100644
--- a/app/src/main/res/layout/lobby_activity.xml
+++ b/app/src/main/res/layout/lobby_activity.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context="com.jshvarts.daggerandroidsampleapp.lobby.LobbyActivity">
+    tools:context="com.jshvarts.daggerandroidmvp.lobby.LobbyActivity">
 
     <TextView
         android:id="@+id/common_hello"
@@ -22,7 +22,7 @@
 
     <fragment
         android:id="@+id/lobby_fragment"
-        android:name="com.jshvarts.daggerandroidsampleapp.lobby.LobbyFragment"
+        android:name="com.jshvarts.daggerandroidmvp.lobby.LobbyFragment"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
diff --git a/build.gradle b/build.gradle
index 1d5d4df..ccfe3c5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,6 +5,7 @@ buildscript {
     repositories {
         google()
         jcenter()
+        mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.4.0'
diff --git a/gradle.properties b/gradle.properties
index aac7c9b..9e6fce1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,6 +9,8 @@
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
+android.enableJetifier=true
+android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m
 
 # When configured, Gradle will run in incubating parallel mode.