From b68ebd7d9eee8c183c2743e814be229b1e6a3d0b Mon Sep 17 00:00:00 2001 From: "translatewiki.net" Date: Fri, 7 Aug 2020 09:42:17 +0200 Subject: [PATCH 1/8] Localisation updates from https://translatewiki.net. --- core/src/main/res/values-ar/strings.xml | 2 +- core/src/main/res/values-de/strings.xml | 2 +- core/src/main/res/values-diq/strings.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/main/res/values-ar/strings.xml b/core/src/main/res/values-ar/strings.xml index 7601c3820..512f1f6bf 100644 --- a/core/src/main/res/values-ar/strings.xml +++ b/core/src/main/res/values-ar/strings.xml @@ -147,7 +147,7 @@ التالي السابق السماح بتنزيل المحتوى عبر شبكة المحمول؟ - إذا اخترت \“نعم\”، فلن يتم تحذيرك في المستقبل. مع ذلك، يمكنك دائمًا تغيير هذا في الإعدادات. + إذا اخترت \"نعم\"، فلن يتم تحذيرك في المستقبل. مع ذلك، يمكنك دائمًا تغيير هذا في الإعدادات. تنزيل المحتوى عبر واي فاي فقط يوم ساعة diff --git a/core/src/main/res/values-de/strings.xml b/core/src/main/res/values-de/strings.xml index 67a1008d6..aede8180c 100644 --- a/core/src/main/res/values-de/strings.xml +++ b/core/src/main/res/values-de/strings.xml @@ -163,7 +163,7 @@ Ausgewählte Sprachen: Weitere Sprachen: Keine Objekte verfügbar - Also… Das ist peinlich. + Also... Das ist peinlich. Es sieht aus, als wären wir abgestürzt.\n\nWürde es Ihnen etwas ausmachen, uns bei der Behebung dieses Problems zu helfen, indem Sie uns die folgenden Informationen schicken? Ihre Spracheinstellungen Eine Liste Ihrer ZIM-Dateien diff --git a/core/src/main/res/values-diq/strings.xml b/core/src/main/res/values-diq/strings.xml index 25f540fdb..fc8a9b352 100644 --- a/core/src/main/res/values-diq/strings.xml +++ b/core/src/main/res/values-diq/strings.xml @@ -185,7 +185,7 @@ Cihazê Şıma: NEZDI CİHAZİ TRANSFERÊ DOSYAYAN - Keno ke dosyaya transfer kero… + Keno ke dosyaya transfer kero... Weziyet Resım Video From 97d4a2bb25eee2280ad38136f298d90b95aca6a5 Mon Sep 17 00:00:00 2001 From: Sean Mac Gillicuddy Date: Fri, 7 Aug 2020 08:51:45 +0100 Subject: [PATCH 2/8] fix lint issues --- core/src/main/res/values-ar/strings.xml | 2 +- core/src/main/res/values-de/strings.xml | 2 +- core/src/main/res/values-diq/strings.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/main/res/values-ar/strings.xml b/core/src/main/res/values-ar/strings.xml index 512f1f6bf..7601c3820 100644 --- a/core/src/main/res/values-ar/strings.xml +++ b/core/src/main/res/values-ar/strings.xml @@ -147,7 +147,7 @@ التالي السابق السماح بتنزيل المحتوى عبر شبكة المحمول؟ - إذا اخترت \"نعم\"، فلن يتم تحذيرك في المستقبل. مع ذلك، يمكنك دائمًا تغيير هذا في الإعدادات. + إذا اخترت \“نعم\”، فلن يتم تحذيرك في المستقبل. مع ذلك، يمكنك دائمًا تغيير هذا في الإعدادات. تنزيل المحتوى عبر واي فاي فقط يوم ساعة diff --git a/core/src/main/res/values-de/strings.xml b/core/src/main/res/values-de/strings.xml index aede8180c..67a1008d6 100644 --- a/core/src/main/res/values-de/strings.xml +++ b/core/src/main/res/values-de/strings.xml @@ -163,7 +163,7 @@ Ausgewählte Sprachen: Weitere Sprachen: Keine Objekte verfügbar - Also... Das ist peinlich. + Also… Das ist peinlich. Es sieht aus, als wären wir abgestürzt.\n\nWürde es Ihnen etwas ausmachen, uns bei der Behebung dieses Problems zu helfen, indem Sie uns die folgenden Informationen schicken? Ihre Spracheinstellungen Eine Liste Ihrer ZIM-Dateien diff --git a/core/src/main/res/values-diq/strings.xml b/core/src/main/res/values-diq/strings.xml index fc8a9b352..25f540fdb 100644 --- a/core/src/main/res/values-diq/strings.xml +++ b/core/src/main/res/values-diq/strings.xml @@ -185,7 +185,7 @@ Cihazê Şıma: NEZDI CİHAZİ TRANSFERÊ DOSYAYAN - Keno ke dosyaya transfer kero... + Keno ke dosyaya transfer kero… Weziyet Resım Video From 233881ceec8d748b123952b4cecd8e9478da2510 Mon Sep 17 00:00:00 2001 From: Sean Mac Gillicuddy Date: Fri, 7 Aug 2020 10:45:16 +0100 Subject: [PATCH 3/8] #2267 Increase Library versions - bump versions - dagger lint fixes --- .../kiwix/kiwixmobile/di/modules/KiwixModule.kt | 3 --- buildSrc/src/main/kotlin/Versions.kt | 17 ++++++++--------- .../core/di/modules/ActivityModule.kt | 3 --- .../core/di/modules/DownloaderModule.kt | 6 ------ 4 files changed, 8 insertions(+), 21 deletions(-) diff --git a/app/src/main/java/org/kiwix/kiwixmobile/di/modules/KiwixModule.kt b/app/src/main/java/org/kiwix/kiwixmobile/di/modules/KiwixModule.kt index ed6318e32..696c0cc08 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/di/modules/KiwixModule.kt +++ b/app/src/main/java/org/kiwix/kiwixmobile/di/modules/KiwixModule.kt @@ -34,19 +34,16 @@ import org.kiwix.kiwixmobile.zim_manager.MountPointProducer object KiwixModule { @Provides @KiwixScope - @JvmStatic internal fun provideLocationManager(context: Context): LocationManager = context.getSystemService(Context.LOCATION_SERVICE) as LocationManager @Provides @KiwixScope - @JvmStatic fun provideWifiManager(context: Context): WifiManager = context.applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager @Provides @KiwixScope - @JvmStatic internal fun provideFat32Checker( sharedPreferenceUtil: SharedPreferenceUtil, mountPointProducer: MountPointProducer diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 361048a26..4cac37253 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -1,4 +1,3 @@ -import kotlin.String import org.gradle.plugin.use.PluginDependenciesSpec import org.gradle.plugin.use.PluginDependencySpec @@ -20,15 +19,15 @@ object Versions { const val org_jetbrains_kotlin: String = "1.3.72" - const val com_google_dagger: String = "2.26" // available: "2.28.3" + const val com_google_dagger: String = "2.28.3" const val com_yahoo_squidb: String = "2.0.0" // available: "3.2.3" - const val com_jakewharton: String = "10.2.1" // available: "10.2.2" + const val com_jakewharton: String = "10.2.2" const val androidx_test: String = "1.2.0" - const val io_objectbox: String = "2.6.0" // available: "2.7.0" + const val io_objectbox: String = "2.7.0" const val org_jacoco: String = "0.7.9" @@ -82,11 +81,11 @@ object Versions { const val rxandroid: String = "2.1.1" - const val core_ktx: String = "1.3.0" // available: "1.3.1" + const val core_ktx: String = "1.3.1" - const val kiwixlib: String = "9.2.3" // available: "9.3.1" + const val kiwixlib: String = "9.3.1" - const val material: String = "1.1.0" // available: "1.2.0" + const val material: String = "1.2.0" const val multidex: String = "2.0.1" @@ -96,7 +95,7 @@ object Versions { const val jsr305: String = "3.0.2" - const val ktlint: String = "0.36.0" // available: "0.37.2" + const val ktlint: String = "0.37.2" const val rxjava: String = "2.2.19" @@ -120,4 +119,4 @@ object Versions { */ val PluginDependenciesSpec.buildSrcVersions: PluginDependencySpec inline get() = - id("de.fayard.buildSrcVersions").version(Versions.de_fayard_buildsrcversions_gradle_plugin) + id("de.fayard.buildSrcVersions").version(Versions.de_fayard_buildsrcversions_gradle_plugin) diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/di/modules/ActivityModule.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/di/modules/ActivityModule.kt index a9cb6d35d..cb5ecb710 100644 --- a/core/src/main/java/org/kiwix/kiwixmobile/core/di/modules/ActivityModule.kt +++ b/core/src/main/java/org/kiwix/kiwixmobile/core/di/modules/ActivityModule.kt @@ -40,15 +40,12 @@ abstract class ActivityModule { @ActivityScope abstract fun bindDialogShower(alertDialogShower: AlertDialogShower): DialogShower - @Module companion object { - @JvmStatic @Provides @ActivityScope fun providesMainPresenter(dataSource: DataSource): MainContract.Presenter = MainPresenter(dataSource) - @JvmStatic @Provides @ActivityScope fun providesMainMenuFactory(activity: Activity, zimReaderContainer: ZimReaderContainer): diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/di/modules/DownloaderModule.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/di/modules/DownloaderModule.kt index 6b608ce53..ad6ce5ba1 100644 --- a/core/src/main/java/org/kiwix/kiwixmobile/core/di/modules/DownloaderModule.kt +++ b/core/src/main/java/org/kiwix/kiwixmobile/core/di/modules/DownloaderModule.kt @@ -39,7 +39,6 @@ import javax.inject.Singleton @Module object DownloaderModule { - @JvmStatic @Provides @Singleton fun providesDownloader( @@ -48,19 +47,16 @@ object DownloaderModule { kiwixService: KiwixService ): Downloader = DownloaderImpl(downloadRequester, downloadDao, kiwixService) - @JvmStatic @Provides @Singleton fun providesDownloadRequester(fetch: Fetch, sharedPreferenceUtil: SharedPreferenceUtil): DownloadRequester = FetchDownloadRequester(fetch, sharedPreferenceUtil) - @JvmStatic @Provides @Singleton fun provideFetch(fetchConfiguration: FetchConfiguration): Fetch = Fetch.getInstance(fetchConfiguration) - @JvmStatic @Provides @Singleton fun provideFetchConfiguration( @@ -77,7 +73,6 @@ object DownloaderModule { setNotificationManager(fetchNotificationManager) }.build().also(Impl::setDefaultInstanceConfiguration) - @JvmStatic @Provides @Singleton fun provideOkHttpDownloader() = OkHttpDownloader( @@ -87,7 +82,6 @@ object DownloaderModule { .build() ) - @JvmStatic @Provides @Singleton fun provideFetchDownloadNotificationManager(context: Context): From f83a3b9e69efaf07351a13060389bfe8e060c12c Mon Sep 17 00:00:00 2001 From: Shahryar Khosravi <36692416+5hahryar@users.noreply.github.com> Date: Mon, 10 Aug 2020 13:46:07 +0430 Subject: [PATCH 4/8] Open in new tab when searching has bad contrast in dark mode fix --- core/src/main/res/drawable/ic_open_in_new_24dp.xml | 6 ++++-- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/core/src/main/res/drawable/ic_open_in_new_24dp.xml b/core/src/main/res/drawable/ic_open_in_new_24dp.xml index 034831af2..8c84b8d5f 100644 --- a/core/src/main/res/drawable/ic_open_in_new_24dp.xml +++ b/core/src/main/res/drawable/ic_open_in_new_24dp.xml @@ -16,8 +16,10 @@ ~ --> - - + diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9ec52ade7..5c18b0d4c 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-6.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip From e758ec9e5a3d37d913b1dca0c44a025f04e4dee7 Mon Sep 17 00:00:00 2001 From: Shahryar Khosravi <36692416+5hahryar@users.noreply.github.com> Date: Mon, 10 Aug 2020 14:44:20 +0430 Subject: [PATCH 5/8] Add drawable resource for night mode --- .../drawable-night/ic_open_in_new_24dp.xml | 25 +++++++++++++++++++ .../main/res/drawable/ic_open_in_new_24dp.xml | 3 +-- 2 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 core/src/main/res/drawable-night/ic_open_in_new_24dp.xml diff --git a/core/src/main/res/drawable-night/ic_open_in_new_24dp.xml b/core/src/main/res/drawable-night/ic_open_in_new_24dp.xml new file mode 100644 index 000000000..90b15ec67 --- /dev/null +++ b/core/src/main/res/drawable-night/ic_open_in_new_24dp.xml @@ -0,0 +1,25 @@ + + + + + + diff --git a/core/src/main/res/drawable/ic_open_in_new_24dp.xml b/core/src/main/res/drawable/ic_open_in_new_24dp.xml index 8c84b8d5f..24eed2e73 100644 --- a/core/src/main/res/drawable/ic_open_in_new_24dp.xml +++ b/core/src/main/res/drawable/ic_open_in_new_24dp.xml @@ -20,6 +20,5 @@ android:height="24dp" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> - + From 7b142788afd73d64dde4ed1da0135de566cf18a2 Mon Sep 17 00:00:00 2001 From: Shahryar Khosravi <36692416+5hahryar@users.noreply.github.com> Date: Mon, 10 Aug 2020 14:49:00 +0430 Subject: [PATCH 6/8] Delete gradle-wrapper.properties --- gradle/wrapper/gradle-wrapper.properties | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 gradle/wrapper/gradle-wrapper.properties diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 5c18b0d4c..000000000 --- a/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,6 +0,0 @@ -#Tue Feb 25 11:46:45 IST 2020 -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip From 1c4d13fd737251162d482888a87320fed29a7fa9 Mon Sep 17 00:00:00 2001 From: Shahryar Khosravi <36692416+5hahryar@users.noreply.github.com> Date: Mon, 10 Aug 2020 15:27:50 +0430 Subject: [PATCH 7/8] Revert "Delete gradle-wrapper.properties" This reverts commit 7b142788 --- gradle/wrapper/gradle-wrapper.properties | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 gradle/wrapper/gradle-wrapper.properties diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000..5c18b0d4c --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Tue Feb 25 11:46:45 IST 2020 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip From 4e3c7fa966134c6424a5f689baeae038daf4d036 Mon Sep 17 00:00:00 2001 From: Shahryar Khosravi <36692416+5hahryar@users.noreply.github.com> Date: Mon, 10 Aug 2020 15:34:19 +0430 Subject: [PATCH 8/8] Update gradle-wrapper.properties --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5c18b0d4c..9ec52ade7 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-6.5.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-all.zip