-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Added saving and loading server entries [#5]
* Added a shared view model. * Changed Server to be a shared model. * Added dependency injection using Koin. * Added the ServersDb table. * Added screens to edit servers.
- Loading branch information
Showing
40 changed files
with
1,355 additions
and
160 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
44 changes: 44 additions & 0 deletions
44
androidVariant/src/main/java/org/comixedproject/variant/android/VariantApp.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| /* | ||
| * Variant - A digital comic book reading application for the iPad and Android tablets. | ||
| * Copyright (C) 2024, The ComiXed Project | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses> | ||
| */ | ||
|
|
||
| package org.comixedproject.variant.android | ||
|
|
||
| import android.app.Application | ||
| import android.content.Context | ||
| import org.comixedproject.variant.shared.initKoin | ||
| import org.comixedproject.variant.shared.model.VariantViewModel | ||
| import org.koin.androidx.viewmodel.dsl.viewModel | ||
| import org.koin.dsl.module | ||
|
|
||
|
|
||
| class VariantApp : Application() { | ||
| override fun onCreate() { | ||
| super.onCreate() | ||
|
|
||
| initKoin( | ||
| appModule = module { | ||
| single<Context> { this@VariantApp } | ||
|
|
||
| }, | ||
| viewModelsModule = module { | ||
| viewModel { | ||
| VariantViewModel(get()) | ||
| } | ||
| }) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
74 changes: 74 additions & 0 deletions
74
...t/src/main/java/org/comixedproject/variant/android/ui/ServerListEntryDismissBackground.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| /* | ||
| * Variant - A digital comic book reading application for the iPad and Android tablets. | ||
| * Copyright (C) 2024, The ComiXed Project | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses> | ||
| */ | ||
|
|
||
| package org.comixedproject.variant.android.ui | ||
|
|
||
| import androidx.compose.foundation.background | ||
| import androidx.compose.foundation.layout.Arrangement | ||
| import androidx.compose.foundation.layout.Row | ||
| import androidx.compose.foundation.layout.Spacer | ||
| import androidx.compose.foundation.layout.fillMaxSize | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.material.icons.Icons | ||
| import androidx.compose.material.icons.filled.Delete | ||
| import androidx.compose.material.icons.filled.Edit | ||
| import androidx.compose.material3.ExperimentalMaterial3Api | ||
| import androidx.compose.material3.Icon | ||
| import androidx.compose.material3.SwipeToDismissBoxState | ||
| import androidx.compose.material3.SwipeToDismissBoxValue | ||
| import androidx.compose.material3.rememberSwipeToDismissBoxState | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.graphics.Color | ||
| import androidx.compose.ui.res.stringResource | ||
| import androidx.compose.ui.tooling.preview.Preview | ||
| import androidx.compose.ui.unit.dp | ||
| import org.comixedproject.variant.android.R | ||
| import org.comixedproject.variant.android.VariantTheme | ||
|
|
||
| @OptIn(ExperimentalMaterial3Api::class) | ||
| @Composable | ||
| fun ServerListEntryDismissBackground(dismissState: SwipeToDismissBoxState) { | ||
| val color = when (dismissState.dismissDirection) { | ||
| SwipeToDismissBoxValue.StartToEnd -> Color(0xFFFF1744) | ||
| SwipeToDismissBoxValue.EndToStart -> Color(0xFF1DE986) | ||
| SwipeToDismissBoxValue.Settled -> Color.Transparent | ||
| } | ||
|
|
||
| Row( | ||
| modifier = Modifier | ||
| .fillMaxSize() | ||
| .background(color) | ||
| .padding(12.dp, 8.dp), | ||
| verticalAlignment = Alignment.CenterVertically, | ||
| horizontalArrangement = Arrangement.SpaceBetween | ||
| ) { | ||
| Icon(Icons.Default.Delete, contentDescription = stringResource(id = R.string.deleteServer)) | ||
| Spacer(modifier = Modifier) | ||
| Icon(Icons.Default.Edit, contentDescription = stringResource(id = R.string.editServer)) | ||
| } | ||
| } | ||
|
|
||
| @Preview | ||
| @Composable | ||
| fun ServerListEntryDismissBackgroundPreview() { | ||
| VariantTheme { | ||
| ServerListEntryDismissBackground(rememberSwipeToDismissBoxState()) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
102 changes: 102 additions & 0 deletions
102
androidVariant/src/main/java/org/comixedproject/variant/android/ui/server/ServerDetail.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,102 @@ | ||
| /* | ||
| * Variant - A digital comic book reading application for the iPad and Android tablets. | ||
| * Copyright (C) 2024, The ComiXed Project | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses> | ||
| */ | ||
|
|
||
| package org.comixedproject.variant.android.ui.server | ||
|
|
||
| import androidx.compose.foundation.layout.Box | ||
| import androidx.compose.foundation.layout.Column | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.material.icons.Icons | ||
| import androidx.compose.material.icons.filled.Delete | ||
| import androidx.compose.material.icons.filled.Edit | ||
| import androidx.compose.material.icons.filled.Search | ||
| import androidx.compose.material3.BottomAppBar | ||
| import androidx.compose.material3.Button | ||
| import androidx.compose.material3.Icon | ||
| import androidx.compose.material3.MaterialTheme | ||
| import androidx.compose.material3.Scaffold | ||
| import androidx.compose.material3.Text | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.res.stringResource | ||
| import androidx.compose.ui.tooling.preview.Preview | ||
| import androidx.compose.ui.unit.dp | ||
| import org.comixedproject.variant.android.R | ||
| import org.comixedproject.variant.android.VariantTheme | ||
| import org.comixedproject.variant.shared.model.server.Server | ||
|
|
||
| @Composable | ||
| fun ServerDetail( | ||
| server: Server, | ||
| onEdit: () -> Unit, | ||
| onDelete: () -> Unit, | ||
| onBrowse: () -> Unit | ||
| ) { | ||
| Scaffold(bottomBar = { | ||
| BottomAppBar( | ||
| containerColor = MaterialTheme.colorScheme.primaryContainer, | ||
| contentColor = MaterialTheme.colorScheme.primary | ||
| ) { | ||
| Button(onClick = onEdit) { | ||
| Icon( | ||
| imageVector = Icons.Filled.Edit, | ||
| contentDescription = stringResource(id = R.string.editButtonLabel) | ||
| ) | ||
| } | ||
| Button(onClick = onBrowse) { | ||
| Icon( | ||
| imageVector = Icons.Filled.Search, | ||
| contentDescription = stringResource(id = R.string.browseButtonLabel) | ||
| ) | ||
| } | ||
| Button(onClick = onDelete) { | ||
| Icon( | ||
| imageVector = Icons.Filled.Delete, | ||
| contentDescription = stringResource(id = R.string.deleteButtonLabel) | ||
| ) | ||
| } | ||
| } | ||
| }) { padding -> | ||
| Box(modifier = Modifier.padding(padding)) { | ||
| Column(modifier = Modifier.padding(32.dp)) { | ||
| Text(text = server.name, style = MaterialTheme.typography.titleLarge) | ||
| Text(text = server.url, style = MaterialTheme.typography.bodyMedium) | ||
| Text(text = server.username, style = MaterialTheme.typography.bodyMedium) | ||
| Text( | ||
| text = server.password.replace(".".toRegex(), "*"), | ||
| style = MaterialTheme.typography.bodyMedium | ||
| ) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Preview | ||
| @Composable | ||
| fun ServerDetailPreview() { | ||
| VariantTheme { | ||
| ServerDetail( | ||
| server = Server( | ||
| "1", | ||
| "My Server", | ||
| "http://www.comixedproject.org:7171/opds", | ||
| "[email protected]", | ||
| "my!password" | ||
| ), onEdit = {}, onDelete = {}, onBrowse = {}) | ||
| } | ||
| } |
Oops, something went wrong.