diff --git a/app/build.gradle b/app/build.gradle index 925489fe..9ca19640 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,6 +3,7 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-kapt' apply plugin: 'androidx.navigation.safeargs.kotlin' +apply plugin: 'com.mikepenz.aboutlibraries.plugin' android { compileSdkVersion 29 @@ -67,7 +68,7 @@ dependencies { implementation 'androidx.constraintlayout:constraintlayout:1.1.3' implementation 'androidx.recyclerview:recyclerview:1.1.0' implementation 'com.google.maps.android:android-maps-utils:0.5' - implementation 'com.github.johan12345:CustomBottomSheetBehavior:4e43539e' + implementation 'com.github.johan12345:CustomBottomSheetBehavior:c2dcf0dc' implementation 'com.google.android.gms:play-services-maps:17.0.0' implementation 'com.google.android.gms:play-services-location:17.0.0' implementation 'com.squareup.retrofit2:retrofit:2.7.2' @@ -75,6 +76,8 @@ dependencies { implementation 'com.squareup.moshi:moshi-kotlin:1.9.2' implementation 'com.squareup.picasso:picasso:2.71828' implementation 'com.github.MikeOrtiz:TouchImageView:2.3.3' + implementation "com.mikepenz:aboutlibraries-core:$about_libs_version" + implementation "com.mikepenz:aboutlibraries:$about_libs_version" // navigation library def nav_version = "2.3.0-alpha04" diff --git a/app/src/main/java/com/johan/evmap/fragment/AboutFragment.kt b/app/src/main/java/com/johan/evmap/fragment/AboutFragment.kt index 4420657f..37ddba2b 100644 --- a/app/src/main/java/com/johan/evmap/fragment/AboutFragment.kt +++ b/app/src/main/java/com/johan/evmap/fragment/AboutFragment.kt @@ -10,6 +10,7 @@ import androidx.preference.PreferenceFragmentCompat import com.johan.evmap.BuildConfig import com.johan.evmap.MapsActivity import com.johan.evmap.R +import com.mikepenz.aboutlibraries.LibsBuilder class AboutFragment : PreferenceFragmentCompat() { @@ -36,6 +37,16 @@ class AboutFragment : PreferenceFragmentCompat() { (activity as? MapsActivity)?.openUrl(preference.summary.toString()) true } + "oss_licenses" -> { + LibsBuilder() + .withLicenseShown(true) + .withAboutVersionShown(false) + .withAboutIconShown(false) + .withActivityTitle(getString(R.string.oss_licenses)) + .withExcludedLibraries() + .start(requireActivity()) + true + } else -> super.onPreferenceTreeClick(preference) } } diff --git a/app/src/main/res/layout/fragment_map.xml b/app/src/main/res/layout/fragment_map.xml index dce9bd29..e44ab4cc 100644 --- a/app/src/main/res/layout/fragment_map.xml +++ b/app/src/main/res/layout/fragment_map.xml @@ -89,12 +89,12 @@ android:fitsSystemWindows="true" android:fillViewport="true" android:orientation="vertical" - app:anchorPoint="@dimen/gallery_height" + app:bottomsheetbehavior_anchorPoint="@dimen/gallery_height" app:behavior_hideable="true" app:behavior_peekHeight="@dimen/peek_height" - app:defaultState="stateHidden" + app:bottomsheetbehavior_defaultState="stateHidden" app:layout_behavior="@string/BottomSheetBehaviorGoogleMapsLike" - tools:defaultState="stateCollapsed"> + tools:bottomsheetbehavior_defaultState="stateCollapsed"> Über EVMap Version Quellcode + Open Source-Lizenzen Einstellungen \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 556541fc..62863cbf 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -28,5 +28,6 @@ About EVMap Version Source code + Open Source Licenses Settings diff --git a/app/src/main/res/xml/about.xml b/app/src/main/res/xml/about.xml index 5db8cf20..70bfe3dc 100644 --- a/app/src/main/res/xml/about.xml +++ b/app/src/main/res/xml/about.xml @@ -14,5 +14,9 @@ android:title="@string/github_link_title" android:summary="@string/github_link" /> + + \ No newline at end of file diff --git a/build.gradle b/build.gradle index 1c424d74..17d5379d 100644 --- a/build.gradle +++ b/build.gradle @@ -2,6 +2,7 @@ buildscript { ext.kotlin_version = '1.3.61' + ext.about_libs_version = '8.1.1' repositories { google() jcenter() @@ -9,6 +10,7 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:4.0.0-beta03' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:$about_libs_version" def nav_version = "2.3.0-alpha04" classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version"