Skip to content

Commit 90ce14d

Browse files
ismartcodingismartcoding
committed
Update web code
1 parent df4bf7b commit 90ce14d

File tree

94 files changed

+299
-301
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+299
-301
lines changed

‎app/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ android {
4141
else -> 0
4242
}
4343

44-
val vCode = 364
44+
val vCode = 367
4545
versionCode = vCode - singleAbiNum
46-
versionName = "2.0.10"
46+
versionName = "2.0.11"
4747

4848
ndk {
4949
//noinspection ChromeOsAbiSupport

‎app/src/main/java/com/ismartcoding/plain/ui/models/NotificationSettingsViewModel.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,6 @@ class NotificationSettingsViewModel : ViewModel() {
9696
}
9797
filterData.value = NotificationFilterPreference.getValueAsync(context)
9898
loadSelectedApps(context)
99-
// Remove added apps from all apps list
100-
_allAppsFlow.value.removeAll { packageNames.contains(it.id) }
10199
refreshNotifications()
102100
}
103101

‎app/src/main/java/com/ismartcoding/plain/ui/page/web/AppSelectorBottomSheet.kt

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ fun AppSelectorBottomSheet(
6262
if (searchQuery.isBlank()) {
6363
allAppsState
6464
} else {
65-
allAppsState.filter {
66-
it.name.contains(searchQuery, ignoreCase = true) ||
67-
it.id.contains(searchQuery, ignoreCase = true)
65+
allAppsState.filter {
66+
it.name.contains(searchQuery, ignoreCase = true) ||
67+
it.id.contains(searchQuery, ignoreCase = true)
6868
}
6969
}
7070
}
@@ -94,13 +94,13 @@ fun AppSelectorBottomSheet(
9494
actions = {
9595
PTopRightButton(
9696
stringResource(R.string.add) +
97-
if (vm.selectedAppIds.isNotEmpty()) " (${vm.selectedAppIds.size})" else "", click = {
98-
if (vm.selectedAppIds.isNotEmpty()) {
99-
onAppsSelected(vm.selectedAppIds.toList())
100-
vm.clearSelectedApps()
101-
onDismiss()
102-
}
103-
}, enabled = vm.selectedAppIds.isNotEmpty()
97+
if (vm.selectedAppIds.isNotEmpty()) " (${vm.selectedAppIds.size})" else "", click = {
98+
if (vm.selectedAppIds.isNotEmpty()) {
99+
onAppsSelected(vm.selectedAppIds.toList())
100+
vm.clearSelectedApps()
101+
onDismiss()
102+
}
103+
}, enabled = vm.selectedAppIds.isNotEmpty()
104104
)
105105
}
106106
)
@@ -132,7 +132,7 @@ fun AppSelectorBottomSheet(
132132
.fillMaxWidth()
133133
.weight(1f)
134134
) {
135-
items(filteredApps, key = { it.id }) { app ->
135+
items(filteredApps.filter { !vm.filterData.value.apps.contains(it.id) }, key = { it.id }) { app ->
136136
AppSelectorItem(
137137
app = app,
138138
isSelected = vm.selectedAppIds.contains(app.id),
@@ -154,10 +154,10 @@ private fun AppSelectorItem(
154154
isSelected: Boolean,
155155
onToggleSelection: () -> Unit
156156
) {
157-
val appIcon = remember(app.id) {
158-
packageManager.getApplicationIcon(app.appInfo)
157+
val appIcon = remember(app.id) {
158+
packageManager.getApplicationIcon(app.appInfo)
159159
}
160-
160+
161161
Row(
162162
modifier = Modifier
163163
.fillMaxWidth()

‎app/src/main/java/com/ismartcoding/plain/ui/page/web/NotificationSettingsPage.kt

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -59,39 +59,39 @@ import kotlinx.coroutines.launch
5959
@Composable
6060
fun NotificationSettingsPage(
6161
navController: NavHostController,
62-
viewModel: NotificationSettingsViewModel = viewModel()
62+
vm: NotificationSettingsViewModel = viewModel()
6363
) {
6464
val context = LocalContext.current
6565
val scope = rememberCoroutineScope()
66-
val selectedAppsState by viewModel.selectedAppsFlow.collectAsState()
66+
val selectedAppsState by vm.selectedAppsFlow.collectAsState()
6767

6868
LaunchedEffect(Unit) {
6969
scope.launch(Dispatchers.IO) {
70-
viewModel.loadDataAsync(context)
70+
vm.loadDataAsync(context)
7171
}
7272
}
7373

7474
fun toggleMode() {
7575
scope.launch(Dispatchers.IO) {
76-
viewModel.toggleModeAsync(context)
76+
vm.toggleModeAsync(context)
7777
}
7878
}
7979

8080
fun removeApp(packageName: String) {
8181
scope.launch(Dispatchers.IO) {
82-
viewModel.removeAppAsync(context, packageName)
82+
vm.removeAppAsync(context, packageName)
8383
}
8484
}
8585

8686
fun addApps(packageNames: List<String>) {
8787
scope.launch(Dispatchers.IO) {
88-
viewModel.addAppsAsync(context, packageNames)
88+
vm.addAppsAsync(context, packageNames)
8989
}
9090
}
9191

9292
fun clearAll() {
9393
scope.launch(Dispatchers.IO) {
94-
viewModel.clearAllAsync(context)
94+
vm.clearAllAsync(context)
9595
}
9696
}
9797

@@ -143,8 +143,8 @@ fun NotificationSettingsPage(
143143
horizontalArrangement = Arrangement.spacedBy(8.dp)
144144
) {
145145
FilterChip(
146-
selected = viewModel.filterData.value.mode == "allowlist",
147-
onClick = { if (viewModel.filterData.value.mode != "allowlist") toggleMode() },
146+
selected = vm.filterData.value.mode == "allowlist",
147+
onClick = { if (vm.filterData.value.mode != "allowlist") toggleMode() },
148148
label = { Text(stringResource(R.string.allowlist_mode)) },
149149
colors = FilterChipDefaults.filterChipColors(
150150
selectedContainerColor = MaterialTheme.colorScheme.primary,
@@ -154,8 +154,8 @@ fun NotificationSettingsPage(
154154
)
155155
)
156156
FilterChip(
157-
selected = viewModel.filterData.value.mode == "blacklist",
158-
onClick = { if (viewModel.filterData.value.mode != "blacklist") toggleMode() },
157+
selected = vm.filterData.value.mode == "blacklist",
158+
onClick = { if (vm.filterData.value.mode != "blacklist") toggleMode() },
159159
label = { Text(stringResource(R.string.blacklist_mode)) },
160160
colors = FilterChipDefaults.filterChipColors(
161161
selectedContainerColor = MaterialTheme.colorScheme.primary,
@@ -173,15 +173,15 @@ fun NotificationSettingsPage(
173173
item {
174174
Subtitle(
175175
text = stringResource(
176-
if (viewModel.filterData.value.mode == "allowlist")
176+
if (vm.filterData.value.mode == "allowlist")
177177
R.string.allowed_apps
178178
else
179179
R.string.blocked_apps
180180
)
181181
)
182182
}
183183

184-
if (!viewModel.isLoading.value) {
184+
if (!vm.isLoading.value) {
185185
items(selectedAppsState, key = { it.id }) { app ->
186186
Row(
187187
modifier = PlainTheme
@@ -220,7 +220,7 @@ fun NotificationSettingsPage(
220220
TextButton(
221221
onClick = { removeApp(app.id) }
222222
) {
223-
Text(stringResource(R.string.delete), color = MaterialTheme.colorScheme.red)
223+
Text(stringResource(R.string.remove), color = MaterialTheme.colorScheme.red)
224224
}
225225
}
226226
VerticalSpace(dp = 8.dp)
@@ -229,7 +229,7 @@ fun NotificationSettingsPage(
229229
item {
230230
Button(
231231
onClick = {
232-
viewModel.showAppSelectorDialog()
232+
vm.showAppSelectorDialog()
233233
},
234234
modifier = Modifier
235235
.fillMaxWidth()
@@ -253,13 +253,13 @@ fun NotificationSettingsPage(
253253
}
254254
}
255255

256-
if (viewModel.showAppSelector.value) {
256+
if (vm.showAppSelector.value) {
257257
AppSelectorBottomSheet(
258-
vm = viewModel,
259-
onDismiss = { viewModel.showAppSelector.value = false },
258+
vm = vm,
259+
onDismiss = { vm.showAppSelector.value = false },
260260
onAppsSelected = { packageNames ->
261261
addApps(packageNames)
262-
viewModel.showAppSelector.value = false
262+
vm.showAppSelector.value = false
263263
}
264264
)
265265
}

‎app/src/main/resources/web/assets/AppsSidebar-ByB2N89C.js renamed to ‎app/src/main/resources/web/assets/AppsSidebar-DBVmA06Z.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/src/main/resources/web/assets/AppsView-BdJXfxo0.css

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)