diff --git a/app/build.gradle b/app/build.gradle index 9ad7689..942d4d4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-kapt' -apply plugin: 'com.jaredsburrows.license' +apply plugin: 'com.mikepenz.aboutlibraries.plugin' android { compileSdkVersion 30 @@ -58,4 +58,6 @@ dependencies { implementation 'com.squareup.moshi:moshi:1.9.3' kapt 'com.squareup.moshi:moshi-kotlin-codegen:1.9.3' implementation 'org.jsoup:jsoup:1.13.1' + implementation "com.mikepenz:aboutlibraries-core:$about_libs_version" + implementation "com.mikepenz:aboutlibraries:$about_libs_version" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8af80a9..24148a4 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -12,10 +12,12 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme"> + + @@ -25,10 +27,6 @@ - diff --git a/app/src/main/assets/open_source_licenses.html b/app/src/main/assets/open_source_licenses.html deleted file mode 100644 index 2eb3689..0000000 --- a/app/src/main/assets/open_source_licenses.html +++ /dev/null @@ -1,432 +0,0 @@ - - - - Open source licenses - - -

Notice for packages:

- - - diff --git a/app/src/main/java/net/underdesk/circolapp/LicensesActivity.kt b/app/src/main/java/net/underdesk/circolapp/LicensesActivity.kt deleted file mode 100644 index 86dcbfa..0000000 --- a/app/src/main/java/net/underdesk/circolapp/LicensesActivity.kt +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Circolapp - * Copyright (C) 2019-2020 Matteo Schiff - * - * This program is free software: you can redistribute it and/or modify - * 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 - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package net.underdesk.circolapp - -import android.os.Bundle -import androidx.appcompat.app.AppCompatActivity -import kotlinx.android.synthetic.main.activity_licenses.* - -class LicensesActivity : AppCompatActivity() { - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setContentView(R.layout.activity_licenses) - licenses_webview.loadUrl("file:///android_asset/open_source_licenses.html") - } -} diff --git a/app/src/main/java/net/underdesk/circolapp/MainActivity.kt b/app/src/main/java/net/underdesk/circolapp/MainActivity.kt index da9c521..97b3820 100644 --- a/app/src/main/java/net/underdesk/circolapp/MainActivity.kt +++ b/app/src/main/java/net/underdesk/circolapp/MainActivity.kt @@ -27,7 +27,6 @@ import android.os.Bundle import android.os.Environment import android.view.Menu import android.view.MenuItem -import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatDelegate import androidx.appcompat.widget.SearchView @@ -38,6 +37,7 @@ import androidx.navigation.ui.setupWithNavController import androidx.preference.PreferenceManager import com.google.android.material.bottomnavigation.BottomNavigationView import com.google.android.material.snackbar.Snackbar +import com.mikepenz.aboutlibraries.LibsBuilder import kotlinx.android.synthetic.main.activity_main.* import net.underdesk.circolapp.adapters.CircularLetterAdapter import net.underdesk.circolapp.data.Circular @@ -57,6 +57,7 @@ class MainActivity : AppCompatActivity(), CircularLetterAdapter.AdapterCallback loadDarkTheme() super.onCreate(savedInstanceState) setContentView(R.layout.activity_main) + setSupportActionBar(main_toolbar) val navView: BottomNavigationView = findViewById(R.id.nav_view) val navController = findNavController(R.id.nav_host_fragment) @@ -75,7 +76,7 @@ class MainActivity : AppCompatActivity(), CircularLetterAdapter.AdapterCallback PollWork.enqueue(this) if (getPreferences(Context.MODE_PRIVATE).getBoolean("first_start", true)) { - showInfoDialog() + startInfoActivity() getPreferences(Context.MODE_PRIVATE).edit().apply { putBoolean("first_start", false) @@ -116,7 +117,7 @@ class MainActivity : AppCompatActivity(), CircularLetterAdapter.AdapterCallback true } R.id.menu_main_about -> { - showInfoDialog() + startInfoActivity() true } else -> super.onOptionsItemSelected(item) @@ -161,24 +162,17 @@ class MainActivity : AppCompatActivity(), CircularLetterAdapter.AdapterCallback ).show() } - private fun showInfoDialog() { - val builder = AlertDialog.Builder(this) - builder.apply { - setTitle(R.string.dialog_info_title) - setMessage(R.string.dialog_info_content) - setPositiveButton( - R.string.dialog_ok - ) { dialog, _ -> - dialog.dismiss() - } - setNeutralButton( - R.string.dialog_licenses - ) { _, _ -> - startActivity(Intent(this@MainActivity, LicensesActivity::class.java)) - } - } - - builder.create().show() + private fun startInfoActivity() { + LibsBuilder() + .withAboutAppName(getString(R.string.app_name)) + .withAboutDescription(getString(R.string.activity_info_content)) + .withActivityTitle(getString(R.string.activity_info_title)) + .withAboutSpecial1(getString(R.string.activity_info_license)) + .withAboutSpecial1Description(getString(R.string.activity_info_license_description)) + .withAboutSpecial2(getString(R.string.activity_info_source_code)) + .withAboutSpecial2Description(getString(R.string.activity_info_source_code_description)) + .withLicenseShown(true) + .start(this@MainActivity) } private fun loadDarkTheme() { diff --git a/app/src/main/java/net/underdesk/circolapp/SettingsActivity.kt b/app/src/main/java/net/underdesk/circolapp/SettingsActivity.kt index fdc83ea..63664fc 100644 --- a/app/src/main/java/net/underdesk/circolapp/SettingsActivity.kt +++ b/app/src/main/java/net/underdesk/circolapp/SettingsActivity.kt @@ -26,6 +26,7 @@ import androidx.preference.EditTextPreference import androidx.preference.Preference import androidx.preference.PreferenceFragmentCompat import androidx.preference.SwitchPreferenceCompat +import kotlinx.android.synthetic.main.settings_activity.* import net.underdesk.circolapp.works.PollWork class SettingsActivity : AppCompatActivity() { @@ -33,6 +34,7 @@ class SettingsActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.settings_activity) + setSupportActionBar(settings_toolbar) supportFragmentManager .beginTransaction() .replace(R.id.settings, SettingsFragment()) diff --git a/app/src/main/res/layout/activity_licenses.xml b/app/src/main/res/layout/activity_licenses.xml deleted file mode 100644 index 36f33cf..0000000 --- a/app/src/main/res/layout/activity_licenses.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index d504aa5..4755380 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -5,6 +5,17 @@ android:layout_width="match_parent" android:layout_height="match_parent"> + + \ No newline at end of file diff --git a/app/src/main/res/layout/settings_activity.xml b/app/src/main/res/layout/settings_activity.xml index de6591a..8277f7c 100644 --- a/app/src/main/res/layout/settings_activity.xml +++ b/app/src/main/res/layout/settings_activity.xml @@ -1,6 +1,16 @@ + android:layout_height="match_parent" + android:orientation="vertical"> + + Circolari Preferiti Promemoria - Licenze di terze parti Impostazioni Informazioni @@ -37,13 +36,15 @@ Avanti Indietro Annulla - Mostra licenze di terze parti - Informazioni su Circolapp - Circolapp è rilasciata secondo la licenza GPL v3 (https://github.com/Matte23/circolapp/blob/master/LICENSE):\n\n - © 2019 - 2020 Matteo Schiff\nQuesto programma è rilasciato SENZA ALCUNA GARANZIA E SENZA ALCUNA RESPONSABILITÀ A CARICO DELLO SVILUPPATORE.\nQuesto è software libero, e sei invitato a condividerlo nei termini della licenza. \n\n - Le circolari sono scritte e pubblicate dal Liceo Scientifico Maria Curie di Pinerolo, e sono scaricate direttamente da https://curiepinerolo.edu.it/.\n - Questi documenti sono rilasciati secondo la licenza "Attribution-NonCommercial-ShareAlike 3.0 Unported" (CC BY-NC-SA 3.0)(https://creativecommons.org/licenses/by-nc-sa/3.0/), come specificato in questa pagina: https://curiepinerolo.edu.it/note-legali/ + Informazioni su Circolapp + Le circolari sono scritte e pubblicate dal Liceo Scientifico Maria Curie di Pinerolo, e sono scaricate direttamente da <a href="https://curiepinerolo.edu.it/">https://curiepinerolo.edu.it/</a>.<br /> + Questi documenti sono rilasciati secondo la licenza <a href="https://creativecommons.org/licenses/by-nc-sa/3.0/"> <i>Attribution-NonCommercial-ShareAlike 3.0 Unported (CC BY-NC-SA 3.0)</i></a>, come specificato in questa pagina: <a href="https://curiepinerolo.edu.it/note-legali/">https://curiepinerolo.edu.it/note-legali/</a> + Licenza + Circolapp è rilasciata secondo la licenza GPL v3 (<a href="https://github.com/Matte23/circolapp/blob/master/LICENSE">https://github.com/Matte23/circolapp/blob/master/LICENSE</a>):<br /><br /> + © 2019 - 2020 Matteo Schiff<br />Questo programma è rilasciato SENZA ALCUNA GARANZIA E SENZA ALCUNA RESPONSABILITÀ A CARICO DELLO SVILUPPATORE.<br />Questo è software libero, e sei invitato a condividerlo nei termini della licenza + Codice sorgente + Puoi scaricare il codice sorgente da <a href="https://github.com/Matte23/circolapp">https://github.com/Matte23/circolapp</a> Lettore PDF non installato Installa un lettore di PDF per aprire le circolari diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c1eb860..29f12ff 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -3,7 +3,6 @@ Circular letters Favourites Reminders - Third party licenses Settings About @@ -37,14 +36,16 @@ Next Back Cancel - Show third party licenses - About Circolapp - Circolapp is released under the GPL v3 license (https://github.com/Matte23/circolapp/blob/master/LICENSE):\n\n - © 2019 - 2020 Matteo Schiff\nThis program comes with ABSOLUTELY NO WARRANTY.\nThis is free software, and you are welcome to redistribute it - under certain conditions. \n\n - Circulars letters are written by the Liceo Scientifico Maria Curie Pinerolo, and are downloaded directly from https://curiepinerolo.edu.it/.\n - Those documents are released under the "Attribution-NonCommercial-ShareAlike 3.0 Unported (CC BY-NC-SA 3.0)(https://creativecommons.org/licenses/by-nc-sa/3.0/), as specified in this page: https://curiepinerolo.edu.it/note-legali + About Circolapp + Circulars letters are written and published by the Liceo Scientifico Maria Curie Pinerolo, and are downloaded directly from <a href="https://curiepinerolo.edu.it/">https://curiepinerolo.edu.it/</a>.<br /> + Those documents are released under the license <a href="https://creativecommons.org/licenses/by-nc-sa/3.0/"> <i>Attribution-NonCommercial-ShareAlike 3.0 Unported (CC BY-NC-SA 3.0)</i></a>, as specified in this page: <a href="https://curiepinerolo.edu.it/note-legali/">https://curiepinerolo.edu.it/note-legali/</a> + License + Circolapp is released under the GPL v3 license (<a href="https://github.com/Matte23/circolapp/blob/master/LICENSE">https://github.com/Matte23/circolapp/blob/master/LICENSE</a>):<br /><br /> + © 2019 - 2020 Matteo Schiff<br />This program comes with ABSOLUTELY NO WARRANTY.<br />This is free software, and you are welcome to redistribute it + under certain conditions + Source code + The source code can be downloaded from <a href="https://github.com/Matte23/circolapp">https://github.com/Matte23/circolapp</a> PDF reader not found Please install an external application to open circular letters diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 51e95ae..ac56e86 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,7 +1,7 @@ - diff --git a/build.gradle b/build.gradle index 9ee8e31..6243786 100644 --- a/build.gradle +++ b/build.gradle @@ -2,6 +2,7 @@ buildscript { ext.kotlin_version = '1.4.10' + ext.about_libs_version = '8.3.0' repositories { google() jcenter() @@ -10,7 +11,7 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:4.0.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath 'com.jaredsburrows:gradle-license-plugin:0.8.5' + classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:$about_libs_version" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files }