From 8c897ede181c60f2b95ce1895997b36e7e33689c Mon Sep 17 00:00:00 2001
From: singhDevs <heysinghg1@gmail.com>
Date: Wed, 2 Oct 2024 05:21:36 +0530
Subject: [PATCH 1/2] feat: Added Language support for Spanish, French & German

---
 .idea/compiler.xml                            |   2 +-
 .idea/gradle.xml                              |   1 +
 .idea/misc.xml                                |   3 +-
 .../weathernaut/constants/WeatherConstants.kt |  90 ++++++++++++++++++
 .../tangobee/weathernaut/ui/HomeFragment.kt   |  12 ++-
 .../weathernaut/ui/Next7DaysFragment.kt       |  12 +++
 .../weathernaut/ui/SettingsFragment.kt        |  75 ++++++++++++++-
 app/src/main/res/drawable/country_flag_de.png | Bin 0 -> 753 bytes
 app/src/main/res/drawable/country_flag_es.png | Bin 0 -> 1185 bytes
 app/src/main/res/drawable/country_flag_fr.png | Bin 0 -> 755 bytes
 app/src/main/res/drawable/country_flag_uk.png | Bin 0 -> 1414 bytes
 app/src/main/res/layout/fragment_settings.xml |  54 +++++++++++
 app/src/main/res/menu/language_menu.xml       |  22 +++++
 app/src/main/res/values-de/strings.xml        |  69 ++++++++++++++
 app/src/main/res/values-es/strings.xml        |  68 +++++++++++++
 app/src/main/res/values-fr/strings.xml        |  68 +++++++++++++
 app/src/main/res/values/strings.xml           |   6 ++
 17 files changed, 477 insertions(+), 5 deletions(-)
 create mode 100644 app/src/main/res/drawable/country_flag_de.png
 create mode 100644 app/src/main/res/drawable/country_flag_es.png
 create mode 100644 app/src/main/res/drawable/country_flag_fr.png
 create mode 100644 app/src/main/res/drawable/country_flag_uk.png
 create mode 100644 app/src/main/res/menu/language_menu.xml
 create mode 100644 app/src/main/res/values-de/strings.xml
 create mode 100644 app/src/main/res/values-es/strings.xml
 create mode 100644 app/src/main/res/values-fr/strings.xml

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index b589d56..b86273d 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="17" />
+    <bytecodeTargetLevel target="21" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 0897082..7b3006b 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,6 +4,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <option name="testRunner" value="CHOOSE_PER_TEST" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
         <option name="modules">
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 2f5ee3b..e0ef6f7 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,7 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK" />
 </project>
\ No newline at end of file
diff --git a/app/src/main/java/me/tangobee/weathernaut/constants/WeatherConstants.kt b/app/src/main/java/me/tangobee/weathernaut/constants/WeatherConstants.kt
index 30b90ca..33d0a7e 100644
--- a/app/src/main/java/me/tangobee/weathernaut/constants/WeatherConstants.kt
+++ b/app/src/main/java/me/tangobee/weathernaut/constants/WeatherConstants.kt
@@ -36,4 +36,94 @@ object WeatherCodes {
         WeatherConstants(96, "Slight Thunderstorm"),
         WeatherConstants(99, "Heavy Thunderstorm")
     )
+    val weatherConstants_es = listOf(
+        WeatherConstants(0, "Despejado"),
+        WeatherConstants(1, "Despejado/Parcialmente Nublado"),
+        WeatherConstants(2, "Parcialmente Nublado"),
+        WeatherConstants(3, "Nublado"),
+        WeatherConstants(45, "Niebla"),
+        WeatherConstants(48, "Niebla con Escarcha"),
+        WeatherConstants(51, "Llovizna Ligera"),
+        WeatherConstants(53, "Llovizna Moderada"),
+        WeatherConstants(55, "Llovizna Fuerte"),
+        WeatherConstants(56, "Llovizna Ligera Helada"),
+        WeatherConstants(57, "Llovizna Fuerte Helada"),
+        WeatherConstants(61, "Lluvia Ligera"),
+        WeatherConstants(63, "Lluvia Moderada"),
+        WeatherConstants(65, "Lluvia Fuerte"),
+        WeatherConstants(66, "Lluvia Ligera Helada"),
+        WeatherConstants(67, "Lluvia Fuerte Helada"),
+        WeatherConstants(71, "Nieve Ligera"),
+        WeatherConstants(73, "Nieve Moderada"),
+        WeatherConstants(75, "Nieve Fuerte"),
+        WeatherConstants(77, "Granos de Nieve"),
+        WeatherConstants(80, "Chubascos de Lluvia Ligera"),
+        WeatherConstants(81, "Chubascos de Lluvia Moderada"),
+        WeatherConstants(82, "Chubascos de Lluvia Fuerte"),
+        WeatherConstants(85, "Chubascos de Nieve Ligera"),
+        WeatherConstants(86, "Chubascos de Nieve Fuerte"),
+        WeatherConstants(95, "Tormenta Ligera"),
+        WeatherConstants(96, "Tormenta Ligera"),
+        WeatherConstants(99, "Tormenta Fuerte")
+    )
+    val weatherConstants_fr = listOf(
+        WeatherConstants(0, "Clair"),
+        WeatherConstants(1, "Dégagé/Partiellement nuageux"),
+        WeatherConstants(2, "Partiellement nuageux"),
+        WeatherConstants(3, "Couvert"),
+        WeatherConstants(45, "Brouillard"),
+        WeatherConstants(48, "Brouillard de givre"),
+        WeatherConstants(51, "Légère bruine"),
+        WeatherConstants(53, "Bruine modérée"),
+        WeatherConstants(55, "Grosse bruine"),
+        WeatherConstants(56, "Légère bruine verglaçante"),
+        WeatherConstants(57, "Forte bruine verglaçante"),
+        WeatherConstants(61, "Légère pluie"),
+        WeatherConstants(63, "Pluie modérée"),
+        WeatherConstants(65, "Grosse pluie"),
+        WeatherConstants(66, "Légère pluie verglaçante"),
+        WeatherConstants(67, "Forte pluie verglaçante"),
+        WeatherConstants(71, "Légère neige"),
+        WeatherConstants(73, "Neige modérée"),
+        WeatherConstants(75, "Grosse neige"),
+        WeatherConstants(77, "Grains de neige"),
+        WeatherConstants(80, "Averses légères de pluie"),
+        WeatherConstants(81, "Averses modérées de pluie"),
+        WeatherConstants(82, "Gros averses de pluie"),
+        WeatherConstants(85, "Averses légères de neige"),
+        WeatherConstants(86, "Fortes chutes de neige"),
+        WeatherConstants(95, "Léger orage"),
+        WeatherConstants(96, "Léger orage"),
+        WeatherConstants(99, "Fort orage")
+    )
+    val weatherConstants_de = listOf(
+        WeatherConstants(0, "Klar"),
+        WeatherConstants(1, "Klar/Teilweise Bewölkt"),
+        WeatherConstants(2, "Teilweise Bewölkt"),
+        WeatherConstants(3, "Bedeckt"),
+        WeatherConstants(45, "Nebel"),
+        WeatherConstants(48, "Raureifnebel"),
+        WeatherConstants(51, "Leichter Nieselregen"),
+        WeatherConstants(53, "Mäßiger Nieselregen"),
+        WeatherConstants(55, "Starker Nieselregen"),
+        WeatherConstants(56, "Leichter Gefrierender Nieselregen"),
+        WeatherConstants(57, "Starker Gefrierender Nieselregen"),
+        WeatherConstants(61, "Leichter Regen"),
+        WeatherConstants(63, "Mäßiger Regen"),
+        WeatherConstants(65, "Starker Regen"),
+        WeatherConstants(66, "Leichter Gefrierender Regen"),
+        WeatherConstants(67, "Starker Gefrierender Regen"),
+        WeatherConstants(71, "Leichter Schnee"),
+        WeatherConstants(73, "Mäßiger Schnee"),
+        WeatherConstants(75, "Starker Schnee"),
+        WeatherConstants(77, "Schneegriesel"),
+        WeatherConstants(80, "Leichte Regenschauer"),
+        WeatherConstants(81, "Mäßige Regenschauer"),
+        WeatherConstants(82, "Starke Regenschauer"),
+        WeatherConstants(85, "Leichte Schneeschauer"),
+        WeatherConstants(86, "Starke Schneeschauer"),
+        WeatherConstants(95, "Leichtes Gewitter"),
+        WeatherConstants(96, "Leichtes Gewitter"),
+        WeatherConstants(99, "Starkes Gewitter")
+    )
 }
diff --git a/app/src/main/java/me/tangobee/weathernaut/ui/HomeFragment.kt b/app/src/main/java/me/tangobee/weathernaut/ui/HomeFragment.kt
index 798d854..fdee3e3 100644
--- a/app/src/main/java/me/tangobee/weathernaut/ui/HomeFragment.kt
+++ b/app/src/main/java/me/tangobee/weathernaut/ui/HomeFragment.kt
@@ -1,8 +1,10 @@
 package me.tangobee.weathernaut.ui
 
+import android.content.ContentValues.TAG
 import android.os.Bundle
 import android.text.SpannableString
 import android.text.style.RelativeSizeSpan
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -119,7 +121,15 @@ class HomeFragment : Fragment() {
         binding.currentWeatherTemperature.text = weatherData.current_weather.current.temperature_2m.toInt().toString()
         binding.weatherUnit.text = weatherData.current_weather.current_units.temperature_2m
         binding.weatherIcon.setImageResource(WeatherImageMapper.getImageForWeatherCode(weatherData.current_weather.current.weather_code))
-        binding.currentWeatherType.text = WeatherCodes.weatherConstants.first {it.code == weatherData.current_weather.current.weather_code}.description
+
+        val lang = requireContext().resources.configuration.locale.language
+        when(lang){
+            "en" -> binding.currentWeatherType.text = WeatherCodes.weatherConstants.first {it.code == weatherData.current_weather.current.weather_code}.description
+            "es" -> binding.currentWeatherType.text = WeatherCodes.weatherConstants_es.first {it.code == weatherData.current_weather.current.weather_code}.description
+            "fr" -> binding.currentWeatherType.text = WeatherCodes.weatherConstants_fr.first {it.code == weatherData.current_weather.current.weather_code}.description
+            "de" -> binding.currentWeatherType.text = WeatherCodes.weatherConstants_de.first {it.code == weatherData.current_weather.current.weather_code}.description
+        }
+//        binding.currentWeatherType.text = WeatherCodes.weatherConstants.first {it.code == weatherData.current_weather.current.weather_code}.description
 
         val currentPressure = weatherData.current_weather.current.pressure_msl.toString() + weatherData.current_weather.current_units.pressure_msl
         binding.pressureValue.text = currentPressure
diff --git a/app/src/main/java/me/tangobee/weathernaut/ui/Next7DaysFragment.kt b/app/src/main/java/me/tangobee/weathernaut/ui/Next7DaysFragment.kt
index 2b688ef..90a9e55 100644
--- a/app/src/main/java/me/tangobee/weathernaut/ui/Next7DaysFragment.kt
+++ b/app/src/main/java/me/tangobee/weathernaut/ui/Next7DaysFragment.kt
@@ -99,6 +99,18 @@ class Next7DaysFragment : Fragment() {
         }
 
         val days = arrayOf("Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday")
+        val days_es = arrayOf("Domingo", "Lunes", "Martes", "Miércoles", "Jueves", "Viernes", "Sábado")
+        val days_fr = arrayOf("Dimanche", "Lundi", "Mardi", "Mercredi", "Jeudi", "Vendredi", "Samedi")
+        val days_de = arrayOf("Sonntag", "Montag", "Dienstag", "Mittwoch", "Donnerstag", "Freitag", "Samstag")
+
+        val lang = requireContext().resources.configuration.locale.language
+        when(lang){
+            "en" -> return days[calendar.get(Calendar.DAY_OF_WEEK) - 1]
+            "es" -> return days_es[calendar.get(Calendar.DAY_OF_WEEK) - 1]
+            "fr" -> return days_fr[calendar.get(Calendar.DAY_OF_WEEK) - 1]
+            "de" -> return days_de[calendar.get(Calendar.DAY_OF_WEEK) - 1]
+        }
+
         return days[calendar.get(Calendar.DAY_OF_WEEK) - 1]
     }
 
diff --git a/app/src/main/java/me/tangobee/weathernaut/ui/SettingsFragment.kt b/app/src/main/java/me/tangobee/weathernaut/ui/SettingsFragment.kt
index 04dce3e..4274e79 100644
--- a/app/src/main/java/me/tangobee/weathernaut/ui/SettingsFragment.kt
+++ b/app/src/main/java/me/tangobee/weathernaut/ui/SettingsFragment.kt
@@ -1,9 +1,10 @@
 package me.tangobee.weathernaut.ui
 
+import android.annotation.SuppressLint
+import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
-import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.MenuItem
 import android.view.View
@@ -12,6 +13,7 @@ import android.widget.ScrollView
 import android.widget.Toast
 import androidx.appcompat.widget.PopupMenu
 import androidx.core.content.ContextCompat
+import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import me.tangobee.weathernaut.R
 import me.tangobee.weathernaut.constants.UnitsMapper
@@ -22,6 +24,7 @@ import me.tangobee.weathernaut.services.WeatherMusicService
 import me.tangobee.weathernaut.utils.SharedPreferencesHelper
 import me.tangobee.weathernaut.utils.WeatherHelper
 import me.tangobee.weathernaut.viewmodels.WeatherViewModel
+import java.util.Locale
 
 class SettingsFragment : Fragment() {
 
@@ -44,6 +47,7 @@ class SettingsFragment : Fragment() {
         return binding.root
     }
 
+    @SuppressLint("SetTextI18n")
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         mainContainerView = requireActivity().findViewById(R.id.mainContainerView)
@@ -68,6 +72,28 @@ class SettingsFragment : Fragment() {
         binding.temperatureUnit.setOnClickListener {showTemperatureUnitPopup(binding.temperatureSpinner)}
         binding.windSpeedUnit.setOnClickListener {showWindSpeedUnitPopup(binding.windSpeedSpinner)}
         binding.atmosphericPressureUnit.setOnClickListener {showAtmosphericPressureUnitPopup(binding.atmosphericPressureSpinner)}
+        binding.language.setOnClickListener {showLanguagePopup(binding.languageSpinner)}
+        binding.language.apply {
+            val lang = context.resources.configuration.locale.language
+            when(lang){
+                "en" -> {
+                    binding.languageSpinner.text = "English"
+                    binding.flagIcon.setImageResource(R.drawable.country_flag_uk)
+                }
+                "es" -> {
+                    binding.languageSpinner.text = "Español"
+                    binding.flagIcon.setImageResource(R.drawable.country_flag_es)
+                }
+                "fr" -> {
+                    binding.languageSpinner.text = "Français"
+                    binding.flagIcon.setImageResource(R.drawable.country_flag_fr)
+                }
+                "de" -> {
+                    binding.languageSpinner.text = "Deutsch"
+                    binding.flagIcon.setImageResource(R.drawable.country_flag_de)
+                }
+            }
+        }
 
         binding.backButton.setOnClickListener {
             requireActivity().onBackPressedDispatcher.onBackPressed()
@@ -247,6 +273,40 @@ class SettingsFragment : Fragment() {
 
         popup.show()
     }
+    private fun showLanguagePopup(view: View) {
+        val popup = PopupMenu(requireContext(), view)
+        popup.inflate(R.menu.language_menu)
+        popup.setOnMenuItemClickListener { item: MenuItem? ->
+            when (item!!.itemId) {
+                R.id.english -> {
+                    setLocale(requireContext(),"en")
+                    binding.languageSpinner.text = item.title
+                    binding.flagIcon.setImageResource(R.drawable.country_flag_uk)
+                    requireActivity().onBackPressedDispatcher.onBackPressed()
+                }
+                R.id.spanish -> {
+                    setLocale(requireContext(),"es")
+                    binding.languageSpinner.text = item.title
+                    binding.flagIcon.setImageResource(R.drawable.country_flag_es)
+                    requireActivity().onBackPressedDispatcher.onBackPressed()
+                }
+                R.id.french -> {
+                    setLocale(requireContext(),"fr")
+                    binding.languageSpinner.text = item.title
+                    binding.flagIcon.setImageResource(R.drawable.country_flag_fr)
+                    requireActivity().onBackPressedDispatcher.onBackPressed()
+                }
+                R.id.german -> {
+                    setLocale(requireContext(),"de")
+                    binding.languageSpinner.text = item.title
+                    binding.flagIcon.setImageResource(R.drawable.country_flag_de)
+                    requireActivity().onBackPressedDispatcher.onBackPressed()
+                }
+            }
+            true
+        }
+        popup.show()
+    }
 
     private fun updateWeatherData(currentSettings: SettingsModel?) {
         if(currentSettings != null) {
@@ -261,4 +321,15 @@ class SettingsFragment : Fragment() {
         super.onDestroy()
         mainContainerView.background = ContextCompat.getDrawable(requireContext(), R.drawable.home_background)
     }
-}
\ No newline at end of file
+
+    private fun setLocale(context: Context, languageCode: String) {
+        val locale = Locale(languageCode)
+        Locale.setDefault(locale)
+
+        val config = resources.configuration
+        config.setLocale(locale)
+//        context.createConfigurationContext(config)
+        context.resources.updateConfiguration(config, resources.displayMetrics)
+    }
+}
+
diff --git a/app/src/main/res/drawable/country_flag_de.png b/app/src/main/res/drawable/country_flag_de.png
new file mode 100644
index 0000000000000000000000000000000000000000..e13d9914c4204708c052f63b003ad9b1d7204e36
GIT binary patch
literal 753
zcmV<N0uKF&P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00009a7bBm000XU
z000XU0RWnu7ytkQqe(<TRCt{2n9XYwK^TW86=x7>{W|DD{|0ICBuRV7OpP9`i_U}+
zaVEW0LD7OAq{pH*+CRaI)J9P}3z?-ocqsw#s@2l;q#mk0B!|AT8ykpC$R^qBY-nEi
z!5%ir^UV9s&Ju+B)vtbaT$W`WxR9J0p*($ya+#xC7N}6`l*?^5mFof%YKaMXGk)#H
zu=5#Yy2h;3DJs+q6>^OU1udq?gq$0{di_k`;E7~%h;jLhaanEyyf$2xDOXwNI|G4d
zNp*#Cx!E!Jf1zA%#(8?8o9q$B<t!6w$8UI6Bcc{EnaqH%<cY*Ip+ddyCOE4dt9O=V
zVPD{#)u=o@0)iLSPAvM;2`1$8pyAoBgpl(c!BZ|TnSy84q%XDyZ%rL>4j|(KTyBh|
zQb*fZeU&v1FLou=)0W`JEqR;?`P(?SsDyI$Cq6lO!m|M5@{wt1wnsuf@B|MCMIeU0
zK@35t5=CncTXTW)=$vubSi_7o7l@*JApnKC8AW%z2)s598f%!G7lBV90EGrAG#7}W
zUm*a6x{0D6UIfa<L1PV5+7|*pdwYbUy}yZbApnI2S@I%qH^d`!ySHB@M$vFnfqz~2
z(z7pfPJxXdf=wV)(fB^{TCj|cfhJqwfhSuIlV^cS7sz~w1Rl2p?+ScGL!j}xd3gLC
zR?uL}0<J`!P|#$@s6d`1+Jdi2Xp%KJI!`)+cLe}Nz{W2O2)qP9{`|=cpAiO4-UbN&
z#`#TO;A=ZUW&_w03%;#<T@f2kfW}4t=N%V8<I7zGuaQ_mgYG$@Ny&$eT5>jP+mFhQ
zL_Qoo2^!CU#$Q{9#~WaiImjP69XR+N5kLd5eDEyf$u!vH6=<^R9zdFGSK?l;f+maZ
jJ<h$|ob!J5Yai8LqSCt*9uc4T00000NkvXXu0mjfnes?;

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/country_flag_es.png b/app/src/main/res/drawable/country_flag_es.png
new file mode 100644
index 0000000000000000000000000000000000000000..e3eeb0da5c2cbb496eee29fc0ed3a40c51c6bc93
GIT binary patch
literal 1185
zcmV;S1YY}zP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00009a7bBm000XU
z000XU0RWnu7ytkSQ%OWYRCt{2S$#}ZWf*@dy$85_++E;WF|(QD>%7JmlJ!T!us_OB
zA#H29Npoy%rX|Yy0~Qt*E0YXZ6m^@-d*$*~;P?~}?lnk7i$SCb=M6A1{G+W}$bbFX
zIU}u0&T~J`x!1;Td$zN4-sjox_dd_Fz2|v}7O{v$_zV!;^<xsP<&5@mMzx&LsKjVm
z66v~PjHbCr-*H9`d5yeQ_Mt%IQVPXMB9%xYO>jo=#AF|d(K}NKbieMze~70T&gihj
zXwFmO{~_eM97~R=3wepr2Bjo?B)-5zx+XEo){Howr+XxkD*R5IEf7)$qPzV{{_<lK
z%0>E8bMowleKE0uLi|Er-VHgRj^v^A2BQ`^>plzMB9-e+p5JWn4}2xRF;L|B%}jXL
z*b^ya;v!uM0s&VqCzIJ@0dNVWa0v(!EA@<gk8v5C!fX%_hhj399^*3g0-VBufRlDD
z5K-(w`549nPT1vc1_@Ac0EBZ%+U<h<=?uki({g;@9H%_%CZcc28a2D0f2#n$c1K{U
z)r9_|F*sWljWZub;Iu6UldUHF(H)^f85#Df5FpguD!^!6B$^+O!RHy#IQEnUwv1R<
zGt6j7H{)Vsq#jwQQBgv|sJr8DO(7WhFid&wDhP)oKLWLdVW=qxgCj2-y>Emo-==J#
znCl49Qox9s68hQQaiCIwb-#e$8$&UeV?xVwk!W3SM!$UzTy?uK(zyq-eQ`LlU%+6M
zh60?1X*DG@=k9pzL=pyDcVotCMD<z|N_H%TZKVah4Q)78P>JrN4*YVG;hT=vFx{T0
zWd`QF5-@x)32nLSab`yptWQ`_kiQDmD`IiNUXOv|YJ6Saj&Dm+(7AIRhThXqfK!-N
z(F2C7?v5vStwKjtA<h?u<C8T}crzyvIT@MQ{`6L~+Z|}LIWSU{j4o>tdUideVFnCW
zylUceuP5U8OW8PA{s8J<42L5t61nR#@p5`5+BcZdo@v5`vIMl|Zo%37qyRUuQ*gLD
zUObYD)7_OAs$8xJsLhH*-F73IpNvNHP7^venK1To0?s=>#mHxmXxYSeH6^sq-EpkZ
zf?iu1CTq;7eIY^-VA~dpmMssWb8{3rvdx&OjYXe54VM}$+6g#i$n)wbQBk@HMQ?Az
zP+dIw-;GDpE04lfkq3K45xQPY$I!utm2dKz^7l7tC*Z54skarNh;RvG8rHFwW{^~o
z58C6jOL*(f{-GH#T2u>|FQY>NC+@mohsaa#REpvv{dC9v)XU(Eo(;5saYk9>3*^ah
zz;<6G&r2tWMvD!88}iD7Ry{>Xj2iql-2GQ3L@Lukz+u0S*Z&D=H9e!n1&1Wk%=l{B
zOnTr#B1OxS<N50$Uy093B9+Q9NpDOh(tVuK0WK2vg1p2<DxOHDdnp*eMM~q0_Hsrw
zl1RhyWc%-H*7;}o-7%g_dGgvo^IgOu{xA3o6uV3JHrheA00000NkvXXu0mjfZ-*-t

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/country_flag_fr.png b/app/src/main/res/drawable/country_flag_fr.png
new file mode 100644
index 0000000000000000000000000000000000000000..2f26dcfad9c69e7e42216841dfc013e04df23924
GIT binary patch
literal 755
zcmV<P0u23$P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00009a7bBm000XU
z000XU0RWnu7ytkQrAb6VRCt{2nO{p3Q5eRbOzSF2F9OZJK)0K*ZRgDCq9UmDoW!rt
zT~t>UR7TwxLjOKQ)NYXI9P_R(P?2;Sl^O+}ZT>`x-uT9j8;F=Y)6R@%VIO#58D`-5
z?eh+td0(Kdw%Tf1MATt|V4&&+H;oroj30b7Ug#MwSY5Bst6!@aFSt>=xAqKnTBX5>
zKI4b?jUO&l{g9HB@x%Grvs6M~?#7EFGd)7;F`@KQQsbM8IF^Xx2_475T+DMhea4ac
zhftbol>z`o#bD?JE@Wn0h&P>%)K7(S*Z!JM6@W*z7NsH3nX36CBjr7ga$jyVo)G}m
zYm&}lZz|>sm)>?cQoCE3&k%qjh%}OLq<;7>^BDsWF^o55{^XDz-rV!K0`Taa82&Hw
zV(8TYM`^R2`5XX<IDS$QJ*l@&jsTRnmH5!iVIlRZH2@r|B+#GW-*-pjn9mV_h~suV
z_oJg7j?`bR17P?<K;r`-ms7{$n$I}_q7sfa1Q5!-W-Wk&D{=b2Vl4o}^Tr8Cch+Kn
z_c0RC-z)~0kCA|0wibY6xwQcpe#dAbcfnc!j=4DRzz1sq7~VB*A*Ekf3&8O#2Ef!+
zYXKN8H*O&{J<!re34nGv%Kc;=0K?~4hq)*P>E5vpfa4b8N~r06t3GHLR;Y+Wu>sao
z(Bswsa6CX#l?EsFZ5$!)AiyG>!hW>uSjE9bG^0kXlrg{<(irLr<xb`fz%Y^8kavAP
zy7iY@MgV0hpbKfLp2XwK$LkD_Xau{Fl^mr{3+aB(0AP_A&La=8b8fd#`mRv=S4u0U
zF=FUO-s0+YZ+*!(pVYYV!#U%J_lTnxmaJI|CJ3$@FDx5BoHbrht*uzAUa%7Vj;@8}
l=$;@bSg~ept1Yy?{s8KWFWrSI_^|*0002ovPDHLkV1kAwS>ONw

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/country_flag_uk.png b/app/src/main/res/drawable/country_flag_uk.png
new file mode 100644
index 0000000000000000000000000000000000000000..4427bbdcef666048098acf5c56577910cf66469b
GIT binary patch
literal 1414
zcmV;11$p|3P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00009a7bBm000XU
z000XU0RWnu7ytkTI7vi7RCt{2nfp&1RTRg^*Kby1f6)F9ny7(kcfig-#fZ}440Rh+
z)WjdKX&P<OMw7Ncw6Rnh6Dvu7&@`=DNSbQE&H$yrF0dkRTqxmTc{;<g%fdd`UD(~3
zJ?0KeT<9#!vcp0R-{k(l&b{ZJ&*eVOxfjEBw4)tqB8s{78~~gIfa?N*xA8iBoF{Ov
zTy*$2`VD<Ubx>VwJLtfn%4bNLEhK67F2!)LEP=ok%d${ilIHqInmtYF**yt&JSDqg
z7s;@nQ4H%s&McQ$03wQ)qPda`{hcQh;(QvzW|0gxv&xBh06;D@Yelv<&GDrC&c{fa
z`-WoJkfH<e0x+nsA&Ta{Lw#xLyk39f5t8Q0qj#(o0JpS07_LGy2;@9Pv)9+_R7(I#
zhG1`^zT*b)`=xJh8+k*9zS^HifR~R{FV-|n7RKc~032EF)E^K>&Xja^Bm&?}NryQQ
zkVfUoi;Hh=)cM^2V1-q(+I;Ot^6RHI1K{un_12LImk9tuAW0$D)hi|;b>GlPQc~<&
zto@^7ML~<j0t%8OaNhWR)R2}_C29eX&QwXi-2A&qlE8(&2kzY)v%L07_i{U4mwY}Z
z=O=Z#-8_MNP#EAi_k|IH!Jra|Z$TV5S=iba55S4Dt%F`~U{D?ypU-PAIAIV7JP_G#
z>R=`cL)4$xJb|BGVc-Bc;P2|}SAszO4h%c%vhr$YV*$v@yY1}hvo`{OC=W(`U8_J6
zqpRA?xh|JBq3Hww>J~HrJQU>lKc|^DOp(TT0++1s=e3Crhf8@{Nj3nG=kGcIp&!eJ
zn?*^QL4Sxgn`Jsz-?*x;kTvh^7ID@-7tzI-T7VY-z=K+NDl1xq)P4L4<EeYC?rT?D
zA-a0j0O$dLzvNn?D7i{6HSh%PUQv%s8TT0)%u#GVuLj@~06>ek3u4y-02tN)2mnBH
zxL&M6gLX^}Kv_hib^w@E*+Dk|jHp=y05Aan9V+ckhW$V)TNi-WC3i$~V5<wS!`oE=
z$l25O1R#>vU&v_h-@X92_dy5nr~pVF+s0F9RLvS_-)cvN=%sC4fbi7^gby<#04T;m
zYblxo8&nVgP{`p{wT%KmL3rO4HrnGF0OK3A2}_6ThiU*`R33+5z<J^P9kh@lotjD~
zhy2}LgDOvA`FpgJ*i%{YhhpgR)3tWhp+p#BDH{rF(cIG~r0?%vwIg^PU!7|PQIw-e
z+w4L|_=H_|3gsO)PS|G`I+Y-#`FZ!u(R?GXOBN&BPV1Q}6lkgiD3*=+eDn5?kJsI2
z>`+!mkpG8Abwp8`y7WW8aU=Oa$@k{=U{F+?s{X#-!KsY2yAka_SLJ*dV2_8p)grv4
z6ITB_=gZ4lmM2xG+1`-(R?U1o3C*jyHC}^BK%0gCJ_;1EUM_9o3EXBOh^MhwBoO%5
z5z{3!{Z6h)oST!A7MDBFoBye4Sj(LF=qb~X+Y{_noK{ZfMJ!g$q@?T;bhsewm*ey9
za4zill^bhBIqYU6^=Ub5=t}ueizrEvi401Vp29Ywxr-OFCI8|g%A$rwoW|_;YVC=*
zRyp`?ts|UnO6Y0_i$^y5LP<gKe~EjdF19F!gHvC&6=Ry*i!xkUq5(*T`xz@LdKlB}
zW}4wD5(YqXzfqLoQA|rAgA~IRQ#2=S^7VR&W+Sg8^aw%GtW9eGlIARAPSxvJB1Gv8
zk8AbBL^7-gjr!iqswc25dgMEe9_(TUpjk5-1Y`qy(4JY-4_80C)&A~iNB<Z73o33}
UoY95#761SM07*qoM6N<$f}tUpIRF3v

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index b5c3900..f068ce6 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -243,6 +243,60 @@
                         android:layout_gravity="center" />
                 </LinearLayout>
 
+                <LinearLayout
+                    android:id="@+id/language"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:foreground="?attr/selectableItemBackground"
+                    android:layout_marginTop="@dimen/_5sdp"
+                    android:paddingVertical="@dimen/_15sdp"
+                    android:weightSum="2"
+                    android:gravity="center">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/language"
+                        android:fontFamily="@font/inter_medium"
+                        android:textColor="@color/black"
+                        android:textSize="@dimen/_13ssp"
+                        android:layout_weight="1"/>
+
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="end"
+                        android:orientation="horizontal">
+
+                        <ImageView
+                            android:id="@+id/flagIcon"
+                            android:layout_width="24dp"
+                            android:layout_height="24dp"
+                            android:layout_gravity="center_vertical"
+                            android:contentDescription="@string/country_flag"
+                            android:src="@drawable/country_flag_uk"
+                            android:layout_marginEnd="@dimen/_5sdp" />
+
+                        <TextView
+                            android:id="@+id/languageSpinner"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            app:drawableEndCompat="@drawable/icon_dropdown"
+                            app:drawableTint="@color/placeholderColor"
+                            android:drawablePadding="@dimen/_5sdp"
+                            android:text="@string/english"
+                            android:textColor="@color/placeholderColor"
+                            android:fontFamily="@font/inter"
+                            android:layout_gravity="center"
+                            android:gravity="center|end" />
+                    </LinearLayout>
+
+                </LinearLayout>
+
             </LinearLayout>
 
 
diff --git a/app/src/main/res/menu/language_menu.xml b/app/src/main/res/menu/language_menu.xml
new file mode 100644
index 0000000..f6e6f92
--- /dev/null
+++ b/app/src/main/res/menu/language_menu.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/english"
+        android:title="@string/english"
+        android:icon="@drawable/country_flag_uk"/>
+
+    <item
+        android:id="@+id/spanish"
+        android:title="@string/spanish"
+        android:icon="@drawable/country_flag_es"/>
+
+    <item
+        android:id="@+id/french"
+        android:title="@string/french"
+        android:icon="@drawable/country_flag_fr"/>
+
+    <item
+        android:id="@+id/german"
+        android:title="@string/german"
+        android:icon="@drawable/country_flag_de"/>
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
new file mode 100644
index 0000000..4b25666
--- /dev/null
+++ b/app/src/main/res/values-de/strings.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Weathernaut</string>
+
+    <string name="api_fetching_error">Etwas ist schief gelaufen!\nMach dir keine Sorgen, es liegt nicht an dir, sondern an uns. Versuche es später noch einmal.</string>
+    <string name="no_internet">Keine Internetverbindung</string>
+    <string name="search_cities_button">Städte suchen Schaltfläche</string>
+    <string name="app_settings_button">App Einstellungen Schaltfläche</string>
+    <string name="atmospheric_pressure_icon">Atmosphärendruck Symbol</string>
+    <string name="back_button">Zurück Schaltfläche</string>
+    <string name="next_7_days">Nächste 7 Tage</string>
+    <string name="tomorrow">Morgen</string>
+    <string name="weather_icon">Wetter Symbol</string>
+
+    <!-- Preference Titles -->
+    <string name="messages_header">Nachrichten</string>
+    <string name="sync_header">Synchronisation</string>
+
+    <!-- Messages Preferences -->
+    <string name="signature_title">Ihre Unterschrift</string>
+    <string name="reply_title">Standard-Antwortaktion</string>
+
+    <!-- Sync Preferences -->
+    <string name="sync_title">E-Mails regelmäßig synchronisieren</string>
+    <string name="attachment_title">Eingehende Anhänge herunterladen</string>
+    <string name="attachment_summary_on">Anhänge automatisch für eingehende E-Mails herunterladen</string>
+    <string name="attachment_summary_off">Anhänge nur auf manuelle Anfrage herunterladen</string>
+    <string name="hello_blank_fragment">Hallo leeres Fragment</string>
+    <string name="pressure">Druck</string>
+    <string name="wind_speed">Windgeschwindigkeit</string>
+    <string name="humidity">Luftfeuchtigkeit</string>
+    <string name="today">Heute</string>
+    <string name="sunset_icon">Sonnenuntergang Symbol</string>
+    <string name="sunrise_icon">Sonnenaufgang Symbol</string>
+    <string name="settings">Einstellungen</string>
+    <string name="units">Einheiten</string>
+    <string name="language">Sprache</string>
+    <string name="temperature_units">Temperatureinheiten</string>
+    <string name="celsius">°C</string>
+    <string name="fahrenheit">°F</string>
+    <string name="wind_speed_units">Einheiten der Windgeschwindigkeit</string>
+    <string name="hpa">hPa</string>
+    <string name="atm">atm</string>
+    <string name="atmospheric_pressure_units">Einheiten des Atmosphärendrucks</string>
+    <string name="meters_per_second">m/s</string>
+    <string name="kilometers_per_hour">km/h</string>
+    <string name="miles_per_hour">mph</string>
+    <string name="weather_music_desc">Musik passend zum Wetter.</string>
+    <string name="about_weathernaut">Über Weathernaut</string>
+    <string name="feedback">Feedback</string>
+    <string name="privacy_policy">Datenschutzerklärung</string>
+    <string name="credits">Credits</string>
+    <string name="other_settings">Andere Einstellungen</string>
+    <string name="weather_music">Wetter Musik</string>
+    <string name="donate_us">Spenden Sie uns</string>
+    <string name="cancel">Abbrechen</string>
+    <string name="search_your_city">Suche deine Stadt</string>
+    <string name="add_remove_button">Hinzufügen/Entfernen Schaltfläche</string>
+    <string name="country">Land</string>
+    <string name="city">Stadt</string>
+    <string name="no_locations_found">Keine Orte gefunden</string>
+    <string name="loading">Lädt…</string>
+    <string name="something_went_wrong">Etwas ist schief gelaufen!</string>
+    <string name="spanish">Spanisch</string>
+    <string name="english">Englisch</string>
+    <string name="french">Französisch</string>
+    <string name="german">Deutsch</string>
+    <string name="country_flag">Länderflagge</string>
+</resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
new file mode 100644
index 0000000..eca6fc0
--- /dev/null
+++ b/app/src/main/res/values-es/strings.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Weathernaut</string>
+
+    <string name="api_fetching_error">¡Algo salió mal!\nNo te preocupes, no eres tú, somos nosotros. Inténtalo más tarde.</string>
+    <string name="no_internet">Sin conexión a Internet</string>
+    <string name="search_cities_button">Botón de búsqueda de ciudades</string>
+    <string name="app_settings_button">Botón de configuración de la aplicación</string>
+    <string name="atmospheric_pressure_icon">Icono de presión atmosférica</string>
+    <string name="back_button">Botón de retroceso</string>
+    <string name="next_7_days">Próximos 7 días</string>
+    <string name="tomorrow">Mañana</string>
+    <string name="weather_icon">Icono del clima</string>
+    <!-- Preference Titles -->
+    <string name="messages_header">Mensajes</string>
+    <string name="sync_header">Sincronización</string>
+
+    <!-- Messages Preferences -->
+    <string name="signature_title">Tu firma</string>
+    <string name="reply_title">Acción de respuesta predeterminada</string>
+
+    <!-- Sync Preferences -->
+    <string name="sync_title">Sincronizar correo periódicamente</string>
+    <string name="attachment_title">Descargar archivos adjuntos entrantes</string>
+    <string name="attachment_summary_on">Descargar automáticamente los archivos adjuntos de los correos entrantes</string>
+    <string name="attachment_summary_off">Descargar archivos adjuntos solo cuando se solicite manualmente</string>
+    <string name="hello_blank_fragment">Hola fragmento en blanco</string>
+    <string name="pressure">Presión</string>
+    <string name="wind_speed">Velocidad del viento</string>
+    <string name="humidity">Humedad</string>
+    <string name="today">Hoy</string>
+    <string name="sunset_icon">Icono de puesta de sol</string>
+    <string name="sunrise_icon">Icono de salida de sol</string>
+    <string name="settings">Configuraciones</string>
+    <string name="units">Unidades</string>
+    <string name="language">Idioma</string>
+    <string name="temperature_units">Unidades de temperatura</string>
+    <string name="celsius">°C</string>
+    <string name="fahrenheit">°F</string>
+    <string name="wind_speed_units">Unidades de velocidad del viento</string>
+    <string name="hpa">hPa</string>
+    <string name="atm">atm</string>
+    <string name="atmospheric_pressure_units">Unidades de presión atmosférica</string>
+    <string name="meters_per_second">m/s</string>
+    <string name="kilometers_per_hour">km/h</string>
+    <string name="miles_per_hour">mph</string>
+    <string name="weather_music_desc">Música según el clima.</string>
+    <string name="about_weathernaut">Acerca de Weathernaut</string>
+    <string name="feedback">Comentarios</string>
+    <string name="privacy_policy">Política de privacidad</string>
+    <string name="credits">Créditos</string>
+    <string name="other_settings">Otras configuraciones</string>
+    <string name="weather_music">Música del clima</string>
+    <string name="donate_us">Donar</string>
+    <string name="cancel">Cancelar</string>
+    <string name="search_your_city">Busca tu ciudad</string>
+    <string name="add_remove_button">Botón de agregar/quitar</string>
+    <string name="country">País</string>
+    <string name="city">Ciudad</string>
+    <string name="no_locations_found">No se encontraron ubicaciones</string>
+    <string name="loading">Cargando…</string>
+    <string name="something_went_wrong">¡Algo salió mal!</string>
+    <string name="spanish">Español</string>
+    <string name="english">Inglés</string>
+    <string name="french">Francés</string>
+    <string name="german">Alemán</string>
+    <string name="country_flag">country_flag</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
new file mode 100644
index 0000000..5a17d99
--- /dev/null
+++ b/app/src/main/res/values-fr/strings.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Weathernaut</string>
+
+    <string name="api_fetching_error">Quelque chose a mal tourné !\nNe vous inquiétez pas, ce n\'est pas de votre faute, c\'est nous. Essayez plus tard.</string>
+    <string name="no_internet">Pas de connexion Internet</string>
+    <string name="search_cities_button">Bouton de recherche de villes</string>
+    <string name="app_settings_button">Bouton des paramètres de l\'application</string>
+    <string name="atmospheric_pressure_icon">Icône de pression atmosphérique</string>
+    <string name="back_button">Bouton de retour</string>
+    <string name="next_7_days">Prochaines 7 jours</string>
+    <string name="tomorrow">Demain</string>
+    <string name="weather_icon">Icône météo</string>
+    <!-- Preference Titles -->
+    <string name="messages_header">Messages</string>
+    <string name="sync_header">Synchroniser</string>
+
+    <!-- Messages Preferences -->
+    <string name="signature_title">Votre signature</string>
+    <string name="reply_title">Action de réponse par défaut</string>
+
+    <!-- Sync Preferences -->
+    <string name="sync_title">Synchroniser les e-mails périodiquement</string>
+    <string name="attachment_title">Télécharger les pièces jointes entrantes</string>
+    <string name="attachment_summary_on">Télécharger automatiquement les pièces jointes pour les e-mails entrants</string>
+    <string name="attachment_summary_off">Télécharger uniquement les pièces jointes sur demande</string>
+    <string name="hello_blank_fragment">Bonjour fragment vide</string>
+    <string name="pressure">Pression</string>
+    <string name="wind_speed">Vitesse du vent</string>
+    <string name="humidity">Humidité</string>
+    <string name="today">Aujourd\'hui</string>
+    <string name="sunset_icon">Icône de coucher de soleil</string>
+    <string name="sunrise_icon">Icône de lever de soleil</string>
+    <string name="settings">Paramètres</string>
+    <string name="units">Unités</string>
+    <string name="language">Langue</string>
+    <string name="temperature_units">Unités de température</string>
+    <string name="celsius">°C</string>
+    <string name="fahrenheit">°F</string>
+    <string name="wind_speed_units">Unités de vitesse du vent</string>
+    <string name="hpa">hPa</string>
+    <string name="atm">atm</string>
+    <string name="atmospheric_pressure_units">Unités de pression atmosphérique</string>
+    <string name="meters_per_second">m/s</string>
+    <string name="kilometers_per_hour">km/h</string>
+    <string name="miles_per_hour">mph</string>
+    <string name="weather_music_desc">Musique selon la météo.</string>
+    <string name="about_weathernaut">À propos de Weathernaut</string>
+    <string name="feedback">Retour d\'information</string>
+    <string name="privacy_policy">Politique de confidentialité</string>
+    <string name="credits">Crédits</string>
+    <string name="other_settings">Autres paramètres</string>
+    <string name="weather_music">Musique météo</string>
+    <string name="donate_us">Faites-nous un don</string>
+    <string name="cancel">Annuler</string>
+    <string name="search_your_city">Recherchez votre ville</string>
+    <string name="add_remove_button">bouton ajouter/supprimer</string>
+    <string name="country">Pays</string>
+    <string name="city">Ville</string>
+    <string name="no_locations_found">Aucun emplacement trouvé</string>
+    <string name="loading">Chargement…</string>
+    <string name="something_went_wrong">Quelque chose a mal tourné !</string>
+    <string name="spanish">Espagnol</string>
+    <string name="english">Anglais</string>
+    <string name="french">Français</string>
+    <string name="german">Allemand</string>
+    <string name="country_flag">drapeau_du_pays</string>
+</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8c45fef..56370eb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -33,6 +33,7 @@
     <string name="sunrise_icon">Sunrise icon</string>
     <string name="settings">Settings</string>
     <string name="units">Units</string>
+    <string name="language">Language</string>
     <string name="temperature_units">Temperature units</string>
     <string name="celsius">°C</string>
     <string name="fahrenheit">°F</string>
@@ -59,4 +60,9 @@
     <string name="no_locations_found">No locations found</string>
     <string name="loading">Loading…</string>
     <string name="something_went_wrong">Something went wrong!</string>
+    <string name="spanish">Spanish</string>
+    <string name="english">English</string>
+    <string name="french">French</string>
+    <string name="german">German</string>
+    <string name="country_flag">country_flag</string>
 </resources>
\ No newline at end of file

From d2f2f7023d6cb29a01e59fdcb972e24dd07d1ecc Mon Sep 17 00:00:00 2001
From: singhDevs <heysinghg1@gmail.com>
Date: Fri, 4 Oct 2024 00:56:15 +0530
Subject: [PATCH 2/2] update: added shared preferences for language & defined a
 function for spinner language

---
 .../me/tangobee/weathernaut/MainActivity.kt   | 11 +++-
 .../weathernaut/ui/SettingsFragment.kt        | 64 +++++++++----------
 .../weathernaut/utils/LanguageHelper.kt       | 20 ++++++
 .../utils/SharedPreferencesHelper.kt          | 15 +++++
 .../weathernaut/utils/UnitsCalculator.kt      |  4 +-
 5 files changed, 80 insertions(+), 34 deletions(-)
 create mode 100644 app/src/main/java/me/tangobee/weathernaut/utils/LanguageHelper.kt

diff --git a/app/src/main/java/me/tangobee/weathernaut/MainActivity.kt b/app/src/main/java/me/tangobee/weathernaut/MainActivity.kt
index 313dded..057461e 100644
--- a/app/src/main/java/me/tangobee/weathernaut/MainActivity.kt
+++ b/app/src/main/java/me/tangobee/weathernaut/MainActivity.kt
@@ -17,6 +17,7 @@ import me.tangobee.weathernaut.data.repository.WeatherRepository
 import me.tangobee.weathernaut.databinding.ActivityMainBinding
 import me.tangobee.weathernaut.models.WeatherData.WeatherData
 import me.tangobee.weathernaut.services.WeatherMusicService
+import me.tangobee.weathernaut.utils.LanguageHelper.setLocale
 import me.tangobee.weathernaut.utils.SharedPreferencesHelper
 import me.tangobee.weathernaut.utils.WeatherHelper
 import me.tangobee.weathernaut.viewmodels.WeatherViewModel
@@ -24,6 +25,7 @@ import me.tangobee.weathernaut.viewmodels.WeatherViewModelFactory
 import java.net.UnknownHostException
 import kotlin.system.exitProcess
 
+
 class MainActivity : AppCompatActivity() {
 
     private lateinit var binding: ActivityMainBinding
@@ -40,7 +42,8 @@ class MainActivity : AppCompatActivity() {
         binding = ActivityMainBinding.inflate(layoutInflater)
 
         sharedPreferencesHelper = SharedPreferencesHelper(this)
-
+        setLanguage()
+        
         val noInternetLiveData : MutableLiveData<Boolean> =  MutableLiveData(false)
 
         coroutineExceptionHandler = CoroutineExceptionHandler{_, throwable ->
@@ -69,6 +72,12 @@ class MainActivity : AppCompatActivity() {
         setContentView(binding.root)
     }
 
+    private fun setLanguage() {
+        val language = sharedPreferencesHelper.getLanguagePreference()
+        setLocale(this@MainActivity, language, resources)
+        Log.d("Weathernaut", "Language set to: $language")
+    }
+
     private fun fetchData() {
         val weatherService = RetrofitHelper.getInstance().create(WeatherService::class.java)
         val weatherRepository = WeatherRepository(weatherService)
diff --git a/app/src/main/java/me/tangobee/weathernaut/ui/SettingsFragment.kt b/app/src/main/java/me/tangobee/weathernaut/ui/SettingsFragment.kt
index 4274e79..384635f 100644
--- a/app/src/main/java/me/tangobee/weathernaut/ui/SettingsFragment.kt
+++ b/app/src/main/java/me/tangobee/weathernaut/ui/SettingsFragment.kt
@@ -1,7 +1,6 @@
 package me.tangobee.weathernaut.ui
 
 import android.annotation.SuppressLint
-import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
@@ -21,10 +20,11 @@ import me.tangobee.weathernaut.databinding.FragmentSettingsBinding
 import me.tangobee.weathernaut.models.SettingsModel
 import me.tangobee.weathernaut.models.WeatherData.WeatherData
 import me.tangobee.weathernaut.services.WeatherMusicService
+import me.tangobee.weathernaut.utils.LanguageHelper.changeLanguage
+import me.tangobee.weathernaut.utils.LanguageHelper.setLocale
 import me.tangobee.weathernaut.utils.SharedPreferencesHelper
 import me.tangobee.weathernaut.utils.WeatherHelper
 import me.tangobee.weathernaut.viewmodels.WeatherViewModel
-import java.util.Locale
 
 class SettingsFragment : Fragment() {
 
@@ -75,24 +75,7 @@ class SettingsFragment : Fragment() {
         binding.language.setOnClickListener {showLanguagePopup(binding.languageSpinner)}
         binding.language.apply {
             val lang = context.resources.configuration.locale.language
-            when(lang){
-                "en" -> {
-                    binding.languageSpinner.text = "English"
-                    binding.flagIcon.setImageResource(R.drawable.country_flag_uk)
-                }
-                "es" -> {
-                    binding.languageSpinner.text = "Español"
-                    binding.flagIcon.setImageResource(R.drawable.country_flag_es)
-                }
-                "fr" -> {
-                    binding.languageSpinner.text = "Français"
-                    binding.flagIcon.setImageResource(R.drawable.country_flag_fr)
-                }
-                "de" -> {
-                    binding.languageSpinner.text = "Deutsch"
-                    binding.flagIcon.setImageResource(R.drawable.country_flag_de)
-                }
-            }
+            setUpLangSpinner(lang)
         }
 
         binding.backButton.setOnClickListener {
@@ -131,6 +114,27 @@ class SettingsFragment : Fragment() {
         }
     }
 
+    private fun setUpLangSpinner(lang: String) {
+        when(lang){
+            "en" -> {
+                binding.languageSpinner.text = resources.getString(R.string.english)
+                binding.flagIcon.setImageResource(R.drawable.country_flag_uk)
+            }
+            "es" -> {
+                binding.languageSpinner.text = resources.getString(R.string.spanish)
+                binding.flagIcon.setImageResource(R.drawable.country_flag_es)
+            }
+            "fr" -> {
+                binding.languageSpinner.text = resources.getString(R.string.french)
+                binding.flagIcon.setImageResource(R.drawable.country_flag_fr)
+            }
+            "de" -> {
+                binding.languageSpinner.text = resources.getString(R.string.german)
+                binding.flagIcon.setImageResource(R.drawable.country_flag_de)
+            }
+        }
+    }
+
     private fun setSettingsUIDate() {
         binding.temperatureSpinner.text = UnitsMapper.getShorthandUnit(settingsModel.tempUnit)
         binding.windSpeedSpinner.text = UnitsMapper.getShorthandUnit(settingsModel.windSpeedUnit)
@@ -279,25 +283,29 @@ class SettingsFragment : Fragment() {
         popup.setOnMenuItemClickListener { item: MenuItem? ->
             when (item!!.itemId) {
                 R.id.english -> {
-                    setLocale(requireContext(),"en")
+                    setLocale(requireContext(),"en", resources)
+                    changeLanguage(sharedPreferencesHelper, "en")
                     binding.languageSpinner.text = item.title
                     binding.flagIcon.setImageResource(R.drawable.country_flag_uk)
                     requireActivity().onBackPressedDispatcher.onBackPressed()
                 }
                 R.id.spanish -> {
-                    setLocale(requireContext(),"es")
+                    setLocale(requireContext(),"es", resources)
+                    changeLanguage(sharedPreferencesHelper, "es")
                     binding.languageSpinner.text = item.title
                     binding.flagIcon.setImageResource(R.drawable.country_flag_es)
                     requireActivity().onBackPressedDispatcher.onBackPressed()
                 }
                 R.id.french -> {
-                    setLocale(requireContext(),"fr")
+                    setLocale(requireContext(),"fr", resources)
+                    changeLanguage(sharedPreferencesHelper, "fr")
                     binding.languageSpinner.text = item.title
                     binding.flagIcon.setImageResource(R.drawable.country_flag_fr)
                     requireActivity().onBackPressedDispatcher.onBackPressed()
                 }
                 R.id.german -> {
-                    setLocale(requireContext(),"de")
+                    setLocale(requireContext(),"de", resources)
+                    changeLanguage(sharedPreferencesHelper, "de")
                     binding.languageSpinner.text = item.title
                     binding.flagIcon.setImageResource(R.drawable.country_flag_de)
                     requireActivity().onBackPressedDispatcher.onBackPressed()
@@ -322,14 +330,6 @@ class SettingsFragment : Fragment() {
         mainContainerView.background = ContextCompat.getDrawable(requireContext(), R.drawable.home_background)
     }
 
-    private fun setLocale(context: Context, languageCode: String) {
-        val locale = Locale(languageCode)
-        Locale.setDefault(locale)
 
-        val config = resources.configuration
-        config.setLocale(locale)
-//        context.createConfigurationContext(config)
-        context.resources.updateConfiguration(config, resources.displayMetrics)
-    }
 }
 
diff --git a/app/src/main/java/me/tangobee/weathernaut/utils/LanguageHelper.kt b/app/src/main/java/me/tangobee/weathernaut/utils/LanguageHelper.kt
new file mode 100644
index 0000000..3caea1e
--- /dev/null
+++ b/app/src/main/java/me/tangobee/weathernaut/utils/LanguageHelper.kt
@@ -0,0 +1,20 @@
+package me.tangobee.weathernaut.utils
+
+import android.content.Context
+import android.content.res.Resources
+import java.util.Locale
+
+object LanguageHelper {
+    fun setLocale(context: Context, languageCode: String, resources: Resources) {
+        val locale = Locale(languageCode)
+        Locale.setDefault(locale)
+
+        val config = resources.configuration
+        config.setLocale(locale)
+        context.resources.updateConfiguration(config, resources.displayMetrics)
+    }
+
+    fun changeLanguage(sharedPreferencesHelper: SharedPreferencesHelper, language: String){
+        sharedPreferencesHelper.saveLanguagePreference(language)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/me/tangobee/weathernaut/utils/SharedPreferencesHelper.kt b/app/src/main/java/me/tangobee/weathernaut/utils/SharedPreferencesHelper.kt
index 682ab81..aaee632 100644
--- a/app/src/main/java/me/tangobee/weathernaut/utils/SharedPreferencesHelper.kt
+++ b/app/src/main/java/me/tangobee/weathernaut/utils/SharedPreferencesHelper.kt
@@ -11,6 +11,7 @@ class SharedPreferencesHelper(context: Context) {
         private const val PREFS_NAME = "WeathernautPrefs"
         private const val SETTINGS_KEY = "SettingsKey"
         private const val GEOCODING_KEY = "GeocodingKey"
+        private const val LANGUAGE_PREF = "LanguagePreference"
     }
 
     private val sharedPreferences: SharedPreferences = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
@@ -51,5 +52,19 @@ class SharedPreferencesHelper(context: Context) {
             null
         }
     }
+
+    fun saveLanguagePreference(language: String) {
+        val languageJson = gson.toJson(language)
+        sharedPreferences.edit().putString(LANGUAGE_PREF, languageJson).apply()
+    }
+
+    fun getLanguagePreference(): String {
+        val languageJson = sharedPreferences.getString(LANGUAGE_PREF, null)
+        return if(languageJson != null){
+            gson.fromJson(languageJson, String::class.java)
+        } else{
+            "en"
+        }
+    }
 }
 
diff --git a/app/src/main/java/me/tangobee/weathernaut/utils/UnitsCalculator.kt b/app/src/main/java/me/tangobee/weathernaut/utils/UnitsCalculator.kt
index 1762c74..f4bdcec 100644
--- a/app/src/main/java/me/tangobee/weathernaut/utils/UnitsCalculator.kt
+++ b/app/src/main/java/me/tangobee/weathernaut/utils/UnitsCalculator.kt
@@ -1,5 +1,7 @@
 package me.tangobee.weathernaut.utils
 
+import java.util.Locale
+
 class UnitConverter {
 
     fun convertTemperature(value: Double, fromUnit: String, toUnit: String): Double {
@@ -37,6 +39,6 @@ class UnitConverter {
     }
 
     private fun Double.formatToTwoDecimalPlaces(): Double {
-        return String.format("%.2f", this).toDouble()
+        return String.format(Locale.US, "%.2f", this).toDouble()
     }
 }