mirror/matomocamp-companion-android
1
0
Fork 0
mirror of https://github.com/MatomoCamp/matomocamp-companion-android.git synced 2024-09-19 16:13:46 +02:00
Code Releases Activity

update Gradle plugin, Core, Material Components

Browse source
This commit is contained in:
Christophe Beyls 2021-07-10 12:03:49 +02:00
parent 71b1bcaf37
commit 7531b22a0a
7 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/build.gradle
View file

@ -77,10 +77,10 @@ dependencies {
implementation "com.google.dagger:hilt-android:$hilt_version"
kapt "com.google.dagger:hilt-compiler:$hilt_version"
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.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.recyclerview:recyclerview:1.2.1'
implementation 'androidx.viewpager2:viewpager2:1.1.0-alpha01'

2
app/src/main/java/be/digitalia/fosdem/fragments/BookmarksListFragment.kt
View file

@ -151,7 +151,7 @@ class BookmarksListFragment : Fragment(R.layout.recyclerview), CreateNfcAppDataC
true
}
R.id.export_bookmarks -> {
val exportIntent = BookmarksExportProvider.getIntent(activity)
val exportIntent = BookmarksExportProvider.getIntent(requireActivity())
startActivity(Intent.createChooser(exportIntent, getString(R.string.export_bookmarks)))
true
}

2
app/src/main/java/be/digitalia/fosdem/fragments/EventDetailsFragment.kt
View file

@ -189,7 +189,7 @@ class EventDetailsFragment : Fragment(R.layout.fragment_event_details) {
private fun createShareChooserIntent(): Intent {
val title = event.title ?: ""
val url = event.url ?: ""
return ShareCompat.IntentBuilder.from(requireActivity())
return ShareCompat.IntentBuilder(requireActivity())
.setSubject("$title ($CONFERENCE_NAME)")
.setType("text/plain")
.setText("$title $url $CONFERENCE_HASHTAG")

4
app/src/main/java/be/digitalia/fosdem/providers/BookmarksExportProvider.kt
View file

@ -175,9 +175,9 @@ class BookmarksExportProvider : ContentProvider() {
.build()
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
return ShareCompat.IntentBuilder.from(activity!!)
return ShareCompat.IntentBuilder(activity)
.setStream(URI)
.setType(TYPE)
.intent

1
app/src/main/res-override/layout/mtrl_navigation_rail_item.xml Normal file
View file

@ -0,0 +1 @@
<merge />

1
app/src/main/res-override/layout/test_navigation_bar_item_layout.xml Normal file
View file

@ -0,0 +1 @@
<merge />

2
build.gradle
View file

@ -9,7 +9,7 @@ buildscript {
mavenCentral()
}
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 "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
}