Feature/79 translations (#80)

* #79: Create folder for sending translations
* #79: Update mockito kotlin
* #79: Adding other languages

.travis.yml

@@ -12,8 +12,8 @@ cache:
   - $HOME/.gradle/native      #Cache library downloaded from the gradle dependency
 env:
   global:
-  - ANDROID_API=28
-  - ANDROID_BUILD_TOOLS=29.0.3
+  - ANDROID_API=30
+  - ANDROID_BUILD_TOOLS=30.0.2
   - ADB_INSTALL_TIMEOUT=5
   - secure: UH6Td9+MFk1nsYYMKN9t6/XcMmSZtB+L4sWMUmYBMaK1Q6YnGCnyHmU5RWkP+9a3AiZQ+n9XK+9TV+azMxJzyOoPMEzvBYtienvI1ZwTg+gqVOsMGG8TKubdgBfYQKm+mtdc3ctgucqjRg0yb4aUDp4CeNwwCuX1zuzIaAYp8IgRElkJzhJMeTcrCUWTBNk2F9ix0eRyOKOCIwgiAa6wNn1zMRvpbPh3esJ7CcnC0xesBtWriFtJDKFhPPWowPrWhGerLe3y5oNySqPpjxfBDIU9HPThNLNwBgp25Ww2c4Ib4Im0p59dPyKBU8mv3eoHvWtrSYW0bZQfKuJD6JsI0wg7Afx2hOxhPWw2evwjmhYWEfspSTUDUZIV/BhLhR2WbeZgAgd1gBh1ulxe79kne1FLsojVr+wZXA5Cn1TF2R4pnTj8EYLctbz/J1/sbcKwut6+I4z7FgbLDOEvaHTJZiscotR0ofML6OoYkKba8LznCES8RqYc3oyCKJvRD5oiVyHhMScAptMeignnPCGmhzm2evpclZfjoZ6vGyI/MgZML4as7WWz1FuiaNV+vJx6PyuNzBjYyNpKJ7O/G4yUT6EITrw3UPVCaSJr6eM3o8eAjy8XTkFsuRJ4iEhMAGiDRlvIlAMrUQyp8PxxvKB9YS6skFfAXXAUp59m/PLbRc0=
   - secure: b9RwM5JGKpo0axCpeqDx9WZfZppiJWKF6d1zxTpO6cIiUmsgpL2GQy1fK/jHzKA1mlFIgq87pu11M696PqPJq7RadkeqlhKAq0zw8lBphg5Tn50wZUglusvIbMPC4VnsFLNeBd3elZIepglbh994sQxxpCpc8IF29x8cj//xrR6Z+EvyWYjnLgtbQjjdql6K0JRhGyTn+FXe5qLxmgu2lc4QL/RBcpnF+gpLrFfzBf/M/ruSyLjjpLZLCtzz90dAD/Ewb+sLvlfM0SUbXvFg+P2YoSo7rbDum+l45S6meIs6ygqcpb/3ByL9pSK3XEzrqLFQFggST8Puy8pHkwL8IVLuOtTPiO2HUtyzbTJLbEmupwEr6nXF2xtQE4vqgCNCLd63JxldRf3D2nrLG9OXJMlQRzkAfYtXj15tqyDfiLlCzIocfASsj/MF8XKzeR45+6GC9KLULpR0s1MdxYYhhb+Ss4sV8VElC3C4mlQiCA6G5AOJtPcnUshGNXbw3oWotJgY76IEJG2gSnb2SSI94VuXCI/39DLxXoTF1knixdaFJOO2QvBU2b8eZKrU4w1+rUrSfIMnBdn27hdqs+uKYNuJIwtMMCcrFtZmZnKjXcBwjgQdm51gWuMiJN5S8xM8turo23jL2Cak7rXn8RUmLHbhu3Jpl8iQzQOPFm1zmkg=
@@ -34,7 +34,7 @@ android:
   - google-gdk-license-.+
   - android-googletv-license-.+
 before_install:
-- yes | sdkmanager "platform-tools" "platforms;android-28"
+- yes | sdkmanager "platform-tools" "platforms;android-30"
 - openssl aes-256-cbc -K $encrypted_c5c67234e863_key -iv $encrypted_c5c67234e863_iv
   -in android/DartsScorecard/scripts/dsc_keystore.enc -out android/DartsScorecard/scripts/dsc_keystore
   -d

android/DartsScorecard/app/build.gradle

@@ -33,9 +33,9 @@ android {
 
 dependencies {
 
-    implementation project(":shared")
     implementation project(':domain')
     implementation project(':data')
+    implementation project(":libcore")
     implementation project(':libLog')
     implementation project(':libConsent')
     implementation project(':libAds')
@@ -75,7 +75,7 @@ dependencies {
     // Test
     testImplementation "junit:junit:$junit"
     testImplementation "org.mockito:mockito-core:$mockito"
-    testImplementation "com.nhaarman:mockito-kotlin-kt1.1:$mockitoKotlin"
+    testImplementation "org.mockito.kotlin:mockito-kotlin:$mockitoKotlin"
     testImplementation "android.arch.core:core-testing:$xCoreTesting"
 
     // AndroidTest

android/DartsScorecard/app/src/main/AndroidManifest.xml

@@ -17,7 +17,6 @@
         android:banner="@drawable/tv_promo"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
 

android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/base/DialogHelper.kt

@@ -6,7 +6,7 @@ import android.content.Intent
 import android.net.Uri
 import androidx.appcompat.app.AlertDialog
 import nl.entreco.dartsscorecard.R
-import nl.entreco.shared.scopes.ActivityScope
+import nl.entreco.libcore.scopes.ActivityScope
 import nl.entreco.domain.model.players.Team
 import nl.entreco.domain.repository.RatingPrefRepository
 import javax.inject.Inject

android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/beta/BetaAdapter.kt

@@ -9,8 +9,8 @@ import nl.entreco.dartsscorecard.R
 import nl.entreco.dartsscorecard.base.TestableAdapter
 import nl.entreco.dartsscorecard.databinding.BetaViewBinding
 import nl.entreco.domain.beta.Feature
-import nl.entreco.shared.threading.Background
-import nl.entreco.shared.threading.Foreground
+import nl.entreco.libcore.threading.Background
+import nl.entreco.libcore.threading.Foreground
 import java.util.*
 import javax.inject.Inject
 

android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/beta/BetaBindings.kt

@@ -7,7 +7,7 @@ import android.view.View
 import android.view.animation.AccelerateDecelerateInterpolator
 import android.widget.ImageView
 import android.widget.TextView
-import nl.entreco.shared.libs.GlideApp
+import nl.entreco.libcore.GlideApp
 
 /**
  * Created by entreco on 03/02/2018.

android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/beta/donate/DonateViewModel.kt

@@ -7,7 +7,7 @@ import nl.entreco.dartsscorecard.base.BaseViewModel
 import nl.entreco.domain.Analytics
 import nl.entreco.domain.beta.Donation
 import nl.entreco.domain.beta.donations.Purchase
-import nl.entreco.shared.LiveEvent
+import nl.entreco.libcore.LiveEvent
 import java.util.concurrent.atomic.AtomicReference
 import javax.inject.Inject
 

android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/di/application/AppComponent.kt

@@ -8,7 +8,7 @@ import nl.entreco.dartsscorecard.di.viewmodel.ViewModelComponent
 import nl.entreco.dartsscorecard.di.viewmodel.ViewModelModule
 import nl.entreco.libads.AdModule
 import nl.entreco.libconsent.di.ConsentModule
-import nl.entreco.shared.scopes.ApplicationScope
+import nl.entreco.libcore.scopes.ApplicationScope
 
 /**
  * Created by Entreco on 14/11/2017.
@@ -18,6 +18,6 @@ import nl.entreco.shared.scopes.ApplicationScope
 interface AppComponent {
     fun inject(app: App)
 
-    fun plus(sub: ViewModelModule): ViewModelComponent
-    fun plus(sub: ServiceModule): ServiceComponent
+    fun plus(module: ViewModelModule): ViewModelComponent
+    fun plus(module: ServiceModule): ServiceComponent
 }

android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/di/application/AppModule.kt

@@ -15,8 +15,8 @@ import nl.entreco.data.analytics.FirebaseAnalytics
 import nl.entreco.data.db.DscDatabase
 import nl.entreco.domain.Analytics
 import nl.entreco.liblog.Logger
-import nl.entreco.shared.scopes.AppContext
-import nl.entreco.shared.scopes.ApplicationScope
+import nl.entreco.libcore.scopes.AppContext
+import nl.entreco.libcore.scopes.ApplicationScope
 import java.util.UUID
 import javax.inject.Named
 

android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/di/play/Play01Module.kt

@@ -26,8 +26,8 @@ import nl.entreco.domain.repository.AudioPrefRepository
 import nl.entreco.domain.repository.BillingRepo
 import nl.entreco.domain.repository.MatchDescriptionRepository
 import nl.entreco.liblog.Logger
-import nl.entreco.shared.scopes.ActivityScope
-import nl.entreco.shared.scopes.ApplicationScope
+import nl.entreco.libcore.scopes.ActivityScope
+import nl.entreco.libcore.scopes.ApplicationScope
 import java.lang.ref.WeakReference
 
 private const val DYNAMIC_PROVIDER = "nl.entreco.dartsscorecard.sounds.DynamicSoundProvider"
@@ -69,9 +69,9 @@ class Play01Module(
     @Provides
     @Play01Scope
     fun provideSoundRepository(
-            @ActivityScope context: Context,
-            splitInstallManager: SplitInstallManager,
-            prefs: AudioPrefRepository,
+        @ActivityScope context: Context,
+        splitInstallManager: SplitInstallManager,
+        prefs: AudioPrefRepository,
     ): SoundRepository {
         return if (splitInstallManager.installedModules.contains(SOUNDS)) {
             val provider = Class.forName(DYNAMIC_PROVIDER).kotlin.objectInstance as? SoundModuleProvider
@@ -82,8 +82,8 @@ class Play01Module(
     @Provides
     @Play01Scope
     fun provideMusicRepository(
-            @ActivityScope context: Context,
-            splitInstallManager: SplitInstallManager,
+        @ActivityScope context: Context,
+        splitInstallManager: SplitInstallManager,
     ): MusicRepository {
         return if (splitInstallManager.installedModules.contains(SOUNDS)) {
             val provider = Class.forName(DYNAMIC_PROVIDER).kotlin.objectInstance as? SoundModuleProvider

android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/di/profile/ProfileModule.kt

@@ -18,7 +18,7 @@ import nl.entreco.domain.repository.ImageRepository
 import nl.entreco.domain.repository.ProfileInfoRepository
 import nl.entreco.domain.repository.ProfileStatRepository
 import nl.entreco.liblog.Logger
-import nl.entreco.shared.scopes.ActivityScope
+import nl.entreco.libcore.scopes.ActivityScope
 import java.lang.ref.WeakReference
 
 /**

android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/di/viewmodel/ViewModelComponent.kt

@@ -32,7 +32,7 @@ import nl.entreco.dartsscorecard.di.viewmodel.db.PlayerDbModule
 import nl.entreco.dartsscorecard.di.viewmodel.db.StatDbModule
 import nl.entreco.dartsscorecard.di.viewmodel.db.TurnDbModule
 import nl.entreco.dartsscorecard.di.viewmodel.threading.ThreadingModule
-import nl.entreco.shared.scopes.ActivityScope
+import nl.entreco.libcore.scopes.ActivityScope
 
 /**
  * Created by Entreco on 14/11/2017.

android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/di/viewmodel/ViewModelModule.kt

@@ -14,7 +14,7 @@ import nl.entreco.data.prefs.SharedRatingPrefRepo
 import nl.entreco.domain.repository.AudioPrefRepository
 import nl.entreco.domain.repository.BotPrefRepository
 import nl.entreco.domain.repository.RatingPrefRepository
-import nl.entreco.shared.scopes.ActivityScope
+import nl.entreco.libcore.scopes.ActivityScope
 
 /**
  * Created by Entreco on 14/11/2017.

android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/di/viewmodel/db/BotDbModule.kt

@@ -6,7 +6,7 @@ import nl.entreco.data.db.DscDatabase
 import nl.entreco.data.db.bot.BotMapper
 import nl.entreco.data.db.bot.LocalBotRepository
 import nl.entreco.domain.repository.BotRepository
-import nl.entreco.shared.scopes.ActivityScope
+import nl.entreco.libcore.scopes.ActivityScope
 
 @Module
 class BotDbModule {

android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/di/viewmodel/db/GameDbModule.kt

@@ -2,7 +2,7 @@ package nl.entreco.dartsscorecard.di.viewmodel.db
 
 import dagger.Module
 import dagger.Provides
-import nl.entreco.shared.scopes.ActivityScope
+import nl.entreco.libcore.scopes.ActivityScope
 import nl.entreco.data.db.DscDatabase
 import nl.entreco.data.db.game.GameMapper
 import nl.entreco.data.db.game.LocalGameRepository

android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/di/viewmodel/db/MetaDbModule.kt

@@ -2,7 +2,7 @@ package nl.entreco.dartsscorecard.di.viewmodel.db
 
 import dagger.Module
 import dagger.Provides
-import nl.entreco.shared.scopes.ActivityScope
+import nl.entreco.libcore.scopes.ActivityScope
 import nl.entreco.data.db.DscDatabase
 import nl.entreco.data.db.meta.LocalMetaRepository
 import nl.entreco.data.db.meta.MetaMapper

android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/di/viewmodel/db/PlayerDbModule.kt

@@ -6,7 +6,7 @@ import nl.entreco.data.db.DscDatabase
 import nl.entreco.data.db.player.LocalPlayerRepository
 import nl.entreco.data.db.player.PlayerMapper
 import nl.entreco.domain.repository.PlayerRepository
-import nl.entreco.shared.scopes.ActivityScope
+import nl.entreco.libcore.scopes.ActivityScope
 
 /**
  * Created by Entreco on 17/12/2017.

android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/di/viewmodel/db/StatDbModule.kt

@@ -2,7 +2,7 @@ package nl.entreco.dartsscorecard.di.viewmodel.db
 
 import dagger.Module
 import dagger.Provides
-import nl.entreco.shared.scopes.ActivityScope
+import nl.entreco.libcore.scopes.ActivityScope
 import nl.entreco.data.db.DscDatabase
 import nl.entreco.data.db.stats.LocalLiveStatRepository
 import nl.entreco.data.db.stats.LiveStatMapper

android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/di/viewmodel/db/TurnDbModule.kt

@@ -2,7 +2,7 @@ package nl.entreco.dartsscorecard.di.viewmodel.db
 
 import dagger.Module
 import dagger.Provides
-import nl.entreco.shared.scopes.ActivityScope
+import nl.entreco.libcore.scopes.ActivityScope
 import nl.entreco.data.db.DscDatabase
 import nl.entreco.data.db.turn.LocalTurnRepository
 import nl.entreco.data.db.turn.TurnMapper

android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/di/viewmodel/threading/ThreadingModule.kt

@@ -4,10 +4,10 @@ import android.os.Handler
 import android.os.Looper
 import dagger.Module
 import dagger.Provides
-import nl.entreco.shared.threading.Background
-import nl.entreco.shared.threading.BgExecutor
-import nl.entreco.shared.threading.FgExecutor
-import nl.entreco.shared.threading.Foreground
+import nl.entreco.libcore.threading.Background
+import nl.entreco.libcore.threading.BgExecutor
+import nl.entreco.libcore.threading.FgExecutor
+import nl.entreco.libcore.threading.Foreground
 
 /**
  * Created by Entreco on 17/12/2017.

android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/faq/WtfAdapter.kt

@@ -1,25 +1,27 @@
 package nl.entreco.dartsscorecard.faq
 
-import androidx.lifecycle.Observer
-import androidx.databinding.DataBindingUtil
-import androidx.recyclerview.widget.DiffUtil
 import android.view.LayoutInflater
 import android.view.ViewGroup
+import androidx.databinding.DataBindingUtil
+import androidx.lifecycle.Observer
+import androidx.recyclerview.widget.DiffUtil
 import nl.entreco.dartsscorecard.R
 import nl.entreco.dartsscorecard.base.TestableAdapter
 import nl.entreco.dartsscorecard.databinding.WtfViewBinding
-import nl.entreco.shared.threading.Background
-import nl.entreco.shared.threading.Foreground
 import nl.entreco.domain.wtf.SubmitViewedItemRequest
 import nl.entreco.domain.wtf.SubmitViewedItemUsecase
 import nl.entreco.domain.wtf.WtfItem
+import nl.entreco.libcore.threading.Background
+import nl.entreco.libcore.threading.Foreground
 import java.util.*
 import javax.inject.Inject
 
-class WtfAdapter @Inject constructor(private val bg: Background, private val fg: Foreground,
-                                     private val submitViewedItemUsecase: SubmitViewedItemUsecase) : TestableAdapter<WtfView>(), Observer<List<WtfItem>>, WtfToggler, WtfSearchable {
+class WtfAdapter @Inject constructor(
+    private val bg: Background, private val fg: Foreground,
+    private val submitViewedItemUsecase: SubmitViewedItemUsecase,
+) : TestableAdapter<WtfView>(), Observer<List<WtfItem>>, WtfToggler, WtfSearchable {
 
-    private var searchText : String = ""
+    private var searchText: String = ""
     private var allItems: MutableMap<String, WtfItem> = mutableMapOf()
     private val visibleItems: MutableList<WtfItem> = mutableListOf()
     private val queue: Queue<List<WtfItem>> = ArrayDeque()
@@ -47,7 +49,7 @@ class WtfAdapter @Inject constructor(private val bg: Background, private val fg:
 
     override fun search(text: CharSequence) {
         if (text.isNotEmpty() && text.length >= 3) {
-            searchText = text.toString().toLowerCase(Locale.getDefault())
+            searchText = text.toString().lowercase()
             onChanged(allItems.values.toList())
         } else {
             clearSearch()
@@ -100,14 +102,14 @@ class WtfAdapter @Inject constructor(private val bg: Background, private val fg:
     }
 
     private fun doFilter(item: WtfItem, searchText: String): Boolean {
-        if(searchText.isBlank()) return true
-        return item.title.toLowerCase(Locale.getDefault()).contains(searchText) || item.description.toLowerCase(Locale.getDefault()).contains(searchText)
+        if (searchText.isBlank()) return true
+        return item.title.lowercase().contains(searchText) || item.description.lowercase().contains(searchText)
     }
 
     private fun score(item: WtfItem, searchText: String): Int {
-        if(searchText.isBlank()) return 0
-        return if(item.title.toLowerCase(Locale.getDefault()).contains(searchText)) 10 else 0 +
-                if(item.description.toLowerCase(Locale.getDefault()).contains(searchText)) 5 else 0
+        if (searchText.isBlank()) return 0
+        return if (item.title.lowercase().contains(searchText)) 10 else 0 +
+                if (item.description.lowercase().contains(searchText)) 5 else 0
     }
 
     private fun updateItems(features: List<WtfItem>, diff: DiffUtil.DiffResult) {

android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/hiscores/HiScorePager.kt

@@ -5,13 +5,13 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.FragmentPagerAdapter
 import nl.entreco.dartsscorecard.R
-import nl.entreco.shared.scopes.ActivityScope
+import nl.entreco.libcore.scopes.ActivityScope
 import nl.entreco.domain.hiscores.HiScoreItem
 import javax.inject.Inject
 
 class HiScorePager @Inject constructor(
-        @ActivityScope private val context: Context,
-        @ActivityScope fm: FragmentManager
+    @ActivityScope private val context: Context,
+    @ActivityScope fm: FragmentManager
 ) : FragmentPagerAdapter(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) {
 
     private val items = mutableListOf<HiScoreItem>()

android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/hiscores/HiScoreViewModel.kt

@@ -13,8 +13,8 @@ import nl.entreco.domain.hiscores.HiScore
 import nl.entreco.domain.hiscores.HiScoreItem
 import nl.entreco.domain.hiscores.SortHiScoresRequest
 import nl.entreco.domain.hiscores.SortHiScoresUsecase
-import nl.entreco.shared.LiveEvent
-import nl.entreco.shared.toSingleEvent
+import nl.entreco.libcore.LiveEvent
+import nl.entreco.libcore.toSingleEvent
 import javax.inject.Inject
 
 class HiScoreViewModel @Inject constructor(

android/DartsScorecard/app/src/main/java/nl/entreco/dartsscorecard/play/Play01ViewModel.kt

@@ -46,25 +46,25 @@ import nl.entreco.domain.repository.AudioPrefRepository
 import nl.entreco.domain.settings.ScoreSettings
 import nl.entreco.libads.ui.AdViewModel
 import nl.entreco.liblog.Logger
-import nl.entreco.shared.scopes.ActivityScope
+import nl.entreco.libcore.scopes.ActivityScope
 import javax.inject.Inject
 
 /**
  * Created by Entreco on 11/11/2017.
  */
 class Play01ViewModel @Inject constructor(
-        private val playGameUsecase: Play01Usecase,
-        private val revancheUsecase: RevancheUsecase,
-        private val gameListeners: Play01Listeners,
-        private val masterCaller: MasterCaller,
-        private val musicPlayer: MusicPlayer,
-        @ActivityScope private val dialogHelper: DialogHelper,
-        private val toggleSoundUsecase: ToggleSoundUsecase,
-        private val toggleMusicUsecase: ToggleMusicUsecase,
-        private val askForRatingUsecase: AskForRatingUsecase,
-        private val audioPrefRepository: AudioPrefRepository,
-        private val adViewModel: AdViewModel,
-        @ActivityScope private val logger: Logger,
+    private val playGameUsecase: Play01Usecase,
+    private val revancheUsecase: RevancheUsecase,
+    private val gameListeners: Play01Listeners,
+    private val masterCaller: MasterCaller,
+    private val musicPlayer: MusicPlayer,
+    @ActivityScope private val dialogHelper: DialogHelper,
+    private val toggleSoundUsecase: ToggleSoundUsecase,
+    private val toggleMusicUsecase: ToggleMusicUsecase,
+    private val askForRatingUsecase: AskForRatingUsecase,
+    private val audioPrefRepository: AudioPrefRepository,
+    private val adViewModel: AdViewModel,
+    @ActivityScope private val logger: Logger,
 ) : BaseViewModel(), UiCallback, InputListener {
 
     val loading = ObservableBoolean(true)