WIP

app/build.gradle.kts

@@ -11,11 +11,11 @@ plugins {
 }
 
 android {
-    compileSdk = 30
+    compileSdk = 31
     defaultConfig {
         applicationId = "xyz.quaver.pupil"
         minSdk = 21
-        targetSdk = 30
+        targetSdk = 31
         versionCode = 600
         versionName = "6.0.0-alpha2"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -74,6 +74,7 @@ dependencies {
     implementation("androidx.compose.runtime:runtime-livedata:1.0.2")
     implementation("androidx.compose.material:material-icons-extended:1.0.2")
     implementation("androidx.activity:activity-compose:1.3.1")
+    implementation("androidx.navigation:navigation-compose:2.4.0-alpha08")
 
     implementation("com.google.accompanist:accompanist-flowlayout:0.16.1")
     implementation("com.google.accompanist:accompanist-appcompat-theme:0.16.0")

app/src/main/AndroidManifest.xml

@@ -54,7 +54,8 @@
         <activity
             android:name=".ui.ReaderActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
-            android:parentActivityName=".ui.MainActivity">
+            android:parentActivityName=".ui.MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -218,7 +219,8 @@
         <activity
             android:name=".ui.MainActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
-            android:theme="@style/NoActionBarAppTheme">
+            android:theme="@style/NoActionBarAppTheme"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.intent.action.VIEW" />

app/src/main/java/xyz/quaver/pupil/ui/ReaderActivity.kt

@@ -21,8 +21,10 @@ package xyz.quaver.pupil.ui
 import android.content.Intent
 import android.os.Bundle
 import android.view.*
+import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.viewModels
+import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Scaffold
 import androidx.compose.material.TopAppBar
 import androidx.compose.material.Text
@@ -33,12 +35,12 @@ import org.kodein.di.android.closestDI
 import xyz.quaver.pupil.databinding.ReaderActivityBinding
 import xyz.quaver.pupil.ui.viewmodel.ReaderViewModel
 
-class ReaderActivity : BaseActivity(), DIAware {
+class ReaderActivity : ComponentActivity(), DIAware {
     override val di by closestDI()
 
     private var menu: Menu? = null
 
-    private lateinit var binding: ReaderActivityBinding
+    private lateinit var bindiddng: ReaderActivityBinding
     private val model: ReaderViewModel by viewModels()
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -48,9 +50,9 @@ class ReaderActivity : BaseActivity(), DIAware {
             AppCompatTheme {
                 Scaffold(
                     topBar = {
-                        TopAppBar() {
-                            Text("Reader")
-                        }
+                        TopAppBar(
+                            title = { Text("Reader", color = MaterialTheme.colors.onSecondary) }
+                        )
                     }
                 ) {