summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIván Ávalos <avalos@disroot.org>2023-10-09 10:24:49 -0600
committerIván Ávalos <avalos@disroot.org>2023-11-11 13:20:09 -0600
commit8d565282fa257ece54f64959388ede26cc7f6349 (patch)
tree7e631d4f23b15ae2a4dec5c743fb65b3b4f75455
parent428f83e2625f533421cb1090942c556a874e6174 (diff)
downloadtaler-android-8d565282fa257ece54f64959388ede26cc7f6349.tar.gz
taler-android-8d565282fa257ece54f64959388ede26cc7f6349.tar.bz2
taler-android-8d565282fa257ece54f64959388ede26cc7f6349.zip
[anastasis] Move all screens to screen package
-rw-r--r--anastasis/src/main/java/net/taler/anastasis/MainActivity.kt26
-rw-r--r--anastasis/src/main/java/net/taler/anastasis/ui/screens/backup/BackupFinishedScreen.kt (renamed from anastasis/src/main/java/net/taler/anastasis/ui/backup/BackupFinishedScreen.kt)2
-rw-r--r--anastasis/src/main/java/net/taler/anastasis/ui/screens/backup/EditSecretScreen.kt (renamed from anastasis/src/main/java/net/taler/anastasis/ui/backup/EditSecretScreen.kt)2
-rw-r--r--anastasis/src/main/java/net/taler/anastasis/ui/screens/backup/ReviewPoliciesScreen.kt (renamed from anastasis/src/main/java/net/taler/anastasis/ui/backup/ReviewPoliciesScreen.kt)2
-rw-r--r--anastasis/src/main/java/net/taler/anastasis/ui/screens/backup/SelectAuthMethodsScreen.kt (renamed from anastasis/src/main/java/net/taler/anastasis/ui/backup/SelectAuthMethodsScreen.kt)4
-rw-r--r--anastasis/src/main/java/net/taler/anastasis/ui/screens/common/LoadingScreen.kt (renamed from anastasis/src/main/java/net/taler/anastasis/ui/common/LoadingScreen.kt)2
-rw-r--r--anastasis/src/main/java/net/taler/anastasis/ui/screens/common/ManageProvidersScreen.kt (renamed from anastasis/src/main/java/net/taler/anastasis/ui/common/ManageProvidersScreen.kt)2
-rw-r--r--anastasis/src/main/java/net/taler/anastasis/ui/screens/common/SelectContinentScreen.kt (renamed from anastasis/src/main/java/net/taler/anastasis/ui/common/SelectContinentScreen.kt)2
-rw-r--r--anastasis/src/main/java/net/taler/anastasis/ui/screens/common/SelectCountryScreen.kt (renamed from anastasis/src/main/java/net/taler/anastasis/ui/common/SelectCountryScreen.kt)2
-rw-r--r--anastasis/src/main/java/net/taler/anastasis/ui/screens/common/SelectUserAttributesScreen.kt (renamed from anastasis/src/main/java/net/taler/anastasis/ui/common/SelectUserAttributesScreen.kt)2
-rw-r--r--anastasis/src/main/java/net/taler/anastasis/ui/screens/home/HomeScreen.kt (renamed from anastasis/src/main/java/net/taler/anastasis/ui/home/HomeScreen.kt)2
-rw-r--r--anastasis/src/main/java/net/taler/anastasis/ui/screens/recovery/RecoveryFinishedScreen.kt (renamed from anastasis/src/main/java/net/taler/anastasis/ui/recovery/RecoveryFinishedScreen.kt)2
-rw-r--r--anastasis/src/main/java/net/taler/anastasis/ui/screens/recovery/SelectChallengeScreen.kt (renamed from anastasis/src/main/java/net/taler/anastasis/ui/recovery/SelectChallengeScreen.kt)2
-rw-r--r--anastasis/src/main/java/net/taler/anastasis/ui/screens/recovery/SelectSecretScreen.kt (renamed from anastasis/src/main/java/net/taler/anastasis/ui/recovery/SelectSecretScreen.kt)4
-rw-r--r--anastasis/src/main/java/net/taler/anastasis/ui/screens/recovery/SolveChallengeScreen.kt (renamed from anastasis/src/main/java/net/taler/anastasis/ui/recovery/SolveChallengeScreen.kt)2
15 files changed, 29 insertions, 29 deletions
diff --git a/anastasis/src/main/java/net/taler/anastasis/MainActivity.kt b/anastasis/src/main/java/net/taler/anastasis/MainActivity.kt
index bb0fd4d..c014b8b 100644
--- a/anastasis/src/main/java/net/taler/anastasis/MainActivity.kt
+++ b/anastasis/src/main/java/net/taler/anastasis/MainActivity.kt
@@ -15,20 +15,20 @@ import androidx.compose.runtime.getValue
import androidx.compose.ui.Modifier
import androidx.hilt.navigation.compose.hiltViewModel
import dagger.hilt.android.AndroidEntryPoint
-import net.taler.anastasis.ui.backup.BackupFinishedScreen
-import net.taler.anastasis.ui.backup.EditSecretScreen
-import net.taler.anastasis.ui.backup.ReviewPoliciesScreen
-import net.taler.anastasis.ui.backup.SelectAuthMethodsScreen
-import net.taler.anastasis.ui.common.LoadingScreen
-import net.taler.anastasis.ui.common.SelectContinentScreen
-import net.taler.anastasis.ui.common.SelectCountryScreen
-import net.taler.anastasis.ui.common.SelectUserAttributesScreen
+import net.taler.anastasis.ui.screens.backup.BackupFinishedScreen
+import net.taler.anastasis.ui.screens.backup.EditSecretScreen
+import net.taler.anastasis.ui.screens.backup.ReviewPoliciesScreen
+import net.taler.anastasis.ui.screens.backup.SelectAuthMethodsScreen
+import net.taler.anastasis.ui.screens.common.LoadingScreen
+import net.taler.anastasis.ui.screens.common.SelectContinentScreen
+import net.taler.anastasis.ui.screens.common.SelectCountryScreen
+import net.taler.anastasis.ui.screens.common.SelectUserAttributesScreen
import net.taler.anastasis.ui.dialogs.ErrorDialog
-import net.taler.anastasis.ui.home.HomeScreen
-import net.taler.anastasis.ui.recovery.RecoveryFinishedScreen
-import net.taler.anastasis.ui.recovery.SelectChallengeScreen
-import net.taler.anastasis.ui.recovery.SelectSecretScreen
-import net.taler.anastasis.ui.recovery.SolveChallengeScreen
+import net.taler.anastasis.ui.screens.home.HomeScreen
+import net.taler.anastasis.ui.screens.recovery.RecoveryFinishedScreen
+import net.taler.anastasis.ui.screens.recovery.SelectChallengeScreen
+import net.taler.anastasis.ui.screens.recovery.SelectSecretScreen
+import net.taler.anastasis.ui.screens.recovery.SolveChallengeScreen
import net.taler.anastasis.ui.theme.AnastasisTheme
import net.taler.anastasis.viewmodels.ReducerViewModel
diff --git a/anastasis/src/main/java/net/taler/anastasis/ui/backup/BackupFinishedScreen.kt b/anastasis/src/main/java/net/taler/anastasis/ui/screens/backup/BackupFinishedScreen.kt
index df499be..49f741f 100644
--- a/anastasis/src/main/java/net/taler/anastasis/ui/backup/BackupFinishedScreen.kt
+++ b/anastasis/src/main/java/net/taler/anastasis/ui/screens/backup/BackupFinishedScreen.kt
@@ -14,7 +14,7 @@
* GNU Taler; see the file COPYING. If not, see <http://www.gnu.org/licenses/>
*/
-package net.taler.anastasis.ui.backup
+package net.taler.anastasis.ui.screens.backup
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
diff --git a/anastasis/src/main/java/net/taler/anastasis/ui/backup/EditSecretScreen.kt b/anastasis/src/main/java/net/taler/anastasis/ui/screens/backup/EditSecretScreen.kt
index d65f933..b444d34 100644
--- a/anastasis/src/main/java/net/taler/anastasis/ui/backup/EditSecretScreen.kt
+++ b/anastasis/src/main/java/net/taler/anastasis/ui/screens/backup/EditSecretScreen.kt
@@ -14,7 +14,7 @@
* GNU Taler; see the file COPYING. If not, see <http://www.gnu.org/licenses/>
*/
-package net.taler.anastasis.ui.backup
+package net.taler.anastasis.ui.screens.backup
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
diff --git a/anastasis/src/main/java/net/taler/anastasis/ui/backup/ReviewPoliciesScreen.kt b/anastasis/src/main/java/net/taler/anastasis/ui/screens/backup/ReviewPoliciesScreen.kt
index e570014..92ed87c 100644
--- a/anastasis/src/main/java/net/taler/anastasis/ui/backup/ReviewPoliciesScreen.kt
+++ b/anastasis/src/main/java/net/taler/anastasis/ui/screens/backup/ReviewPoliciesScreen.kt
@@ -14,7 +14,7 @@
* GNU Taler; see the file COPYING. If not, see <http://www.gnu.org/licenses/>
*/
-package net.taler.anastasis.ui.backup
+package net.taler.anastasis.ui.screens.backup
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
diff --git a/anastasis/src/main/java/net/taler/anastasis/ui/backup/SelectAuthMethodsScreen.kt b/anastasis/src/main/java/net/taler/anastasis/ui/screens/backup/SelectAuthMethodsScreen.kt
index a653342..3522019 100644
--- a/anastasis/src/main/java/net/taler/anastasis/ui/backup/SelectAuthMethodsScreen.kt
+++ b/anastasis/src/main/java/net/taler/anastasis/ui/screens/backup/SelectAuthMethodsScreen.kt
@@ -14,7 +14,7 @@
* GNU Taler; see the file COPYING. If not, see <http://www.gnu.org/licenses/>
*/
-package net.taler.anastasis.ui.backup
+package net.taler.anastasis.ui.screens.backup
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
@@ -54,7 +54,7 @@ import net.taler.anastasis.models.AuthMethod
import net.taler.anastasis.models.AuthenticationProviderStatus
import net.taler.anastasis.models.BackupStates
import net.taler.anastasis.models.ReducerState
-import net.taler.anastasis.ui.common.ManageProvidersScreen
+import net.taler.anastasis.ui.screens.common.ManageProvidersScreen
import net.taler.anastasis.ui.dialogs.EditMethodDialog
import net.taler.anastasis.ui.reusable.components.ActionCard
import net.taler.anastasis.ui.reusable.pages.WizardPage
diff --git a/anastasis/src/main/java/net/taler/anastasis/ui/common/LoadingScreen.kt b/anastasis/src/main/java/net/taler/anastasis/ui/screens/common/LoadingScreen.kt
index 2dda0ca..566da97 100644
--- a/anastasis/src/main/java/net/taler/anastasis/ui/common/LoadingScreen.kt
+++ b/anastasis/src/main/java/net/taler/anastasis/ui/screens/common/LoadingScreen.kt
@@ -14,7 +14,7 @@
* GNU Taler; see the file COPYING. If not, see <http://www.gnu.org/licenses/>
*/
-package net.taler.anastasis.ui.common
+package net.taler.anastasis.ui.screens.common
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxSize
diff --git a/anastasis/src/main/java/net/taler/anastasis/ui/common/ManageProvidersScreen.kt b/anastasis/src/main/java/net/taler/anastasis/ui/screens/common/ManageProvidersScreen.kt
index 2f3dd40..a9904be 100644
--- a/anastasis/src/main/java/net/taler/anastasis/ui/common/ManageProvidersScreen.kt
+++ b/anastasis/src/main/java/net/taler/anastasis/ui/screens/common/ManageProvidersScreen.kt
@@ -14,7 +14,7 @@
* GNU Taler; see the file COPYING. If not, see <http://www.gnu.org/licenses/>
*/
-package net.taler.anastasis.ui.common
+package net.taler.anastasis.ui.screens.common
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
diff --git a/anastasis/src/main/java/net/taler/anastasis/ui/common/SelectContinentScreen.kt b/anastasis/src/main/java/net/taler/anastasis/ui/screens/common/SelectContinentScreen.kt
index c803ffe..6208c74 100644
--- a/anastasis/src/main/java/net/taler/anastasis/ui/common/SelectContinentScreen.kt
+++ b/anastasis/src/main/java/net/taler/anastasis/ui/screens/common/SelectContinentScreen.kt
@@ -14,7 +14,7 @@
* GNU Taler; see the file COPYING. If not, see <http://www.gnu.org/licenses/>
*/
-package net.taler.anastasis.ui.common
+package net.taler.anastasis.ui.screens.common
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
diff --git a/anastasis/src/main/java/net/taler/anastasis/ui/common/SelectCountryScreen.kt b/anastasis/src/main/java/net/taler/anastasis/ui/screens/common/SelectCountryScreen.kt
index ba8136e..2679306 100644
--- a/anastasis/src/main/java/net/taler/anastasis/ui/common/SelectCountryScreen.kt
+++ b/anastasis/src/main/java/net/taler/anastasis/ui/screens/common/SelectCountryScreen.kt
@@ -14,7 +14,7 @@
* GNU Taler; see the file COPYING. If not, see <http://www.gnu.org/licenses/>
*/
-package net.taler.anastasis.ui.common
+package net.taler.anastasis.ui.screens.common
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
diff --git a/anastasis/src/main/java/net/taler/anastasis/ui/common/SelectUserAttributesScreen.kt b/anastasis/src/main/java/net/taler/anastasis/ui/screens/common/SelectUserAttributesScreen.kt
index fe90eff..1acff36 100644
--- a/anastasis/src/main/java/net/taler/anastasis/ui/common/SelectUserAttributesScreen.kt
+++ b/anastasis/src/main/java/net/taler/anastasis/ui/screens/common/SelectUserAttributesScreen.kt
@@ -14,7 +14,7 @@
* GNU Taler; see the file COPYING. If not, see <http://www.gnu.org/licenses/>
*/
-package net.taler.anastasis.ui.common
+package net.taler.anastasis.ui.screens.common
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Spacer
diff --git a/anastasis/src/main/java/net/taler/anastasis/ui/home/HomeScreen.kt b/anastasis/src/main/java/net/taler/anastasis/ui/screens/home/HomeScreen.kt
index 8cee602..3354f4b 100644
--- a/anastasis/src/main/java/net/taler/anastasis/ui/home/HomeScreen.kt
+++ b/anastasis/src/main/java/net/taler/anastasis/ui/screens/home/HomeScreen.kt
@@ -1,4 +1,4 @@
-package net.taler.anastasis.ui.home
+package net.taler.anastasis.ui.screens.home
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
diff --git a/anastasis/src/main/java/net/taler/anastasis/ui/recovery/RecoveryFinishedScreen.kt b/anastasis/src/main/java/net/taler/anastasis/ui/screens/recovery/RecoveryFinishedScreen.kt
index aa43200..8d160cc 100644
--- a/anastasis/src/main/java/net/taler/anastasis/ui/recovery/RecoveryFinishedScreen.kt
+++ b/anastasis/src/main/java/net/taler/anastasis/ui/screens/recovery/RecoveryFinishedScreen.kt
@@ -14,7 +14,7 @@
* GNU Taler; see the file COPYING. If not, see <http://www.gnu.org/licenses/>
*/
-package net.taler.anastasis.ui.recovery
+package net.taler.anastasis.ui.screens.recovery
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
diff --git a/anastasis/src/main/java/net/taler/anastasis/ui/recovery/SelectChallengeScreen.kt b/anastasis/src/main/java/net/taler/anastasis/ui/screens/recovery/SelectChallengeScreen.kt
index 742ad0b..0bf1b97 100644
--- a/anastasis/src/main/java/net/taler/anastasis/ui/recovery/SelectChallengeScreen.kt
+++ b/anastasis/src/main/java/net/taler/anastasis/ui/screens/recovery/SelectChallengeScreen.kt
@@ -14,7 +14,7 @@
* GNU Taler; see the file COPYING. If not, see <http://www.gnu.org/licenses/>
*/
-package net.taler.anastasis.ui.recovery
+package net.taler.anastasis.ui.screens.recovery
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
diff --git a/anastasis/src/main/java/net/taler/anastasis/ui/recovery/SelectSecretScreen.kt b/anastasis/src/main/java/net/taler/anastasis/ui/screens/recovery/SelectSecretScreen.kt
index 4a9a291..3cc17f5 100644
--- a/anastasis/src/main/java/net/taler/anastasis/ui/recovery/SelectSecretScreen.kt
+++ b/anastasis/src/main/java/net/taler/anastasis/ui/screens/recovery/SelectSecretScreen.kt
@@ -14,7 +14,7 @@
* GNU Taler; see the file COPYING. If not, see <http://www.gnu.org/licenses/>
*/
-package net.taler.anastasis.ui.recovery
+package net.taler.anastasis.ui.screens.recovery
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
@@ -52,7 +52,7 @@ import net.taler.anastasis.R
import net.taler.anastasis.models.AggregatedPolicyMetaInfo
import net.taler.anastasis.models.RecoveryStates
import net.taler.anastasis.models.ReducerState
-import net.taler.anastasis.ui.common.ManageProvidersScreen
+import net.taler.anastasis.ui.screens.common.ManageProvidersScreen
import net.taler.anastasis.ui.reusable.pages.WizardPage
import net.taler.anastasis.ui.theme.LocalSpacing
import net.taler.anastasis.viewmodels.FakeRecoveryViewModel
diff --git a/anastasis/src/main/java/net/taler/anastasis/ui/recovery/SolveChallengeScreen.kt b/anastasis/src/main/java/net/taler/anastasis/ui/screens/recovery/SolveChallengeScreen.kt
index 3841045..4bb21a1 100644
--- a/anastasis/src/main/java/net/taler/anastasis/ui/recovery/SolveChallengeScreen.kt
+++ b/anastasis/src/main/java/net/taler/anastasis/ui/screens/recovery/SolveChallengeScreen.kt
@@ -14,7 +14,7 @@
* GNU Taler; see the file COPYING. If not, see <http://www.gnu.org/licenses/>
*/
-package net.taler.anastasis.ui.recovery
+package net.taler.anastasis.ui.screens.recovery
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box