From e973ffc14d8d2c7b99816d418d7548eb3cf9f282 Mon Sep 17 00:00:00 2001 From: "translatewiki.net" Date: Mon, 7 Dec 2020 15:45:39 +0100 Subject: [PATCH 1/9] Localisation updates from https://translatewiki.net. --- core/src/main/res/values-ar/strings.xml | 1 + core/src/main/res/values-bg/strings.xml | 2 ++ core/src/main/res/values-diq/strings.xml | 1 + core/src/main/res/values-el/strings.xml | 2 ++ core/src/main/res/values-eo/strings.xml | 2 ++ core/src/main/res/values-es/strings.xml | 2 ++ core/src/main/res/values-fr/strings.xml | 1 + core/src/main/res/values-it/strings.xml | 1 + core/src/main/res/values-iw/strings.xml | 2 ++ core/src/main/res/values-ku/strings.xml | 3 ++- core/src/main/res/values-lb/strings.xml | 1 + core/src/main/res/values-mk/strings.xml | 1 + core/src/main/res/values-pl/strings.xml | 2 ++ core/src/main/res/values-pt-rBR/strings.xml | 1 + core/src/main/res/values-pt/strings.xml | 2 ++ core/src/main/res/values-qq/strings.xml | 4 ++-- core/src/main/res/values-sl/strings.xml | 2 +- core/src/main/res/values-sv/strings.xml | 1 + core/src/main/res/values-tr/strings.xml | 1 + core/src/main/res/values-zh-rTW/strings.xml | 1 + 20 files changed, 29 insertions(+), 4 deletions(-) diff --git a/core/src/main/res/values-ar/strings.xml b/core/src/main/res/values-ar/strings.xml index bcd755c75..5620fe0d8 100644 --- a/core/src/main/res/values-ar/strings.xml +++ b/core/src/main/res/values-ar/strings.xml @@ -77,6 +77,7 @@ حذف هذا العنصر؟ إفراغ التاريخ إفراغ عمليات البحث الحديثة وعلامات التبويب + ملاحظات أُفرغ سجل التاريخ حذف الإشارات المرجعية مسح كل التاريخ diff --git a/core/src/main/res/values-bg/strings.xml b/core/src/main/res/values-bg/strings.xml index 8e92ff1da..8af2ce78c 100644 --- a/core/src/main/res/values-bg/strings.xml +++ b/core/src/main/res/values-bg/strings.xml @@ -1,6 +1,7 @@ @@ -68,6 +69,7 @@ Διαγραφή αυτού του αντικειμένου; Εκκαθάριση ιστορικού Εκκαθάριση ιστορικού πρόσφατων αναζητήσεων και ετικετών + Σημειώσεις Όλο το ιστορικό καθαρίστηκε Εκκαθάριση όλου του ιστορικού Διαγραφή diff --git a/core/src/main/res/values-eo/strings.xml b/core/src/main/res/values-eo/strings.xml index e89022f27..607f38ca5 100644 --- a/core/src/main/res/values-eo/strings.xml +++ b/core/src/main/res/values-eo/strings.xml @@ -3,6 +3,7 @@ * Abijeet Patro * Blahma * Fitoschido +* Javiero * Kelson * KuboF * Mirin @@ -49,6 +50,7 @@ Forigi ĉi tiu eron? Forviŝi hisorion Forviŝi ĵusajn serĉojn kaj historion de langetoj + Notoj Forviŝis Ĉiun Historion Forviŝi Ĉiun da Historio Diskonigi diff --git a/core/src/main/res/values-es/strings.xml b/core/src/main/res/values-es/strings.xml index e912cac3a..c4b174063 100644 --- a/core/src/main/res/values-es/strings.xml +++ b/core/src/main/res/values-es/strings.xml @@ -12,6 +12,7 @@ * MarcoAurelio * Mpayansilva * Ncr +* Rodney Araujo * VegaDark --> @@ -76,6 +77,7 @@ ¿Borrar este elemento? Limpiar el historial Borrar las búsquedas recientes y el historial de pestañas + Notas Borrado todo el historial Borrar marcadores Borrar todo el historial? diff --git a/core/src/main/res/values-fr/strings.xml b/core/src/main/res/values-fr/strings.xml index 0ffe4048a..afd411718 100644 --- a/core/src/main/res/values-fr/strings.xml +++ b/core/src/main/res/values-fr/strings.xml @@ -84,6 +84,7 @@ Supprimer cet élément ? Effacer l’historique Effacer les recherches récentes et l’historique des onglets + Notes Tout l’historique est effacé Supprimer les marque-pages Effacer tout l’historique ? diff --git a/core/src/main/res/values-it/strings.xml b/core/src/main/res/values-it/strings.xml index f6dcb6c3b..4e24314e5 100644 --- a/core/src/main/res/values-it/strings.xml +++ b/core/src/main/res/values-it/strings.xml @@ -50,6 +50,7 @@ Sei sicuro di voler cancellare la tua cronologia di ricerca e resettare tutte le tab attive? Elimina questo elemento? Cancella la cronologia + Note Tutta la cronologia è stata cancellata Cancellare tutta la cronologia? Cancella diff --git a/core/src/main/res/values-iw/strings.xml b/core/src/main/res/values-iw/strings.xml index eb7392998..bac72d0ae 100644 --- a/core/src/main/res/values-iw/strings.xml +++ b/core/src/main/res/values-iw/strings.xml @@ -9,6 +9,7 @@ * Tuvalevsku * YaronSh * יאיר מן +* ישראל קלר --> עזרה @@ -77,6 +78,7 @@ למחוק את הפריט הזה? ניקוי ההיסטוריה ניקוי מילות חיפוש קודמות והיסטוריית כרטיסיות + הערות כל ההיסטוריה נמחקה ניקוי סימניות לנקות את כל ההיסטוריה? diff --git a/core/src/main/res/values-ku/strings.xml b/core/src/main/res/values-ku/strings.xml index d48301e3e..411cadd9e 100644 --- a/core/src/main/res/values-ku/strings.xml +++ b/core/src/main/res/values-ku/strings.xml @@ -73,6 +73,7 @@ Vê pelê jê bibe? Raboriyê paqij bike Lêgerînên dawî û raboriya hilpekînan paqij bike + Not Hemû Raborî Hat Paqijkirin Bijareyan paqij bike Hemû Dîrokê Paqij Bike @@ -247,7 +248,7 @@ Rewş Hemû notan ji hemû gotaran bibe Temamiya notan paqij bike - Mezinahiya nivîsê bi bilindkirinên 25\% biguherîne. + Mezinahiya nivîsê bi bilindkirinên 25% biguherîne. Wêne Vîdeo Tenê Nivîs diff --git a/core/src/main/res/values-lb/strings.xml b/core/src/main/res/values-lb/strings.xml index 766af916a..c02d42649 100644 --- a/core/src/main/res/values-lb/strings.xml +++ b/core/src/main/res/values-lb/strings.xml @@ -39,6 +39,7 @@ Sicht eng Sprooch eraus Auteuren a Lizenzen Dëst Element läschen? + Notizen Lieszeechen ewechhuelen Läschen Ofbriechen diff --git a/core/src/main/res/values-mk/strings.xml b/core/src/main/res/values-mk/strings.xml index a3c15faa1..e4006471f 100644 --- a/core/src/main/res/values-mk/strings.xml +++ b/core/src/main/res/values-mk/strings.xml @@ -70,6 +70,7 @@ Да ја избришам ставкава? Исчисти историја Исчисти скорешни пребарувања и јазичиња + Белешки Сета историја е исчистена Исчисти обележувачи Да ја исчистам сета историја diff --git a/core/src/main/res/values-pl/strings.xml b/core/src/main/res/values-pl/strings.xml index c238306f7..059869591 100644 --- a/core/src/main/res/values-pl/strings.xml +++ b/core/src/main/res/values-pl/strings.xml @@ -4,6 +4,7 @@ * Alan ffm * DeRudySoulStorm * InternerowyGołąb +* Kareyac * Kelson * Krzyz23 * Macofe @@ -79,6 +80,7 @@ Usunąć ten obiekt? Wyczyść historię Wyczyść historię ostatnich wyszukiwań i kart + Uwagi Usunięto całą historię Wyczyść zakładki Wyczyść całą historię? diff --git a/core/src/main/res/values-pt-rBR/strings.xml b/core/src/main/res/values-pt-rBR/strings.xml index 456487851..7d08cc343 100644 --- a/core/src/main/res/values-pt-rBR/strings.xml +++ b/core/src/main/res/values-pt-rBR/strings.xml @@ -76,6 +76,7 @@ Eliminar este item? Apagar histórico Limpar pesquisas recentes e histórico de guias + Notas Eliminando todo o histórico Limpar marcadores Limpar todo o histórico? diff --git a/core/src/main/res/values-pt/strings.xml b/core/src/main/res/values-pt/strings.xml index 4faf32a47..a3e37edf5 100644 --- a/core/src/main/res/values-pt/strings.xml +++ b/core/src/main/res/values-pt/strings.xml @@ -7,6 +7,7 @@ * Hamilton Abreu * Imperadeiro90 * Imperadeiro98 +* Kareyac * Kelson * Macofe * Mansil alfalb @@ -53,6 +54,7 @@ Apagar este elemento? Limpar o histórico Limpar as pesquisas recentes e o histórico de separadores + Notas Todo o historial foi apagado Apagar todo o historial Apagar diff --git a/core/src/main/res/values-qq/strings.xml b/core/src/main/res/values-qq/strings.xml index 22b31846d..085aaadf0 100644 --- a/core/src/main/res/values-qq/strings.xml +++ b/core/src/main/res/values-qq/strings.xml @@ -27,10 +27,9 @@ {{Identical|Information}} {{Identical|Version}} {{Identical|Back to top}} - {{Identical|History}} - {{Identical|Notes}} {{Identical|Language}} {{Identical|Choose language}} + {{Identical|Notes}} {{Identical|Delete}} {{identical|Cancel}} {{Identical|Undo}} @@ -47,6 +46,7 @@ {{Identical|Previous}} This is the past participle of the verb “to leave” (meaning “quitted” or “exited”). This is used in a context of “X minutes left” to finish a download. {{Identical|Yesterday}} + {{Identical|History}} TODO: Unclear, must be documented. See https://github.com/kiwix/overview/issues/31 {{Identical|Save}} Tell the user Location permission required for hosting zim file. diff --git a/core/src/main/res/values-sl/strings.xml b/core/src/main/res/values-sl/strings.xml index 49e16c90d..9eb57b554 100644 --- a/core/src/main/res/values-sl/strings.xml +++ b/core/src/main/res/values-sl/strings.xml @@ -156,7 +156,7 @@ Kazalo vsebine Izberi jezike Shrani jezike - Sporoči svoje mnenje + Sporočite svoje mnenje Razširi Zgodovina Zgodovina iz trenutne knjige diff --git a/core/src/main/res/values-sv/strings.xml b/core/src/main/res/values-sv/strings.xml index e92faa056..025389f35 100644 --- a/core/src/main/res/values-sv/strings.xml +++ b/core/src/main/res/values-sv/strings.xml @@ -75,6 +75,7 @@ Radera detta objekt? Rensa historik Rensa senaste sökningar och flikhistorik + Anteckningar All historik rensades Rensa bokmärken Rensa all historik? diff --git a/core/src/main/res/values-tr/strings.xml b/core/src/main/res/values-tr/strings.xml index 8490f186e..dbe42042e 100644 --- a/core/src/main/res/values-tr/strings.xml +++ b/core/src/main/res/values-tr/strings.xml @@ -83,6 +83,7 @@ Bu öğe silinsin mi? Geçmişi temizle Son aramalar ve sekmeler geçmişini temizle + Notlar Tüm geçmiş temizlendi Yer imlerini temizle Tüm Geçmişi Silinsin mi? diff --git a/core/src/main/res/values-zh-rTW/strings.xml b/core/src/main/res/values-zh-rTW/strings.xml index f9f33cbc8..baee4200d 100644 --- a/core/src/main/res/values-zh-rTW/strings.xml +++ b/core/src/main/res/values-zh-rTW/strings.xml @@ -75,6 +75,7 @@ 刪除此項目？ 清除歷史記錄 清除近期搜尋和分頁歷史記錄 + 備註 所有歷史記錄已清除 清除書籤 清除所有歷史記錄？ From 73a6a7c3823f702d19268ae5280d13189def62f0 Mon Sep 17 00:00:00 2001 From: Sean Mac Gillicuddy Date: Tue, 8 Dec 2020 09:32:00 +0000 Subject: [PATCH 2/9] lint fix --- core/src/main/res/values-ku/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/res/values-ku/strings.xml b/core/src/main/res/values-ku/strings.xml index 411cadd9e..c96f0282e 100644 --- a/core/src/main/res/values-ku/strings.xml +++ b/core/src/main/res/values-ku/strings.xml @@ -248,7 +248,7 @@ Rewş Hemû notan ji hemû gotaran bibe Temamiya notan paqij bike - Mezinahiya nivîsê bi bilindkirinên 25% biguherîne. + Mezinahiya nivîsê bi bilindkirinên 25\% biguherîne. Wêne Vîdeo Tenê Nivîs From 3388142142f4d77b06db6991c8889ddc008ca377 Mon Sep 17 00:00:00 2001 From: Sean Mac Gillicuddy Date: Wed, 9 Dec 2020 10:22:40 +0000 Subject: [PATCH 3/9] #2532 Video seeking does not work anymore with 3.4.2 - readd range headers --- .../core/ServiceWorkerInitialiser.kt | 2 +- .../core/main/CoreWebViewClient.java | 7 ++--- .../kiwixmobile/core/main/KiwixWebView.kt | 2 +- .../core/reader/ZimReaderContainer.kt | 27 ++++++++++++++----- 4 files changed, 25 insertions(+), 13 deletions(-) diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/ServiceWorkerInitialiser.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/ServiceWorkerInitialiser.kt index 707dd32d6..e2f801ca5 100644 --- a/core/src/main/java/org/kiwix/kiwixmobile/core/ServiceWorkerInitialiser.kt +++ b/core/src/main/java/org/kiwix/kiwixmobile/core/ServiceWorkerInitialiser.kt @@ -32,7 +32,7 @@ class ServiceWorkerInitialiser @Inject constructor(zimReaderContainer: ZimReader ServiceWorkerControllerCompat.getInstance() .setServiceWorkerClient(object : ServiceWorkerClientCompat() { override fun shouldInterceptRequest(request: WebResourceRequest): WebResourceResponse? = - zimReaderContainer.load(request.url.toString()) + zimReaderContainer.load(request.url.toString(), request.requestHeaders) }) } } diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreWebViewClient.java b/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreWebViewClient.java index ea42552fb..a2ca2a179 100644 --- a/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreWebViewClient.java +++ b/core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreWebViewClient.java @@ -139,13 +139,10 @@ public class CoreWebViewClient extends WebViewClient { @Nullable @Override - public WebResourceResponse shouldInterceptRequest( - WebView view, - WebResourceRequest request) - { + public WebResourceResponse shouldInterceptRequest(WebView view, WebResourceRequest request) { String url = convertLegacyUrl(request.getUrl().toString()); if (url.startsWith(CONTENT_PREFIX)) { - return zimReaderContainer.load(url); + return zimReaderContainer.load(url, request.getRequestHeaders()); } else { return super.shouldInterceptRequest(view, request); } diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/main/KiwixWebView.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/main/KiwixWebView.kt index f53124e95..c218bb1c9 100644 --- a/core/src/main/java/org/kiwix/kiwixmobile/core/main/KiwixWebView.kt +++ b/core/src/main/java/org/kiwix/kiwixmobile/core/main/KiwixWebView.kt @@ -172,7 +172,7 @@ open class KiwixWebView @SuppressLint("SetJavaScriptEnabled") constructor( }.first { !it.exists() } val source = Uri.parse(src) try { - zimReaderContainer.load("$source").data.use { inputStream -> + zimReaderContainer.load("$source", emptyMap()).data.use { inputStream -> fileToSave.outputStream().use { inputStream.copyTo(it) } } instance.toast(instance.getString(R.string.save_media_saved, fileToSave.name)) diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/reader/ZimReaderContainer.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/reader/ZimReaderContainer.kt index f03c616e8..97814856c 100644 --- a/core/src/main/java/org/kiwix/kiwixmobile/core/reader/ZimReaderContainer.kt +++ b/core/src/main/java/org/kiwix/kiwixmobile/core/reader/ZimReaderContainer.kt @@ -20,6 +20,7 @@ package org.kiwix.kiwixmobile.core.reader import android.webkit.WebResourceResponse import org.kiwix.kiwixmobile.core.reader.ZimFileReader.Factory import java.io.File +import java.net.HttpURLConnection import javax.inject.Inject import javax.inject.Singleton @@ -45,12 +46,26 @@ class ZimReaderContainer @Inject constructor(private val zimFileReaderFactory: F fun getRandomArticleUrl() = zimFileReader?.getRandomArticleUrl() fun isRedirect(url: String): Boolean = zimFileReader?.isRedirect(url) == true fun getRedirect(url: String): String = zimFileReader?.getRedirect(url) ?: "" - fun load(url: String) = - WebResourceResponse( - zimFileReader?.readMimeType(url), - Charsets.UTF_8.name(), - zimFileReader?.load(url) - ) + fun load(url: String, requestHeaders: Map): WebResourceResponse { + val data = zimFileReader?.load(url) + return WebResourceResponse(zimFileReader?.readMimeType(url), Charsets.UTF_8.name(), data) + .apply { + val headers = mutableMapOf("Accept-Ranges" to "bytes") + if ("Range" in requestHeaders.keys) { + setStatusCodeAndReasonPhrase(HttpURLConnection.HTTP_PARTIAL, "Partial Content") + val fullSize = data?.available()?.toLong() ?: 0L + val lastByte = fullSize - 1 + val byteRanges = requestHeaders.getValue("Range").substringAfter("=").split("-") + headers["Content-Range"] = "bytes ${byteRanges[0]}-$lastByte/$fullSize" + if (byteRanges.size == 1) { + headers["Connection"] = "close" + } + } else { + setStatusCodeAndReasonPhrase(HttpURLConnection.HTTP_OK, "OK") + } + responseHeaders = headers + } + } fun copyReader(): ZimFileReader? = zimFile?.let(zimFileReaderFactory::create) From 45549d34461d2bd924de5beb7c3f39c24385f9da Mon Sep 17 00:00:00 2001 From: gouri-panda Date: Thu, 10 Dec 2020 17:14:34 +0530 Subject: [PATCH 4/9] 2534_added bitmap in launch screen --- custom/src/main/res/drawable-night/launch_screen.xml | 11 ++++------- custom/src/main/res/drawable/launch_screen.xml | 11 ++++------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/custom/src/main/res/drawable-night/launch_screen.xml b/custom/src/main/res/drawable-night/launch_screen.xml index b11ad6354..05ca4c686 100644 --- a/custom/src/main/res/drawable-night/launch_screen.xml +++ b/custom/src/main/res/drawable-night/launch_screen.xml @@ -21,11 +21,8 @@ android:opacity="opaque"> - + + + diff --git a/custom/src/main/res/drawable/launch_screen.xml b/custom/src/main/res/drawable/launch_screen.xml index e4495189c..9c42b700b 100644 --- a/custom/src/main/res/drawable/launch_screen.xml +++ b/custom/src/main/res/drawable/launch_screen.xml @@ -21,11 +21,8 @@ android:opacity="opaque"> - + + + From 912ed25d0a23628f1fb2d069d81e120442b7ea53 Mon Sep 17 00:00:00 2001 From: "translatewiki.net" Date: Thu, 10 Dec 2020 13:49:23 +0100 Subject: [PATCH 5/9] Localisation updates from https://translatewiki.net. --- core/src/main/res/values-de/strings.xml | 2 ++ core/src/main/res/values-ku/strings.xml | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/core/src/main/res/values-de/strings.xml b/core/src/main/res/values-de/strings.xml index da6c558d2..64eb7f630 100644 --- a/core/src/main/res/values-de/strings.xml +++ b/core/src/main/res/values-de/strings.xml @@ -6,6 +6,7 @@ * FF11 * Killarnee * Metalhead64 +* Pittigrilli * Stephane * Susann Schweden * Symposiarch @@ -74,6 +75,7 @@ Dieses Element löschen? Verlauf löschen Letzte Suchanfragen und Registerkartenverlauf löschen + Anmerkungen Gesamter Verlauf gelöscht Lesezeichen löschen Gesamten Verlauf löschen? diff --git a/core/src/main/res/values-ku/strings.xml b/core/src/main/res/values-ku/strings.xml index c96f0282e..be77c7325 100644 --- a/core/src/main/res/values-ku/strings.xml +++ b/core/src/main/res/values-ku/strings.xml @@ -52,7 +52,7 @@ Vê adresa IPyê di geroka xwe de binivîsîne ji bo ku xwe bigihînî servera %s Çewtîː Peldanka ZIM\'ê ya bijartî nehate dîtin. Nikare dosyeya zim-ê veke - Çewtîː Peldanka bijartî ne peldankeke ZIM\'ê ya derbasdar e. + Çewtîː Peldanka bijartî ne peldankeke ZIMê ya derbasdar e. Çewtîː Barkirina gotara (Url: %1$s) têk çû. Nîşan bide Agahî @@ -248,7 +248,7 @@ Rewş Hemû notan ji hemû gotaran bibe Temamiya notan paqij bike - Mezinahiya nivîsê bi bilindkirinên 25\% biguherîne. + Mezinahiya nivîsê bi bilindkirinên 25% biguherîne. Wêne Vîdeo Tenê Nivîs From 1e502f5bec13c7277af5c6ace635a9c39d4e9032 Mon Sep 17 00:00:00 2001 From: Sean Mac Gillicuddy Date: Fri, 11 Dec 2020 10:12:51 +0000 Subject: [PATCH 6/9] lint fix --- core/src/main/res/values-ku/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/res/values-ku/strings.xml b/core/src/main/res/values-ku/strings.xml index be77c7325..bd52efdff 100644 --- a/core/src/main/res/values-ku/strings.xml +++ b/core/src/main/res/values-ku/strings.xml @@ -248,7 +248,7 @@ Rewş Hemû notan ji hemû gotaran bibe Temamiya notan paqij bike - Mezinahiya nivîsê bi bilindkirinên 25% biguherîne. + Mezinahiya nivîsê bi bilindkirinên 25\% biguherîne. Wêne Vîdeo Tenê Nivîs From 5d921ce747cbc1f6be71d590200ea9d205b43dfd Mon Sep 17 00:00:00 2001 From: gouri-panda Date: Fri, 11 Dec 2020 17:35:07 +0530 Subject: [PATCH 7/9] #2534 created different xml file for api level 23 or higher --- .../res/drawable-night-v23/launch_screen.xml | 22 +++++++++++++++++++ .../main/res/drawable-v23/launch_screen.xml | 22 +++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 custom/src/main/res/drawable-night-v23/launch_screen.xml create mode 100644 custom/src/main/res/drawable-v23/launch_screen.xml diff --git a/custom/src/main/res/drawable-night-v23/launch_screen.xml b/custom/src/main/res/drawable-night-v23/launch_screen.xml new file mode 100644 index 000000000..ac4db0c46 --- /dev/null +++ b/custom/src/main/res/drawable-night-v23/launch_screen.xml @@ -0,0 +1,22 @@ + + + + + + diff --git a/custom/src/main/res/drawable-v23/launch_screen.xml b/custom/src/main/res/drawable-v23/launch_screen.xml new file mode 100644 index 000000000..ac4db0c46 --- /dev/null +++ b/custom/src/main/res/drawable-v23/launch_screen.xml @@ -0,0 +1,22 @@ + + + + + + From c96ffb29274d0bd4f7b61e52b6e0e69b078366bb Mon Sep 17 00:00:00 2001 From: gouri-panda Date: Fri, 11 Dec 2020 17:40:30 +0530 Subject: [PATCH 8/9] added items for api equal and greater than 23 --- .../main/res/drawable-night-v23/launch_screen.xml | 15 ++++++++++++--- .../src/main/res/drawable-night/launch_screen.xml | 2 +- .../src/main/res/drawable-v23/launch_screen.xml | 15 ++++++++++++--- 3 files changed, 25 insertions(+), 7 deletions(-) diff --git a/custom/src/main/res/drawable-night-v23/launch_screen.xml b/custom/src/main/res/drawable-night-v23/launch_screen.xml index ac4db0c46..e4495189c 100644 --- a/custom/src/main/res/drawable-night-v23/launch_screen.xml +++ b/custom/src/main/res/drawable-night-v23/launch_screen.xml @@ -17,6 +17,15 @@ ~ --> - - - + + + + + diff --git a/custom/src/main/res/drawable-night/launch_screen.xml b/custom/src/main/res/drawable-night/launch_screen.xml index 05ca4c686..4cdbf9e86 100644 --- a/custom/src/main/res/drawable-night/launch_screen.xml +++ b/custom/src/main/res/drawable-night/launch_screen.xml @@ -6,7 +6,7 @@ ~ it under the terms of the GNU General Public License as published by ~ the Free Software Foundation, either version 3 of the License, or ~ (at your option) any later version. - ~ + ~ This program is distributed in the hope that it will be useful, ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the diff --git a/custom/src/main/res/drawable-v23/launch_screen.xml b/custom/src/main/res/drawable-v23/launch_screen.xml index ac4db0c46..e4495189c 100644 --- a/custom/src/main/res/drawable-v23/launch_screen.xml +++ b/custom/src/main/res/drawable-v23/launch_screen.xml @@ -17,6 +17,15 @@ ~ --> - - - + + + + + From 13178f88a930014429622daaadca2c7d09005570 Mon Sep 17 00:00:00 2001 From: gouri-panda Date: Fri, 11 Dec 2020 17:41:49 +0530 Subject: [PATCH 9/9] reformated code --- custom/src/main/res/drawable-night-v23/launch_screen.xml | 3 +-- custom/src/main/res/drawable-night/launch_screen.xml | 8 ++++---- custom/src/main/res/drawable-v23/launch_screen.xml | 3 +-- custom/src/main/res/drawable/launch_screen.xml | 5 +++-- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/custom/src/main/res/drawable-night-v23/launch_screen.xml b/custom/src/main/res/drawable-night-v23/launch_screen.xml index e4495189c..e34f35c7e 100644 --- a/custom/src/main/res/drawable-night-v23/launch_screen.xml +++ b/custom/src/main/res/drawable-night-v23/launch_screen.xml @@ -1,5 +1,4 @@ - - - + diff --git a/custom/src/main/res/drawable-v23/launch_screen.xml b/custom/src/main/res/drawable-v23/launch_screen.xml index e4495189c..e34f35c7e 100644 --- a/custom/src/main/res/drawable-v23/launch_screen.xml +++ b/custom/src/main/res/drawable-v23/launch_screen.xml @@ -1,5 +1,4 @@ - - - +