Removing other sessions section learn more

vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt

@@ -43,7 +43,6 @@ import im.vector.app.features.settings.devices.v2.list.SESSION_IS_MARKED_AS_INAC
 import im.vector.app.features.settings.devices.v2.list.SecurityRecommendationView
 import im.vector.app.features.settings.devices.v2.list.SecurityRecommendationViewState
 import im.vector.app.features.settings.devices.v2.list.SessionInfoViewState
-import im.vector.app.features.settings.devices.v2.more.SessionLearnMoreBottomSheet
 import javax.inject.Inject
 
 /**
@@ -82,7 +81,6 @@ class VectorSettingsDevicesFragment :
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        initLearnMoreButtons()
         initWaitingView()
         initOtherSessionsView()
         initSecurityRecommendationsView()
@@ -155,24 +153,6 @@ class VectorSettingsDevicesFragment :
         super.onDestroyView()
     }
 
-    private fun initLearnMoreButtons() {
-        views.deviceListHeaderOtherSessions.onLearnMoreClickListener = {
-            showLearnMoreInfoOtherSessions()
-        }
-    }
-
-    private fun showLearnMoreInfoOtherSessions() {
-        val args = SessionLearnMoreBottomSheet.Args(
-                title = getString(R.string.device_manager_sessions_other_title),
-                description = buildString {
-                    append(getString(R.string.device_manager_learn_more_sessions_unverified))
-                    append("\n\n\n")
-                    append(getString(R.string.device_manager_learn_more_sessions_inactive))
-                },
-        )
-        SessionLearnMoreBottomSheet.show(childFragmentManager, args)
-    }
-
     private fun cleanUpLearnMoreButtonsListeners() {
         views.deviceListHeaderOtherSessions.onLearnMoreClickListener = null
     }

vector/src/main/res/layout/fragment_settings_devices.xml

@@ -12,12 +12,12 @@
             android:id="@+id/deviceListHeaderSectionSecurityRecommendations"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            app:sessionsListHeaderDescription="@string/device_manager_header_section_security_recommendations_description"
-            app:sessionsListHeaderTitle="@string/device_manager_header_section_security_recommendations_title"
-            app:sessionsListHeaderHasLearnMoreLink="false"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            app:sessionsListHeaderDescription="@string/device_manager_header_section_security_recommendations_description"
+            app:sessionsListHeaderHasLearnMoreLink="false"
+            app:sessionsListHeaderTitle="@string/device_manager_header_section_security_recommendations_title" />
 
         <im.vector.app.features.settings.devices.v2.list.SecurityRecommendationView
             android:id="@+id/deviceListUnverifiedSessionsRecommendation"
@@ -25,13 +25,13 @@
             android:layout_height="wrap_content"
             android:layout_marginHorizontal="16dp"
             android:layout_marginVertical="16dp"
-            app:recommendationTitle="@string/device_manager_unverified_sessions_title"
-            app:recommendationDescription="@string/device_manager_unverified_sessions_description"
-            app:recommendationImageResource="@drawable/ic_shield_warning_no_border"
-            app:recommendationImageBackgroundTint="@color/shield_color_warning_background"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/deviceListHeaderSectionSecurityRecommendations"/>
+            app:layout_constraintTop_toBottomOf="@id/deviceListHeaderSectionSecurityRecommendations"
+            app:recommendationDescription="@string/device_manager_unverified_sessions_description"
+            app:recommendationImageBackgroundTint="@color/shield_color_warning_background"
+            app:recommendationImageResource="@drawable/ic_shield_warning_no_border"
+            app:recommendationTitle="@string/device_manager_unverified_sessions_title" />
 
         <im.vector.app.features.settings.devices.v2.list.SecurityRecommendationView
             android:id="@+id/deviceListInactiveSessionsRecommendation"
@@ -39,13 +39,13 @@
             android:layout_height="wrap_content"
             android:layout_marginHorizontal="16dp"
             android:layout_marginVertical="16dp"
-            app:recommendationTitle="@string/device_manager_inactive_sessions_title"
-            app:recommendationDescription="@plurals/device_manager_inactive_sessions_description"
-            app:recommendationImageResource="@drawable/ic_inactive_sessions"
-            app:recommendationImageBackgroundTint="?vctr_system"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/deviceListUnverifiedSessionsRecommendation"/>
+            app:layout_constraintTop_toBottomOf="@id/deviceListUnverifiedSessionsRecommendation"
+            app:recommendationDescription="@plurals/device_manager_inactive_sessions_description"
+            app:recommendationImageBackgroundTint="?vctr_system"
+            app:recommendationImageResource="@drawable/ic_inactive_sessions"
+            app:recommendationTitle="@string/device_manager_inactive_sessions_title" />
 
         <View
             android:id="@+id/deviceListSecurityRecommendationsDivider"
@@ -61,12 +61,12 @@
             android:id="@+id/deviceListHeaderCurrentSession"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            app:sessionsListHeaderDescription=""
-            app:sessionsListHeaderTitle="@string/device_manager_current_session_title"
-            app:sessionsListHeaderHasLearnMoreLink="false"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/deviceListSecurityRecommendationsDivider" />
+            app:layout_constraintTop_toBottomOf="@id/deviceListSecurityRecommendationsDivider"
+            app:sessionsListHeaderDescription=""
+            app:sessionsListHeaderHasLearnMoreLink="false"
+            app:sessionsListHeaderTitle="@string/device_manager_current_session_title" />
 
         <im.vector.app.features.settings.devices.v2.list.SessionInfoView
             android:id="@+id/deviceListCurrentSession"
@@ -92,12 +92,12 @@
             android:id="@+id/deviceListHeaderOtherSessions"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            app:sessionsListHeaderDescription="@string/device_manager_sessions_other_description"
-            app:sessionsListHeaderTitle="@string/device_manager_sessions_other_title"
-            app:sessionsListHeaderHasLearnMoreLink="true"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/deviceListDividerCurrentSession" />
+            app:layout_constraintTop_toBottomOf="@id/deviceListDividerCurrentSession"
+            app:sessionsListHeaderDescription="@string/device_manager_sessions_other_description"
+            app:sessionsListHeaderHasLearnMoreLink="false"
+            app:sessionsListHeaderTitle="@string/device_manager_sessions_other_title" />
 
         <im.vector.app.features.settings.devices.v2.list.OtherSessionsView
             android:id="@+id/deviceListOtherSessions"