diff --git a/app/build.gradle b/app/build.gradle index 7f1a4930..320ca8e9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -103,6 +103,9 @@ dependencies { implementation "androidx.browser:browser:1.3.0" implementation "androidx.viewpager2:viewpager2:1.0.0" implementation "androidx.palette:palette-ktx:1.0.0" + implementation "androidx.window:window:1.0.0-beta03" + implementation "androidx.startup:startup-runtime:1.1.0" + //Test testImplementation "junit:junit:4.13.2" diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7170f246..c185eacf 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -277,6 +277,16 @@ android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths_share_img" /> + + + + \ No newline at end of file diff --git a/app/src/main/assets/easygo.json b/app/src/main/assets/easygo.json index cb0e79fc..0af8b5c1 100644 --- a/app/src/main/assets/easygo.json +++ b/app/src/main/assets/easygo.json @@ -30,21 +30,17 @@ "from": "com.huanchengfly.tieba.post.activities.MessageActivity", "to": "com.huanchengfly.tieba.post.activities.FloorActivity" }, - { - "from": "com.huanchengfly.tieba.post.activities.HistoryActivity", - "to": "com.huanchengfly.tieba.post.activities.ThreadActivity" - }, { "from": "com.huanchengfly.tieba.post.activities.UserCollectActivity", "to": "com.huanchengfly.tieba.post.activities.ThreadActivity" }, { - "from": "com.huanchengfly.tieba.post.activities.UserActivity", - "to": "com.huanchengfly.tieba.post.activities.ThreadActivity" + "from": "com.huanchengfly.tieba.post.activities.UserCollectActivity", + "to": "com.huanchengfly.tieba.post.activities.UserActivity" }, { - "from": "com.huanchengfly.tieba.post.activities.HistoryActivity", - "to": "com.huanchengfly.tieba.post.activities.UserCollectActivity" + "from": "com.huanchengfly.tieba.post.activities.UserActivity", + "to": "com.huanchengfly.tieba.post.activities.ThreadActivity" } ], "transActivities": [], diff --git a/app/src/main/java/com/huanchengfly/tieba/post/components/WindowInitializer.kt b/app/src/main/java/com/huanchengfly/tieba/post/components/WindowInitializer.kt new file mode 100644 index 00000000..5044646a --- /dev/null +++ b/app/src/main/java/com/huanchengfly/tieba/post/components/WindowInitializer.kt @@ -0,0 +1,19 @@ +package com.huanchengfly.tieba.post.components + +import android.content.Context +import androidx.startup.Initializer +import androidx.window.core.ExperimentalWindowApi +import androidx.window.embedding.SplitController +import com.huanchengfly.tieba.post.R + +@ExperimentalWindowApi +class WindowInitializer : Initializer { + override fun create(context: Context): SplitController { + SplitController.initialize(context, R.xml.main_split_config) + return SplitController.getInstance() + } + + override fun dependencies(): List>> { + return emptyList() + } +} \ No newline at end of file diff --git a/app/src/main/res/xml/main_split_config.xml b/app/src/main/res/xml/main_split_config.xml new file mode 100644 index 00000000..31e53570 --- /dev/null +++ b/app/src/main/res/xml/main_split_config.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + \ No newline at end of file