From 6a4929170857ebeaae9da777596128fa17267c7f Mon Sep 17 00:00:00 2001 From: ritwikshanker Date: Fri, 13 May 2022 11:59:51 +0200 Subject: [PATCH 01/12] Updated Gradle to 7.2.0 --- app/build.gradle | 1 + app/src/main/AndroidManifest.xml | 3 +-- build.gradle | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index fc4b3ea..180b540 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -35,6 +35,7 @@ android { lint { abortOnError false } + namespace 'com.example.gocoronago' } dependencies { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8a49dec..37149e1 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + diff --git a/build.gradle b/build.gradle index cdd34e6..5552b4d 100644 --- a/build.gradle +++ b/build.gradle @@ -1,14 +1,14 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { ext.kotlin_version = "1.5.30" - ext.android_plugin_version = '7.1.2' + ext.android_plugin_version = '7.2.0' repositories { google() jcenter() } dependencies { classpath "com.android.tools.build:gradle:$android_plugin_version" - classpath 'com.android.tools.build:gradle:7.1.2' + classpath 'com.android.tools.build:gradle:7.2.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5b55f1f..1e0e75e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip From a3784550cf8e4a5add796a8055a727f816f2e071 Mon Sep 17 00:00:00 2001 From: ritwikshanker Date: Sun, 16 Oct 2022 13:47:28 +0200 Subject: [PATCH 02/12] Updated gradle to 7.3.1 --- build.gradle | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 5552b4d..732ed90 100644 --- a/build.gradle +++ b/build.gradle @@ -1,14 +1,14 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { ext.kotlin_version = "1.5.30" - ext.android_plugin_version = '7.2.0' + ext.android_plugin_version = '7.3.1' repositories { google() jcenter() } dependencies { classpath "com.android.tools.build:gradle:$android_plugin_version" - classpath 'com.android.tools.build:gradle:7.2.0' + classpath 'com.android.tools.build:gradle:7.3.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1e0e75e..1350606 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip From bf1a83036d00b039f461fd08e9e2ca1773db0fe5 Mon Sep 17 00:00:00 2001 From: ritwikshanker Date: Sun, 16 Oct 2022 13:57:24 +0200 Subject: [PATCH 03/12] Updated kotlin too 1.7.20 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 732ed90..f16ff6d 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = "1.5.30" + ext.kotlin_version = "1.7.20" ext.android_plugin_version = '7.3.1' repositories { google() From e8f558749cc961e6bbbd67529dcfe431a082a030 Mon Sep 17 00:00:00 2001 From: AnanyaShanker <97778377+AnanyaShanker@users.noreply.github.com> Date: Sun, 16 Oct 2022 17:36:29 +0530 Subject: [PATCH 04/12] added German strings. --- app/src/main/res/values-de/strings.xml | 45 ++++++++++++++++++++++++-- 1 file changed, 43 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index a6b3dae..735cbfb 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -1,2 +1,43 @@ - - \ No newline at end of file + + + + Weltweiter Corona Tracker + Suche + Dunkel + Hell + + Total Cases Worldwide + Gesamtheit der weltweit geheilten Fälle + Gesamtzahl der Todesfälle weltweit + + Gesamtanzahl bestätigter Fälle + Gesamtanzahl der geheilten Fälle\n%d + Gesamttodesfälle\n%d + Weltweit + Land auswählen + Nichts ausgewählt + Spinner 2 Position: %d und Sprache: %s + Ausgewähltes Land: %s + + + Über uns + GoCoronaGo + Version + Mitwirkende + + Wiederholung + Oops! Etwas ist schief gelaufen :( + + + + Zuhause bleiben Tipps + Mund und Nase mit einer Maske bedecken. + Bleiben Sie zu Hause und gehen Sie nicht aus, wenn es nicht sehr wichtig ist. + Decken Sie Nase und Mund mit dem angewinkelten Ellbogen oder einem Taschentuch ab, wenn Sie husten oder niesen. + Waschen Sie sich häufig die Hände. Verwenden Sie Wasser und Seife oder ein alkoholhaltiges Handreinigungsmittel. + Halten Sie, wann immer möglich, einen sicheren Abstand zu anderen Menschen. + Bleiben Sie in Kontakt mit Ihren Lieben, damit sich niemand in diesen schweren Zeiten allein fühlt. + + + + From 2e46c38b45fd66f06c7e19607dbf32b1f5446ff9 Mon Sep 17 00:00:00 2001 From: AnanyaShanker <97778377+AnanyaShanker@users.noreply.github.com> Date: Sun, 16 Oct 2022 17:39:46 +0530 Subject: [PATCH 05/12] added Dutch strings. --- app/src/main/res/values-nl/strings.xml | 45 ++++++++++++++++++++++++-- 1 file changed, 43 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index a6b3dae..d74dbad 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -1,2 +1,43 @@ - - \ No newline at end of file + + + + Worldwide Corona Tracker + Zoek + Dark + Light + + Totaal aantal gevallen wereldwijd + Totaal genezen wereldwijd + Totaal aantal sterfgevallen wereldwijd + + Totaal bevestigde gevallen wereldwijd + Totaal genezen gevallenn%d + Totaal aantal sterfgevallen + Worldwide + Selecteer land + Niets geselecteerd + Spinner 2 Positie: %d en taal: %s + Land geselecteerd: %s + + + Over ons + GoCoronaGo + Version + Contributors + + Retry + Oeps! Er is iets fout gegaan :( + + + + Stay Home Tips + Mond en neus bedekken met masker. + Blijf thuis en vermijd uitgaan tenzij het heel belangrijk is. + bedek je neus en mond met je gebogen elleboog of een tissue als je hoest of niest. + Schoon uw handen vaak. Gebruik water en zeep of een handmelk op alcoholbasis. + Blijf waar mogelijk op veilige afstand van mensen. + Blijf in contact met je dierbaren zodat niemand zich alleen voelt in deze moeilijke tijden. + + + + From 5de448d4d63b6ed57d4cb9396a549328b96ba4dd Mon Sep 17 00:00:00 2001 From: AnanyaShanker <97778377+AnanyaShanker@users.noreply.github.com> Date: Sun, 16 Oct 2022 17:48:12 +0530 Subject: [PATCH 06/12] added Chinese strings. --- app/src/main/res/values-zh/strings.xml | 44 ++++++++++++++++++++++++-- 1 file changed, 42 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index a6b3dae..07e848e 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -1,2 +1,42 @@ - - \ No newline at end of file + + + <！--主--> + Worldwide Corona Tracker + 搜索 + Dark + Light + + Total Cases Worldwide + 世界范围内的治愈总数 + 世界范围内的死亡总数 + + Total Confirmed Cases\n%d + Total Cured Cases\n%d + Total Deaths/n%d + Worldwide + 选择国家 + 没有选择 + Spinner 2 Position: %d and language: %s + 选择的国家: %s + + + 关于我们 + GoCoronaGo + 版本 + Contributors + + 重试 + Oops! 出错了 : + + + + 呆在家里的提示 + 用口罩遮住嘴巴和鼻子。 + 呆在家里，除非有非常重要的事情，否则不要外出。 + 当你咳嗽或打喷嚏时，用弯曲的肘部或纸巾遮住你的鼻子和嘴巴。 + 经常清洁你的双手。使用肥皂和水，或使用以酒精为基础的擦手液。 + 尽可能地与人保持安全距离。 + 与你的亲人保持联系，这样就不会有人在这些艰难的时刻感到孤独。 + + + From 0ac6edc35c2d8ab0ddf8c4e9e4fa1a0281ee927b Mon Sep 17 00:00:00 2001 From: ritwikshanker Date: Sun, 16 Oct 2022 14:24:30 +0200 Subject: [PATCH 07/12] Updated various libraries --- app/build.gradle | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 180b540..21d5159 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -43,15 +43,15 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" implementation 'com.airbnb.android:lottie:3.4.4' kapt "com.android.databinding:compiler:$android_plugin_version" - implementation 'androidx.core:core-ktx:1.6.0' - implementation 'com.google.code.gson:gson:2.8.6' + implementation 'androidx.core:core-ktx:1.9.0' + implementation 'com.google.code.gson:gson:2.8.7' implementation 'com.squareup.retrofit2:retrofit:2.9.0' implementation "com.squareup.retrofit2:converter-gson:2.9.0" - implementation 'androidx.appcompat:appcompat:1.3.1' - implementation 'androidx.constraintlayout:constraintlayout:2.1.1' + implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' - implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1' - implementation 'com.google.android.material:material:1.4.0' + implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1' + implementation 'com.google.android.material:material:1.6.1' implementation 'com.toptoche.searchablespinner:searchablespinnerlibrary:1.3.1' testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.3' From d4ac5265fde47c7a03e437abf7a3dd1401f125fe Mon Sep 17 00:00:00 2001 From: ritwikshanker Date: Sun, 16 Oct 2022 14:25:26 +0200 Subject: [PATCH 08/12] Changed Jcenter to mavenCentral --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index f16ff6d..3ae4a48 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { ext.android_plugin_version = '7.3.1' repositories { google() - jcenter() + mavenCentral() } dependencies { classpath "com.android.tools.build:gradle:$android_plugin_version" @@ -19,7 +19,7 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() } } From 73910c47cb76ef636c903b8a5d6e92eb4a17d90b Mon Sep 17 00:00:00 2001 From: ritwikshanker Date: Sun, 16 Oct 2022 14:31:02 +0200 Subject: [PATCH 09/12] Updated dev/target-sdk to 32 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 21d5159..889d787 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,7 +4,7 @@ apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-kapt' android { - compileSdkVersion 31 + compileSdkVersion 32 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 @@ -16,7 +16,7 @@ android { defaultConfig { applicationId "com.gocoronago.tracker" minSdkVersion 19 - targetSdkVersion 31 + targetSdkVersion 32 versionCode 40200 versionName "4.2.0" From 61df3aea035be726d3964db1238e6a3bfe387f58 Mon Sep 17 00:00:00 2001 From: ritwikshanker Date: Sun, 16 Oct 2022 14:36:52 +0200 Subject: [PATCH 10/12] Fixed build issues after updating sdk --- .../ui/main/MainViewModelFactory.kt | 2 +- app/src/main/res/values-fr/strings.xml | 11 ++++---- app/src/main/res/values-zh/strings.xml | 28 +++++++++---------- build.gradle | 2 ++ 4 files changed, 22 insertions(+), 21 deletions(-) diff --git a/app/src/main/java/com/example/gocoronago/ui/main/MainViewModelFactory.kt b/app/src/main/java/com/example/gocoronago/ui/main/MainViewModelFactory.kt index 77bcdf9..41aa60d 100644 --- a/app/src/main/java/com/example/gocoronago/ui/main/MainViewModelFactory.kt +++ b/app/src/main/java/com/example/gocoronago/ui/main/MainViewModelFactory.kt @@ -6,7 +6,7 @@ import androidx.lifecycle.ViewModelProvider class MainViewModelFactory : ViewModelProvider.NewInstanceFactory() { - override fun create(modelClass: Class): T { + override fun create(modelClass: Class): T { return MainViewModel() as T } } \ 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 index 2085b55..4d4f6ca 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -1,6 +1,6 @@ -
- Principales --> + Suiveur de Corona mondial Recherche Foncé @@ -11,8 +11,7 @@ Total des décès dans le monde Total des cas confirmés\n%d - Total des cas guéris\n%d - Total des cas guéris\n%d + Total des cas guéris\n%d Total des décès\n%d Mondial Sélectionnez un pays @@ -27,15 +26,15 @@ Contributeurs Retry - Oops ! Quelque chose s'est mal passé :( + Oops ! Quelque chose s\'est mal passé :( Stay Home Tips Couvrir la bouche et le nez avec un masque. - Rester à la maison et éviter de sortir sauf si c'est très important. + Rester à la maison et éviter de sortir sauf si c\'est très important. Couvrez votre nez et votre bouche avec votre coude plié ou un mouchoir en papier lorsque vous toussez ou éternuez. - Lavez-vous souvent les mains. Utilisez du savon et de l'eau, ou un produit de friction pour les mains à base d'alcool. + Lavez-vous souvent les mains. Utilisez du savon et de l\'eau, ou un produit de friction pour les mains à base d\'alcool. Gardez une distance de sécurité avec les gens chaque fois que possible. Restez en contact avec vos proches afin que personne ne se sente seul dans ces moments difficiles. diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index 07e848e..c7f4c06 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -1,19 +1,19 @@ - <！--主--> + Worldwide Corona Tracker - 搜索 - Dark - Light + 搜索 + Dark + Light - Total Cases Worldwide + Total Cases Worldwide 世界范围内的治愈总数 世界范围内的死亡总数 - Total Confirmed Cases\n%d - Total Cured Cases\n%d - Total Deaths/n%d - Worldwide + Total Confirmed Cases\n%d + Total Cured Cases\n%d + Total Deaths/n%d + Worldwide 选择国家 没有选择 Spinner 2 Position: %d and language: %s @@ -21,15 +21,15 @@ 关于我们 - GoCoronaGo - 版本 - Contributors + GoCoronaGo + 版本 + Contributors - 重试 + 重试 Oops! 出错了 : - + 呆在家里的提示 用口罩遮住嘴巴和鼻子。 呆在家里，除非有非常重要的事情，否则不要外出。 diff --git a/build.gradle b/build.gradle index 3ae4a48..524f645 100644 --- a/build.gradle +++ b/build.gradle @@ -5,6 +5,7 @@ buildscript { repositories { google() mavenCentral() + jcenter() } dependencies { classpath "com.android.tools.build:gradle:$android_plugin_version" @@ -20,6 +21,7 @@ allprojects { repositories { google() mavenCentral() + jcenter() } } From 92c81972ebe937a11505db1209aec37ccb64f7cb Mon Sep 17 00:00:00 2001 From: ritwikshanker Date: Sun, 16 Oct 2022 14:37:02 +0200 Subject: [PATCH 11/12] Updated dev/target-sdk to 33 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 889d787..7d48672 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,7 +4,7 @@ apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-kapt' android { - compileSdkVersion 32 + compileSdkVersion 33 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 @@ -16,7 +16,7 @@ android { defaultConfig { applicationId "com.gocoronago.tracker" minSdkVersion 19 - targetSdkVersion 32 + targetSdkVersion 33 versionCode 40200 versionName "4.2.0" From 95402dc88400b67a7c58b636baa3603d898380bc Mon Sep 17 00:00:00 2001 From: ritwikshanker Date: Sun, 16 Oct 2022 14:37:13 +0200 Subject: [PATCH 12/12] Added contributor data --- app/src/main/java/com/example/gocoronago/about/AboutFragment.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/com/example/gocoronago/about/AboutFragment.kt b/app/src/main/java/com/example/gocoronago/about/AboutFragment.kt index 2e6f1ae..87d2954 100644 --- a/app/src/main/java/com/example/gocoronago/about/AboutFragment.kt +++ b/app/src/main/java/com/example/gocoronago/about/AboutFragment.kt @@ -28,6 +28,7 @@ class AboutFragment : Fragment() { Contributor("Matthew Scibilia", "\uD83C\uDDE6\uD83C\uDDFA"), Contributor("MR Abdhi P", "🇮🇩"), Contributor("Akshai Baruah", "🇮🇳"), + Contributor("Ananya Shanker", "🇮🇳"), ) override fun onCreateView(