Merge pull request #197 from corenting/feat/add-kor

feat: add south korea

Author: corenting

.github/FUNDING.yml

@@ -1,2 +1 @@
-ko_fi: corenting
-custom: ["https://www.buymeacoffee.com/corenting"]
+custom: ["https://corenting.fr/donate"]

README.md

@@ -9,11 +9,14 @@ It supports the following countries :
 - USA (from 1913 to 2022)
 - UK (from 1800 to 2022)
 - France (from 1901 to 2022)
+- South Korea (from 1965 to 2022)
 
 ## Data sources
-- France: INSEE, https://www.insee.fr/fr/statistiques/serie/010605954
+
 - USA: Bureau of Labor Statistics (Historical CPI-U), https://www.bls.gov/cpi/
 - UK: Office for National Statistics, https://www.ons.gov.uk/economy/inflationandpriceindices/timeseries/cdko/mm23
+- France: INSEE, https://www.insee.fr/fr/statistiques/serie/010605954
+- South Korea:  Statistics Korea (Consumer Price Inflation Rate - 소비자물가상승률), https://www.index.go.kr/unity/potal/indicator/PotalIdxSearch.do?idxCd=4226&sttsCd=422601&clas_div=&idx_sys_cd=
 
 ## Download
 
@@ -23,6 +26,4 @@ It supports the following countries :
 
 ## Donations
 
-If you wish to support the app, donations are possible on the following platforms:
-- [ko-fi](https://ko-fi.com/corenting)
-- [buymeacoffee](https://www.buymeacoffee.com/corenting)
+If you wish to support the app, donations are possible [here](https://corenting.fr/donate).

app/build.gradle

@@ -9,13 +9,18 @@ android {
         applicationId "fr.corenting.convertisseureurofranc"
         minSdkVersion 17
         targetSdkVersion 34
-        versionCode 23
-        versionName "2.14"
+        versionCode 24
+        versionName "2.15"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
+        jvmTarget = JavaVersion.VERSION_17.toString()
     }
 
     testOptions {
@@ -51,7 +56,7 @@ dependencies {
     // Tests
     testImplementation 'androidx.test:core-ktx:1.5.0'
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.mockito:mockito-core:5.4.0'
+    testImplementation 'org.mockito:mockito-core:5.5.0'
     testImplementation "org.robolectric:robolectric:4.10.3"
 }
 

app/src/main/java/fr/corenting/convertisseureurofranc/ConverterActivity.kt

@@ -12,6 +12,7 @@ import androidx.appcompat.widget.Toolbar
 import androidx.core.widget.doOnTextChanged
 import fr.corenting.convertisseureurofranc.converters.ConverterAbstract
 import fr.corenting.convertisseureurofranc.converters.FranceConverter
+import fr.corenting.convertisseureurofranc.converters.SouthKoreaConverter
 import fr.corenting.convertisseureurofranc.converters.UKConverter
 import fr.corenting.convertisseureurofranc.converters.USAConverter
 import fr.corenting.convertisseureurofranc.databinding.ActivityConverterBinding
@@ -25,6 +26,7 @@ class ConverterActivity : AppCompatActivity() {
         USAConverter::class.java to 0,
         UKConverter::class.java to 1,
         FranceConverter::class.java to 2,
+        SouthKoreaConverter::class.java to 3,
     )
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -47,7 +49,8 @@ class ConverterActivity : AppCompatActivity() {
         val currenciesList = listOf(
             getString(R.string.usa_currencies),
             getString(R.string.uk_currencies),
-            getString(R.string.france_currencies)
+            getString(R.string.france_currencies),
+            getString(R.string.south_korea_currencies)
         )
 
         // Sum input

app/src/main/java/fr/corenting/convertisseureurofranc/converters/SouthKoreaConverter.kt

@@ -0,0 +1,19 @@
+package fr.corenting.convertisseureurofranc.converters
+
+import android.content.Context
+
+import fr.corenting.convertisseureurofranc.R
+
+class SouthKoreaConverter(context: Context) : ConverterAbstract(context, R.raw.kr_values) {
+
+    override fun convertFunction(yearOfOrigin: Int, yearOfResult: Int, amount: Float): Float {
+        if (yearOfOrigin == yearOfResult) return amount
+
+        val multiplier = getValueForYear(yearOfResult) / getValueForYear(yearOfOrigin)
+        return amount * multiplier
+    }
+
+    override fun getCurrencyFromYear(year: Int): String {
+        return context.getString(R.string.wons)
+    }
+}

app/src/main/java/fr/corenting/convertisseureurofranc/utils/Utils.kt

@@ -6,6 +6,7 @@ import android.view.inputmethod.InputMethodManager
 import androidx.core.os.ConfigurationCompat
 import fr.corenting.convertisseureurofranc.converters.ConverterAbstract
 import fr.corenting.convertisseureurofranc.converters.FranceConverter
+import fr.corenting.convertisseureurofranc.converters.SouthKoreaConverter
 import fr.corenting.convertisseureurofranc.converters.UKConverter
 import fr.corenting.convertisseureurofranc.converters.USAConverter
 import java.text.DecimalFormat
@@ -25,6 +26,14 @@ object Utils {
                 UKConverter(context)
             }
 
+            Locale.US -> {
+                USAConverter(context)
+            }
+
+            Locale.KOREA -> {
+                SouthKoreaConverter(context)
+            }
+
             else -> {
                 USAConverter(context)
             }

app/src/main/res/raw/kr_values.csv

@@ -0,0 +1,58 @@
+2022;107.7
+2021;102.5
+2020;100.0
+2019;99.5
+2018;99.1
+2017;97.6
+2016;95.8
+2015;94.9
+2014;94.2
+2013;93.0
+2012;91.8
+2011;89.9
+2010;86.4
+2009;83.9
+2008;81.7
+2007;78.0
+2006;76.1
+2005;74.4
+2004;72.4
+2003;69.9
+2002;67.5
+2001;65.7
+2000;63.2
+1999;61.8
+1998;61.3
+1997;57.0
+1996;54.6
+1995;52.0
+1994;49.8
+1993;46.8
+1992;44.7
+1991;42.1
+1990;38.5
+1989;35.4
+1988;33.5
+1987;31.3
+1986;30.4
+1985;29.6
+1984;28.8
+1983;28.2
+1982;27.3
+1981;25.4
+1980;21.0
+1979;16.3
+1978;13.8
+1977;12.0
+1976;10.9
+1975;9.5
+1974;7.6
+1973;6.1
+1972;5.9
+1971;5.3
+1970;4.7
+1969;4.0
+1968;3.6
+1967;3.2
+1966;2.9
+1965;2.6

app/src/main/res/values-fr/strings.xml

@@ -14,7 +14,9 @@
     <string name="francs">francs</string>
     <string name="oldFrancs">anciens francs</string>
     <string name="dollars">dollars</string>
+    <string name="wons">wons</string>
     <string name="currency">Devise</string>
+    <string name="south_korea_currencies">Wons (Corée du Sud)</string>
     <string name="no_amount_entered">Aucun montant entré</string>
     <string name="usa_currencies">Dollars US (USA)</string>
     <string name="france_currencies">Euros et Francs (France)</string>

app/src/main/res/values/strings.xml

@@ -14,10 +14,12 @@
     <string name="oldFrancs">old francs</string>
     <string name="dollars">dollars</string>
     <string name="pounds_sterling">pounds sterling</string>
+    <string name="wons">wons</string>
     <string name="currency">Currency</string>
     <string name="france_currencies">Euros and Francs (France)</string>
     <string name="usa_currencies">US Dollars (USA)</string>
     <string name="uk_currencies">Pounds sterling (UK)</string>
+    <string name="south_korea_currencies">Wons (South Korea)</string>
     <string name="no_amount_entered">No amount entered</string>
     <string name="theme">Theme</string>
     <string name="theme_light">Light</string>

build.gradle

@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.8.22'
+    ext.kotlin_version = '1.9.10'
     repositories {
         google()
         mavenCentral()