* version beta4-4

* fix a ui bug, finally..

Signed-off-by: js <liy087621@gmail.com>

app/build.gradle

@@ -12,8 +12,8 @@ android {
         applicationId "com.js.nowakelock"
         minSdkVersion 24
         targetSdkVersion 29
-        versionCode 33
-        versionName "1.1.0-beta4-3"
+        versionCode 36
+        versionName "1.1.0-beta4-4"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 

app/src/main/java/com/js/nowakelock/data/repository/frepository/IAlarmR.kt

@@ -27,7 +27,18 @@ class IAlarmR(private val alarmDao: AlarmDao) :
     }
 
     override fun getLists(packageName: String): Flow<List<Item>> {
-        return alarmDao.loadAlarms(packageName)
+        return alarmDao.loadAlarms(packageName).map { items ->
+            items.forEach {
+                if (it.st == null) {
+                    it.st = AlarmSt(
+                        name = it.info.name,
+                        packageName = it.info.packageName
+                    ).apply { alarmDao.insertST(this) }
+                }
+                it.stFlag.set(it.st!!.flag)
+            }
+            items
+        }
     }
 
     override suspend fun sync(pN: String) {

app/src/main/java/com/js/nowakelock/data/repository/frepository/IServiceR.kt

@@ -28,7 +28,18 @@ class IServiceR(private val serviceDao: ServiceDao) :
     }
 
     override fun getLists(packageName: String): Flow<List<Service>> {
-        return serviceDao.loadServices(packageName)
+        return serviceDao.loadServices(packageName).map { items ->
+            items.forEach {
+                if (it.st == null) {
+                    it.st = ServiceSt(
+                        name = it.info.name,
+                        packageName = it.info.packageName
+                    ).apply { serviceDao.insertST(this) }
+                }
+                it.stFlag.set(it.st!!.flag)
+            }
+            items
+        }
     }
 
     override suspend fun sync(pN: String) {

app/src/main/java/com/js/nowakelock/data/repository/frepository/IWakelockR.kt

@@ -28,7 +28,18 @@ class IWakelockR(private var wakeLockDao: WakeLockDao) :
     }
 
     override fun getLists(packageName: String): Flow<List<Item>> {
-        return wakeLockDao.loadWakeLocks(packageName)
+        return wakeLockDao.loadWakeLocks(packageName).map { items ->
+            items.forEach {
+                if (it.st == null) {
+                    it.st = WakeLockSt(
+                        name = it.info.name,
+                        packageName = it.info.packageName
+                    ).apply { wakeLockDao.insertST(this) }
+                }
+                it.stFlag.set(it.st!!.flag)
+            }
+            items
+        }
     }
 
     override suspend fun sync(pN: String) {

app/src/main/java/com/js/nowakelock/ui/fragment/fbase/FViewModel.kt

@@ -63,7 +63,7 @@ class FViewModel(
     //save st
     fun saveST(item: Item) = viewModelScope.launch(Dispatchers.IO) {
         item.st?.let {
-//            it.flag = item.stFlag.get()
+            it.flag = item.stFlag.get()
             FRepository.setItemSt(it)
         }
     }

app/src/main/res/layout/item.xml

@@ -83,7 +83,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
             android:layout_marginTop="8dp"
-            android:checked="@={item.st.flag}"
+            android:checked="@={item.stFlag}"
             android:onClick="@{()->handler.onClick(item)}"
             android:text=""
             android:textSize="18sp"
@@ -110,6 +110,7 @@
             android:layout_marginEnd="8dp"
             android:afterTextChanged="@{() -> handler.onTextChanged(item)}"
             android:autofillHints=""
+            android:enabled="@{item.stFlag}"
             android:hint="@string/ATIUnit"
             android:inputType="number"
             android:maxEms="5"

build.gradle

@@ -8,7 +8,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.0'
+        classpath 'com.android.tools.build:gradle:4.0.1'
         //noinspection DifferentKotlinGradleVersion
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         def nav_version = "2.3.0-alpha01"