Moving navigation into separate module

.circleci/config.yml

@@ -9,20 +9,20 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "client/build.gradle" }}-{{ checksum  "core/build.gradle" }}-{{ checksum  "core-android/build.gradle" }}
+          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/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" }}-{{ checksum  "core/build.gradle" }}-{{ checksum  "core-android/build.gradle" }}
+          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/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
+          path: app/build/reports
+          destination: app/reports
       - store_artifacts:
           path: core/build/reports
           destination: core/reports
@@ -33,7 +33,7 @@ jobs:
           path: feature/push/build/reports
           destination: feature/push/reports
       - store_test_results:
-          path: client/build/test-results
+          path: app/build/test-results
       - store_test_results:
           path: core/build/test-results
       - store_test_results:

app/build.gradle

@@ -74,6 +74,7 @@ dependencies {
 
   api project(':core')
   api project(':core-android')
+  api project(':lib:navigation-deeplink')
   api project(':lib:identity')
   api project(':lib:dynamic-features')
   api project(':lib:network-status')

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

@@ -4,12 +4,15 @@ import android.content.Context
 import androidx.lifecycle.ViewModelProvider
 import com.jraska.github.client.about.entrance.AboutFeatureEntranceModule
 import com.jraska.github.client.analytics.EventAnalytics
+import com.jraska.github.client.core.android.CoreAndroidModule
 import com.jraska.github.client.core.android.OnAppCreate
 import com.jraska.github.client.core.android.ServiceModel
 import com.jraska.github.client.dynamicbase.DynamicFeaturesModule
 import com.jraska.github.client.http.HttpComponent
 import com.jraska.github.client.identity.IdentityModule
 import com.jraska.github.client.identity.IdentityProvider
+import com.jraska.github.client.navigation.Navigator
+import com.jraska.github.client.navigation.deeplink.DeepLinkNavigationModule
 import com.jraska.github.client.networkstatus.NetworkStatusModule
 import com.jraska.github.client.push.PushModule
 import com.jraska.github.client.settings.entrance.SettingsEntranceModule
@@ -23,8 +26,10 @@ import dagger.Subcomponent
 @Component(
   modules = [
     AppModule::class,
-    NavigationModule::class,
+    CoreAndroidModule::class,
+    ChromeCustomTabsModule::class,
     DynamicFeaturesModule::class,
+    DeepLinkNavigationModule::class,
     IdentityModule::class,
     NetworkStatusModule::class,
     UsersModule::class,

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

@@ -4,110 +4,29 @@ import android.app.Application
 import android.app.NotificationManager
 import android.content.Context
 import android.view.LayoutInflater
-import androidx.lifecycle.ViewModelProvider
 import com.facebook.drawee.backends.pipeline.Fresco
 import com.jakewharton.threetenabp.AndroidThreeTen
-import com.jraska.github.client.analytics.AnalyticsEvent
-import com.jraska.github.client.analytics.EventAnalytics
 import com.jraska.github.client.core.android.OnAppCreate
-import com.jraska.github.client.core.android.ServiceModel
-import com.jraska.github.client.core.android.ServiceModelFactory
-import com.jraska.github.client.core.android.TopActivityProvider
-import com.jraska.github.client.core.android.ViewModelFactory
-import com.jraska.github.client.core.android.logging.SetupLogging
-import com.jraska.github.client.rx.AppSchedulers
-import com.jraska.github.client.time.DateTimeProvider
-import com.jraska.github.client.time.RealDateTimeProvider
-import com.jraska.github.client.time.RealTimeProvider
-import com.jraska.github.client.time.TimeProvider
 import dagger.Module
 import dagger.Provides
 import dagger.multibindings.IntoSet
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.schedulers.Schedulers
 
 @Module
 object AppModule {
 
   @Provides
   @JvmStatic
-  @PerApp internal fun topActivityProvider(): TopActivityProvider {
-    return TopActivityProvider()
-  }
-
-  @Provides
-  @IntoSet
-  @JvmStatic
-  fun topActivityOnCreate(setup: TopActivityProvider.RegisterCallbacks): OnAppCreate {
-    return setup
-  }
-
-  @Provides
-  @JvmStatic
-  @PerApp internal fun provideLayoutInflater(context: Context): LayoutInflater {
-    return LayoutInflater.from(context)
-  }
-
-  @Provides
   @PerApp
-  @JvmStatic
-  internal fun provideViewModelFactory(factory: ViewModelFactory): ViewModelProvider.Factory {
-    return factory
-  }
-
-  @Provides
-  @PerApp
-  @JvmStatic
-  internal fun provideServiceModelFactory(factory: ServiceModelFactory): ServiceModel.Factory {
-    return factory
-  }
-
-  @JvmStatic
-  @Provides
-  @PerApp internal fun dateTimeProvider(): DateTimeProvider {
-    return RealDateTimeProvider()
+  internal fun provideLayoutInflater(context: Context): LayoutInflater {
+    return LayoutInflater.from(context)
   }
 
   @JvmStatic
   @Provides
-  @PerApp internal fun timeProvider(): TimeProvider {
-    return RealTimeProvider.INSTANCE
-  }
-
-  @JvmStatic
-  @Provides internal fun notificationManager(context: Context): NotificationManager {
+  internal fun notificationManager(context: Context): NotificationManager {
     return context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
   }
 
-  @JvmStatic
-  @Provides
-  @PerApp
-  fun schedulers(): AppSchedulers {
-    return AppSchedulers(
-      AndroidSchedulers.mainThread(),
-      Schedulers.io(), Schedulers.computation()
-    )
-  }
-
-  @JvmStatic
-  @Provides
-  @IntoSet
-  internal fun setupLoggingOnCreate(setupLogging: SetupLogging): OnAppCreate {
-    return setupLogging
-  }
-
-  @JvmStatic
-  @Provides
-  @IntoSet
-  fun reportAppCreateEvent(eventAnalytics: EventAnalytics): OnAppCreate {
-    return object : OnAppCreate {
-      override fun onCreate(app: Application) {
-        val createEvent = AnalyticsEvent.create("app_create")
-        eventAnalytics.report(createEvent)
-      }
-    }
-  }
-
   @JvmStatic
   @Provides
   @IntoSet

app/src/main/java/com/jraska/github/client/ChromeCustomTabsModule.kt

@@ -0,0 +1,16 @@
+package com.jraska.github.client
+
+import com.jraska.github.client.core.android.TopActivityProvider
+import com.jraska.github.client.rx.AppSchedulers
+import dagger.Module
+import dagger.Provides
+
+@Module
+object ChromeCustomTabsModule {
+
+  @JvmStatic
+  @Provides
+  fun webLinkLauncher(provider: TopActivityProvider, appSchedulers: AppSchedulers): WebLinkLauncher {
+    return ChromeCustomTabsLauncher(provider, appSchedulers)
+  }
+}

core-android/build.gradle

@@ -1,5 +1,6 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-kapt'
 
 android {
   compileSdkVersion 28
@@ -21,6 +22,11 @@ dependencies {
   api 'androidx.lifecycle:lifecycle-extensions:2.1.0'
   api 'androidx.lifecycle:lifecycle-reactivestreams-ktx:2.1.0'
 
+  kapt 'com.google.dagger:dagger-compiler:2.24'
+  implementation 'com.google.dagger:dagger:2.24'
+
+  implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
+
   api 'com.jakewharton.timber:timber:4.7.1'
 
   testImplementation 'junit:junit:4.12'

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

@@ -5,7 +5,6 @@ import android.net.Uri
 import okhttp3.HttpUrl
 import okhttp3.HttpUrl.Companion.toHttpUrl
 
-@Suppress("RECEIVER_NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS")
 fun Activity.inputUrl(): HttpUrl {
   val inputUri = intent.data ?: throw IllegalArgumentException("No uri provided")
 

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

@@ -0,0 +1,113 @@
+package com.jraska.github.client.core.android
+
+import android.app.Application
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import com.jraska.github.client.DeepLinkLauncher
+import com.jraska.github.client.PerApp
+import com.jraska.github.client.analytics.AnalyticsEvent
+import com.jraska.github.client.analytics.EventAnalytics
+import com.jraska.github.client.core.android.logging.SetupLogging
+import com.jraska.github.client.rx.AppSchedulers
+import com.jraska.github.client.time.DateTimeProvider
+import com.jraska.github.client.time.RealDateTimeProvider
+import com.jraska.github.client.time.RealTimeProvider
+import com.jraska.github.client.time.TimeProvider
+import dagger.Module
+import dagger.Provides
+import dagger.multibindings.ClassKey
+import dagger.multibindings.IntoMap
+import dagger.multibindings.IntoSet
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.schedulers.Schedulers
+
+@Module
+object CoreAndroidModule {
+  @Provides
+  @PerApp
+  @JvmStatic
+  internal fun provideViewModelFactory(factory: ViewModelFactory): ViewModelProvider.Factory {
+    return factory
+  }
+
+  @Provides
+  @PerApp
+  @JvmStatic
+  internal fun provideServiceModelFactory(factory: ServiceModelFactory): ServiceModel.Factory {
+    return factory
+  }
+
+  @JvmStatic
+  @Provides
+  fun bindDeepLinkLauncher(
+    topActivityProvider: TopActivityProvider,
+    launchers: @JvmSuppressWildcards Set<LinkLauncher>
+  ): DeepLinkLauncher {
+    return RealDeepLinkLauncher.create(topActivityProvider, launchers)
+  }
+
+  @JvmStatic
+  @Provides
+  @IntoMap
+  @ClassKey(UriHandlerViewModel::class)
+  fun uriHandlerViewModel(viewModel: UriHandlerViewModel): ViewModel {
+    return viewModel
+  }
+
+  @Provides
+  @JvmStatic
+  @PerApp
+  internal fun topActivityProvider(): TopActivityProvider {
+    return TopActivityProvider()
+  }
+
+  @Provides
+  @IntoSet
+  @JvmStatic
+  fun topActivityOnCreate(setup: TopActivityProvider.RegisterCallbacks): OnAppCreate {
+    return setup
+  }
+
+  @JvmStatic
+  @Provides
+  @PerApp
+  internal fun dateTimeProvider(): DateTimeProvider {
+    return RealDateTimeProvider()
+  }
+
+  @JvmStatic
+  @Provides
+  @PerApp
+  internal fun timeProvider(): TimeProvider {
+    return RealTimeProvider.INSTANCE
+  }
+
+  @JvmStatic
+  @Provides
+  @PerApp
+  fun schedulers(): AppSchedulers {
+    return AppSchedulers(
+      AndroidSchedulers.mainThread(),
+      Schedulers.io(), Schedulers.computation()
+    )
+  }
+
+  @JvmStatic
+  @Provides
+  @IntoSet
+  internal fun setupLoggingOnCreate(setupLogging: SetupLogging): OnAppCreate {
+    return setupLogging
+  }
+
+  @JvmStatic
+  @Provides
+  @IntoSet
+  fun reportAppCreateEvent(eventAnalytics: EventAnalytics): OnAppCreate {
+    return object : OnAppCreate {
+      override fun onCreate(app: Application) {
+        val createEvent = AnalyticsEvent.create("app_create")
+        eventAnalytics.report(createEvent)
+      }
+    }
+  }
+}

feature/about/build.gradle

@@ -21,6 +21,7 @@ dependencies {
 
   api project(':core')
   api project(':core-android')
+  api project(':navigation')
   api project(':lib:identity')
 
   kapt 'com.google.dagger:dagger-compiler:2.24'