Skip to content

Commit ffae788

Browse files
committed
Update version
1 parent c9b9b82 commit ffae788

File tree

5 files changed

+14
-10
lines changed

5 files changed

+14
-10
lines changed

app/build.gradle.kts

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ android {
3737
else -> 0
3838
}
3939

40-
val vCode = 292
40+
val vCode = 295
4141
versionCode = vCode - singleAbiNum
42-
versionName = "1.2.53"
42+
versionName = "1.2.54"
4343

4444
ndk {
4545
//noinspection ChromeOsAbiSupport

app/src/main/java/com/ismartcoding/plain/features/PackageHelper.kt

+8-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,14 @@ object PackageHelper {
9090
}.sorted(sortBy).drop(offset).take(limit)
9191
}
9292

93-
return apps.map { getPackage(it.appInfo, packageManager.getPackageInfo(it.id, PackageManager.GET_SIGNING_CERTIFICATES)) }.filter {
93+
return apps.map {
94+
try {
95+
getPackage(it.appInfo, packageManager.getPackageInfo(it.id, PackageManager.GET_SIGNING_CERTIFICATES))
96+
} catch (ex: Exception) {
97+
LogCat.d(ex.toString())
98+
getPackage(it.appInfo, PackageInfo())
99+
}
100+
}.filter {
94101
text.isEmpty()
95102
|| it.id.contains(text, true)
96103
|| it.name.contains(text, true)

app/src/main/java/com/ismartcoding/plain/ui/page/feeds/FeedEntryPage.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,6 @@ fun FeedEntryPage(
231231
)
232232
},
233233
modifier = Modifier
234-
.nestedScroll(scrollBehavior.nestedScrollConnection)
235234
.imePadding(),
236235
content = { paddingValues ->
237236
val m = viewModel.item.value ?: return@PScaffold
@@ -260,7 +259,8 @@ fun FeedEntryPage(
260259
) {
261260
LazyColumn(
262261
Modifier
263-
.fillMaxSize(),
262+
.fillMaxSize()
263+
.nestedScroll(scrollBehavior.nestedScrollConnection),
264264
state = scrollState,
265265
) {
266266
item {

app/src/main/java/com/ismartcoding/plain/ui/page/images/ImagesPage.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,6 @@ fun ImagesPage(
295295
CastDialog(castViewModel)
296296

297297
PScaffold(
298-
modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
299298
topBar = {
300299
if (viewModel.showSearchBar.value) {
301300
ListSearchBar(
@@ -446,6 +445,7 @@ fun ImagesPage(
446445
state = scrollState,
447446
modifier = Modifier
448447
.fillMaxSize()
448+
.nestedScroll(scrollBehavior.nestedScrollConnection)
449449
.gridDragSelect(
450450
items = itemsState,
451451
state = dragSelectState,

app/src/main/java/com/ismartcoding/plain/ui/page/videos/VideosPage.kt

+1-4
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ import androidx.compose.animation.slideInVertically
99
import androidx.compose.animation.slideOutVertically
1010
import androidx.compose.foundation.ExperimentalFoundationApi
1111
import androidx.compose.foundation.combinedClickable
12-
import androidx.compose.foundation.horizontalScroll
1312
import androidx.compose.foundation.layout.Arrangement
14-
import androidx.compose.foundation.layout.Row
1513
import androidx.compose.foundation.layout.fillMaxSize
1614
import androidx.compose.foundation.layout.fillMaxWidth
1715
import androidx.compose.foundation.layout.padding
@@ -23,7 +21,6 @@ import androidx.compose.foundation.lazy.grid.items
2321
import androidx.compose.foundation.lazy.grid.rememberLazyGridState
2422
import androidx.compose.foundation.pager.HorizontalPager
2523
import androidx.compose.foundation.pager.rememberPagerState
26-
import androidx.compose.foundation.rememberScrollState
2724
import androidx.compose.material.icons.Icons
2825
import androidx.compose.material.icons.outlined.Folder
2926
import androidx.compose.material3.ExperimentalMaterial3Api
@@ -299,7 +296,6 @@ fun VideosPage(
299296
CastDialog(castViewModel)
300297

301298
PScaffold(
302-
modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
303299
topBar = {
304300
if (viewModel.showSearchBar.value) {
305301
ListSearchBar(
@@ -453,6 +449,7 @@ fun VideosPage(
453449
state = scrollState,
454450
modifier = Modifier
455451
.fillMaxSize()
452+
.nestedScroll(scrollBehavior.nestedScrollConnection)
456453
.gridDragSelect(
457454
items = itemsState,
458455
state = dragSelectState,

0 commit comments

Comments
 (0)