From 7541a87b2143f5e1579fb4cd10fdbfbdd8cebd09 Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Tue, 10 Jan 2023 17:54:55 +0800
Subject: [PATCH] Convert login to compose, step 1, skeleton

---
 app/build.gradle                              |  4 +-
 app/src/main/AndroidManifest.xml              | 58 +++++++------------
 .../com/hippo/ehviewer/ui/LoginActivity.kt    | 14 +++++
 .../hippo/ehviewer/ui/compose/theme/Theme.kt  | 50 ++++++++++++++++
 app/src/main/res/navigation/nav_graph.xml     |  4 ++
 5 files changed, 91 insertions(+), 39 deletions(-)
 create mode 100644 app/src/main/java/com/hippo/ehviewer/ui/LoginActivity.kt
 create mode 100644 app/src/main/java/com/hippo/ehviewer/ui/compose/theme/Theme.kt

diff --git a/app/build.gradle b/app/build.gradle
index 23c59e936..f327f310a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -104,6 +104,7 @@ android {
 dependencies {
     def activity_version = "1.6.1"
     implementation "androidx.activity:activity-ktx:$activity_version"
+    implementation "androidx.activity:activity-compose:$activity_version"
 
     implementation "androidx.annotation:annotation:1.5.0"
     implementation "androidx.annotation:annotation-experimental:1.3.0"
@@ -128,6 +129,8 @@ dependencies {
     implementation "androidx.compose.runtime:runtime"
     implementation "androidx.compose.runtime:runtime-saveable"
     implementation "androidx.compose.ui:ui"
+    implementation 'androidx.compose.ui:ui-graphics'
+    implementation 'androidx.compose.ui:ui-tooling-preview'
 
     implementation "androidx.constraintlayout:constraintlayout:2.2.0-alpha05"
     implementation "androidx.coordinatorlayout:coordinatorlayout:1.2.0"
@@ -197,7 +200,6 @@ dependencies {
 configurations.all {
     exclude group: 'dev.rikka.rikkax.appcompat', module: 'appcompat'
     exclude group: 'dev.rikka.rikkax.material', module: 'material'
-    exclude group: 'androidx.compose.material'
     exclude group: 'org.jetbrains.kotlin', module: 'kotlin-android-extensions-runtime'
     exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-jdk7'
     exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-jdk8'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 87816ed1a..15b0568fc 100755
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,19 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2016 Hippo Seven
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
--->
-
+<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
@@ -28,13 +13,12 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-
     <uses-permission
         android:name="android.permission.WRITE_EXTERNAL_STORAGE"
         android:maxSdkVersion="28" />
 
     <application
-        android:name="com.hippo.ehviewer.EhApplication"
+        android:name=".EhApplication"
         android:allowBackup="true"
         android:appCategory="image"
         android:dataExtractionRules="@xml/data_extraction_rules"
@@ -42,29 +26,32 @@
         android:fullBackupContent="@xml/backup_scheme"
         android:hasFragileUserData="true"
         android:icon="@mipmap/ic_launcher"
-        android:supportsRtl="true"
         android:label="@string/app_name"
         android:localeConfig="@xml/locales_config"
         android:networkSecurityConfig="@xml/network_security_config"
         android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
         android:theme="@style/AppTheme"
         tools:targetApi="tiramisu">
-
         <activity
-            android:name="com.hippo.ehviewer.ui.MainActivity"
+            android:name=".ui.LoginActivity"
+            android:exported="false"
+            android:theme="@style/AppTheme" />
+        <activity
+            android:name=".ui.MainActivity"
             android:banner="@mipmap/ic_leanback_banner"
             android:configChanges="screenSize"
             android:exported="true"
             android:launchMode="singleTask"
             android:windowSoftInputMode="adjustResize|stateAlwaysHidden">
-
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
             </intent-filter>
 
@@ -85,26 +72,26 @@
                 <data android:host="g.e-hentai.org" />
                 <data android:host="lofi.e-hentai.org" />
             </intent-filter>
-
             <intent-filter android:label="@string/keyword_search">
                 <action android:name="android.intent.action.SEND" />
+
                 <category android:name="android.intent.category.DEFAULT" />
+
                 <data android:mimeType="text/plain" />
             </intent-filter>
-
             <intent-filter android:label="@string/image_search">
                 <action android:name="android.intent.action.SEND" />
+
                 <category android:name="android.intent.category.DEFAULT" />
+
                 <data android:mimeType="image/*" />
             </intent-filter>
         </activity>
-
         <activity
             android:name="eu.kanade.tachiyomi.ui.reader.ReaderActivity"
             android:configChanges="screenSize"
             android:exported="true"
             android:launchMode="singleTask">
-
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -138,21 +125,18 @@
                 <data android:mimeType="application/x-xz-compressed-tar" />
             </intent-filter>
         </activity>
-
         <activity
-            android:name="com.hippo.ehviewer.ui.SettingsActivity"
+            android:name=".ui.SettingsActivity"
             android:configChanges="screenSize"
             android:label="@string/settings"
             android:theme="@style/AppTheme" />
-
         <activity
-            android:name="com.hippo.ehviewer.ui.SecurityActivity"
+            android:name=".ui.SecurityActivity"
             android:configChanges="screenSize"
             android:label="@string/settings"
             android:theme="@style/AppTheme" />
-
         <activity
-            android:name="com.hippo.ehviewer.shortcuts.ShortcutsActivity"
+            android:name=".shortcuts.ShortcutsActivity"
             android:excludeFromRecents="true"
             android:launchMode="singleTask"
             android:taskAffinity=""
@@ -166,9 +150,8 @@
                 android:name="autoStoreLocales"
                 android:value="true" />
         </service>
-
         <service
-            android:name="com.hippo.ehviewer.download.DownloadService"
+            android:name=".download.DownloadService"
             android:foregroundServiceType="dataSync"
             android:label="@string/download_service_label" />
 
@@ -177,11 +160,10 @@
             android:authorities="${applicationId}.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true">
-
             <meta-data
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/filepaths" />
-
         </provider>
     </application>
-</manifest>
+
+</manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/LoginActivity.kt b/app/src/main/java/com/hippo/ehviewer/ui/LoginActivity.kt
new file mode 100644
index 000000000..5f371db78
--- /dev/null
+++ b/app/src/main/java/com/hippo/ehviewer/ui/LoginActivity.kt
@@ -0,0 +1,14 @@
+package com.hippo.ehviewer.ui
+
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+
+class LoginActivity : ComponentActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContent {
+
+        }
+    }
+}
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/compose/theme/Theme.kt b/app/src/main/java/com/hippo/ehviewer/ui/compose/theme/Theme.kt
new file mode 100644
index 000000000..e503bd465
--- /dev/null
+++ b/app/src/main/java/com/hippo/ehviewer/ui/compose/theme/Theme.kt
@@ -0,0 +1,50 @@
+package com.hippo.ehviewer.ui.ui.theme
+
+import android.app.Activity
+import android.graphics.Color
+import android.os.Build
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.darkColorScheme
+import androidx.compose.material3.dynamicDarkColorScheme
+import androidx.compose.material3.dynamicLightColorScheme
+import androidx.compose.material3.lightColorScheme
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.SideEffect
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalView
+import androidx.core.view.WindowCompat
+
+private val DarkColorScheme = darkColorScheme()
+private val LightColorScheme = lightColorScheme()
+
+@Composable
+fun EhViewerTheme(
+    darkTheme: Boolean = isSystemInDarkTheme(),
+    // Dynamic color is available on Android 12+
+    dynamicColor: Boolean = true,
+    content: @Composable () -> Unit
+) {
+    val colorScheme = when {
+        dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
+            val context = LocalContext.current
+            if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
+        }
+
+        darkTheme -> DarkColorScheme
+        else -> LightColorScheme
+    }
+    val view = LocalView.current
+    if (!view.isInEditMode) {
+        SideEffect {
+            val window = (view.context as Activity).window
+            window.statusBarColor = Color.TRANSPARENT
+            WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = !darkTheme
+        }
+    }
+
+    MaterialTheme(
+        colorScheme = colorScheme,
+        content = content
+    )
+}
\ No newline at end of file
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
index 753d380bf..b05a5d3c7 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -92,4 +92,8 @@
         android:id="@+id/cookieSignInScene"
         android:name="com.hippo.ehviewer.ui.scene.CookieSignInScene"
         android:label="CookieSignInScene" />
+    <activity
+        android:id="@+id/loginActivity"
+        android:name="com.hippo.ehviewer.ui.LoginActivity"
+        android:label="LoginActivity" />
 </navigation>
\ No newline at end of file