Merge pull request #5 from SukiEva/dev-compose

Dev compose

app/build.gradle.kts

@@ -1,29 +1,28 @@
 plugins {
     id("com.android.application")
     id("kotlin-android")
+    id("kotlin-kapt")
 }
 
 
-
 android {
-    val androidTargetSdkVersion: Int by rootProject.extra
-    val androidMinSdkVersion: Int by rootProject.extra
+    val targetSdkVersion: Int by rootProject.extra
+    val minSdkVersion: Int by rootProject.extra
     val androidBuildToolsVersion: String by rootProject.extra
-    val androidCompileSdkVersion: Int by rootProject.extra
-    val androidCompileNdkVersion: String by rootProject.extra
-    val defaultManagerPackageName: String by rootProject.extra
+    val compileSdkVersion: Int by rootProject.extra
+    val compileNdkVersion: String by rootProject.extra
+    val packageName: String by rootProject.extra
     val verCode: Int by rootProject.extra
     val verName: String by rootProject.extra
 
-
-    compileSdk = androidCompileSdkVersion
-    ndkVersion = androidCompileNdkVersion
+    compileSdk = compileSdkVersion
+    ndkVersion = compileNdkVersion
     buildToolsVersion = androidBuildToolsVersion
 
     defaultConfig {
-        applicationId = defaultManagerPackageName
-        minSdk = androidMinSdkVersion
-        targetSdk = androidTargetSdkVersion
+        applicationId = packageName
+        minSdk = minSdkVersion
+        targetSdk = targetSdkVersion
         versionCode = verCode
         versionName = verName
 
@@ -69,6 +68,14 @@ dependencies {
     implementation(libs.bundles.accompanist)
     implementation(libs.bundles.lifecycle)
     implementation(libs.bundles.retrofit)
+    implementation(libs.bundles.room)
     implementation(libs.bundles.thirdparty)
 
+    kapt("androidx.room:room-compiler:2.3.0")
+
+    implementation("androidx.appcompat:appcompat:1.3.1")
+
+    debugImplementation("androidx.compose.ui:ui-tooling:1.0.2")
+    androidTestImplementation("androidx.compose.ui:ui-test-junit4:1.0.2")
+
 }

app/src/main/AndroidManifest.xml

@@ -13,20 +13,23 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.Hhu.NoActionBar"
         android:usesCleartextTraffic="true">
-
         <activity
-            android:name=".ui.activity.ConfigActivity"
+            android:name=".ui.activity.results.ResultsActivity"
             android:exported="false" />
         <activity
-            android:name=".ui.activity.FavouriteActivity"
+            android:name=".ui.activity.config.ConfigActivity"
+            android:exported="false"
+            android:windowSoftInputMode="adjustResize" />
+        <activity
+            android:name=".ui.activity.favourite.FavouriteActivity"
             android:exported="false" />
         <activity
-            android:name=".ui.activity.AboutActivity"
+            android:name=".ui.activity.about.AboutActivity"
             android:exported="false"
             android:label="@string/title_activity_about"
             android:theme="@style/AppTheme.About" />
         <activity
-            android:name=".ui.activity.MainActivity"
+            android:name=".ui.activity.home.HomeActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

app/src/main/java/github/sukieva/hhu/data/entity/Website.kt

@@ -0,0 +1,17 @@
+package github.sukieva.hhu.data.entity
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.Index
+import androidx.room.PrimaryKey
+
+@Entity(indices = [Index(value = ["site_name"], unique = true)])
+data class Website(
+    @ColumnInfo(name = "site_name")
+    var siteName: String,
+    @ColumnInfo(name = "site_address")
+    var siteAddress: String
+) {
+    @PrimaryKey(autoGenerate = true)
+    var id: Long = 0
+}

app/src/main/java/github/sukieva/hhu/data/bean/Course.kt → app/src/main/java/github/sukieva/hhu/data/entity/bean/Course.kt

@@ -1,4 +1,4 @@
-package github.sukieva.hhu.data.bean
+package github.sukieva.hhu.data.entity.bean
 
 
 data class Course(

app/src/main/java/github/sukieva/hhu/data/bean/LoginData.kt → app/src/main/java/github/sukieva/hhu/data/entity/bean/LoginData.kt

@@ -1,12 +1,13 @@
-package github.sukieva.hhu.data.bean
+package github.sukieva.hhu.data.entity.bean
+
 
 import java.math.BigInteger
 import java.security.MessageDigest
 
+
 data class LoginData(
     var username: String,
-    var password: String,
-    var captcha: String
+    var password: String
 ) {
     init { // md5 加密(小写字母+数字)
         val md = MessageDigest.getInstance("MD5")

app/src/main/java/github/sukieva/hhu/data/entity/bean/PostData.kt

@@ -0,0 +1,15 @@
+package github.sukieva.hhu.data.entity.bean
+
+
+data class PostData(
+    var maccount: String,
+    var mwid: String,
+    var mname: String,
+    var maid: String,
+    var minstitute: String,
+    var mgrade: String,
+    var mclass: String,
+    var mbuilding: String,
+    var mroom: String,
+    var mphone: String
+)

app/src/main/java/github/sukieva/hhu/data/bean/Rank.kt → app/src/main/java/github/sukieva/hhu/data/entity/bean/Rank.kt

@@ -1,4 +1,4 @@
-package github.sukieva.hhu.data.bean
+package github.sukieva.hhu.data.entity.bean
 
 data class Rank(
     var name: String,

app/src/main/java/github/sukieva/hhu/data/local/AppDatabase.kt

@@ -0,0 +1,32 @@
+package github.sukieva.hhu.data.local
+
+import android.content.Context
+import androidx.room.Database
+import androidx.room.Room
+import androidx.room.RoomDatabase
+import github.sukieva.hhu.data.entity.Website
+import github.sukieva.hhu.data.local.dao.FavDao
+
+@Database(version = 1, exportSchema = false, entities = [Website::class])
+abstract class AppDatabase : RoomDatabase() {
+
+    abstract fun favDao(): FavDao
+
+
+    companion object {  // 全局只创建一个数据库实例
+        private var instance: AppDatabase? = null
+
+        @Synchronized
+        fun getDatabase(context: Context): AppDatabase {
+            instance?.let {
+                return it
+            }
+            return Room.databaseBuilder(context.applicationContext, AppDatabase::class.java, "app_database")
+                .fallbackToDestructiveMigration() // 数据库升级时销毁，测试用
+                .build().apply {
+                    instance = this
+                }
+        }
+    }
+
+}

app/src/main/java/github/sukieva/hhu/data/local/dao/FavDao.kt

@@ -0,0 +1,24 @@
+package github.sukieva.hhu.data.local.dao
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.Query
+import androidx.room.Update
+import github.sukieva.hhu.data.entity.Website
+
+@Dao
+interface FavDao {
+
+    @Insert
+    suspend fun insertWeb(website: Website): Long
+
+
+    @Query("select * from Website")
+    suspend fun loadAllWebs(): List<Website>
+
+    @Query("delete from Website")
+    suspend fun deleteAllWebs()
+
+    @Query("delete from Website where site_name = :siteName")
+    suspend fun deleteWebBySiteName(siteName: String): Int
+}