Merge pull request #5868 from nextcloud/feat/3248/ecosystem

📚 Add ecosystem bar to account chooser dialog

Author: mahibi

app/build.gradle

@@ -315,6 +315,7 @@ dependencies {
     implementation 'androidx.core:core-ktx:1.17.0'
     implementation 'androidx.activity:activity-ktx:1.12.4'
     implementation 'com.github.nextcloud.android-common:ui:0.33.0'
+    implementation 'com.github.nextcloud.android-common:core:0.33.0'
     implementation 'com.github.nextcloud-deps:android-talk-webrtc:132.6834.0'
 
     gplayImplementation 'com.google.android.gms:play-services-base:18.10.0'

app/src/main/AndroidManifest.xml

@@ -110,6 +110,11 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
 
+            <intent-filter>
+                <action android:name="com.nextcloud.intent.OPEN_ECOSYSTEM_APP" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />

app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt

@@ -4313,6 +4313,7 @@ class ChatActivity :
         }
     }
 
+    @Suppress("Detekt.TooGenericExceptionCaught")
     private fun shareToNotes(
         shareUri: Uri?,
         roomToken: String,

app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt

@@ -756,10 +756,15 @@ class ConversationsListActivity :
     }
 
     private fun showChooseAccountDialog() {
+        val brandedClient = getResources().getBoolean(R.bool.is_branded_client)
         binding.genericComposeView.apply {
             val shouldDismiss = mutableStateOf(false)
             setContent {
-                ChooseAccountDialogCompose().GetChooseAccountDialog(shouldDismiss, this@ConversationsListActivity)
+                ChooseAccountDialogCompose().GetChooseAccountDialog(
+                    shouldDismiss,
+                    this@ConversationsListActivity,
+                    appPreferences.isShowEcosystem && !brandedClient
+                )
             }
         }
     }

app/src/main/java/com/nextcloud/talk/conversationlist/viewmodels/ConversationsListViewModel.kt

@@ -281,6 +281,7 @@ class ConversationsListViewModel @Inject constructor(
             return differenceMillis > checkIntervalInMillies
         }
 
+        @Suppress("Detekt.TooGenericExceptionCaught")
         fun checkIfFollowedThreadsExist() {
             val threadsUrl = ApiUtils.getUrlForSubscribedThreads(
                 version = 1,

app/src/main/java/com/nextcloud/talk/settings/SettingsActivity.kt

@@ -216,6 +216,7 @@ class SettingsActivity :
         }
 
         setupCheckables(isOnline.value)
+        setupEcosystemSetting()
         setupScreenLockSetting()
         setupNotificationSettings()
         setupProxyTypeSettings()
@@ -252,6 +253,14 @@ class SettingsActivity :
         }
     }
 
+    private fun setupEcosystemSetting() {
+        if (getResources().getBoolean(R.bool.is_branded_client)) {
+            binding.settingsShowEcosystem.visibility = View.GONE
+        } else {
+            binding.settingsShowEcosystem.visibility = View.VISIBLE
+        }
+    }
+
     @Suppress("MagicNumber")
     private fun scrollToNotificationCategory() {
         binding.scrollView.post {
@@ -771,6 +780,7 @@ class SettingsActivity :
     private fun themeSwitchPreferences() {
         binding.run {
             listOf(
+                settingsShowEcosystemSwitch,
                 settingsShowNotificationWarningSwitch,
                 settingsScreenLockSwitch,
                 settingsScreenSecuritySwitch,
@@ -967,6 +977,8 @@ class SettingsActivity :
     }
 
     private fun setupCheckables(isOnline: Boolean) {
+        setupShowEcosystemCheckable()
+
         binding.settingsShowNotificationWarningSwitch.isChecked =
             appPreferences.showRegularNotificationWarning
 
@@ -1031,6 +1043,15 @@ class SettingsActivity :
         }
     }
 
+    private fun setupShowEcosystemCheckable() {
+        binding.settingsShowEcosystemSwitch.isChecked = appPreferences.isShowEcosystem
+        binding.settingsShowEcosystem.setOnClickListener {
+            val isChecked = binding.settingsShowEcosystemSwitch.isChecked
+            binding.settingsShowEcosystemSwitch.isChecked = !isChecked
+            appPreferences.setShowEcosystem(!isChecked)
+        }
+    }
+
     private fun setupPhoneBookIntegrationSetting() {
         binding.settingsPhoneBookIntegrationSwitch.isChecked = appPreferences.isPhoneBookIntegrationEnabled
         binding.settingsPhoneBookIntegration.setOnClickListener {