Update version

ismartcoding · May 26, 2024 · ffae788 · ffae788
1 parent c9b9b82
commit ffae788
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 10 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -37,9 +37,9 @@ android {
                 else -> 0
             }
 
-        val vCode = 292
+        val vCode = 295
         versionCode = vCode - singleAbiNum
-        versionName = "1.2.53"
+        versionName = "1.2.54"
 
         ndk {
             //noinspection ChromeOsAbiSupport

diff --git a/app/src/main/java/com/ismartcoding/plain/features/PackageHelper.kt b/app/src/main/java/com/ismartcoding/plain/features/PackageHelper.kt
@@ -90,7 +90,14 @@ object PackageHelper {
             }.sorted(sortBy).drop(offset).take(limit)
         }
 
-        return apps.map { getPackage(it.appInfo, packageManager.getPackageInfo(it.id, PackageManager.GET_SIGNING_CERTIFICATES)) }.filter {
+        return apps.map {
+            try {
+                getPackage(it.appInfo, packageManager.getPackageInfo(it.id, PackageManager.GET_SIGNING_CERTIFICATES))
+            } catch (ex: Exception) {
+                LogCat.d(ex.toString())
+                getPackage(it.appInfo, PackageInfo())
+            }
+        }.filter {
             text.isEmpty()
                     || it.id.contains(text, true)
                     || it.name.contains(text, true)

diff --git a/app/src/main/java/com/ismartcoding/plain/ui/page/feeds/FeedEntryPage.kt b/app/src/main/java/com/ismartcoding/plain/ui/page/feeds/FeedEntryPage.kt
@@ -231,7 +231,6 @@ fun FeedEntryPage(
             )
         },
         modifier = Modifier
-            .nestedScroll(scrollBehavior.nestedScrollConnection)
             .imePadding(),
         content = { paddingValues ->
             val m = viewModel.item.value ?: return@PScaffold
@@ -260,7 +259,8 @@ fun FeedEntryPage(
             ) {
                 LazyColumn(
                     Modifier
-                        .fillMaxSize(),
+                        .fillMaxSize()
+                        .nestedScroll(scrollBehavior.nestedScrollConnection),
                     state = scrollState,
                 ) {
                     item {

diff --git a/app/src/main/java/com/ismartcoding/plain/ui/page/images/ImagesPage.kt b/app/src/main/java/com/ismartcoding/plain/ui/page/images/ImagesPage.kt
@@ -295,7 +295,6 @@ fun ImagesPage(
     CastDialog(castViewModel)
 
     PScaffold(
-        modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
         topBar = {
             if (viewModel.showSearchBar.value) {
                 ListSearchBar(
@@ -446,6 +445,7 @@ fun ImagesPage(
                                 state = scrollState,
                                 modifier = Modifier
                                     .fillMaxSize()
+                                    .nestedScroll(scrollBehavior.nestedScrollConnection)
                                     .gridDragSelect(
                                         items = itemsState,
                                         state = dragSelectState,

diff --git a/app/src/main/java/com/ismartcoding/plain/ui/page/videos/VideosPage.kt b/app/src/main/java/com/ismartcoding/plain/ui/page/videos/VideosPage.kt
@@ -9,9 +9,7 @@ import androidx.compose.animation.slideInVertically
 import androidx.compose.animation.slideOutVertically
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.combinedClickable
-import androidx.compose.foundation.horizontalScroll
 import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
@@ -23,7 +21,6 @@ import androidx.compose.foundation.lazy.grid.items
 import androidx.compose.foundation.lazy.grid.rememberLazyGridState
 import androidx.compose.foundation.pager.HorizontalPager
 import androidx.compose.foundation.pager.rememberPagerState
-import androidx.compose.foundation.rememberScrollState
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.Folder
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -299,7 +296,6 @@ fun VideosPage(
     CastDialog(castViewModel)
 
     PScaffold(
-        modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
         topBar = {
             if (viewModel.showSearchBar.value) {
                 ListSearchBar(
@@ -453,6 +449,7 @@ fun VideosPage(
                                 state = scrollState,
                                 modifier = Modifier
                                     .fillMaxSize()
+                                    .nestedScroll(scrollBehavior.nestedScrollConnection)
                                     .gridDragSelect(
                                         items = itemsState,
                                         state = dragSelectState,