Hotfix 1.49.1 (#873)

hyperskill · Feb 2, 2024 · 2ee16d2 · 2ee16d2
1 parent 0f3e822
commit 2ee16d2
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 13 deletions.
diff --git a/...src/main/java/org/hyperskill/app/android/auth/view/ui/fragment/AuthCredentialsFragment.kt b/...src/main/java/org/hyperskill/app/android/auth/view/ui/fragment/AuthCredentialsFragment.kt
@@ -9,7 +9,6 @@ import androidx.core.widget.doAfterTextChanged
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProvider
 import by.kirich1409.viewbindingdelegate.viewBinding
-import org.hyperskill.app.SharedResources
 import org.hyperskill.app.android.HyperskillApp
 import org.hyperskill.app.android.R
 import org.hyperskill.app.android.auth.view.ui.navigation.AuthFlow
@@ -30,6 +29,7 @@ import ru.nobird.android.view.base.ui.extension.setTextIfChanged
 import ru.nobird.android.view.base.ui.extension.showIfNotExists
 import ru.nobird.android.view.redux.ui.extension.reduxViewModel
 import ru.nobird.app.presentation.redux.container.ReduxView
+import org.hyperskill.app.R as SharedRes
 
 class AuthCredentialsFragment :
     Fragment(R.layout.fragment_auth_email),
@@ -95,6 +95,10 @@ class AuthCredentialsFragment :
             requireRouter().backTo(AuthSocialScreen())
         }
 
+        viewBinding.signInToTextView.text = getString(
+            SharedRes.string.auth_sign_up_title,
+            getString(SharedRes.string.android_app_name)
+        )
         viewBinding.root.addKeyboardVisibilityListener { isVisible ->
             if (!isAdded) return@addKeyboardVisibilityListener
             viewBinding.signInHyperskillLogoShapeableImageView.isVisible = !isVisible
@@ -119,7 +123,7 @@ class AuthCredentialsFragment :
             is AuthCredentialsFeature.Action.ViewAction.OpenUrl ->
                 requireContext().openUrl(action.url)
             is AuthCredentialsFeature.Action.ViewAction.ShowGetMagicLinkError ->
-                viewBinding.root.snackbar(SharedResources.strings.common_error.resourceId)
+                viewBinding.root.snackbar(SharedRes.string.common_error)
         }
     }
 

diff --git a/androidHyperskillApp/src/main/res/layout/fragment_auth_email.xml b/androidHyperskillApp/src/main/res/layout/fragment_auth_email.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fillViewport="true">
+                                       xmlns:app="http://schemas.android.com/apk/res-auto"
+                                       android:layout_width="match_parent"
+                                       android:layout_height="match_parent"
+                                       xmlns:tools="http://schemas.android.com/tools"
+                                       android:fillViewport="true">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/authEmailFragment"
@@ -26,7 +27,7 @@
             android:layout_width="wrap_content"
             android:layout_height="0dp"
             android:layout_marginTop="20dp"
-            android:text="@string/auth_log_in_title"
+            tools:text="@string/auth_log_in_title"
             android:textAlignment="center"
             android:textAppearance="?textAppearanceBody1"
             app:layout_constraintEnd_toEndOf="parent"

diff --git a/gradle/app.versions.toml b/gradle/app.versions.toml
@@ -2,5 +2,5 @@
 minSdk = '24'
 targetSdk = '33'
 compileSdk = '33'
-versionName = '1.49'
-versionCode = '305'
+versionName = '1.49.1'
+versionCode = '312'
diff --git a/iosHyperskillApp/NotificationServiceExtension/Info.plist b/iosHyperskillApp/NotificationServiceExtension/Info.plist
@@ -11,7 +11,7 @@
 	<key>CFBundleVersion</key>
 	<string>306</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.49</string>
+	<string>1.49.1</string>
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleExecutable</key>

diff --git a/iosHyperskillApp/iosHyperskillApp/Info.plist b/iosHyperskillApp/iosHyperskillApp/Info.plist
@@ -23,7 +23,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.49</string>
+	<string>1.49.1</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>

diff --git a/iosHyperskillApp/iosHyperskillAppTests/Info.plist b/iosHyperskillApp/iosHyperskillAppTests/Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.49</string>
+	<string>1.49.1</string>
 	<key>CFBundleVersion</key>
 	<string>306</string>
 </dict>

diff --git a/iosHyperskillApp/iosHyperskillAppUITests/Info.plist b/iosHyperskillApp/iosHyperskillAppUITests/Info.plist
@@ -13,7 +13,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.49</string>
+	<string>1.49.1</string>
 	<key>CFBundleVersion</key>
 	<string>306</string>
 </dict>