diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml index 0c0c338..5f104f0 100644 --- a/.idea/deploymentTargetDropDown.xml +++ b/.idea/deploymentTargetDropDown.xml @@ -3,7 +3,20 @@ - + + + + + + + + + + + + + + diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 89808e5..78f0547 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,7 +1,7 @@ plugins { id("com.android.application") id("org.jetbrains.kotlin.android") - id ("kotlin-kapt") + id("kotlin-kapt") id("com.google.dagger.hilt.android") } @@ -46,9 +46,9 @@ android { } dependencies { - val retrofitVersion = "2.9.0" - val loggingInterceptorVersion = "5.0.0-alpha.11" - val daggerHiltVersion = "2.46" + val retrofitVersion = "2.9.0" + val loggingInterceptorVersion = "5.0.0-alpha.11" + val daggerHiltVersion = "2.46" implementation("androidx.core:core-ktx:1.12.0") implementation("androidx.appcompat:appcompat:1.6.1") implementation("com.google.android.material:material:1.11.0") @@ -61,7 +61,7 @@ dependencies { // Navigation implementation("androidx.navigation:navigation-fragment-ktx:2.7.6") implementation("androidx.navigation:navigation-ui-ktx:2.7.6") - implementation ("androidx.navigation:navigation-fragment-ktx:2.7.6") + implementation("androidx.navigation:navigation-fragment-ktx:2.7.6") //Retrofit implementation("com.squareup.retrofit2:retrofit:$retrofitVersion") implementation("com.squareup.retrofit2:converter-gson:$retrofitVersion") @@ -70,7 +70,7 @@ dependencies { implementation("androidx.datastore:datastore-preferences:1.0.0") //Dagger Hilt implementation("com.google.dagger:hilt-android:$daggerHiltVersion") - annotationProcessor("com.google.dagger:hilt-android-compiler:$daggerHiltVersion") + kapt("com.google.dagger:hilt-android-compiler:$daggerHiltVersion") //Chucker debugImplementation("com.github.chuckerteam.chucker:library:4.0.0") releaseImplementation("com.github.chuckerteam.chucker:library-no-op:4.0.0") diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 9582cea..e8b0b7a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -7,9 +7,9 @@ android:allowBackup="true" android:dataExtractionRules="@xml/data_extraction_rules" android:fullBackupContent="@xml/backup_rules" - android:icon="@mipmap/ic_launcher" + android:icon="@drawable/ic_logo_white" android:label="@string/app_name" - android:roundIcon="@mipmap/ic_launcher_round" + android:roundIcon="@drawable/ic_logo_white" android:supportsRtl="true" android:theme="@style/Theme.SkyExplorer" tools:targetApi="31"> diff --git a/app/src/main/java/com/capstone/skyexplorer/presentation/ui/onboarding/SecondOnboardingFragment.kt b/app/src/main/java/com/capstone/skyexplorer/presentation/ui/onboarding/SecondOnboardingFragment.kt index 09e3f5b..df1682f 100644 --- a/app/src/main/java/com/capstone/skyexplorer/presentation/ui/onboarding/SecondOnboardingFragment.kt +++ b/app/src/main/java/com/capstone/skyexplorer/presentation/ui/onboarding/SecondOnboardingFragment.kt @@ -25,7 +25,7 @@ class SecondOnboardingFragment : Fragment() { private fun slideToNextFragment(){ val onboardingViewpagerContainer = activity?.findViewById(R.id.onBoardingContainer) binding.btnNext.setOnClickListener { - onboardingViewpagerContainer?.currentItem = 1 + onboardingViewpagerContainer?.currentItem = 2 } } diff --git a/app/src/main/java/com/capstone/skyexplorer/presentation/ui/onboarding/SpalshScreenFragment.kt b/app/src/main/java/com/capstone/skyexplorer/presentation/ui/onboarding/SplashScreenFragment.kt similarity index 96% rename from app/src/main/java/com/capstone/skyexplorer/presentation/ui/onboarding/SpalshScreenFragment.kt rename to app/src/main/java/com/capstone/skyexplorer/presentation/ui/onboarding/SplashScreenFragment.kt index 5e21dbb..11dc96c 100644 --- a/app/src/main/java/com/capstone/skyexplorer/presentation/ui/onboarding/SpalshScreenFragment.kt +++ b/app/src/main/java/com/capstone/skyexplorer/presentation/ui/onboarding/SplashScreenFragment.kt @@ -9,7 +9,7 @@ import android.view.ViewGroup import androidx.navigation.fragment.findNavController import com.capstone.skyexplorer.R -class SpalshScreenFragment : Fragment() { +class SplashScreenFragment : Fragment() { override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? diff --git a/app/src/main/java/com/capstone/skyexplorer/presentation/ui/signin/SignInFragment.kt b/app/src/main/java/com/capstone/skyexplorer/presentation/ui/signin/SignInFragment.kt index 9af1d14..424406e 100644 --- a/app/src/main/java/com/capstone/skyexplorer/presentation/ui/signin/SignInFragment.kt +++ b/app/src/main/java/com/capstone/skyexplorer/presentation/ui/signin/SignInFragment.kt @@ -33,6 +33,9 @@ class SignInFragment : Fragment() { R.id.action_signInFragment_to_forgotEmailFragment ) } + btnBack.setOnClickListener { + findNavController().popBackStack() + } } } } \ No newline at end of file diff --git a/app/src/main/java/com/capstone/skyexplorer/presentation/ui/signup/SetPasswordFragment.kt b/app/src/main/java/com/capstone/skyexplorer/presentation/ui/signup/SetPasswordFragment.kt index 00c313c..127874e 100644 --- a/app/src/main/java/com/capstone/skyexplorer/presentation/ui/signup/SetPasswordFragment.kt +++ b/app/src/main/java/com/capstone/skyexplorer/presentation/ui/signup/SetPasswordFragment.kt @@ -33,6 +33,9 @@ class SetPasswordFragment : Fragment() { btnSignIn.setOnClickListener { } + btnBack.setOnClickListener { + findNavController().popBackStack() + } } } } diff --git a/app/src/main/java/com/capstone/skyexplorer/presentation/ui/signup/SignUpCheckFragment.kt b/app/src/main/java/com/capstone/skyexplorer/presentation/ui/signup/SignUpCheckFragment.kt index bbaa2bb..776d9f4 100644 --- a/app/src/main/java/com/capstone/skyexplorer/presentation/ui/signup/SignUpCheckFragment.kt +++ b/app/src/main/java/com/capstone/skyexplorer/presentation/ui/signup/SignUpCheckFragment.kt @@ -30,6 +30,9 @@ class SignUpCheckFragment : Fragment() { btnSignIn.setOnClickListener { findNavController().navigate(R.id.action_signUpCheckFragment_to_signUpOtpFragment) } + btnBack.setOnClickListener { + findNavController().popBackStack() + } } } diff --git a/app/src/main/java/com/capstone/skyexplorer/presentation/ui/signup/SignUpContactFragment.kt b/app/src/main/java/com/capstone/skyexplorer/presentation/ui/signup/SignUpContactFragment.kt index c2b120d..0d4178c 100644 --- a/app/src/main/java/com/capstone/skyexplorer/presentation/ui/signup/SignUpContactFragment.kt +++ b/app/src/main/java/com/capstone/skyexplorer/presentation/ui/signup/SignUpContactFragment.kt @@ -29,6 +29,9 @@ class SignUpContactFragment : Fragment() { btnSignIn.setOnClickListener { findNavController().navigate(R.id.action_signUpContactFragment_to_signUpCheckFragment) } + btnBack.setOnClickListener { + findNavController().popBackStack() + } } } } \ No newline at end of file diff --git a/app/src/main/java/com/capstone/skyexplorer/presentation/ui/signup/SignUpPersonalFragment.kt b/app/src/main/java/com/capstone/skyexplorer/presentation/ui/signup/SignUpPersonalFragment.kt index 9959c59..d9bb72e 100644 --- a/app/src/main/java/com/capstone/skyexplorer/presentation/ui/signup/SignUpPersonalFragment.kt +++ b/app/src/main/java/com/capstone/skyexplorer/presentation/ui/signup/SignUpPersonalFragment.kt @@ -29,6 +29,9 @@ class SignUpPersonalFragment : Fragment() { btnNext.setOnClickListener { findNavController().navigate(R.id.action_signUpPersonalFragment_to_signUpContactFragment) } + btnBack.setOnClickListener { + findNavController().popBackStack() + } } } } \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_logo_white.xml b/app/src/main/res/drawable/ic_logo_white.xml new file mode 100644 index 0000000..5871e92 --- /dev/null +++ b/app/src/main/res/drawable/ic_logo_white.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/layout/fragment_sign_up_check.xml b/app/src/main/res/layout/fragment_sign_up_check.xml index 0b46a1b..712a72b 100644 --- a/app/src/main/res/layout/fragment_sign_up_check.xml +++ b/app/src/main/res/layout/fragment_sign_up_check.xml @@ -21,6 +21,16 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> + + - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_sign_up_contact.xml b/app/src/main/res/layout/fragment_sign_up_contact.xml index c4764d9..a10a1e3 100644 --- a/app/src/main/res/layout/fragment_sign_up_contact.xml +++ b/app/src/main/res/layout/fragment_sign_up_contact.xml @@ -17,6 +17,16 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> + + - - - + + - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + android:layout_height="64dp" + android:layout_marginStart="24dp" + android:layout_marginTop="48dp" + android:layout_marginEnd="24dp" + android:layout_marginBottom="30dp" + android:fontFamily="@font/pjs_bold" + android:text="@string/continueWithEmail" + android:textSize="17sp" + app:cornerRadius="14dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/tv_tagline" /> + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_spalsh_screen.xml b/app/src/main/res/layout/fragment_spalsh_screen.xml index 4ef0370..73276bf 100644 --- a/app/src/main/res/layout/fragment_spalsh_screen.xml +++ b/app/src/main/res/layout/fragment_spalsh_screen.xml @@ -5,7 +5,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@drawable/bg_splash_screen" - tools:context=".presentation.ui.onboarding.SpalshScreenFragment"> + tools:context=".presentation.ui.onboarding.SplashScreenFragment"> 12dp 12dp 1dp + @color/edit_text