fix sign in,sign up string and top image

betulantep · Aug 4, 2022 · 7bc0973 · 7bc0973
1 parent 6533a7c
commit 7bc0973
Show file tree

Hide file tree

Showing 11 changed files with 40 additions and 15 deletions.
diff --git a/...c/main/java/com/betulantep/bootcampgraduationproject/ui/bindingadapter/bindingAdapters.kt b/...c/main/java/com/betulantep/bootcampgraduationproject/ui/bindingadapter/bindingAdapters.kt
@@ -24,7 +24,7 @@ fun textChangedEmailListener(et: EditText, textInputLayout: TextInputLayout){
 
 fun validEditTextEmail(et: EditText): String? {
     if(!Patterns.EMAIL_ADDRESS.matcher(et.text.toString()).matches()){
-        return "Invalid Email Address"
+        return "Geçersiz E-posta Adresi"
     }
     return null
 }
@@ -40,16 +40,16 @@ fun textChangedPasswordListener(et: EditText, textInputLayout: TextInputLayout){
 
 fun validEditTextPassword(password:String): String? {
     if(password.length < 8){
-        return "Minimum 8 Character Password"
+        return "En az 8 Karakter Olmalı"
     }
     if(!password.matches(".*[A-Z].*".toRegex())){
-        return "Must Contain 1 Upper-case Character"
+        return "En az 1 Büyük Harf İçermeli"
     }
     if(!password.matches(".*[a-z].*".toRegex())){
-        return "Must Contain 1 Lower-case Character"
+        return "En az 1 Küçük Harf İçermeli"
     }
     if(!password.matches(".*[@#\$%^&+=*].*".toRegex())){
-        return "Must Contain 1 Special Character (@#\$%^&+=*)"
+        return "En az 1 Özel Karakter İçermeli"
     }
     return null
 }
diff --git a/app/src/main/java/com/betulantep/bootcampgraduationproject/ui/splash/SplashViewModel.kt b/app/src/main/java/com/betulantep/bootcampgraduationproject/ui/splash/SplashViewModel.kt
@@ -20,7 +20,7 @@ class SplashViewModel @Inject constructor(var appPref: AppPref): ViewModel() {
 
     fun showOnBoarding(view: View,auth: FirebaseAuth){
         viewModelScope.launch {
-            delay(500)
+            delay(5000)
             if(appPref.getOnBoardingShow()){
                 Navigation.actionFragment(view,SplashFragmentDirections.actionSplashFragmentToOnBoardingFragment())
             }else{

diff --git a/app/src/main/res/drawable/sign_in_up_image.png b/app/src/main/res/drawable/sign_in_up_image.png
diff --git a/app/src/main/res/layout/fragment_sign_in.xml b/app/src/main/res/layout/fragment_sign_in.xml
@@ -116,8 +116,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="8dp"
                 android:fontFamily="@font/poppins_extrabold"
-                android:text="@string/sign_up"
                 android:onClick="@{()->viewModel.goToSignUp(tvSignUpClick)}"
+                android:text="@string/sign_up"
                 android:textColor="@color/primaryGreen"
                 android:textSize="14sp"
                 app:layout_constraintBottom_toBottomOf="@+id/textView3"
@@ -147,6 +147,17 @@
             app:layout_constraintBottom_toTopOf="@+id/constraintLayout2"
             app:layout_constraintStart_toStartOf="@+id/imageView2" />
 
+        <ImageView
+            android:id="@+id/imageView3"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintBottom_toTopOf="@+id/imageView2"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:srcCompat="@drawable/sign_in_up_image" />
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
 
diff --git a/app/src/main/res/layout/fragment_sign_up.xml b/app/src/main/res/layout/fragment_sign_up.xml
@@ -173,5 +173,18 @@
             android:text="@string/sign_up"
             app:layout_constraintBottom_toTopOf="@+id/constraintLayout2"
             app:layout_constraintStart_toStartOf="@+id/imageView2" />
+
+        <ImageView
+            android:id="@+id/imageView11"
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
+            app:layout_constraintBottom_toTopOf="@+id/imageView2"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:srcCompat="@drawable/sign_in_up_image" />
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/app/src/main/res/layout/fragment_splash.xml b/app/src/main/res/layout/fragment_splash.xml
@@ -20,6 +20,6 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.49"
         app:lottie_autoPlay="true"
-        app:lottie_rawRes="@raw/splash_anim"
+        app:lottie_rawRes="@raw/splashh_anim"
         app:lottie_repeatMode="restart" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_user.xml b/app/src/main/res/layout/fragment_user.xml
@@ -14,7 +14,7 @@
         android:layout_marginEnd="150dp"
         android:layout_marginBottom="100dp"
         android:background="@drawable/bg_button_sign"
-        android:text="Çıkış"
+        android:text="@string/sign_out"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"

diff --git a/app/src/main/res/raw/splash_anim.json b/app/src/main/res/raw/splash_anim.json
diff --git a/app/src/main/res/raw/splashh_anim.json b/app/src/main/res/raw/splashh_anim.json
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -5,10 +5,11 @@
     <string name="email">Email</string>
     <string name="password">Password</string>
     <string name="confirm_password">Confirm Password</string>
-    <string name="sign_in">SIGN IN</string>
-    <string name="already_have_an_account">Already have an account?</string>
-    <string name="sign_up">SIGN UP</string>
-    <string name="do_not_have_an_account">Do not have an account?</string>
+    <string name="sign_in">Giriş Yap</string>
+    <string name="already_have_an_account">Zaten hesabınız var mı?</string>
+    <string name="sign_up">Kayıt Ol</string>
+    <string name="do_not_have_an_account">Bir hesabınız yok mu?</string>
     <string name="search">Search</string>
     <string name="sepete_ekle">Sepete Ekle</string>
+    <string name="sign_out">Çıkış Yap</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -10,7 +10,7 @@
         <item name="boxCornerRadiusTopStart">30dp</item>
         <item name="boxStrokeWidth">2dp</item>
         <item name="hintTextColor">@color/black</item>
-        <item name="helperText">Required</item>
+        <item name="helperText">Gerekli</item>
         <item name="helperTextTextColor">@color/red</item>
     </style>