feat: strings ambient (#63)

jcaiqueoliveira · May 28, 2022 · 5df0b4d · 5df0b4d
1 parent fa166c7
commit 5df0b4d
Show file tree

Hide file tree

Showing 10 changed files with 43 additions and 74 deletions.
diff --git a/buildSrc/src/main/java/dependencies.kt b/buildSrc/src/main/java/dependencies.kt
@@ -1,7 +1,7 @@
 object Versions {
 
     const val kotlin = "1.4.10"
-    const val androidGradleSupport = "4.2.0-alpha14"
+    const val androidGradleSupport = "4.2.0-alpha16"
     const val gmsSupport = "4.3.2"
     const val ktlint = "9.0.0"
     const val detekt = "1.1.1"
@@ -21,7 +21,7 @@ object Versions {
 
     const val androidxLifecycle = "2.1.0"
 
-    const val compose = "1.0.0-alpha05"
+    const val compose = "1.0.0-alpha07"
 
     const val firebaseCrashlytics = "2.10.1"
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-rc-4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/presentation/src/main/java/com/jcaique/dialetus/presentation/DialetusActivity.kt b/presentation/src/main/java/com/jcaique/dialetus/presentation/DialetusActivity.kt
@@ -52,7 +52,8 @@ class DialetusActivity : AppCompatActivity() {
             }
 
             Providers(
-                NavigatorAmbient provides navigator.value
+                NavigatorAmbient provides navigator.value,
+                StringsAmbient provides Strings()
             ) {
                 Crossfade(current = navigator.value.currentScreen) { screen ->
                     when (screen) {

diff --git a/presentation/src/main/java/com/jcaique/dialetus/presentation/strings.kt b/presentation/src/main/java/com/jcaique/dialetus/presentation/strings.kt
@@ -0,0 +1,20 @@
+package com.jcaique.dialetus.presentation
+
+import androidx.compose.runtime.ambientOf
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.setValue
+
+val StringsAmbient = ambientOf<Strings> { error("Strings not initialized") }
+
+data class Strings(
+  val appName: String = "Dialetus",
+  val meaning: String = "Significado",
+  val examples: String = "Exemplos",
+  val search: String = "Pesquisar",
+  val moreDialectsOn: String = "Mais dialetos em %s",
+  val tryAgain: String = "Tentar novamente",
+  val noDialectFoundTitle: String = "Nenhum dialeto cadastrado",
+  val noDialectFoundSubtitle: String = "Não foi encontrado nenhum dialeto ou região.",
+  val defaultError: String = "Ops, algo deu errado",
+  val loadRegionsError: String = "Não conseguimos carregar as regiões"
+)
diff --git a/presentation/src/main/java/com/jcaique/dialetus/presentation/ui/common.kt b/presentation/src/main/java/com/jcaique/dialetus/presentation/ui/common.kt
@@ -1,13 +1,13 @@
 package com.jcaique.dialetus.presentation.ui
 
-import androidx.compose.foundation.Icon
-import androidx.compose.foundation.Text
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.Divider
+import androidx.compose.material.Icon
+import androidx.compose.material.Text
 import androidx.compose.material.TextField
 import androidx.compose.material.TopAppBar
 import androidx.compose.material.icons.Icons.Outlined

diff --git a/presentation/src/main/java/com/jcaique/dialetus/presentation/ui/screen/dialects.kt b/presentation/src/main/java/com/jcaique/dialetus/presentation/ui/screen/dialects.kt
@@ -1,7 +1,5 @@
 package com.jcaique.dialetus.presentation.ui.screen
 
-import androidx.compose.foundation.Icon
-import androidx.compose.foundation.Text
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
@@ -11,8 +9,10 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumnFor
 import androidx.compose.material.Card
+import androidx.compose.material.Icon
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Scaffold
+import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.ArrowBack
 import androidx.compose.material.icons.filled.Share
@@ -24,6 +24,7 @@ import androidx.compose.ui.unit.dp
 import com.jcaique.dialetus.domain.models.Dialect
 import com.jcaique.dialetus.domain.models.Region
 import com.jcaique.dialetus.presentation.NavigatorAmbient
+import com.jcaique.dialetus.presentation.StringsAmbient
 import com.jcaique.dialetus.presentation.ui.DialetusDivider
 import com.jcaique.dialetus.presentation.ui.DialetusSearchField
 import com.jcaique.dialetus.presentation.ui.DialetusTopBar
@@ -72,6 +73,8 @@ private fun Content(dialects: List<Dialect>) {
 
 @Composable
 private fun DialectCard(dialect: Dialect) {
+    val strings = StringsAmbient.current
+
     Card(
         elevation = 2.dp
     ) {
@@ -85,8 +88,8 @@ private fun DialectCard(dialect: Dialect) {
                     .align(Alignment.CenterHorizontally)
                     .padding(top = 16.dp)
             )
-            DialectCardSection(title = "Significado", items = dialect.meanings)
-            DialectCardSection(title = "Exemplos", items = dialect.examples)
+            DialectCardSection(title = strings.meaning, items = dialect.meanings)
+            DialectCardSection(title = strings.examples, items = dialect.examples)
 
             DialetusDivider()
 

diff --git a/presentation/src/main/java/com/jcaique/dialetus/presentation/ui/screen/regions.kt b/presentation/src/main/java/com/jcaique/dialetus/presentation/ui/screen/regions.kt
@@ -1,6 +1,5 @@
 package com.jcaique.dialetus.presentation.ui.screen
 
-import androidx.compose.foundation.Text
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.fillMaxSize
@@ -9,6 +8,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumnFor
 import androidx.compose.material.Divider
 import androidx.compose.material.Scaffold
+import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -20,6 +20,7 @@ import com.jcaique.dialetus.domain.models.Region
 import com.jcaique.dialetus.presentation.NavigatorAmbient
 import com.jcaique.dialetus.presentation.R
 import com.jcaique.dialetus.presentation.Screen.Dialects
+import com.jcaique.dialetus.presentation.StringsAmbient
 import com.jcaique.dialetus.presentation.ui.DialetusTopBar
 
 @Composable
@@ -33,7 +34,7 @@ fun RegionsScreen(regions: List<Region>) {
 @Composable
 fun Header() {
     DialetusTopBar(
-        title = "Dialetus",
+        title = StringsAmbient.current.appName,
         icon = vectorResource(id = R.drawable.ic_logo)
     )
 }

diff --git a/presentation/src/main/res/values/colors.xml b/presentation/src/main/res/values/colors.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-        <color name="colorPrimary">@color/white</color>
-        <color name="colorPrimaryDark">@color/white</color>
-        <color name="colorAccent">@color/green</color>
+    <color name="colorPrimary">@color/white</color>
+    <color name="colorPrimaryDark">@color/white</color>
+    <color name="colorAccent">@color/green</color>
 
-        <color name="green">#249042</color>
-        <color name="white">@android:color/white</color>
-        <color name="blackAlpha">#AA333333</color>
-        <color name="lightGray1">#F8F9FD</color>
-        <color name="lightGray2">#DCE0E9</color>
-        <color name="darkGray1">#2D3844</color>
-        <color name="darkGray2">#5a6872</color>
+    <color name="green">#249042</color>
+    <color name="white">@android:color/white</color>
+    <color name="blackAlpha">#AA333333</color>
 </resources>
diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml
@@ -1,14 +1,3 @@
 <resources>
     <string name="app_name">Dialetus</string>
-    <string name="text_button_try_again">Tentar novamente</string>
-    <string name="text_title_error">Ops, algo deu errado.</string>
-    <string name="menu_contribute_web">Adicionar mais dialetos</string>
-    <string name="text_description_error">Não conseguimos carregar as regiões</string>
-    <string name="title_no_events_found">Nenhum dialeto cadastrado</string>
-    <string name="text_description_no_dialects_found">Não foi encontrado nenhum dialeto ou região.</string>
-    <string name="menu_android">Contribuir com o aplicativo</string>
-    <string name="meaning">Significado</string>
-    <string name="examples">Exemplos</string>
-    <string name="more_dialects_on">Mais dialetos em %s</string>
-    <string name="search">Pesquisar</string>
 </resources>
diff --git a/presentation/src/main/res/values/styles.xml b/presentation/src/main/res/values/styles.xml
@@ -1,6 +1,5 @@
 <resources>
 
-    <style name="AppTheme.Translucent" parent="AppTheme.Base.Translucent"/>
     <style name="AppTheme" parent="AppTheme.Base"/>
 
     <style name="AppTheme.Base" parent="Theme.MaterialComponents.Light.NoActionBar">
@@ -12,44 +11,4 @@
         <item name="android:fontFamily">@font/google_sans</item>
         <item name="fontFamily">@font/google_sans</item>
     </style>
-
-    <style name="AppTheme.Base.Translucent" parent="AppTheme.Base">
-        <item name="android:windowTranslucentStatus">true</item>
-        <item name="android:windowTranslucentNavigation">false</item>
-        <item name="android:navigationBarColor">@color/colorPrimaryDark</item>
-    </style>
-
-    <style name="AppTheme.Inverted" parent="AppTheme.Base">
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-    </style>
-
-    <style name="DialectCardTitle" parent="TextAppearance.MaterialComponents.Headline6">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:gravity">center</item>
-    </style>
-
-    <style name="DialectCardLabel" parent="TextAppearance.MaterialComponents.Overline">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_marginTop">16dp</item>
-        <item name="android:textColor">@color/darkGray2</item>
-    </style>
-
-    <style name="DialectCardValue" parent="TextAppearance.MaterialComponents.Body1">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:textColor">@color/darkGray1</item>
-    </style>
-
-    <style name="DialectActionButton" parent="TextAppearance.MaterialComponents.Body1">
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_marginEnd">8dp</item>
-        <item name="android:padding">12dp</item>
-        <item name="android:background">?selectableItemBackgroundBorderless</item>
-        <item name="android:tint">@color/darkGray1</item>
-    </style>
-
 </resources>