Merge pull request #2063 from element-hq/feature/bma/hideRoomListMenu

Hide room list menu

appconfig/src/main/kotlin/io/element/android/appconfig/AnalyticsConfig.kt

@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-package io.element.android.features.analytics.api
+package io.element.android.appconfig
 
-object Config {
+object AnalyticsConfig {
     const val POLICY_LINK = "https://element.io/cookie-policy"
 }
-

appconfig/src/main/kotlin/io/element/android/appconfig/NotificationConfig.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.libraries.push.impl
+package io.element.android.appconfig
 
 object NotificationConfig {
     // TODO EAx Implement and set to true at some point

appconfig/src/main/kotlin/io/element/android/appconfig/RoomListConfig.kt

@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2023 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 io.element.android.appconfig
+
+object RoomListConfig {
+    const val showInviteMenuItem = false
+    const val showReportProblemMenuItem = false
+
+    const val hasDropdownMenu = showInviteMenuItem || showReportProblemMenuItem
+}

changelog.d/2062.misc

@@ -0,0 +1 @@
+Hide room list dropdown menu.

features/analytics/impl/build.gradle.kts

@@ -39,6 +39,7 @@ dependencies {
     implementation(projects.libraries.uiStrings)
     api(projects.features.analytics.api)
     api(projects.services.analytics.api)
+    implementation(projects.appconfig)
     implementation(libs.androidx.datastore.preferences)
     implementation(libs.androidx.browser)
     ksp(libs.showkase.processor)

features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInNode.kt

@@ -17,7 +17,6 @@
 package io.element.android.features.analytics.impl
 
 import android.app.Activity
-import androidx.compose.material.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
@@ -27,7 +26,8 @@ import com.bumble.appyx.core.plugin.Plugin
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import io.element.android.anvilannotations.ContributesNode
-import io.element.android.features.analytics.api.Config
+import io.element.android.appconfig.AnalyticsConfig
+import io.element.android.compound.theme.ElementTheme
 import io.element.android.libraries.androidutils.browser.openUrlInChromeCustomTab
 import io.element.android.libraries.di.AppScope
 
@@ -39,13 +39,13 @@ class AnalyticsOptInNode @AssistedInject constructor(
 ) : Node(buildContext, plugins = plugins) {
 
     private fun onClickTerms(activity: Activity, darkTheme: Boolean) {
-        activity.openUrlInChromeCustomTab(null, darkTheme, Config.POLICY_LINK)
+        activity.openUrlInChromeCustomTab(null, darkTheme, AnalyticsConfig.POLICY_LINK)
     }
 
     @Composable
     override fun View(modifier: Modifier) {
         val activity = LocalContext.current as Activity
-        val isDark = MaterialTheme.colors.isLight.not()
+        val isDark = ElementTheme.isLightTheme.not()
         val state = presenter.present()
         AnalyticsOptInView(
             state = state,

features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInView.kt

@@ -40,10 +40,10 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
+import io.element.android.appconfig.AnalyticsConfig
 import io.element.android.compound.theme.ElementTheme
 import io.element.android.compound.tokens.generated.CompoundIcons
 import io.element.android.features.analytics.api.AnalyticsOptInEvents
-import io.element.android.features.analytics.api.Config
 import io.element.android.libraries.designsystem.atomic.molecules.ButtonColumnMolecule
 import io.element.android.libraries.designsystem.atomic.molecules.IconTitleSubtitleMolecule
 import io.element.android.libraries.designsystem.atomic.organisms.InfoListItem
@@ -119,7 +119,7 @@ private fun AnalyticsOptInHeader(
             color = Color.Unspecified,
             underline = false,
             bold = true,
-            tagAndLink = LINK_TAG to Config.POLICY_LINK,
+            tagAndLink = LINK_TAG to AnalyticsConfig.POLICY_LINK,
         )
         ClickableText(
             text = text,

features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/preferences/DefaultAnalyticsPreferencesPresenter.kt

@@ -20,8 +20,8 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.rememberCoroutineScope
 import com.squareup.anvil.annotations.ContributesBinding
+import io.element.android.appconfig.AnalyticsConfig
 import io.element.android.features.analytics.api.AnalyticsOptInEvents
-import io.element.android.features.analytics.api.Config
 import io.element.android.features.analytics.api.preferences.AnalyticsPreferencesPresenter
 import io.element.android.features.analytics.api.preferences.AnalyticsPreferencesState
 import io.element.android.libraries.core.meta.BuildMeta
@@ -52,7 +52,7 @@ class DefaultAnalyticsPreferencesPresenter @Inject constructor(
         return AnalyticsPreferencesState(
             applicationName = buildMeta.applicationName,
             isEnabled = isEnabled.value,
-            policyUrl = Config.POLICY_LINK,
+            policyUrl = AnalyticsConfig.POLICY_LINK,
             eventSink = ::handleEvents
         )
     }

features/roomlist/impl/build.gradle.kts

@@ -38,6 +38,7 @@ anvil {
 dependencies {
     implementation(projects.anvilannotations)
     anvil(projects.anvilcodegen)
+    implementation(projects.appconfig)
     implementation(projects.libraries.core)
     implementation(projects.libraries.androidutils)
     implementation(projects.libraries.architecture)

features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomListTopBar.kt

@@ -46,6 +46,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.DpOffset
 import androidx.compose.ui.unit.DpSize
 import androidx.compose.ui.unit.dp
+import io.element.android.appconfig.RoomListConfig
 import io.element.android.compound.theme.ElementTheme
 import io.element.android.compound.tokens.generated.CompoundIcons
 import io.element.android.features.roomlist.impl.R
@@ -128,8 +129,6 @@ private fun DefaultRoomListTopBar(
     onMenuActionClicked: (RoomListMenuAction) -> Unit,
     modifier: Modifier = Modifier,
 ) {
-    var showMenu by remember { mutableStateOf(false) }
-
     // We need this to manually clip the top app bar in preview mode
     val previewAppBarHeight = if (LocalInspectionMode.current) {
         112.dp.roundToPx()
@@ -222,46 +221,53 @@ private fun DefaultRoomListTopBar(
                         contentDescription = stringResource(CommonStrings.action_search),
                     )
                 }
-                IconButton(
-                    onClick = { showMenu = !showMenu }
-                ) {
-                    Icon(
-                        imageVector = CompoundIcons.OverflowVertical,
-                        contentDescription = null,
-                    )
-                }
-                DropdownMenu(
-                    expanded = showMenu,
-                    onDismissRequest = { showMenu = false }
-                ) {
-                    DropdownMenuItem(
-                        onClick = {
-                            showMenu = false
-                            onMenuActionClicked(RoomListMenuAction.InviteFriends)
-                        },
-                        text = { Text(stringResource(id = CommonStrings.action_invite)) },
-                        leadingIcon = {
-                            Icon(
-                                imageVector = CompoundIcons.ShareAndroid,
-                                tint = ElementTheme.materialColors.secondary,
-                                contentDescription = null,
+                if (RoomListConfig.hasDropdownMenu) {
+                    var showMenu by remember { mutableStateOf(false) }
+                    IconButton(
+                        onClick = { showMenu = !showMenu }
+                    ) {
+                        Icon(
+                            imageVector = CompoundIcons.OverflowVertical,
+                            contentDescription = null,
+                        )
+                    }
+                    DropdownMenu(
+                        expanded = showMenu,
+                        onDismissRequest = { showMenu = false }
+                    ) {
+                        if (RoomListConfig.showInviteMenuItem) {
+                            DropdownMenuItem(
+                                onClick = {
+                                    showMenu = false
+                                    onMenuActionClicked(RoomListMenuAction.InviteFriends)
+                                },
+                                text = { Text(stringResource(id = CommonStrings.action_invite)) },
+                                leadingIcon = {
+                                    Icon(
+                                        imageVector = CompoundIcons.ShareAndroid,
+                                        tint = ElementTheme.materialColors.secondary,
+                                        contentDescription = null,
+                                    )
+                                }
                             )
                         }
-                    )
-                    DropdownMenuItem(
-                        onClick = {
-                            showMenu = false
-                            onMenuActionClicked(RoomListMenuAction.ReportBug)
-                        },
-                        text = { Text(stringResource(id = CommonStrings.common_report_a_problem)) },
-                        leadingIcon = {
-                            Icon(
-                                imageVector = CompoundIcons.ChatProblem,
-                                tint = ElementTheme.materialColors.secondary,
-                                contentDescription = null,
+                        if (RoomListConfig.showReportProblemMenuItem) {
+                            DropdownMenuItem(
+                                onClick = {
+                                    showMenu = false
+                                    onMenuActionClicked(RoomListMenuAction.ReportBug)
+                                },
+                                text = { Text(stringResource(id = CommonStrings.common_report_a_problem)) },
+                                leadingIcon = {
+                                    Icon(
+                                        imageVector = CompoundIcons.ChatProblem,
+                                        tint = ElementTheme.materialColors.secondary,
+                                        contentDescription = null,
+                                    )
+                                }
                             )
                         }
-                    )
+                    }
                 }
             },
             scrollBehavior = scrollBehavior,

libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/action/MarkAsReadActionFactory.kt

@@ -20,9 +20,9 @@ import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
 import androidx.core.app.NotificationCompat
+import io.element.android.appconfig.NotificationConfig
 import io.element.android.libraries.androidutils.uri.createIgnoredUri
 import io.element.android.libraries.di.ApplicationContext
-import io.element.android.libraries.push.impl.NotificationConfig
 import io.element.android.libraries.push.impl.R
 import io.element.android.libraries.push.impl.notifications.NotificationActionIds
 import io.element.android.libraries.push.impl.notifications.NotificationBroadcastReceiver

libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/action/QuickReplyActionFactory.kt

@@ -22,12 +22,12 @@ import android.content.Intent
 import android.os.Build
 import androidx.core.app.NotificationCompat
 import androidx.core.app.RemoteInput
+import io.element.android.appconfig.NotificationConfig
 import io.element.android.libraries.androidutils.uri.createIgnoredUri
 import io.element.android.libraries.di.ApplicationContext
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.matrix.api.core.ThreadId
-import io.element.android.libraries.push.impl.NotificationConfig
 import io.element.android.libraries.push.impl.R
 import io.element.android.libraries.push.impl.notifications.NotificationActionIds
 import io.element.android.libraries.push.impl.notifications.NotificationBroadcastReceiver