From 3cefd60d5fa3a453ccaadcbd4ae32841897d8934 Mon Sep 17 00:00:00 2001 From: aritra Date: Mon, 11 Mar 2024 15:06:27 +0530 Subject: [PATCH] Fixed some bugs --- .../account/PasswordGeneratorViewModel.kt | 3 ++- .../uncrack/presentation/auth/login/LoginScreens.kt | 12 ++++++++++-- .../uncrack/presentation/intro/OnboardingScreen.kt | 7 ++++++- .../uncrack/presentation/intro/SplashScreen.kt | 7 ++++++- 4 files changed, 24 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/geekymusketeers/uncrack/presentation/account/PasswordGeneratorViewModel.kt b/app/src/main/java/com/geekymusketeers/uncrack/presentation/account/PasswordGeneratorViewModel.kt index 61da80af..9f012d69 100644 --- a/app/src/main/java/com/geekymusketeers/uncrack/presentation/account/PasswordGeneratorViewModel.kt +++ b/app/src/main/java/com/geekymusketeers/uncrack/presentation/account/PasswordGeneratorViewModel.kt @@ -4,9 +4,10 @@ import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import dagger.hilt.android.lifecycle.HiltViewModel +import javax.inject.Inject @HiltViewModel -class PasswordGeneratorViewModel : ViewModel() { +class PasswordGeneratorViewModel @Inject constructor() : ViewModel() { private val _password = MutableLiveData() val password: LiveData = _password diff --git a/app/src/main/java/com/geekymusketeers/uncrack/presentation/auth/login/LoginScreens.kt b/app/src/main/java/com/geekymusketeers/uncrack/presentation/auth/login/LoginScreens.kt index cfcd9462..ef481c6f 100644 --- a/app/src/main/java/com/geekymusketeers/uncrack/presentation/auth/login/LoginScreens.kt +++ b/app/src/main/java/com/geekymusketeers/uncrack/presentation/auth/login/LoginScreens.kt @@ -5,6 +5,7 @@ import androidx.activity.ComponentActivity import androidx.activity.SystemBarStyle import androidx.activity.compose.setContent import androidx.activity.enableEdgeToEdge +import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer @@ -13,6 +14,7 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.Scaffold @@ -40,7 +42,9 @@ import com.geekymusketeers.uncrack.ui.theme.OnPrimaryContainerLight import com.geekymusketeers.uncrack.ui.theme.PrimaryLight import com.geekymusketeers.uncrack.ui.theme.UnCrackTheme import com.geekymusketeers.uncrack.ui.theme.medium16 +import dagger.hilt.android.AndroidEntryPoint +@AndroidEntryPoint class LoginScreens : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { @@ -149,14 +153,18 @@ fun LoginContent(modifier: Modifier = Modifier) { enabled = false ) - Spacer(modifier = Modifier.height(10.dp)) + Spacer(modifier = Modifier.height(15.dp)) - Row { + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.Center + ) { Text( text = stringResource(R.string.don_t_have_an_account), style = medium16.copy(color = OnPrimaryContainerLight) ) + Spacer(modifier = Modifier.width(8.dp)) Text( text = stringResource(R.string.create), style = medium16.copy(color = PrimaryLight) diff --git a/app/src/main/java/com/geekymusketeers/uncrack/presentation/intro/OnboardingScreen.kt b/app/src/main/java/com/geekymusketeers/uncrack/presentation/intro/OnboardingScreen.kt index 83d56a57..c9fc168f 100644 --- a/app/src/main/java/com/geekymusketeers/uncrack/presentation/intro/OnboardingScreen.kt +++ b/app/src/main/java/com/geekymusketeers/uncrack/presentation/intro/OnboardingScreen.kt @@ -47,12 +47,15 @@ import com.geekymusketeers.uncrack.ui.theme.DMSansFontFamily import com.geekymusketeers.uncrack.ui.theme.OnSurfaceLight import com.geekymusketeers.uncrack.ui.theme.OnSurfaceVariantLight import com.geekymusketeers.uncrack.ui.theme.PrimaryDark +import com.geekymusketeers.uncrack.ui.theme.UnCrackTheme import com.geekymusketeers.uncrack.ui.theme.navigationTopBarHeight import com.geekymusketeers.uncrack.ui.theme.normal16 import com.geekymusketeers.uncrack.util.UtilsKt.findActivity import com.geekymusketeers.uncrack.util.onClick +import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.launch +@AndroidEntryPoint class OnboardingScreen : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { @@ -68,7 +71,9 @@ class OnboardingScreen : ComponentActivity() { super.onCreate(savedInstanceState) setContent { - OnboardingContent(this@OnboardingScreen) + UnCrackTheme { + OnboardingContent(this@OnboardingScreen) + } } } } diff --git a/app/src/main/java/com/geekymusketeers/uncrack/presentation/intro/SplashScreen.kt b/app/src/main/java/com/geekymusketeers/uncrack/presentation/intro/SplashScreen.kt index 75b6a74f..61acfcb1 100644 --- a/app/src/main/java/com/geekymusketeers/uncrack/presentation/intro/SplashScreen.kt +++ b/app/src/main/java/com/geekymusketeers/uncrack/presentation/intro/SplashScreen.kt @@ -32,8 +32,11 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp import com.geekymusketeers.uncrack.R import com.geekymusketeers.uncrack.ui.theme.BackgroundLight +import com.geekymusketeers.uncrack.ui.theme.UnCrackTheme +import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.delay +@AndroidEntryPoint @SuppressLint("CustomSplashScreen") class SplashScreen : ComponentActivity() { @@ -50,7 +53,9 @@ class SplashScreen : ComponentActivity() { super.onCreate(savedInstanceState) setContent { - SplashContent(this@SplashScreen) + UnCrackTheme { + SplashContent(this@SplashScreen) + } } } }