Move shortcuts implementation into feature module

client/build.gradle

@@ -63,6 +63,7 @@ dependencies {
   api project(':feature-users')
   api project(':feature-settings')
   api project(':feature-about')
+  api project(':feature-shortcuts')
 
   implementation 'androidx.appcompat:appcompat:1.1.0-rc01'
   implementation 'androidx.legacy:legacy-support-v4:1.0.0'

client/src/main/AndroidManifest.xml

@@ -26,19 +26,6 @@
         android:name="android.app.shortcuts"
         android:resource="@xml/shortcuts"/>
     </activity>
-    <activity android:name=".ui.ShortcutHandlerActivity">
-      <intent-filter>
-        <action android:name="android.intent.action.VIEW"/>
-
-        <category android:name="android.intent.category.DEFAULT"/>
-        <category android:name="android.intent.category.BROWSABLE"/>
-
-        <data
-          android:host="github.com"
-          android:pathPattern="/.*"
-          android:scheme="clientgithubjraskacom"/>
-      </intent-filter>
-    </activity>
   </application>
 
 </manifest>

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

@@ -13,6 +13,7 @@ import com.jraska.github.client.identity.IdentityModule
 import com.jraska.github.client.logging.CrashReporter
 import com.jraska.github.client.push.PushModule
 import com.jraska.github.client.settings.SettingsModule
+import com.jraska.github.client.shortcuts.ShortcutsModule
 import com.jraska.github.client.users.UsersModule
 import dagger.BindsInstance
 import dagger.Component
@@ -26,6 +27,7 @@ import retrofit2.Retrofit
     PushModule::class, AppModule::class,
     SettingsModule::class, AboutModule::class,
     IdentityModule::class,
+    ShortcutsModule::class,
     HttpComponentModule::class, CoreComponentModule::class]
 )
 interface AppComponent {

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

@@ -5,7 +5,6 @@ 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 dagger.Module
 import dagger.Provides
 import dagger.multibindings.ClassKey
@@ -41,12 +40,4 @@ object NavigationModule {
   fun uriHandlerViewModel(viewModel: UriHandlerViewModel): ViewModel {
     return viewModel
   }
-
-  @JvmStatic
-  @Provides
-  @IntoMap
-  @ClassKey(ShortcutHandlerModel::class)
-  fun uriShortcutViewModel(viewModel: ShortcutHandlerModel): ViewModel {
-    return viewModel
-  }
 }

feature-shortcuts/.gitignore

@@ -0,0 +1 @@
+/build

feature-shortcuts/build.gradle

@@ -0,0 +1,24 @@
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-kapt'
+
+android {
+  compileSdkVersion 28
+  defaultConfig {
+    minSdkVersion 21
+  }
+
+  compileOptions {
+    sourceCompatibility JavaVersion.VERSION_1_8
+    targetCompatibility JavaVersion.VERSION_1_8
+  }
+}
+
+dependencies {
+  api project(':core')
+  api project(':core-android')
+
+  kapt 'com.google.dagger:dagger-compiler:2.24'
+  api 'com.google.dagger:dagger:2.24'
+}

feature-shortcuts/src/main/AndroidManifest.xml

@@ -0,0 +1,20 @@
+<manifest
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  package="com.jraska.github.client.shortcuts">
+
+  <application>
+    <activity android:name=".ShortcutHandlerActivity">
+      <intent-filter>
+        <action android:name="android.intent.action.VIEW"/>
+
+        <category android:name="android.intent.category.DEFAULT"/>
+        <category android:name="android.intent.category.BROWSABLE"/>
+
+        <data
+          android:host="github.com"
+          android:pathPattern="/.*"
+          android:scheme="clientgithubjraskacom"/>
+      </intent-filter>
+    </activity>
+  </application>
+</manifest>

client/src/main/java/com/jraska/github/client/ui/ShortcutHandlerActivity.kt → feature-shortcuts/src/main/java/com/jraska/github/client/shortcuts/ShortcutHandlerActivity.kt

@@ -1,11 +1,11 @@
-package com.jraska.github.client.ui
+package com.jraska.github.client.shortcuts
 
 import android.os.Bundle
 import com.jraska.github.client.core.android.BaseActivity
 import com.jraska.github.client.core.android.inputUrl
 import com.jraska.github.client.core.android.viewModel
 
-class ShortcutHandlerActivity : BaseActivity() {
+internal class ShortcutHandlerActivity : BaseActivity() {
 
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)

client/src/main/java/com/jraska/github/client/ui/ShortcutHandlerModel.kt → feature-shortcuts/src/main/java/com/jraska/github/client/shortcuts/ShortcutHandlerModel.kt

@@ -1,4 +1,4 @@
-package com.jraska.github.client.ui
+package com.jraska.github.client.shortcuts
 
 import androidx.lifecycle.ViewModel
 import com.jraska.github.client.DeepLinkHandler
@@ -9,7 +9,7 @@ import com.jraska.github.client.analytics.EventAnalytics
 import okhttp3.HttpUrl
 import javax.inject.Inject
 
-class ShortcutHandlerModel @Inject constructor(
+internal class ShortcutHandlerModel @Inject constructor(
   private val deepLinkHandler: DeepLinkHandler,
   private val eventAnalytics: EventAnalytics
 ) : ViewModel() {

feature-shortcuts/src/main/java/com/jraska/github/client/shortcuts/ShortcutsModule.kt

@@ -0,0 +1,18 @@
+package com.jraska.github.client.shortcuts
+
+import androidx.lifecycle.ViewModel
+import dagger.Module
+import dagger.Provides
+import dagger.multibindings.ClassKey
+import dagger.multibindings.IntoMap
+
+@Module
+object ShortcutsModule {
+  @JvmStatic
+  @Provides
+  @IntoMap
+  @ClassKey(com.jraska.github.client.shortcuts.ShortcutHandlerModel::class)
+  internal fun uriShortcutViewModel(viewModel: ShortcutHandlerModel): ViewModel {
+    return viewModel
+  }
+}

settings.gradle

@@ -9,4 +9,5 @@ include ':client',
   ':feature-users',
   ':feature-push',
   ':feature-settings',
-  ':feature-about'
+  ':feature-about',
+  ':feature-shortcuts'