Merge pull request #509 from yt-tkhs/deeplink

Support Deep Link
DroidKaigi · Jan 18, 2019 · 156f474 · 156f474
2 parents 3a8c32d + 4acd13a
commit 156f474
Show file tree

Hide file tree

Showing 9 changed files with 46 additions and 7 deletions.
diff --git a/buildSrc/src/main/java/dependencies/Dep.kt b/buildSrc/src/main/java/dependencies/Dep.kt
@@ -57,7 +57,7 @@ object Dep {
         }
 
         object Navigation {
-            val version = "1.0.0-alpha08"
+            val version = "1.0.0-alpha09"
             val runtime = "android.arch.navigation:navigation-runtime:$version"
             val runtimeKtx = "android.arch.navigation:navigation-runtime-ktx:$version"
             val fragment = "android.arch.navigation:navigation-fragment:$version"

diff --git a/...main/java/io/github/droidkaigi/confsched2019/session/ui/BottomSheetDaySessionsFragment.kt b/...main/java/io/github/droidkaigi/confsched2019/session/ui/BottomSheetDaySessionsFragment.kt
@@ -56,7 +56,7 @@ class BottomSheetDaySessionsFragment : DaggerFragment() {
 
     private val groupAdapter = GroupAdapter<ViewHolder<*>>()
     private val args: BottomSheetDaySessionsFragmentArgs by lazy {
-        BottomSheetDaySessionsFragmentArgs.fromBundle(arguments)
+        BottomSheetDaySessionsFragmentArgs.fromBundle(arguments ?: Bundle())
     }
 
     override fun onCreateView(

diff --git a/...sion/src/main/java/io/github/droidkaigi/confsched2019/session/ui/SessionDetailFragment.kt b/...sion/src/main/java/io/github/droidkaigi/confsched2019/session/ui/SessionDetailFragment.kt
@@ -37,6 +37,7 @@ import io.github.droidkaigi.confsched2019.session.ui.item.SpeakerItem
 import io.github.droidkaigi.confsched2019.session.ui.store.SessionContentsStore
 import io.github.droidkaigi.confsched2019.session.ui.widget.DaggerFragment
 import io.github.droidkaigi.confsched2019.system.actioncreator.ActivityActionCreator
+import io.github.droidkaigi.confsched2019.user.store.UserStore
 import io.github.droidkaigi.confsched2019.util.ProgressTimeLatch
 import javax.inject.Inject
 
@@ -45,6 +46,7 @@ class SessionDetailFragment : DaggerFragment() {
 
     @Inject lateinit var sessionContentsActionCreator: SessionContentsActionCreator
     @Inject lateinit var sessionContentsStore: SessionContentsStore
+    @Inject lateinit var userStore: UserStore
     @Inject lateinit var speakerItemFactory: SpeakerItem.Factory
     @Inject lateinit var activityActionCreator: ActivityActionCreator
     @Inject lateinit var navController: NavController
@@ -72,7 +74,7 @@ class SessionDetailFragment : DaggerFragment() {
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 
-        sessionDetailFragmentArgs = SessionDetailFragmentArgs.fromBundle(arguments)
+        sessionDetailFragmentArgs = SessionDetailFragmentArgs.fromBundle(arguments ?: Bundle())
 
         binding.sessionSpeakers.adapter = groupAdapter
 
@@ -98,6 +100,12 @@ class SessionDetailFragment : DaggerFragment() {
             return@setOnMenuItemClickListener true
         }
 
+        userStore.registered.changed(viewLifecycleOwner) { registered ->
+            if (registered && sessionContentsStore.isInitialized) {
+                sessionContentsActionCreator.refresh()
+            }
+        }
+
         sessionContentsStore.speechSession(sessionDetailFragmentArgs.session)
             .changed(viewLifecycleOwner) { session ->
                 applySpeechSessionLayout(session)

diff --git a/...ession/src/main/java/io/github/droidkaigi/confsched2019/session/ui/SessionPageFragment.kt b/...ession/src/main/java/io/github/droidkaigi/confsched2019/session/ui/SessionPageFragment.kt
@@ -64,7 +64,7 @@ class SessionPageFragment : DaggerFragment() {
     }
 
     private val args: SessionPageFragmentArgs by lazy {
-        SessionPageFragmentArgs.fromBundle(arguments)
+        SessionPageFragmentArgs.fromBundle(arguments ?: Bundle())
     }
 
     private val bottomSheetBehavior: BottomSheetBehavior<*>

diff --git a/...re/session/src/main/java/io/github/droidkaigi/confsched2019/session/ui/SpeakerFragment.kt b/...re/session/src/main/java/io/github/droidkaigi/confsched2019/session/ui/SpeakerFragment.kt
@@ -44,7 +44,7 @@ class SpeakerFragment : DaggerFragment() {
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
 
-        speakerFragmentArgs = SpeakerFragmentArgs.fromBundle(arguments)
+        speakerFragmentArgs = SpeakerFragmentArgs.fromBundle(arguments ?: Bundle())
 
         val speakerId = speakerFragmentArgs.speaker
         binding.lang = defaultLang()

diff --git a/...urvey/src/main/java/io/github/droidkaigi/confsched2019/survey/ui/SessionSurveyFragment.kt b/...urvey/src/main/java/io/github/droidkaigi/confsched2019/survey/ui/SessionSurveyFragment.kt
@@ -34,7 +34,7 @@ class SessionSurveyFragment : DaggerFragment() {
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
-        sessionSurveyFragmentArgs = SessionSurveyFragmentArgs.fromBundle(arguments)
+        sessionSurveyFragmentArgs = SessionSurveyFragmentArgs.fromBundle(arguments ?: Bundle())
     }
 }
 

diff --git a/frontend/android/src/main/AndroidManifest.xml b/frontend/android/src/main/AndroidManifest.xml
@@ -31,6 +31,30 @@
 
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
+            <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="droidkaigi.jp"
+                    android:pathPrefix="/2019/timetable/"
+                    android:scheme="https"
+                    />
+            </intent-filter>
+            <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="droidkaigi.jp"
+                    android:pathPrefix="/2019/en/timetable/"
+                    android:scheme="https"
+                    />
+            </intent-filter>
         </activity>
         <activity
             android:name="com.google.android.gms.oss.licenses.OssLicensesMenuActivity"

diff --git a/frontend/android/src/main/java/io/github/droidkaigi/confsched2019/ui/MainActivity.kt b/frontend/android/src/main/java/io/github/droidkaigi/confsched2019/ui/MainActivity.kt
@@ -100,7 +100,10 @@ class MainActivity : DaggerAppCompatActivity() {
         val appBarConfiguration = AppBarConfiguration(
             topLevelDestinationIds,
             binding.drawerLayout
-        )
+        ) {
+            onBackPressed()
+            true
+        }
         setupActionBarWithNavController(navController, appBarConfiguration)
         binding.navView.setupWithNavController(navController)
         binding.toolbar.setupWithNavController(navController, appBarConfiguration)

diff --git a/frontendcomponent/androidcomponent/src/main/res/navigation/navigation.xml b/frontendcomponent/androidcomponent/src/main/res/navigation/navigation.xml
@@ -55,6 +55,10 @@
             android:id="@+id/action_session_detail_to_session_survey"
             app:destination="@id/session_survey"
             />
+        <deepLink app:uri="droidkaigi.jp/2019/timetable/{session}/"/>
+        <deepLink app:uri="droidkaigi.jp/2019/timetable/{session}"/>
+        <deepLink app:uri="droidkaigi.jp/2019/en/timetable/{session}/"/>
+        <deepLink app:uri="droidkaigi.jp/2019/en/timetable/{session}"/>
     </fragment>
     <fragment
         android:id="@+id/search"