diff --git a/app/build.gradle b/app/build.gradle index a08241f69..713349835 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,5 +1,6 @@ apply plugin: 'com.android.application' apply plugin: 'org.greenrobot.greendao' +apply plugin: 'com.mikepenz.aboutlibraries.plugin' android { compileSdkVersion 28 @@ -70,7 +71,8 @@ dependencies { implementation 'org.conscrypt:conscrypt-android:2.4.0' implementation 'com.facebook.stetho:stetho:1.5.1' implementation 'com.facebook.stetho:stetho-okhttp3:1.5.1' - implementation 'com.mikepenz:aboutlibraries:7.1.0' + implementation "com.mikepenz:aboutlibraries-core:${aboutLibrariesVersion}" + implementation "com.mikepenz:aboutlibraries:${aboutLibrariesVersion}" implementation 'com.github.di72nn.wallabag-api-wrapper:api-wrapper:v2.0.0-beta.4' implementation 'org.slf4j:slf4j-android:1.7.30' } diff --git a/app/src/main/java/fr/gaulupeau/apps/Poche/ui/MainActivity.java b/app/src/main/java/fr/gaulupeau/apps/Poche/ui/MainActivity.java index fa3f1be1f..e6570bb6f 100644 --- a/app/src/main/java/fr/gaulupeau/apps/Poche/ui/MainActivity.java +++ b/app/src/main/java/fr/gaulupeau/apps/Poche/ui/MainActivity.java @@ -22,8 +22,6 @@ import androidx.appcompat.widget.SearchView; import androidx.appcompat.widget.Toolbar; -import android.text.Html; -import android.text.Spanned; import android.text.TextUtils; import android.text.format.DateUtils; import android.util.Log; @@ -35,7 +33,6 @@ import android.widget.TextView; import android.widget.Toast; -import com.mikepenz.aboutlibraries.Libs; import com.mikepenz.aboutlibraries.LibsBuilder; import org.greenrobot.eventbus.EventBus; @@ -465,27 +462,7 @@ public boolean onNavigationItemSelected(@NonNull MenuItem item) { break; case R.id.nav_about: - Libs.ActivityStyle style; - switch(Themes.getCurrentTheme()) { - case DARK: - case DARK_CONTRAST: - style = Libs.ActivityStyle.DARK; - break; - - default: - style = Libs.ActivityStyle.LIGHT_DARK_TOOLBAR; - break; - } - CharSequence aboutCharSequence = getText(R.string.aboutText); - String aboutString = aboutCharSequence instanceof Spanned - ? Html.toHtml((Spanned) aboutCharSequence) - : aboutCharSequence.toString(); - new LibsBuilder() - .withActivityStyle(style) - .withAboutIconShown(true) - .withAboutVersionShown(true) - .withAboutDescription(aboutString) - .start(this); + new LibsBuilder().start(this); break; } diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index b8c21d346..8cdbd6ff9 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -66,7 +66,7 @@ Solarisiert Schrift vergrößern Schrift verkleinern - wallabag-App für Android\n + wallabag-App für Android\n wallabag ist eine selbsthostbare Anwendung, die dir ermöglicht, nie wieder Inhalte zu vermissen. Klicke, speichere und lese es, wann du willst. Der ausgewählte Inhalt wird gespeichert, sodass du ihn lesen kannst, wenn du Zeit hast. Lesegeschwindigkeit Stimmhöhe diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 08ab65afa..d34d640d6 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -97,7 +97,7 @@ Solarizado Aumentar tamaño de letra Disminuir tamaño de letra - + Aplicación de wallabag para Android\n wallabag es una aplicación self hosted que te ayuda a no perderte contenidos nunca más. Haz clic, guarda y lee cuando puedas. Extrae contenido de forma automática para que puedas leerlo cuando tengas tiempo. Velocidad de lectura diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index 4d38b4610..d34f1e9de 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -95,7 +95,7 @@ Solarizatuta Handiagotu letra-tamaina Txikiagotu letra-tamaina - wallabag aplikazioa Androiderako + wallabag aplikazioa Androiderako \n wallabag edukirik inoiz gehiago ez galtzea ahalbidetzen dizun aplikazio auto-ostatagarri bat da. Klikatu, gorde eta irakurri ahal duzunean. Edukia ateratzen du astia duzunean irakurri ahal izateko. Irakurketa abiadura Ahots tonua diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 5445bff7a..fba0def25 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -100,7 +100,7 @@ Solarisé Augmenter la taille de la police Diminuer la taille de la police - Application wallabag pour Android + Application wallabag pour Android \n wallabag est une application auto-hébergeable vous permettant de ne plus rater aucun contenu. Cliquez, enregistrez et lisez le contenu extrait au moment le plus opportun. Vitesse de lecture Hauteur de voix diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 0680914d7..5789c367f 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -85,7 +85,7 @@ Túlexponált Betűméret növelése Betűméret csökkentése - wallabag alkalmazás Androidra\n + wallabag alkalmazás Androidra\n A wallabag egy saját szerveren futó alkalmazás, amely lehetővé teszi, hogy többé ne hagyjon ki semmilyen tartalmat. Kattintson, mentse és olvassa el a kibontott tartalmat szabadidejében. Olvasási sebesség Hangmagasság diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index a99505755..a165bf745 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -95,7 +95,7 @@ Solarizzato Aumenta dimensione del font Diminuisci dimensione del font - App wallabag per Android\n + App wallabag per Android\n wallabag è un\'app autoospidabile che ti permette non mancare più nessun contenuta. Clicca, salva e legge i contenuti estratti come vuoi. Velocità di lettura Tonalità della voce diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index d1753de6f..128f45e2e 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -82,7 +82,7 @@ ソラリゼーション フォントサイズを大きく フォントサイズを小さく - + Android 用 wallabag アプリ\n wallabag は、すべてのコンテンツをもう見逃さないようにすることができる、自己ホスト可能なアプリケーションです。クリックして保存すれば、時間があるときにコンテンツを抽出して読むことができます。 読む速度 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index c958a1965..8cff249e3 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -161,7 +161,7 @@ 자동 동기화 추가 연결 - + 안드로이드용 wallabag 앱 \n왈라백은 스스로 호스팅할 수 있는 앱으로, 더 이상 어떤 콘텐츠도 놓치지 않도록 해준다. 압축을 푼 콘텐츠를 여유롭게 클릭, 저장 및 읽어보십시오. 기사가 %s 다운로드되었다 diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml index d38333b49..b0e4c9fd9 100644 --- a/app/src/main/res/values-nb-rNO/strings.xml +++ b/app/src/main/res/values-nb-rNO/strings.xml @@ -158,7 +158,7 @@ Det er ingen tidligere artikkel i gjeldende liste Ingen flere artikler i gjeldende liste Solarisert - wallabag-programfor Android + wallabag-programfor Android \n wallabag er et program du tjener som vertskap for selv, noe som betyr at du aldri mer vil miste innhold. Klikk, lagre, og les når du kan. Det henter ut innholdet slik at du kan lese det når du har tid. Eksempler:\n https://wallabag.example.com\n diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 411e08c37..5e3130d43 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -88,7 +88,7 @@ Gesolariseerd Vergroot het lettertype Verklein het lettertype - wallabag app voor Android\n + wallabag app voor Android\n wallabag is een \'self-hostable\' app, waarmee je geen content meer hoeft te missen. Klik, bewaar en lees de geëxtraheerde inhoud wanneer het je uitkomt. Leessnelheid Stemhoogte diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index a1378234e..48b21f0c9 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -95,7 +95,7 @@ Prześwietlony (Solarized) Zwiększ rozmiar czcionki Zmniejsz rozmiar czcionki - + Aplikacja wallabag dla Androida\n wallabag to samodzielna aplikacja, dzięki której nie przegapisz już żadnych treści. Kliknij, zapisz i przeczytaj wyciągniętą treść w wolnym czasie. Prędkość czytania diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 806a3c485..a98785791 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -107,7 +107,7 @@ Отменить Рекомендуется изменить URL на: %s. Но вы можете оставить URL введённый вами. Предлагается изменить URL на: %s - Приложение wallabag для Android + Приложение wallabag для Android \n wallabag — это приложение, которое вы можете установить на собственном сервере, благодаря которому вы больше не пропустите никакой контент. Сохраните и читайте когда угодно. Скорость чтения Тембр голоса diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index edb587923..51137b0a0 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -95,7 +95,7 @@ Solarized Tema Yazı tipi boyutunu büyüt Yazı tipi boyutunu küçült - Android için wallabag + Android için wallabag \n wallabag hiçbir makaleyi kaçırmamak için kullanabileceğiniz, ve de kendi sunucunuza yükleyebileceğiniz bir uygulamadır. Makaleleri denk geldiğiniz anda tek tuşla tıklayıp kaydedebilir, dilediğiniz zaman okuyabilirsiniz. wallabag makalelerden içeriği ayrıştırdığı için dilediğiniz zaman kaydedilmiş makaleleri okuyabilirsiniz. Okuma hızı Ses seviyesi diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index f514a6fac..0db7a8e7e 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -101,7 +101,7 @@ 过曝光 增大字体 缩小字体 - 适用于 Android 的 wallabag 应用\n + 适用于 Android 的 wallabag 应用\n wallabag 是一个自托管应用，使您不再错过任何内容。点击，保存并在闲暇时阅读提取的内容。 朗读速度 语音音高 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 5d3197cc2..5beca2c61 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -102,7 +102,7 @@ Solarized Increase font size Decrease font size - wallabag app for Android\n + wallabag app for Android\n wallabag is a self-hostable app, allowing you to not miss any content anymore. Click, save and read the extracted content at your leisure. Read speed Voice pitch diff --git a/build.gradle b/build.gradle index 8b6297960..ab0aed12b 100644 --- a/build.gradle +++ b/build.gradle @@ -5,9 +5,13 @@ buildscript { google() jcenter() } + ext { + aboutLibrariesVersion = '8.1.2' + } dependencies { classpath 'com.android.tools.build:gradle:3.6.2' classpath 'org.greenrobot:greendao-gradle-plugin:3.2.2' + classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:${aboutLibrariesVersion}" } }