Merge remote-tracking branch 'origin/develop' into feature/eric/msc3773

ericdecanini · ericdecanini · commit 51251c2b2b62 · 2022-10-25T11:56:46.000-04:00
diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml
@@ -11,7 +11,7 @@ jobs:
       - run: |
           npm install --save-dev @babel/plugin-transform-flow-strip-types
       - name: Danger
-        uses: danger/danger-js@11.1.3
+        uses: danger/danger-js@11.1.4
         with:
           args: "--dangerfile tools/danger/dangerfile.js"
         env:
diff --git a/.github/workflows/post-pr.yml b/.github/workflows/post-pr.yml
@@ -52,7 +52,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
       - name: Start synapse server
-        uses: michaelkaye/setup-matrix-synapse@v1.0.3
+        uses: michaelkaye/setup-matrix-synapse@v1.0.4
         with:
           uploadLogs: true
           httpPort: 8080
diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml
@@ -66,7 +66,7 @@ jobs:
           yarn add danger-plugin-lint-report --dev
       - name: Danger lint
         if: always()
-        uses: danger/danger-js@11.1.3
+        uses: danger/danger-js@11.1.4
         with:
           args: "--dangerfile tools/danger/dangerfile-lint.js"
         env:
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -50,7 +50,7 @@ jobs:
       - uses: actions/setup-python@v4
         with:
           python-version: 3.8
-      - uses: michaelkaye/setup-matrix-synapse@v1.0.3
+      - uses: michaelkaye/setup-matrix-synapse@v1.0.4
         with:
           uploadLogs: true
           httpPort: 8080
diff --git a/.github/workflows/triage-incoming.yml b/.github/workflows/triage-incoming.yml
@@ -10,7 +10,7 @@ jobs:
     # Skip in forks
     if: github.repository == 'vector-im/element-android'
     steps:
-      - uses: alex-page/github-project-automation-plus@bb266ff4dde9242060e2d5418e120a133586d488
+      - uses: alex-page/github-project-automation-plus@1f8873e97e3c8f58161a323b7c568c1f623a1c4d
         with:
           project: Issue triage
           column: Incoming
diff --git a/.github/workflows/triage-priority-bugs.yml b/.github/workflows/triage-priority-bugs.yml
@@ -24,7 +24,7 @@ jobs:
         contains(github.event.issue.labels.*.name, 'A11y') &&
         contains(github.event.issue.labels.*.name, 'O-Frequent'))
     steps:
-      - uses: alex-page/github-project-automation-plus@bb266ff4dde9242060e2d5418e120a133586d488
+      - uses: alex-page/github-project-automation-plus@1f8873e97e3c8f58161a323b7c568c1f623a1c4d
         with:
           project: Android App Team
           column: Important Issues & Topics (P1)
@@ -50,7 +50,7 @@ jobs:
         contains(github.event.issue.labels.*.name, 'A11y') &&
         contains(github.event.issue.labels.*.name, 'O-Frequent')))
     steps:
-      - uses: alex-page/github-project-automation-plus@bb266ff4dde9242060e2d5418e120a133586d488
+      - uses: alex-page/github-project-automation-plus@1f8873e97e3c8f58161a323b7c568c1f623a1c4d
         with:
           project: Crypto Team
           column: Ready
diff --git a/.github/workflows/triage-unlabelled.yml b/.github/workflows/triage-unlabelled.yml
@@ -28,7 +28,7 @@ jobs:
             echo "ALREADY_IN_BOARD=false" >> $GITHUB_ENV
           fi
       - name: Move issue
-        uses: alex-page/github-project-automation-plus@bb266ff4dde9242060e2d5418e120a133586d488
+        uses: alex-page/github-project-automation-plus@1f8873e97e3c8f58161a323b7c568c1f623a1c4d
         if: ${{ env.ALREADY_IN_BOARD == 'true' }}
         with:
           project: Issue triage
diff --git a/build.gradle b/build.gradle
@@ -33,7 +33,7 @@ buildscript {
         classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.7.20"
         classpath "org.jetbrains.kotlinx:kotlinx-knit:0.4.0"
         classpath 'com.jakewharton:butterknife-gradle-plugin:10.2.3'
-        classpath 'app.cash.paparazzi:paparazzi-gradle-plugin:1.1.0'
+        classpath libs.squareup.paparazziPlugin
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
@@ -45,7 +45,7 @@ plugins {
     // Detekt
     id "io.gitlab.arturbosch.detekt" version "1.21.0"
     // Ksp
-    id "com.google.devtools.ksp" version "1.7.20-1.0.6"
+    id "com.google.devtools.ksp" version "1.7.20-1.0.7"
 
     // Dependency Analysis
     id 'com.autonomousapps.dependency-analysis' version "1.13.1"
@@ -322,7 +322,7 @@ ext.initScreenshotTests = { project ->
     if (hasScreenshots) {
         project.apply plugin: 'app.cash.paparazzi'
     }
-    project.dependencies { testCompileOnly "app.cash.paparazzi:paparazzi:1.0.0" }
+    project.dependencies { testCompileOnly libs.squareup.paparazzi }
     project.android.testOptions.unitTests.all {
         def screenshotTestCapture = "**/*ScreenshotTest*"
         if (hasScreenshots) {
diff --git a/changelog.d/7429.feature b/changelog.d/7429.feature
@@ -0,0 +1 @@
+Add new UI for selecting an attachment
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -1,5 +1,4 @@
 ext.versions = [
-
         'minSdk'            : 21,
         'compileSdk'        : 33,
         'targetSdk'         : 33,
@@ -12,7 +11,7 @@ def gradle = "7.3.1"
 def kotlin = "1.7.20"
 def kotlinCoroutines = "1.6.4"
 def dagger = "2.44"
-def appDistribution = "16.0.0-beta04"
+def appDistribution = "16.0.0-beta05"
 def retrofit = "2.9.0"
 def markwon = "4.6.2"
 def moshi = "1.14.0"
@@ -27,22 +26,20 @@ def jjwt = "0.11.5"
 // Temporary version to unblock #6929. Once 0.16.0 is released we should use it, and revert
 // the whole commit which set version 0.16.0-SNAPSHOT
 def vanniktechEmoji = "0.16.0-SNAPSHOT"
-
-def sentry = "6.4.3"
-
-def fragment = "1.5.3"
-
+def sentry = "6.6.0"
+def fragment = "1.5.4"
 // Testing
 def mockk = "1.12.3" // We need to use 1.12.3 to have mocking in androidTest until a new version is released: https://github.com/mockk/mockk/issues/819
 def espresso = "3.4.0"
 def androidxTest = "1.4.0"
 def androidxOrchestrator = "1.4.1"
+def paparazzi = "1.1.0"
+
 ext.libs = [
         gradle      : [
                 'gradlePlugin'            : "com.android.tools.build:gradle:$gradle",
                 'kotlinPlugin'            : "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin",
                 'hiltPlugin'              : "com.google.dagger:hilt-android-gradle-plugin:$dagger"
-
         ],
         jetbrains   : [
                 'coroutinesCore'          : "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinCoroutines",
@@ -55,7 +52,7 @@ ext.libs = [
                 'biometric'               : "androidx.biometric:biometric:1.1.0",
                 'core'                    : "androidx.core:core-ktx:1.9.0",
                 'recyclerview'            : "androidx.recyclerview:recyclerview:1.2.1",
-                'exifinterface'           : "androidx.exifinterface:exifinterface:1.3.4",
+                'exifinterface'           : "androidx.exifinterface:exifinterface:1.3.5",
                 'fragmentKtx'             : "androidx.fragment:fragment-ktx:$fragment",
                 'fragmentTesting'         : "androidx.fragment:fragment-testing:$fragment",
                 'constraintLayout'        : "androidx.constraintlayout:constraintlayout:2.1.4",
@@ -82,7 +79,7 @@ ext.libs = [
                 'transition'              : "androidx.transition:transition:1.2.0",
         ],
         google      : [
-                'material'                : "com.google.android.material:material:1.6.1",
+                'material'                : "com.google.android.material:material:1.7.0",
                 'appdistributionApi'      : "com.google.firebase:firebase-appdistribution-api-ktx:$appDistribution",
                 'appdistribution'         : "com.google.firebase:firebase-appdistribution:$appDistribution",
                 // Phone number https://github.com/google/libphonenumber
@@ -108,6 +105,8 @@ ext.libs = [
                 'moshiKt'                : "com.squareup.moshi:moshi-kotlin:$moshi",
                 'moshiKotlin'            : "com.squareup.moshi:moshi-kotlin-codegen:$moshi",
                 'moshiAdapters'          : "com.squareup.moshi:moshi-adapters:$moshi",
+                'paparazzi'              : "app.cash.paparazzi:paparazzi:$paparazzi",
+                'paparazziPlugin'        : "app.cash.paparazzi:paparazzi-gradle-plugin:$paparazzi",
                 'retrofit'               : "com.squareup.retrofit2:retrofit:$retrofit",
                 'retrofitMoshi'          : "com.squareup.retrofit2:converter-moshi:$retrofit"
         ],
@@ -167,7 +166,7 @@ ext.libs = [
                 'sentryAndroid'         : "io.sentry:sentry-android:$sentry"
         ],
         tests       : [
-                'kluent'                 : "org.amshove.kluent:kluent-android:1.68",
+                'kluent'                 : "org.amshove.kluent:kluent-android:1.72",
                 'timberJunitRule'        : "net.lachlanmckee:timber-junit-rule:1.0.1",
                 'junit'                  : "junit:junit:4.13.2",
         ]
diff --git a/library/ui-strings/src/main/res/values/strings.xml b/library/ui-strings/src/main/res/values/strings.xml
@@ -3205,6 +3205,15 @@
     <string name="tooltip_attachment_location">Share location</string>
     <string name="tooltip_attachment_voice_broadcast">Start a voice broadcast</string>
 
+    <string name="attachment_type_selector_gallery">Photo library</string>
+    <string name="attachment_type_selector_sticker">Stickers</string>
+    <string name="attachment_type_selector_file">Attachments</string>
+    <string name="attachment_type_selector_voice_broadcast">Voice broadcast</string>
+    <string name="attachment_type_selector_poll">Polls</string>
+    <string name="attachment_type_selector_location">Location</string>
+    <string name="attachment_type_selector_camera">Camera</string>
+    <string name="attachment_type_selector_contact">Contact</string>
+
     <string name="message_reaction_show_less">Show less</string>
     <plurals name="message_reaction_show_more">
         <item quantity="one">"%1$d more"</item>
diff --git a/vector-app/build.gradle b/vector-app/build.gradle
@@ -372,7 +372,7 @@ dependencies {
     debugImplementation 'com.facebook.soloader:soloader:0.10.4'
     debugImplementation "com.kgurgul.flipper:flipper-realm-android:2.2.0"
 
-    gplayImplementation "com.google.android.gms:play-services-location:20.0.0"
+    gplayImplementation "com.google.android.gms:play-services-location:21.0.0"
     // UnifiedPush gplay flavor only
     gplayImplementation('com.google.firebase:firebase-messaging:23.1.0') {
         exclude group: 'com.google.firebase', module: 'firebase-core'
diff --git a/vector/build.gradle b/vector/build.gradle
@@ -239,7 +239,7 @@ dependencies {
     implementation libs.sentry.sentryAndroid
 
     // UnifiedPush
-    implementation 'com.github.UnifiedPush:android-connector:2.1.0'
+    implementation 'com.github.UnifiedPush:android-connector:2.1.1'
 
     implementation "androidx.emoji2:emoji2:1.2.0"
 
diff --git a/vector/src/main/java/im/vector/app/core/di/MavericksViewModelModule.kt b/vector/src/main/java/im/vector/app/core/di/MavericksViewModelModule.kt
@@ -22,6 +22,7 @@ import dagger.hilt.InstallIn
 import dagger.multibindings.IntoMap
 import im.vector.app.features.analytics.accountdata.AnalyticsAccountDataViewModel
 import im.vector.app.features.analytics.ui.consent.AnalyticsConsentViewModel
+import im.vector.app.features.attachments.AttachmentTypeSelectorViewModel
 import im.vector.app.features.auth.ReAuthViewModel
 import im.vector.app.features.call.VectorCallViewModel
 import im.vector.app.features.call.conference.JitsiCallViewModel
@@ -677,4 +678,9 @@ interface MavericksViewModelModule {
     @IntoMap
     @MavericksViewModelKey(VectorSettingsLabsViewModel::class)
     fun vectorSettingsLabsViewModelFactory(factory: VectorSettingsLabsViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+    @Binds
+    @IntoMap
+    @MavericksViewModelKey(AttachmentTypeSelectorViewModel::class)
+    fun attachmentTypeSelectorViewModelFactory(factory: AttachmentTypeSelectorViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
 }
diff --git a/vector/src/main/java/im/vector/app/core/ui/views/BottomSheetActionButton.kt b/vector/src/main/java/im/vector/app/core/ui/views/BottomSheetActionButton.kt
@@ -38,6 +38,10 @@ class BottomSheetActionButton @JvmOverloads constructor(
 ) : FrameLayout(context, attrs, defStyleAttr) {
     val views: ViewBottomSheetActionButtonBinding
 
+    override fun setOnClickListener(l: OnClickListener?) {
+        views.bottomSheetActionClickableZone.setOnClickListener(l)
+    }
+
     var title: String? = null
         set(value) {
             field = value
diff --git a/vector/src/main/java/im/vector/app/features/attachments/AttachmentType.kt b/vector/src/main/java/im/vector/app/features/attachments/AttachmentType.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.attachments
+
+import im.vector.app.core.utils.PERMISSIONS_EMPTY
+import im.vector.app.core.utils.PERMISSIONS_FOR_FOREGROUND_LOCATION_SHARING
+import im.vector.app.core.utils.PERMISSIONS_FOR_PICKING_CONTACT
+import im.vector.app.core.utils.PERMISSIONS_FOR_TAKING_PHOTO
+import im.vector.app.core.utils.PERMISSIONS_FOR_VOICE_BROADCAST
+
+/**
+ * The all possible types to pick with their required permissions.
+ */
+enum class AttachmentType(val permissions: List<String>) {
+    CAMERA(PERMISSIONS_FOR_TAKING_PHOTO),
+    GALLERY(PERMISSIONS_EMPTY),
+    FILE(PERMISSIONS_EMPTY),
+    STICKER(PERMISSIONS_EMPTY),
+    CONTACT(PERMISSIONS_FOR_PICKING_CONTACT),
+    POLL(PERMISSIONS_EMPTY),
+    LOCATION(PERMISSIONS_FOR_FOREGROUND_LOCATION_SHARING),
+    VOICE_BROADCAST(PERMISSIONS_FOR_VOICE_BROADCAST),
+}
diff --git a/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorBottomSheet.kt b/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorBottomSheet.kt
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.attachments
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.view.isVisible
+import androidx.fragment.app.FragmentManager
+import androidx.fragment.app.viewModels
+import com.airbnb.mvrx.fragmentViewModel
+import com.airbnb.mvrx.parentFragmentViewModel
+import com.airbnb.mvrx.withState
+import dagger.hilt.android.AndroidEntryPoint
+import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
+import im.vector.app.databinding.BottomSheetAttachmentTypeSelectorBinding
+import im.vector.app.features.home.room.detail.TimelineViewModel
+
+@AndroidEntryPoint
+class AttachmentTypeSelectorBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetAttachmentTypeSelectorBinding>() {
+
+    private val viewModel: AttachmentTypeSelectorViewModel by fragmentViewModel()
+    private val timelineViewModel: TimelineViewModel by parentFragmentViewModel()
+    private val sharedActionViewModel: AttachmentTypeSelectorSharedActionViewModel by viewModels(
+            ownerProducer = { requireParentFragment() }
+    )
+
+    override val showExpanded = true
+
+    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): BottomSheetAttachmentTypeSelectorBinding {
+        return BottomSheetAttachmentTypeSelectorBinding.inflate(inflater, container, false)
+    }
+
+    override fun invalidate() = withState(viewModel, timelineViewModel) { viewState, timelineState ->
+        super.invalidate()
+        views.location.isVisible = viewState.isLocationVisible
+        views.voiceBroadcast.isVisible = viewState.isVoiceBroadcastVisible
+        views.poll.isVisible = !timelineState.isThreadTimeline()
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        views.gallery.debouncedClicks { onAttachmentSelected(AttachmentType.GALLERY) }
+        views.stickers.debouncedClicks { onAttachmentSelected(AttachmentType.STICKER) }
+        views.file.debouncedClicks { onAttachmentSelected(AttachmentType.FILE) }
+        views.voiceBroadcast.debouncedClicks { onAttachmentSelected(AttachmentType.VOICE_BROADCAST) }
+        views.poll.debouncedClicks { onAttachmentSelected(AttachmentType.POLL) }
+        views.location.debouncedClicks { onAttachmentSelected(AttachmentType.LOCATION) }
+        views.camera.debouncedClicks { onAttachmentSelected(AttachmentType.CAMERA) }
+        views.contact.debouncedClicks { onAttachmentSelected(AttachmentType.CONTACT) }
+    }
+
+    private fun onAttachmentSelected(attachmentType: AttachmentType) {
+        val action = AttachmentTypeSelectorSharedAction.SelectAttachmentTypeAction(attachmentType)
+        sharedActionViewModel.post(action)
+        dismiss()
+    }
+
+    companion object {
+        fun show(fragmentManager: FragmentManager) {
+            val bottomSheet = AttachmentTypeSelectorBottomSheet()
+            bottomSheet.show(fragmentManager, "AttachmentTypeSelectorBottomSheet")
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorSharedActionViewModel.kt b/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorSharedActionViewModel.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package im.vector.app.features.attachments
+
+import im.vector.app.core.platform.VectorSharedAction
+import im.vector.app.core.platform.VectorSharedActionViewModel
+import javax.inject.Inject
+
+class AttachmentTypeSelectorSharedActionViewModel @Inject constructor() :
+        VectorSharedActionViewModel<AttachmentTypeSelectorSharedAction>()
+
+sealed interface AttachmentTypeSelectorSharedAction : VectorSharedAction {
+    data class SelectAttachmentTypeAction(
+            val attachmentType: AttachmentType
+    ) : AttachmentTypeSelectorSharedAction
+}
diff --git a/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt b/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt
diff --git a/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorViewModel.kt b/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorViewModel.kt
diff --git a/vector/src/main/java/im/vector/app/features/attachments/AttachmentsHelper.kt b/vector/src/main/java/im/vector/app/features/attachments/AttachmentsHelper.kt
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/composer/MessageComposerFragment.kt
diff --git a/vector/src/main/res/layout/bottom_sheet_attachment_type_selector.xml b/vector/src/main/res/layout/bottom_sheet_attachment_type_selector.xml
diff --git a/vector/src/test/java/im/vector/app/features/attachments/AttachmentTypeSelectorViewModelTest.kt b/vector/src/test/java/im/vector/app/features/attachments/AttachmentTypeSelectorViewModelTest.kt
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeVectorFeatures.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeVectorFeatures.kt
