1) Fixed bug when title bar appears on api 31 and higher; 2) Translated Contact us text;

ItamiOMW · ItamiOMW · commit 9d865c03af8e · 2024-07-03T10:02:02.000+03:00
diff --git a/app/src/main/java/com/itami/calorie_tracker/core/presentation/MainActivity.kt b/app/src/main/java/com/itami/calorie_tracker/core/presentation/MainActivity.kt
@@ -24,6 +24,7 @@ class MainActivity : AppCompatActivity() {
             navigationBarStyle = SystemBarStyle.light(Color.TRANSPARENT, Color.TRANSPARENT)
         )
         super.onCreate(savedInstanceState)
+        actionBar?.hide()
         installSplashScreen().setKeepOnScreenCondition {
             mainViewModel.showSplash
         }
diff --git a/app/src/main/java/com/itami/calorie_tracker/profile_feature/presentation/screens/contact_us/ContactUsScreen.kt b/app/src/main/java/com/itami/calorie_tracker/profile_feature/presentation/screens/contact_us/ContactUsScreen.kt
@@ -230,14 +230,18 @@ private fun ContactUsTextSection(
     modifier: Modifier = Modifier,
     appNameColor: Color = CalorieTrackerTheme.colors.primary,
     appName: String = stringResource(id = R.string.app_name),
+    contactUsText: String = stringResource(R.string.dont_hesitate_to_contact_us),
 ) {
+
     val annotatedString = remember {
         buildAnnotatedString {
-            append("Don’t hesitate to contact us if you find a bug or have a suggestion. We highly appreciate any feedback provided, as it helps us improve your ")
+            val startIndex = contactUsText.indexOf(appName)
+            val endIndex = startIndex + appName.length
+            append(contactUsText.substring(0, startIndex))
             withStyle(style = SpanStyle(color = appNameColor, fontWeight = FontWeight.Medium)) {
                 append(appName)
             }
-            append(".")
+            append(contactUsText.substring(endIndex))
         }
     }
 
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -265,4 +265,5 @@
     <string name="error_invalid_old_password">Ungültiges altes Passwort.</string>
     <string name="password_has_been_changed">Das Passwort wurde geändert.</string>
     <string name="ml">ml</string>
+    <string name="dont_hesitate_to_contact_us">"Zögern Sie nicht, uns zu kontaktieren, wenn Sie einen Fehler finden oder einen Vorschlag haben. Wir schätzen jedes Feedback sehr, da es uns hilft, Ihren Calorie Tracker zu verbessern."</string>
 </resources>
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
@@ -271,4 +271,5 @@
     <string name="error_invalid_old_password">Invalid old password.</string>
     <string name="password_has_been_changed">Password has been changed.</string>
     <string name="ml">ml</string>
+    <string name="dont_hesitate_to_contact_us">"Don’t hesitate to contact us if you find a bug or have a suggestion. We highly appreciate any feedback provided, as it helps us improve your "</string>
 </resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
@@ -266,4 +266,5 @@
     <string name="error_invalid_old_password">Contraseña antigua inválida.</string>
     <string name="password_has_been_changed">Se ha cambiado la contraseña.</string>
     <string name="ml">ml</string>
+    <string name="dont_hesitate_to_contact_us">"No dude en contactarnos si encuentra un error o tiene una sugerencia. Agradecemos enormemente cualquier comentario proporcionado, ya que nos ayuda a mejorar su Calorie Tracker."</string>
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
@@ -265,4 +265,5 @@
     <string name="error_invalid_old_password">Ancien mot de passe invalide.</string>
     <string name="password_has_been_changed">Le mot de passe a été changé.</string>
     <string name="ml">ml</string>
+    <string name="dont_hesitate_to_contact_us">"N'hésitez pas à nous contacter si vous trouvez un bug ou si vous avez une suggestion. Nous apprécions grandement tout retour fourni, car cela nous aide à améliorer votre Calorie Tracker."</string>
 </resources>
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
@@ -1,8 +1,9 @@
 <resources>
 
-<style name="Theme.CalorieTracker" parent="Theme.AppCompat.Light.NoActionBar">
+<style name="Theme.CalorieTracker" parent="Theme.AppCompat.NoActionBar">
     <item name="android:statusBarColor">#0D0D0D</item>
     <item name="android:navigationBarColor">#0D0D0D</item>
+    <item name="showTitle">false</item>
 </style>
 
 </resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
@@ -132,7 +132,7 @@
     <string name="calorie_intake">Потребление калорий</string>
     <string name="dark_theme">Темная тема</string>
     <string name="theme_dark">Темная</string>
-    <string name="theme_light">Светла</string>
+    <string name="theme_light">Светлая</string>
     <string name="theme_system">Системная</string>
     <string name="desc_icon_contrast">Иконка контраста</string>
     <string name="title_contact_us">Связаться с нами</string>
@@ -267,4 +267,5 @@
     <string name="error_invalid_old_password">Неверный старый пароль.</string>
     <string name="password_has_been_changed">Вы успешно сменили пароль.</string>
     <string name="ml">мл</string>
+    <string name="dont_hesitate_to_contact_us">"Не стесняйтесь связаться с нами, если вы обнаружите ошибку или у вас есть предложение. Мы высоко ценим любые отзывы, так как они помогают нам улучшить ваш Calorie Tracker."</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -270,4 +270,5 @@
     <string name="error_invalid_old_password">Invalid old password.</string>
     <string name="password_has_been_changed">Password has been changed.</string>
     <string name="ml">ml</string>
+    <string name="dont_hesitate_to_contact_us">"Don’t hesitate to contact us if you find a bug or have a suggestion. We highly appreciate any feedback provided, as it helps us improve your Calorie Tracker"</string>
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
@@ -1,8 +1,9 @@
 <resources>
 
-<style name="Theme.CalorieTracker" parent="Theme.AppCompat.Light.NoActionBar">
+<style name="Theme.CalorieTracker" parent="Theme.AppCompat.NoActionBar">
     <item name="android:statusBarColor">#FFFFFF</item>
     <item name="android:navigationBarColor">#FFFFFF</item>
+    <item name="showTitle">false</item>
 </style>
 
 </resources>

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ class MainActivity : AppCompatActivity() {`
`24`	`24`	`navigationBarStyle = SystemBarStyle.light(Color.TRANSPARENT, Color.TRANSPARENT)`
`25`	`25`	`)`
`26`	`26`	`super.onCreate(savedInstanceState)`
	`27`	`+ actionBar?.hide()`
`27`	`28`	`installSplashScreen().setKeepOnScreenCondition {`
`28`	`29`	`mainViewModel.showSplash`
`29`	`30`	`}`