Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apply plugin: 'kotlin-android-extensions'
apply plugin: 'kotlin-kapt'

android {
compileSdkVersion 31
compileSdkVersion 33
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
Expand All @@ -16,7 +16,7 @@ android {
defaultConfig {
applicationId "com.gocoronago.tracker"
minSdkVersion 19
targetSdkVersion 31
targetSdkVersion 33
versionCode 40200
versionName "4.2.0"

Expand All @@ -35,22 +35,23 @@ android {
lint {
abortOnError false
}
namespace 'com.example.gocoronago'
}

dependencies {
implementation fileTree(dir: "libs", include: ["*.jar"])
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'
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.gocoronago">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import androidx.lifecycle.ViewModelProvider
class MainViewModelFactory :
ViewModelProvider.NewInstanceFactory() {

override fun <T : ViewModel?> create(modelClass: Class<T>): T {
override fun <T : ViewModel> create(modelClass: Class<T>): T {
return MainViewModel() as T
}
}
45 changes: 43 additions & 2 deletions app/src/main/res/values-de/strings.xml
Original file line number Diff line number Diff line change
@@ -1,2 +1,43 @@
<?xml version="1.0" encoding="utf-8"?>
<resources></resources>
<resources>

<!-- Main -->
<string name="app_name">Weltweiter Corona Tracker</string>
<string name="action_search">Suche</string>
<string name="theme_dark">Dunkel</string>
<string name="theme_light">Hell</string>

<string name="total_cases_worldwide">Total Cases Worldwide</string>
<string name="total_cured_worldwide">Gesamtheit der weltweit geheilten Fälle</string>
<string name="total_deaths_worldwide">Gesamtzahl der Todesfälle weltweit</string>

<string name="total_confirmed">Gesamtanzahl bestätigter Fälle</string>
<string name="total_cured">Gesamtanzahl der geheilten Fälle\n%d</string>
<string name="total_deaths">Gesamttodesfälle\n%d</string>
<string name="worldwide">Weltweit</string>
<string name="select_country">Land auswählen</string>
<string name="nothing_selected">Nichts ausgewählt</string>
<string name="item_selected_1">Spinner 2 Position: %d und Sprache: %s</string>
<string name="country_selected">Ausgewähltes Land: %s</string>

<!-- AboutFragment -->
<string name="about_us">Über uns</string>
<string name="gocoronago">GoCoronaGo</string>
<string name="version">Version</string>
<string name="contributors">Mitwirkende</string>

<string name="retry_button_text">Wiederholung</string>
<string name="error_msg">Oops! Etwas ist schief gelaufen :(</string>


<!-- StayHomeFragment -->
<string name="stay_home_tips">Zuhause bleiben Tipps</string>
<string name="wear_mask_text">Mund und Nase mit einer Maske bedecken.</string>
<string name="stay_home_text">Bleiben Sie zu Hause und gehen Sie nicht aus, wenn es nicht sehr wichtig ist.</string>
<string name="sneeze_text">Decken Sie Nase und Mund mit dem angewinkelten Ellbogen oder einem Taschentuch ab, wenn Sie husten oder niesen.</string>
<string name="wash_your_hands_text">Waschen Sie sich häufig die Hände. Verwenden Sie Wasser und Seife oder ein alkoholhaltiges Handreinigungsmittel.</string>
<string name="social_distancing_text">Halten Sie, wann immer möglich, einen sicheren Abstand zu anderen Menschen.</string>
<string name="loved_ones_text">Bleiben Sie in Kontakt mit Ihren Lieben, damit sich niemand in diesen schweren Zeiten allein fühlt.</string>


</resources>

11 changes: 5 additions & 6 deletions app/src/main/res/values-fr/strings.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<resources>

<br />- Principales -->
<!--- Principales -->
<string name="app_name">Suiveur de Corona mondial</string>
<string name="action_search">Recherche</string>
<string name="theme_dark">Foncé</string>
Expand All @@ -11,8 +11,7 @@
<string name="total_deaths_worldwide">Total des décès dans le monde</string>

<string name="total_confirmed">Total des cas confirmés\n%d</string>
<string name="total_cured">Total des cas guéris\n%d</string>
<string name="total_cured">Total des cas guéris\n%d</string>
<string name="total_cured">Total des cas guéris\n%d</string>
<string name="total_deaths">Total des décès\n%d</string>
<string name="worldwide">Mondial</string>
<string name="select_country">Sélectionnez un pays</string>
Expand All @@ -27,15 +26,15 @@
<string name="contributors">Contributeurs</string>

<string name="retry_button_text">Retry</string>
<string name="error_msg">Oops ! Quelque chose s'est mal passé :(</string>
<string name="error_msg">Oops ! Quelque chose s\'est mal passé :(</string>


<!-- StayHomeFragment -->
<string name="stay_home_tips">Stay Home Tips</string>
<string name="wear_mask_text">Couvrir la bouche et le nez avec un masque.</string>
<string name="stay_home_text">Rester à la maison et éviter de sortir sauf si c'est très important.</string>
<string name="stay_home_text">Rester à la maison et éviter de sortir sauf si c\'est très important.</string>
<string name="sneeze_text">Couvrez votre nez et votre bouche avec votre coude plié ou un mouchoir en papier lorsque vous toussez ou éternuez.</string>
<string name="wash_your_hands_text">Lavez-vous souvent les mains. Utilisez du savon et de l'eau, ou un produit de friction pour les mains à base d'alcool.</string>
<string name="wash_your_hands_text">Lavez-vous souvent les mains. Utilisez du savon et de l\'eau, ou un produit de friction pour les mains à base d\'alcool.</string>
<string name="social_distancing_text">Gardez une distance de sécurité avec les gens chaque fois que possible.</string>
<string name="loved_ones_text">Restez en contact avec vos proches afin que personne ne se sente seul dans ces moments difficiles.</string>

Expand Down
45 changes: 43 additions & 2 deletions app/src/main/res/values-nl/strings.xml
Original file line number Diff line number Diff line change
@@ -1,2 +1,43 @@
<?xml version="1.0" encoding="utf-8"?>
<resources></resources>
<resources>

<!-- Main -->
<string name="app_name">Worldwide Corona Tracker</string>
<string name="action_search">Zoek</string>
<string name="theme_dark">Dark</string>
<string name="theme_light">Light</string>

<string name="total_cases_worldwide">Totaal aantal gevallen wereldwijd</string>
<string name="total_cured_worldwide">Totaal genezen wereldwijd</string>
<string name="total_deaths_worldwide">Totaal aantal sterfgevallen wereldwijd</string>

<string name="total_confirmed">Totaal bevestigde gevallen wereldwijd</string>
<string name="total_cured">Totaal genezen gevallenn%d</string>
<string name="total_deaths">Totaal aantal sterfgevallen</string>
<string name="worldwide">Worldwide</string>
<string name="select_country">Selecteer land</string>
<string name="nothing_selected">Niets geselecteerd</string>
<string name="item_selected_1">Spinner 2 Positie: %d en taal: %s</string>
<string name="country_selected">Land geselecteerd: %s</string>

<!-- OverFragment -->
<string name="about_us">Over ons</string>
<string name="gocoronago">GoCoronaGo</string>
<string name="version">Version</string>
<string name="contributors">Contributors</string>

<string name="retry_button_text">Retry</string>
<string name="error_msg">Oeps! Er is iets fout gegaan :(</string>


<!-- StayHomeFragment -->
<string name="stay_home_tips">Stay Home Tips</string>
<string name="wear_mask_text">Mond en neus bedekken met masker.</string>
<string name="stay_home_text">Blijf thuis en vermijd uitgaan tenzij het heel belangrijk is.</string>
<string name="sneeze_text">bedek je neus en mond met je gebogen elleboog of een tissue als je hoest of niest.</string>
<string name="wash_your_hands_text">Schoon uw handen vaak. Gebruik water en zeep of een handmelk op alcoholbasis.</string>
<string name="social_distancing_text">Blijf waar mogelijk op veilige afstand van mensen.</string>
<string name="loved_ones_text">Blijf in contact met je dierbaren zodat niemand zich alleen voelt in deze moeilijke tijden.</string>


</resources>

44 changes: 42 additions & 2 deletions app/src/main/res/values-zh/strings.xml
Original file line number Diff line number Diff line change
@@ -1,2 +1,42 @@
<?xml version="1.0" encoding="utf-8"?>
<resources></resources>
<resources>

<!-- 主-->
<string name="app_name">Worldwide Corona Tracker</string>
<string name="action_search">搜索</string>
<string name="theme_dark">Dark</string>
<string name="theme_light">Light</string>

<string name="total_cases_worldwide">Total Cases Worldwide</string>
<string name="total_cured_worldwide">世界范围内的治愈总数</string>
<string name="total_deaths_worldwide">世界范围内的死亡总数</string>

<string name="total_confirmed">Total Confirmed Cases\n%d</string>
<string name="total_cured">Total Cured Cases\n%d</string>
<string name="total_deaths">Total Deaths/n%d</string>
<string name="worldwide">Worldwide</string>
<string name="select_country">选择国家</string>
<string name="nothing_selected">没有选择</string>
<string name="item_selected_1">Spinner 2 Position: %d and language: %s</string>
<string name="country_selected">选择的国家: %s</string>

<!--AboutFragment -->
<string name="about_us">关于我们</string>
<string name="gocoronago">GoCoronaGo</string>
<string name="version">版本</string>
<string name="contributors">Contributors</string>

<string name="retry_button_text">重试</string>
<string name="error_msg">Oops! 出错了 :</string>


<!-- StayHomeFragment -->
<string name="stay_home_tips">呆在家里的提示</string>
<string name="wear_mask_text">用口罩遮住嘴巴和鼻子。</string>
<string name="stay_home_text">呆在家里,除非有非常重要的事情,否则不要外出。</string>
<string name="sneeze_text">当你咳嗽或打喷嚏时,用弯曲的肘部或纸巾遮住你的鼻子和嘴巴。</string>
<string name="wash_your_hands_text">经常清洁你的双手。使用肥皂和水,或使用以酒精为基础的擦手液。</string>
<string name="social_distancing_text">尽可能地与人保持安全距离。</string>
<string name="loved_ones_text">与你的亲人保持联系,这样就不会有人在这些艰难的时刻感到孤独。</string>


</resources>
8 changes: 5 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
// 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.kotlin_version = "1.7.20"
ext.android_plugin_version = '7.3.1'
repositories {
google()
mavenCentral()
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.3.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

// NOTE: Do not place your application dependencies here; they belong
Expand All @@ -19,6 +20,7 @@ buildscript {
allprojects {
repositories {
google()
mavenCentral()
jcenter()
}
}
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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.4-all.zip