diff --git a/app/build.gradle b/app/build.gradle index 5caefd94c54928374458b5b6532174861d5032fe..6dcd82ac2ca695c843f5bbb2e906083d19da49e2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,7 +1,6 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' apply plugin: 'kotlin-kapt' -apply plugin: 'com.mikepenz.aboutlibraries.plugin' android { compileSdkVersion 32 @@ -88,7 +87,6 @@ dependencies { implementation 'com.google.android.material:material:1.6.1' implementation 'com.jaredrummler:colorpicker:1.1.0' - implementation "com.mikepenz:aboutlibraries:${versions.aboutLibs}" implementation "com.squareup.okhttp3:okhttp:${versions.okhttp}" implementation "com.squareup.okhttp3:okhttp-brotli:${versions.okhttp}" implementation "com.squareup.okhttp3:okhttp-coroutines:${versions.okhttp}" diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7a62320637a545f808ef5c48bec6d420d1eb53b5..206c460511eee58ead9a97b575ea75c66308f8cd 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -115,10 +115,6 @@ android:parentActivityName=".ui.CalendarListActivity" android:windowSoftInputMode="stateHidden" /> - \ No newline at end of file diff --git a/app/src/main/java/at/bitfire/icsdroid/ui/CalendarListActivity.kt b/app/src/main/java/at/bitfire/icsdroid/ui/CalendarListActivity.kt index c36b64d4d2ad0e899911ae699b1edde65e8e6ff5..36d2f7c946f1b9c19e74729c288c2e22175dcc59 100644 --- a/app/src/main/java/at/bitfire/icsdroid/ui/CalendarListActivity.kt +++ b/app/src/main/java/at/bitfire/icsdroid/ui/CalendarListActivity.kt @@ -166,10 +166,6 @@ class CalendarListActivity: AppCompatActivity(), SwipeRefreshLayout.OnRefreshLis SyncWorker.run(this, true) } - fun onShowInfo(item: MenuItem) { - startActivity(Intent(this, InfoActivity::class.java)) - } - fun onSetSyncInterval(item: MenuItem) { SyncIntervalDialogFragment().show(supportFragmentManager, "sync_interval") } diff --git a/app/src/main/java/at/bitfire/icsdroid/ui/InfoActivity.kt b/app/src/main/java/at/bitfire/icsdroid/ui/InfoActivity.kt deleted file mode 100644 index 43c4cf233e48e29f6f40c690d741a1e17f32707d..0000000000000000000000000000000000000000 --- a/app/src/main/java/at/bitfire/icsdroid/ui/InfoActivity.kt +++ /dev/null @@ -1,64 +0,0 @@ -/*************************************************************************************************** - * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details. - **************************************************************************************************/ - -package at.bitfire.icsdroid.ui - -import android.content.ActivityNotFoundException -import android.content.Intent -import android.net.Uri -import android.os.Bundle -import android.util.Log -import android.view.Menu -import android.view.MenuItem -import androidx.appcompat.app.AppCompatActivity -import at.bitfire.icsdroid.BuildConfig -import at.bitfire.icsdroid.Constants -import at.bitfire.icsdroid.R -import com.mikepenz.aboutlibraries.Libs -import com.mikepenz.aboutlibraries.LibsBuilder - -class InfoActivity: AppCompatActivity() { - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - - if (savedInstanceState == null) { - val builder = LibsBuilder() - .withAboutIconShown(true) - .withAboutAppName(getString(R.string.app_name)) - .withAboutDescription(getString(R.string.app_info_description)) - .withAboutVersionShownName(true) - .withAboutVersionString(getString(R.string.app_info_version, BuildConfig.VERSION_NAME, BuildConfig.FLAVOR)) - .withAboutSpecial1(getString(R.string.app_info_gplv3)) - .withAboutSpecial1Description(getString(R.string.app_info_gplv3_note)) - .withLicenseShown(true) - - .withFields(R.string::class.java.fields) - .withLibraryModification("org_brotli__dec", Libs.LibraryFields.LIBRARY_NAME, "Brotli") - .withLibraryModification("org_brotli__dec", Libs.LibraryFields.AUTHOR_NAME, "Google") - - supportFragmentManager.beginTransaction() - .replace(android.R.id.content, builder.supportFragment()) - .commit() - } - } - - fun showWebSite(item: MenuItem) { - launchUri(Uri.parse("https://icsx5.bitfire.at/?pk_campaign=icsx5-app&pk_kwd=info-activity")) - } - - fun showTwitter(item: MenuItem) { - launchUri(Uri.parse("https://twitter.com/icsx5app")) - } - - private fun launchUri(uri: Uri) { - val intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://twitter.com/icsx5app")) - try { - startActivity(intent) - } catch (e: ActivityNotFoundException) { - Log.w(Constants.TAG, "No browser installed") - } - } - -} diff --git a/app/src/main/res/menu/activity_calendar_list.xml b/app/src/main/res/menu/activity_calendar_list.xml index 38d67d5c453d67a24fbd2c895501265894427efc..c389a73319044fe5e1f8beac5d9aec0a6a40a5bb 100644 --- a/app/src/main/res/menu/activity_calendar_list.xml +++ b/app/src/main/res/menu/activity_calendar_list.xml @@ -13,8 +13,4 @@ android:onClick="onToggleDarkMode" app:showAsAction="never" /> - - diff --git a/build.gradle b/build.gradle index 2dac876b0d28c099c093da42d20aaaedd0832eac..c4277246b084b48062169a8d04c9bc7efa50d4ea 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,5 @@ buildscript { ext.versions = [ - aboutLibs: '8.9.4', kotlin: '1.7.10', okhttp: '5.0.0-alpha.10' ] @@ -15,7 +14,6 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:7.2.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}" - classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:${versions.aboutLibs}" } }