mirror of
https://github.com/MatomoCamp/matomocamp-companion-android.git
synced 2024-09-19 16:13:46 +02:00
update Gradle plugin, Core, Material Components
This commit is contained in:
parent
71b1bcaf37
commit
7531b22a0a
7 changed files with 9 additions and 7 deletions
|
@ -77,10 +77,10 @@ dependencies {
|
||||||
implementation "com.google.dagger:hilt-android:$hilt_version"
|
implementation "com.google.dagger:hilt-android:$hilt_version"
|
||||||
kapt "com.google.dagger:hilt-compiler:$hilt_version"
|
kapt "com.google.dagger:hilt-compiler:$hilt_version"
|
||||||
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0'
|
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0'
|
||||||
implementation 'androidx.core:core-ktx:1.5.0'
|
implementation 'androidx.core:core-ktx:1.6.0'
|
||||||
implementation 'androidx.fragment:fragment-ktx:1.3.5'
|
implementation 'androidx.fragment:fragment-ktx:1.3.5'
|
||||||
implementation 'androidx.appcompat:appcompat:1.3.0'
|
implementation 'androidx.appcompat:appcompat:1.3.0'
|
||||||
implementation 'com.google.android.material:material:1.3.0'
|
implementation 'com.google.android.material:material:1.4.0'
|
||||||
implementation 'androidx.coordinatorlayout:coordinatorlayout:1.1.0'
|
implementation 'androidx.coordinatorlayout:coordinatorlayout:1.1.0'
|
||||||
implementation 'androidx.recyclerview:recyclerview:1.2.1'
|
implementation 'androidx.recyclerview:recyclerview:1.2.1'
|
||||||
implementation 'androidx.viewpager2:viewpager2:1.1.0-alpha01'
|
implementation 'androidx.viewpager2:viewpager2:1.1.0-alpha01'
|
||||||
|
|
|
@ -151,7 +151,7 @@ class BookmarksListFragment : Fragment(R.layout.recyclerview), CreateNfcAppDataC
|
||||||
true
|
true
|
||||||
}
|
}
|
||||||
R.id.export_bookmarks -> {
|
R.id.export_bookmarks -> {
|
||||||
val exportIntent = BookmarksExportProvider.getIntent(activity)
|
val exportIntent = BookmarksExportProvider.getIntent(requireActivity())
|
||||||
startActivity(Intent.createChooser(exportIntent, getString(R.string.export_bookmarks)))
|
startActivity(Intent.createChooser(exportIntent, getString(R.string.export_bookmarks)))
|
||||||
true
|
true
|
||||||
}
|
}
|
||||||
|
|
|
@ -189,7 +189,7 @@ class EventDetailsFragment : Fragment(R.layout.fragment_event_details) {
|
||||||
private fun createShareChooserIntent(): Intent {
|
private fun createShareChooserIntent(): Intent {
|
||||||
val title = event.title ?: ""
|
val title = event.title ?: ""
|
||||||
val url = event.url ?: ""
|
val url = event.url ?: ""
|
||||||
return ShareCompat.IntentBuilder.from(requireActivity())
|
return ShareCompat.IntentBuilder(requireActivity())
|
||||||
.setSubject("$title ($CONFERENCE_NAME)")
|
.setSubject("$title ($CONFERENCE_NAME)")
|
||||||
.setType("text/plain")
|
.setType("text/plain")
|
||||||
.setText("$title $url $CONFERENCE_HASHTAG")
|
.setText("$title $url $CONFERENCE_HASHTAG")
|
||||||
|
|
|
@ -175,9 +175,9 @@ class BookmarksExportProvider : ContentProvider() {
|
||||||
.build()
|
.build()
|
||||||
private val COLUMNS = arrayOf(OpenableColumns.DISPLAY_NAME, OpenableColumns.SIZE)
|
private val COLUMNS = arrayOf(OpenableColumns.DISPLAY_NAME, OpenableColumns.SIZE)
|
||||||
|
|
||||||
fun getIntent(activity: Activity?): Intent {
|
fun getIntent(activity: Activity): Intent {
|
||||||
// Supports granting read permission for the attached shared file
|
// Supports granting read permission for the attached shared file
|
||||||
return ShareCompat.IntentBuilder.from(activity!!)
|
return ShareCompat.IntentBuilder(activity)
|
||||||
.setStream(URI)
|
.setStream(URI)
|
||||||
.setType(TYPE)
|
.setType(TYPE)
|
||||||
.intent
|
.intent
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
<merge />
|
|
@ -0,0 +1 @@
|
||||||
|
<merge />
|
|
@ -9,7 +9,7 @@ buildscript {
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'com.android.tools.build:gradle:4.2.1'
|
classpath 'com.android.tools.build:gradle:4.2.2'
|
||||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
||||||
classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
|
classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue