Fix remote settings` bugs

sunshine0523 · Aug 30, 2023 · 1f1e22f · 1f1e22f
1 parent a84601d
commit 1f1e22f
Show file tree

Hide file tree

Showing 26 changed files with 253 additions and 181 deletions.
diff --git a/app/src/main/java/com/sunshine/freeform/room/DatabaseRepository.kt b/app/src/main/java/com/sunshine/freeform/room/DatabaseRepository.kt
@@ -13,16 +13,15 @@ import java.lang.Exception
 class DatabaseRepository(context: Context) {
 
     private val freeFormAppsDao: FreeFormAppsDao
-    private val notificationAppsDao: NotificationAppsDao
 
-    fun insertFreeForm(packageName: String, userId: Int) {
+    fun insertFreeForm(packageName: String, activityName: String, userId: Int) {
         try {
-            freeFormAppsDao.insert(packageName, userId)
+            freeFormAppsDao.insert(packageName, activityName, userId)
         }catch (e: Exception) { }
     }
 
-    fun deleteFreeForm(packageName: String, userId: Int) {
-        freeFormAppsDao.delete(packageName, userId)
+    fun deleteFreeForm(packageName: String, activityName: String, userId: Int) {
+        freeFormAppsDao.delete(packageName, activityName, userId)
     }
 
     fun getAllFreeFormName(): LiveData<List<String>?> {
@@ -45,7 +44,7 @@ class DatabaseRepository(context: Context) {
         freeFormAppsDao.update(entity)
     }
 
-    fun getAllFreeFormWithoutLiveData() : List<String>? {
+    fun getAllFreeFormWithoutLiveData() : List<FreeFormAppsEntity>? {
         return freeFormAppsDao.getAllWithoutLiveData()
     }
 
@@ -57,32 +56,8 @@ class DatabaseRepository(context: Context) {
         freeFormAppsDao.deleteList(freeFormAppsEntityList)
     }
 
-    fun insertNotification(packageName: String, userId: Int) {
-        try {
-            notificationAppsDao.insert(packageName, userId)
-        }catch (e: Exception) {}
-
-    }
-
-    fun deleteNotification(packageName: String, userId: Int) {
-        notificationAppsDao.delete(packageName, userId)
-    }
-
-    fun getAllNotification(): LiveData<List<NotificationAppsEntity>?> {
-        return notificationAppsDao.getAll()
-    }
-
-    fun getAllNotificationByFlow(): Flow<List<NotificationAppsEntity>?> {
-        return notificationAppsDao.getAllByFlow()
-    }
-
-    fun deleteAllNotification() {
-        notificationAppsDao.deleteAll()
-    }
-
     init {
         val database = getDatabase(context)
         freeFormAppsDao = database.freeFormAppsDao
-        notificationAppsDao = database.notificationAppsDao
     }
 }
diff --git a/app/src/main/java/com/sunshine/freeform/room/FreeFormAppsDao.kt b/app/src/main/java/com/sunshine/freeform/room/FreeFormAppsDao.kt
@@ -14,11 +14,11 @@ import kotlinx.coroutines.flow.Flow
 @Dao
 interface FreeFormAppsDao {
 
-    @Query("INSERT INTO FreeFormAppsEntity(packageName, userId) VALUES(:packageName, :userId)")
-    fun insert(packageName: String, userId: Int)
+    @Query("INSERT INTO FreeFormAppsEntity(packageName, activityName, userId) VALUES(:packageName, :activityName, :userId)")
+    fun insert(packageName: String, activityName: String, userId: Int)
 
-    @Query("DELETE FROM FreeFormAppsEntity WHERE packageName = :packageName and userId = :userId")
-    fun delete(packageName: String, userId: Int)
+    @Query("DELETE FROM FreeFormAppsEntity WHERE packageName = :packageName and activityName = :activityName and userId = :userId")
+    fun delete(packageName: String, activityName: String, userId: Int)
 
     @Query("SELECT * FROM FreeFormAppsEntity")
     fun getAll() : LiveData<List<FreeFormAppsEntity>?>
@@ -29,8 +29,8 @@ interface FreeFormAppsDao {
     @Query("SELECT packageName FROM FreeFormAppsEntity")
     fun getAllName() : LiveData<List<String>?>
 
-    @Query("SELECT packageName FROM FreeFormAppsEntity")
-    fun getAllWithoutLiveData() : List<String>?
+    @Query("SELECT * FROM FreeFormAppsEntity")
+    fun getAllWithoutLiveData() : List<FreeFormAppsEntity>?
 
     @Query("SELECT COUNT(*) FROM FreeFormAppsEntity")
     fun getCount(): Int

diff --git a/app/src/main/java/com/sunshine/freeform/room/FreeFormAppsEntity.kt b/app/src/main/java/com/sunshine/freeform/room/FreeFormAppsEntity.kt
@@ -15,7 +15,7 @@ class FreeFormAppsEntity(
     @PrimaryKey(autoGenerate = true)
     val sortNum: Int,
     var packageName: String,
-    //20210604新增用户标识
+    var activityName: String,
     var userId: Int = 0
 ) {
     override fun toString(): String {

diff --git a/app/src/main/java/com/sunshine/freeform/room/MyDatabase.kt b/app/src/main/java/com/sunshine/freeform/room/MyDatabase.kt
@@ -11,10 +11,9 @@ import androidx.sqlite.db.SupportSQLiteDatabase
  * @author sunshine
  * @date 2021/1/31
  */
-@Database(entities = [FreeFormAppsEntity::class, NotificationAppsEntity::class], version = 5, exportSchema = false)
+@Database(entities = [FreeFormAppsEntity::class], version = 5, exportSchema = false)
 abstract class MyDatabase : RoomDatabase() {
     abstract val freeFormAppsDao: FreeFormAppsDao
-    abstract val notificationAppsDao: NotificationAppsDao
 
     companion object {
         private var database: MyDatabase? = null

diff --git a/app/src/main/java/com/sunshine/freeform/room/NotificationAppsDao.kt b/app/src/main/java/com/sunshine/freeform/room/NotificationAppsDao.kt
diff --git a/app/src/main/java/com/sunshine/freeform/room/NotificationAppsEntity.kt b/app/src/main/java/com/sunshine/freeform/room/NotificationAppsEntity.kt
diff --git a/...m/sunshine/freeform/ProcessSurfaceView.kt → ...unshine/freeform/ui/ProcessSurfaceView.kt b/...m/sunshine/freeform/ProcessSurfaceView.kt → ...unshine/freeform/ui/ProcessSurfaceView.kt
@@ -1,4 +1,4 @@
-package com.sunshine.freeform
+package com.sunshine.freeform.ui
 
 import android.annotation.SuppressLint
 import android.content.ComponentName

diff --git a/app/src/main/java/com/sunshine/freeform/ui/app_list/AppInfo.kt b/app/src/main/java/com/sunshine/freeform/ui/app_list/AppInfo.kt
@@ -7,5 +7,7 @@ data class AppInfo(
     val label: String,
     val icon: Drawable,
     val componentName: ComponentName,
-    val userId: Int
+    val userId: Int,
+    // is add to freeform app, use for FreeformAppActivity
+    var isFreeformApp: Boolean = false
 )
diff --git a/app/src/main/java/com/sunshine/freeform/ui/app_list/AppListActivity.kt b/app/src/main/java/com/sunshine/freeform/ui/app_list/AppListActivity.kt
@@ -76,43 +76,6 @@ class AppListActivity : ComponentActivity() {
     }
 }
 
-@Composable
-fun SearchWidget(textStyle: TextStyle = TextStyle.Default, viewModel: AppListViewModel) {
-    var text by remember { mutableStateOf("")}
-    Box {
-        BasicTextField(
-            value = text,
-            onValueChange = {
-                text = it
-                viewModel.filterApp(text)
-            },
-            textStyle = textStyle,
-            modifier = Modifier
-                .padding(20.dp)
-                .background(MaterialTheme.colorScheme.primaryContainer, CircleShape)
-                .height(60.dp)
-                .fillMaxWidth(),
-            decorationBox = {
-                Row(verticalAlignment = Alignment.CenterVertically,
-                    modifier = Modifier.padding(horizontal = 8.dp)) {
-                    Box(modifier = Modifier
-                        .padding(horizontal = 10.dp)
-                        .weight(1f),
-                        contentAlignment = Alignment.CenterStart) {
-                        if (text.isEmpty()) {
-                            Text(
-                                text = stringResource(id = R.string.search_app),
-                                style = textStyle
-                            )
-                        }
-                        it()
-                    }
-                }
-            }
-        )
-    }
-}
-
 @Composable
 fun ListWidget(viewModel: AppListViewModel) {
     val appList by viewModel.appListLiveData.observeAsState(ArrayList())

diff --git a/app/src/main/java/com/sunshine/freeform/ui/app_list/AppListViewModel.kt b/app/src/main/java/com/sunshine/freeform/ui/app_list/AppListViewModel.kt
@@ -2,16 +2,23 @@ package com.sunshine.freeform.ui.app_list
 
 import android.app.Application
 import android.content.Context
+import android.content.pm.ApplicationInfo
 import android.content.pm.LauncherActivityInfo
 import android.content.pm.LauncherApps
 import android.os.UserHandle
 import android.os.UserManager
+import android.util.Log
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
 import com.sunshine.freeform.MiFreeform
+import com.sunshine.freeform.room.DatabaseRepository
+import com.sunshine.freeform.room.FreeFormAppsEntity
+import com.sunshine.freeform.utils.contains
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
 import kotlin.math.max
 import kotlin.math.min
@@ -21,6 +28,7 @@ import kotlin.math.min
  * @since 2023/8/25
  */
 class AppListViewModel(private val application: Application): AndroidViewModel(application) {
+    private val repository = DatabaseRepository(application)
     private val allAppList = ArrayList<AppInfo>()
     val appListLiveData: LiveData<List<AppInfo>>
         get() = _appList
@@ -44,16 +52,33 @@ class AppListViewModel(private val application: Application): AndroidViewModel(a
         getAppList()
     }
 
+    /**
+     * use in IO
+     */
+    private fun getAllFreeFormApps(): List<FreeFormAppsEntity> {
+        return repository.getAllFreeFormWithoutLiveData() ?: ArrayList()
+    }
+
     private fun getAppList() {
         viewModelScope.launch(Dispatchers.IO) {
+            val freeformList = getAllFreeFormApps()
             userManager.userProfiles.forEach { userHandle ->
                 val list = launcherApps.getActivityList(null, userHandle)
                 list.forEach {info ->
+                    val packageName = info.componentName.packageName
+                    val activityName = info.componentName.className
+                    val userId = com.sunshine.freeform.systemapi.UserHandle.getUserId(userHandle)
+                    val isFreeformApp = freeformList.contains(FreeFormAppsEntity(-1, packageName, activityName, userId)) { info1, info2 ->
+                        info1.packageName == info2.packageName &&
+                        info1.activityName == info2.activityName &&
+                        info1.userId == info2.userId
+                    }
                     allAppList.add(AppInfo(
-                        info.label.toString(),
+                        "${info.label}${if (com.sunshine.freeform.systemapi.UserHandle.getUserId(userHandle) != 0) -com.sunshine.freeform.systemapi.UserHandle.getUserId(userHandle) else ""}",
                         info.applicationInfo.loadIcon(application.packageManager),
                         info.componentName,
-                        com.sunshine.freeform.systemapi.UserHandle.getUserId(userHandle)
+                        userId,
+                        isFreeformApp
                     ))
                 }
             }
@@ -73,6 +98,14 @@ class AppListViewModel(private val application: Application): AndroidViewModel(a
         }
     }
 
+    fun addFreeformApp(packageName: String, activityName: String, userId: Int) {
+        repository.insertFreeForm(packageName, activityName, userId)
+    }
+
+    fun removeFreeformApp(packageName: String, activityName: String, userId: Int) {
+        repository.deleteFreeForm(packageName, activityName, userId)
+    }
+
     fun closeActivity() {
         _finishActivity.value = true
     }