updated login conditions

robinsrk · Dec 28, 2022 · 409b61b · 409b61b
1 parent f0f8fed
commit 409b61b
Show file tree

Hide file tree

Showing 79 changed files with 27 additions and 43 deletions.
diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml
diff --git a/.gitignore b/.gitignore
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/codestream.xml b/.idea/codestream.xml
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/git_toolbox_prj.xml b/.idea/git_toolbox_prj.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/README.md b/README.md
diff --git a/app/.gitignore b/app/.gitignore
diff --git a/app/build.gradle b/app/build.gradle
@@ -54,7 +54,7 @@ dependencies {
     implementation 'androidx.core:core-ktx:1.9.0'
     implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1'
     implementation 'androidx.activity:activity-compose:1.6.1'
-    implementation platform('androidx.compose:compose-bom:2022.10.00')
+    implementation platform('androidx.compose:compose-bom:2022.12.00')
     implementation 'androidx.compose.ui:ui'
     implementation 'androidx.compose.ui:ui-graphics'
     implementation 'androidx.compose.ui:ui-tooling-preview'
@@ -69,7 +69,7 @@ dependencies {
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.4'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0'
-    androidTestImplementation platform('androidx.compose:compose-bom:2022.10.00')
+    androidTestImplementation platform('androidx.compose:compose-bom:2022.12.00')
     androidTestImplementation 'androidx.compose.ui:ui-test-junit4'
     debugImplementation 'androidx.compose.ui:ui-tooling'
     debugImplementation 'androidx.compose.ui:ui-test-manifest'
@@ -96,7 +96,7 @@ dependencies {
     implementation "androidx.camera:camera-view:1.2.0"
 
     // Zxing for QR Code scanning
-    implementation "com.google.zxing:core:3.3.3"
+    implementation 'com.google.zxing:core:3.5.1'
 
     // LiveData
     implementation 'androidx.compose.runtime:runtime-livedata:1.3.2'
@@ -105,8 +105,8 @@ dependencies {
     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1'
 
     // Hilt
-    implementation 'com.google.dagger:hilt-android:2.41'
+    implementation 'com.google.dagger:hilt-android:2.44.2'
     implementation 'androidx.hilt:hilt-navigation-compose:1.0.0'
-    kapt 'com.google.dagger:hilt-compiler:2.41'
+    kapt 'com.google.dagger:hilt-compiler:2.44.2'
     implementation 'androidx.hilt:hilt-lifecycle-viewmodel:1.0.0-alpha03'
 }
diff --git a/app/google-services.json b/app/google-services.json
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
diff --git a/app/src/androidTest/java/com/example/buspayment/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/example/buspayment/ExampleInstrumentedTest.kt
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
diff --git a/app/src/main/assets/busFare.json b/app/src/main/assets/busFare.json
diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png
diff --git a/app/src/main/java/com/example/buspayment/MainScreen.kt b/app/src/main/java/com/example/buspayment/MainScreen.kt
diff --git a/app/src/main/java/com/example/buspayment/data/User.kt b/app/src/main/java/com/example/buspayment/data/User.kt
diff --git a/app/src/main/java/com/example/buspayment/data/UserDao.kt b/app/src/main/java/com/example/buspayment/data/UserDao.kt
diff --git a/app/src/main/java/com/example/buspayment/data/UserDatabase.kt b/app/src/main/java/com/example/buspayment/data/UserDatabase.kt
diff --git a/app/src/main/java/com/example/buspayment/data/UserRepository.kt b/app/src/main/java/com/example/buspayment/data/UserRepository.kt
diff --git a/app/src/main/java/com/example/buspayment/data/UserViewModel.kt b/app/src/main/java/com/example/buspayment/data/UserViewModel.kt
diff --git a/app/src/main/java/com/example/buspayment/db/DatabaseModule.kt b/app/src/main/java/com/example/buspayment/db/DatabaseModule.kt
diff --git a/app/src/main/java/com/example/buspayment/funtions/Credentials.kt b/app/src/main/java/com/example/buspayment/funtions/Credentials.kt
@@ -1,5 +1,11 @@
 package com.example.buspayment.funtions
 
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+
 class Credentials() {
 	private var name: String = ""
 	private var email: String = ""
@@ -19,4 +25,13 @@ class Credentials() {
 		return email
 	}
 
+}
+
+@Composable
+fun Info() {
+	var email by remember { mutableStateOf("") }
+	fun getEmail() = email
+	fun setEmail(mail: String) {
+		email = mail
+	}
 }
diff --git a/app/src/main/java/com/example/buspayment/funtions/QrCodeAnalysis.kt b/app/src/main/java/com/example/buspayment/funtions/QrCodeAnalysis.kt
diff --git a/app/src/main/java/com/example/buspayment/funtions/authentication.kt b/app/src/main/java/com/example/buspayment/funtions/authentication.kt
diff --git a/app/src/main/java/com/example/buspayment/navigations/NavGraph.kt b/app/src/main/java/com/example/buspayment/navigations/NavGraph.kt
diff --git a/app/src/main/java/com/example/buspayment/navigations/Screens.kt b/app/src/main/java/com/example/buspayment/navigations/Screens.kt
diff --git a/app/src/main/java/com/example/buspayment/screens/HomeScreen.kt b/app/src/main/java/com/example/buspayment/screens/HomeScreen.kt
diff --git a/app/src/main/java/com/example/buspayment/screens/LoginScreen.kt b/app/src/main/java/com/example/buspayment/screens/LoginScreen.kt
@@ -42,7 +42,6 @@ import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.NavController
 import com.example.buspayment.data.User
 import com.example.buspayment.data.UserViewModel
-import com.example.buspayment.funtions.Credentials
 import com.example.buspayment.navigations.Screens
 import com.google.firebase.auth.ktx.auth
 import com.google.firebase.ktx.Firebase
@@ -74,6 +73,7 @@ fun LoginForm(navController: NavController) {
 	val mUserViewModel: UserViewModel = viewModel(
 		factory = UserViewModel.UserViewModelFactory(context.applicationContext as Application)
 	)
+
 	Column(horizontalAlignment = Alignment.CenterHorizontally) {
 		OutlinedTextField(
 			value = email,
@@ -137,7 +137,6 @@ fun LoginForm(navController: NavController) {
 										val user = User(0, "", email)
 										mUserViewModel.deleteUsers()
 										mUserViewModel.addUser(user)
-										Credentials().setEmail(email)
 										Toast.makeText(context, "Successfully logged in", Toast.LENGTH_LONG).show()
 									} else {
 										error = "Wrong username or password"

diff --git a/app/src/main/java/com/example/buspayment/screens/ProfileScreen.kt b/app/src/main/java/com/example/buspayment/screens/ProfileScreen.kt
diff --git a/app/src/main/java/com/example/buspayment/screens/RegisterScreen.kt b/app/src/main/java/com/example/buspayment/screens/RegisterScreen.kt
diff --git a/app/src/main/java/com/example/buspayment/screens/ScanScreen.kt b/app/src/main/java/com/example/buspayment/screens/ScanScreen.kt
diff --git a/app/src/main/java/com/example/buspayment/screens/SplashScreen.kt b/app/src/main/java/com/example/buspayment/screens/SplashScreen.kt
@@ -38,7 +38,7 @@ fun SplashScreen(navController: NavController) {
 	val mUserViewModel: UserViewModel =
 		viewModel(factory = UserViewModel.UserViewModelFactory(context.applicationContext as Application))
 	user = mUserViewModel.readUser.observeAsState(listOf()).value
-	LaunchedEffect(key1 = true) {
+	LaunchedEffect(key1 = user) {
 		delay(2000)
 		if (user.isNotEmpty()) {
 			Credentials().setEmail(user[0].email)

diff --git a/app/src/main/java/com/example/buspayment/screens/paymentInvoice.kt b/app/src/main/java/com/example/buspayment/screens/paymentInvoice.kt
diff --git a/app/src/main/java/com/example/buspayment/ui/theme/Color.kt b/app/src/main/java/com/example/buspayment/ui/theme/Color.kt
diff --git a/app/src/main/java/com/example/buspayment/ui/theme/LogoImage.kt b/app/src/main/java/com/example/buspayment/ui/theme/LogoImage.kt
diff --git a/app/src/main/java/com/example/buspayment/ui/theme/Theme.kt b/app/src/main/java/com/example/buspayment/ui/theme/Theme.kt
diff --git a/app/src/main/java/com/example/buspayment/ui/theme/Type.kt b/app/src/main/java/com/example/buspayment/ui/theme/Type.kt
diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
diff --git a/app/src/main/res/drawable/ticket_logo.png b/app/src/main/res/drawable/ticket_logo.png
diff --git a/app/src/main/res/drawable/undraw_bus_stop_re_h8ej.xml b/app/src/main/res/drawable/undraw_bus_stop_re_h8ej.xml
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
diff --git a/app/src/main/res/xml/backup_rules.xml b/app/src/main/res/xml/backup_rules.xml
diff --git a/app/src/main/res/xml/data_extraction_rules.xml b/app/src/main/res/xml/data_extraction_rules.xml
diff --git a/app/src/test/java/com/example/buspayment/ExampleUnitTest.kt b/app/src/test/java/com/example/buspayment/ExampleUnitTest.kt
diff --git a/build.gradle b/build.gradle
diff --git a/google-services.json b/google-services.json
diff --git a/gradle.properties b/gradle.properties
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Sun Dec 04 18:47:07 BDT 2022
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew.bat b/gradlew.bat
diff --git a/settings.gradle b/settings.gradle