Add core modules

.circleci/config.yml

@@ -9,23 +9,23 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "client/build.gradle" }}
+          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "client/build.gradle" }}-{{ checksum  "core/build.gradle" }}-{{ checksum  "core-android/build.gradle" }}
       - run:
           name: Get Dependencies
           command: ./gradlew androidDependencies
       - save_cache:
           paths:
             - ~/.gradle
-          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "client/build.gradle" }}
+          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "client/build.gradle" }}-{{ checksum  "core/build.gradle" }}-{{ checksum  "core-android/build.gradle" }}
       - run:
           name: Run Tests
           command: ./gradlew lint test
       - store_artifacts:
           path: client/build/reports
           destination: client/reports
       - store_artifacts:
-          path: client-domain/build/reports
-          destination: client-domain/reports
+          path: core/build/reports
+          destination: core/reports
       - store_artifacts:
           path: client-data/build/reports
           destination: client-data/reports
@@ -34,5 +34,5 @@ jobs:
       - store_test_results:
           path: client-data/build/test-results
       - store_test_results:
-          path: client-domain/build/test-results
+          path: core/build/test-results
 

client/build.gradle

@@ -56,8 +56,9 @@ android {
 dependencies {
   implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
-  api project(':client-domain')
-  api project(':client-data')
+  api project(':core')
+  api project(':core-android')
+  api project(':feature-users')
 
   implementation 'androidx.appcompat:appcompat:1.1.0-alpha04'
   implementation 'androidx.legacy:legacy-support-v4:1.0.0'

client/src/main/java/com/jraska/github/client/AppComponent.kt

@@ -4,28 +4,27 @@ import androidx.lifecycle.ViewModelProvider
 import com.google.firebase.database.FirebaseDatabase
 import com.jraska.github.client.analytics.AnalyticsProperty
 import com.jraska.github.client.analytics.EventAnalytics
+import com.jraska.github.client.core.android.OnAppCreate
 import com.jraska.github.client.http.HttpComponent
 import com.jraska.github.client.logging.CrashReporter
 import com.jraska.github.client.push.PushHandler
 import com.jraska.github.client.push.PushModule
 import com.jraska.github.client.settings.SettingsModule
-import com.jraska.github.client.users.UserViewModelModule
-import com.jraska.github.client.users.UsersDataModule
+import com.jraska.github.client.users.UsersModule
 import dagger.Component
 import dagger.Module
 import dagger.Provides
 import retrofit2.Retrofit
-import javax.inject.Provider
 
 @PerApp
-@Component(modules = [UsersDataModule::class, UserViewModelModule::class, NavigationModule::class,
+@Component(modules = [UsersModule::class, NavigationModule::class,
   PushModule::class, AppModule::class, SettingsModule::class,
   HttpComponentModule::class, CoreComponentModule::class])
 interface AppComponent {
 
   fun onAppCreateActions(): Set<OnAppCreate>
 
-  fun pushHandler() : PushHandler
+  fun pushHandler(): PushHandler
 
   fun viewModelFactory(): ViewModelProvider.Factory
 }

client/src/main/java/com/jraska/github/client/AppModule.kt

@@ -10,6 +10,9 @@ import com.jakewharton.threetenabp.AndroidThreeTen
 import com.jraska.github.client.analytics.AnalyticsEvent
 import com.jraska.github.client.analytics.EventAnalytics
 import com.jraska.github.client.common.AppBuildConfig
+import com.jraska.github.client.core.android.OnAppCreate
+import com.jraska.github.client.core.android.TopActivityProvider
+import com.jraska.github.client.core.android.ViewModelFactory
 import com.jraska.github.client.rx.AppSchedulers
 import com.jraska.github.client.time.DateTimeProvider
 import com.jraska.github.client.time.RealDateTimeProvider

client/src/main/java/com/jraska/github/client/ChromeCustomTabsLauncher.kt

@@ -1,13 +1,12 @@
 package com.jraska.github.client
 
+import android.app.Activity
 import android.net.Uri
 import androidx.browser.customtabs.CustomTabsIntent
-import com.jraska.github.client.ui.BaseActivity
 import okhttp3.HttpUrl
-
 import javax.inject.Provider
 
-internal class ChromeCustomTabsLauncher(private val provider: Provider<BaseActivity>) : WebLinkLauncher {
+internal class ChromeCustomTabsLauncher(private val provider: Provider<Activity>) : WebLinkLauncher {
   override fun launch(url: HttpUrl) {
     val customTabsIntent = CustomTabsIntent.Builder().build()
     val uri = Uri.parse(url.toString())

client/src/main/java/com/jraska/github/client/GitHubClientApp.kt

@@ -5,6 +5,7 @@ import android.os.Looper
 import androidx.lifecycle.ViewModelProvider
 import com.google.firebase.perf.metrics.AddTrace
 import com.jraska.github.client.common.AppBuildConfig
+import com.jraska.github.client.core.android.HasViewModelFactory
 import com.jraska.github.client.http.DaggerHttpComponent
 import com.jraska.github.client.http.HttpComponent
 import com.jraska.github.client.http.HttpDependenciesModule

client/src/main/java/com/jraska/github/client/NavigationModule.kt

@@ -3,6 +3,10 @@ package com.jraska.github.client
 import android.app.Activity
 import androidx.lifecycle.ViewModel
 import com.jraska.github.client.analytics.EventAnalytics
+import com.jraska.github.client.core.android.LinkLauncher
+import com.jraska.github.client.core.android.RealDeepLinkLauncher
+import com.jraska.github.client.core.android.TopActivityProvider
+import com.jraska.github.client.core.android.UriHandlerViewModel
 import com.jraska.github.client.ui.ShortcutHandlerModel
 import com.jraska.github.client.ui.UsersActivity
 import dagger.Module

client/src/main/java/com/jraska/github/client/NotificationSetup.kt

@@ -5,6 +5,7 @@ import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.content.Context
 import android.os.Build
+import com.jraska.github.client.core.android.OnAppCreate
 
 import javax.inject.Inject
 

client/src/main/java/com/jraska/github/client/SetupLogging.kt

@@ -2,7 +2,9 @@ package com.jraska.github.client
 
 import android.app.Application
 import com.jraska.console.timber.ConsoleTree
-import com.jraska.github.client.logging.ErrorReportTree
+import com.jraska.github.client.core.android.AnalyticsLoggingTree
+import com.jraska.github.client.core.android.OnAppCreate
+import com.jraska.github.client.core.android.logging.ErrorReportTree
 import timber.log.Timber
 import javax.inject.Inject
 import javax.inject.Provider

client/src/main/java/com/jraska/github/client/UsersPathLauncher.kt

@@ -1,6 +1,7 @@
 package com.jraska.github.client
 
 import android.app.Activity
+import com.jraska.github.client.core.android.LinkLauncher
 import com.jraska.github.client.ui.RepoDetailActivity
 import com.jraska.github.client.ui.UserDetailActivity
 import okhttp3.HttpUrl

client/src/main/java/com/jraska/github/client/push/PushIntentObserver.kt

@@ -8,7 +8,7 @@ import androidx.lifecycle.LifecycleObserver
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.OnLifecycleEvent
 import com.google.firebase.messaging.RemoteMessage
-import com.jraska.github.client.OnAppCreate
+import com.jraska.github.client.core.android.OnAppCreate
 import javax.inject.Inject
 
 class PushIntentObserver(private val pushHandler: PushHandler) : LifecycleObserver {

client/src/main/java/com/jraska/github/client/push/PushModule.kt

@@ -3,7 +3,7 @@ package com.jraska.github.client.push
 import android.app.NotificationManager
 import android.content.Context
 import com.jraska.github.client.Config
-import com.jraska.github.client.OnAppCreate
+import com.jraska.github.client.core.android.OnAppCreate
 import com.jraska.github.client.analytics.AnalyticsProperty
 import dagger.Module
 import dagger.Provides

client/src/main/java/com/jraska/github/client/settings/SettingsActivity.kt

@@ -7,7 +7,8 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import com.airbnb.epoxy.SimpleEpoxyAdapter
 import com.jraska.github.client.R
 import com.jraska.github.client.ui.BaseActivity
-import com.jraska.github.client.viewModel
+import com.jraska.github.client.core.android.viewModel
+import kotlinx.android.synthetic.main.activity_settings.*
 import kotlinx.android.synthetic.main.content_settings.*
 
 class SettingsActivity : BaseActivity(), PurchaseReportModel.PurchaseListener {
@@ -16,6 +17,7 @@ class SettingsActivity : BaseActivity(), PurchaseReportModel.PurchaseListener {
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     setContentView(R.layout.activity_settings)
+    setSupportActionBar(toolbar)
 
     settings_recycler.layoutManager = LinearLayoutManager(this)
     val adapter = SimpleEpoxyAdapter()

client/src/main/java/com/jraska/github/client/settings/SettingsModule.kt

@@ -2,7 +2,7 @@ package com.jraska.github.client.settings
 
 import android.app.Activity
 import androidx.lifecycle.ViewModel
-import com.jraska.github.client.LinkLauncher
+import com.jraska.github.client.core.android.LinkLauncher
 import dagger.Module
 import dagger.Provides
 import dagger.multibindings.ClassKey

client/src/main/java/com/jraska/github/client/ui/BaseActivity.kt

@@ -1,28 +1,5 @@
 package com.jraska.github.client.ui
 
-import android.view.View
-import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
-import kotlinx.android.synthetic.main.activity_settings.*
 
-abstract class BaseActivity : AppCompatActivity() {
-
-  override fun setContentView(layoutResID: Int) {
-    super.setContentView(layoutResID)
-    onSetContentView()
-  }
-
-  override fun setContentView(view: View) {
-    super.setContentView(view)
-    onSetContentView()
-  }
-
-  override fun setContentView(view: View, params: ViewGroup.LayoutParams) {
-    super.setContentView(view, params)
-    onSetContentView()
-  }
-
-  protected fun onSetContentView() {
-    setSupportActionBar(toolbar)
-  }
-}
+abstract class BaseActivity : AppCompatActivity()

client/src/main/java/com/jraska/github/client/ui/RepoDetailActivity.kt

@@ -10,7 +10,7 @@ import com.airbnb.epoxy.SimpleEpoxyModel
 import com.jraska.github.client.R
 import com.jraska.github.client.users.RepoDetail
 import com.jraska.github.client.users.RepoDetailViewModel
-import com.jraska.github.client.viewModel
+import com.jraska.github.client.core.android.viewModel
 import kotlinx.android.synthetic.main.activity_repo_detail.*
 import kotlinx.android.synthetic.main.content_repo_detail.*
 
@@ -26,6 +26,7 @@ class RepoDetailActivity : BaseActivity() {
     super.onCreate(savedInstanceState)
 
     setContentView(R.layout.activity_repo_detail)
+    setSupportActionBar(toolbar)
     repo_detail_recycler.layoutManager = LinearLayoutManager(this)
 
     title = fullRepoName()

client/src/main/java/com/jraska/github/client/ui/ShortcutHandlerActivity.kt

@@ -2,7 +2,7 @@ package com.jraska.github.client.ui
 
 import android.os.Bundle
 import com.jraska.github.client.inputUrl
-import com.jraska.github.client.viewModel
+import com.jraska.github.client.core.android.viewModel
 
 class ShortcutHandlerActivity : BaseActivity() {
 

client/src/main/java/com/jraska/github/client/ui/UriHandlerActivity.kt

@@ -1,9 +1,9 @@
 package com.jraska.github.client.ui
 
 import android.os.Bundle
-import com.jraska.github.client.UriHandlerViewModel
+import com.jraska.github.client.core.android.UriHandlerViewModel
 import com.jraska.github.client.inputUrl
-import com.jraska.github.client.viewModel
+import com.jraska.github.client.core.android.viewModel
 
 class UriHandlerActivity : BaseActivity() {
   override fun onCreate(savedInstanceState: Bundle?) {

client/src/main/java/com/jraska/github/client/ui/UserDetailActivity.kt

@@ -9,10 +9,10 @@ import com.airbnb.epoxy.EpoxyModel
 import com.airbnb.epoxy.SimpleEpoxyAdapter
 import com.airbnb.epoxy.SimpleEpoxyModel
 import com.jraska.github.client.R
+import com.jraska.github.client.core.android.viewModel
 import com.jraska.github.client.users.RepoHeader
 import com.jraska.github.client.users.UserDetail
 import com.jraska.github.client.users.UserDetailViewModel
-import com.jraska.github.client.viewModel
 import kotlinx.android.synthetic.main.activity_user_detail.*
 import kotlinx.android.synthetic.main.content_user_detail.*
 
@@ -27,6 +27,7 @@ class UserDetailActivity : BaseActivity(), RepoHeaderModel.RepoListener {
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     setContentView(R.layout.activity_user_detail)
+    setSupportActionBar(toolbar)
 
     user_detail_recycler.layoutManager = LinearLayoutManager(this)
     user_detail_recycler.isNestedScrollingEnabled = false

client/src/main/java/com/jraska/github/client/ui/UsersActivity.kt

@@ -11,7 +11,8 @@ import com.airbnb.epoxy.SimpleEpoxyAdapter
 import com.jraska.github.client.R
 import com.jraska.github.client.users.User
 import com.jraska.github.client.users.UsersViewModel
-import com.jraska.github.client.viewModel
+import com.jraska.github.client.core.android.viewModel
+import kotlinx.android.synthetic.main.activity_users_list.*
 import kotlinx.android.synthetic.main.content_users_list.*
 
 class UsersActivity : BaseActivity(), UserModel.UserListener {
@@ -20,6 +21,7 @@ class UsersActivity : BaseActivity(), UserModel.UserListener {
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     setContentView(R.layout.activity_users_list)
+    setSupportActionBar(toolbar)
 
     users_recycler.layoutManager = LinearLayoutManager(this)
     users_refresh_swipe_layout.setOnRefreshListener { usersViewModel.onRefresh() }

core-android/build.gradle

@@ -0,0 +1,26 @@
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+
+android {
+  compileSdkVersion 28
+  defaultConfig {
+    minSdkVersion 21
+  }
+
+  compileOptions {
+    sourceCompatibility JavaVersion.VERSION_1_8
+    targetCompatibility JavaVersion.VERSION_1_8
+  }
+}
+
+dependencies {
+  api project(':core')
+
+  api 'androidx.appcompat:appcompat:1.1.0-alpha04'
+  api 'androidx.annotation:annotation:1.0.2'
+  api 'androidx.lifecycle:lifecycle-extensions:2.0.0'
+
+  api 'com.jakewharton.timber:timber:4.7.1'
+
+  testImplementation 'junit:junit:4.12'
+}

core-android/src/main/AndroidManifest.xml

@@ -0,0 +1 @@
+<manifest package="com.jraska.github.client.core.android" />

client-data/src/main/java/com/jraska/github/client/AnalyticsLoggingTree.kt → core-android/src/main/java/com/jraska/github/client/core/android/AnalyticsLoggingTree.kt

@@ -1,6 +1,7 @@
-package com.jraska.github.client
+package com.jraska.github.client.core.android
 
 import android.util.Log
+import com.jraska.github.client.Config
 import com.jraska.github.client.analytics.AnalyticsEvent
 import com.jraska.github.client.analytics.EventAnalytics
 import com.jraska.github.client.time.DateTimeProvider

client/src/main/java/com/jraska/github/client/HasViewModel.kt → core-android/src/main/java/com/jraska/github/client/core/android/HasViewModel.kt

@@ -1,4 +1,4 @@
-package com.jraska.github.client
+package com.jraska.github.client.core.android
 
 import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.ViewModel

client-data/src/main/java/com/jraska/github/client/LinkLauncher.kt → core-android/src/main/java/com/jraska/github/client/core/android/LinkLauncher.kt

@@ -1,4 +1,4 @@
-package com.jraska.github.client
+package com.jraska.github.client.core.android
 
 import android.app.Activity
 import okhttp3.HttpUrl

client/src/main/java/com/jraska/github/client/OnAppCreate.kt → core-android/src/main/java/com/jraska/github/client/core/android/OnAppCreate.kt

@@ -1,4 +1,4 @@
-package com.jraska.github.client
+package com.jraska.github.client.core.android
 
 import android.app.Application