From 751a1ce3be3e210e21c5d7a75e9a75c133c2a78d Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Mon, 3 Dec 2018 14:58:28 +0100 Subject: [PATCH] Switch to Attribouter licenses activity --- app/build.gradle | 1 + app/src/main/AndroidManifest.xml | 5 - .../etchdroid/activities/ActivityBase.kt | 13 +- .../main/res/drawable/ic_fdroid_logo_24dp.xml | 11 ++ app/src/main/res/menu/menu_main.xml | 4 +- app/src/main/res/values-it/strings.xml | 2 +- app/src/main/res/values-night/styles.xml | 6 + app/src/main/res/values-tr/strings.xml | 2 +- app/src/main/res/values/strings.xml | 44 +++++- app/src/main/res/xml/about.xml | 133 ++++++++++++++++++ 10 files changed, 204 insertions(+), 17 deletions(-) create mode 100644 app/src/main/res/drawable/ic_fdroid_logo_24dp.xml create mode 100644 app/src/main/res/xml/about.xml diff --git a/app/build.gradle b/app/build.gradle index b17ba08..bca69ae 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -41,6 +41,7 @@ dependencies { implementation 'com.android.support.constraint:constraint-layout:1.1.3' implementation 'com.android.support:design:28.0.0' implementation 'com.android.support:appcompat-v7:28.0.0' + implementation 'me.jfenn:Attribouter:0.1.5' testImplementation 'junit:junit:4.12' androidTestImplementation 'androidx.test:runner:1.1.0' androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1ce4f2a..d0b32cf 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -30,11 +30,6 @@ - - { - val intent = Intent(this, LicensesActivity::class.java) - startActivity(intent) + R.id.action_about -> { + Attribouter + .from(this) + .withFile(R.xml.about) + .show() return true } R.id.action_reset_warnings -> { diff --git a/app/src/main/res/drawable/ic_fdroid_logo_24dp.xml b/app/src/main/res/drawable/ic_fdroid_logo_24dp.xml new file mode 100644 index 0000000..8488c35 --- /dev/null +++ b/app/src/main/res/drawable/ic_fdroid_logo_24dp.xml @@ -0,0 +1,11 @@ + + + + diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml index 346a65c..b86ed19 100644 --- a/app/src/main/res/menu/menu_main.xml +++ b/app/src/main/res/menu/menu_main.xml @@ -3,9 +3,9 @@ xmlns:tools="http://schemas.android.com/tools" tools:context="eu.depau.etchdroid.activities.StartActivity"> GNU GPLv2 Custom BSD-like Custom - Licenze + Informazioni Converte immagini Apple® DMG compresse Seleziona dispositivo USB Pronto a scrivere diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml index 2ed8be2..efe892c 100644 --- a/app/src/main/res/values-night/styles.xml +++ b/app/src/main/res/values-night/styles.xml @@ -9,4 +9,10 @@ + + + +