From 6c725a1a7536685651ad2be2e443724df037ca53 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onuray.sahin@gmail.com>
Date: Fri, 19 Aug 2022 12:26:12 +0300
Subject: [PATCH] Add custom view into the layout.

---
 .../v2/VectorSettingsDevicesFragment.kt       |  4 +--
 .../devices/v2/list/CurrentSessionView.kt     | 35 +++++++++++++++++++
 .../res/layout/fragment_settings_devices.xml  | 24 +++++++++++--
 3 files changed, 59 insertions(+), 4 deletions(-)
 create mode 100644 vector/src/main/java/im/vector/app/features/settings/devices/v2/list/CurrentSessionView.kt

diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt
index 4fc429c865..6b60e9b020 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt
@@ -61,12 +61,12 @@ class VectorSettingsDevicesFragment @Inject constructor() : VectorBaseFragment<F
     }
 
     private fun initLearnMoreButtons() {
-        views.devicesListHeaderSectionOther.onLearnMoreClickListener = {
+        views.deviceListHeaderSectionOther.onLearnMoreClickListener = {
             Toast.makeText(context, "Learn more other", Toast.LENGTH_LONG).show()
         }
     }
 
     private fun cleanUpLearnMoreButtonsListeners() {
-        views.devicesListHeaderSectionOther.onLearnMoreClickListener = null
+        views.deviceListHeaderSectionOther.onLearnMoreClickListener = null
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/CurrentSessionView.kt b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/CurrentSessionView.kt
new file mode 100644
index 0000000000..f3e6fa73ca
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/v2/list/CurrentSessionView.kt
@@ -0,0 +1,35 @@
+/*
+ * 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.settings.devices.v2.list
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import androidx.constraintlayout.widget.ConstraintLayout
+import im.vector.app.databinding.ViewCurrentSessionBinding
+
+class CurrentSessionView @JvmOverloads constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+        defStyleAttr: Int = 0
+) : ConstraintLayout(context, attrs, defStyleAttr) {
+
+    private val binding = ViewCurrentSessionBinding.inflate(
+            LayoutInflater.from(context),
+            this
+    )
+}
diff --git a/vector/src/main/res/layout/fragment_settings_devices.xml b/vector/src/main/res/layout/fragment_settings_devices.xml
index 11c04eacf8..a1f2717159 100644
--- a/vector/src/main/res/layout/fragment_settings_devices.xml
+++ b/vector/src/main/res/layout/fragment_settings_devices.xml
@@ -5,13 +5,33 @@
     android:layout_height="match_parent">
 
     <im.vector.app.features.settings.devices.v2.list.DevicesListHeaderView
-        android:id="@+id/devices_list_header_section_other"
+        android:id="@+id/deviceListHeaderSectionCurrent"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        app:devicesListHeaderDescription=""
+        app:devicesListHeaderTitle="@string/device_manager_header_section_current_session"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <im.vector.app.features.settings.devices.v2.list.CurrentSessionView
+        android:id="@+id/deviceListCurrentSession"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        android:layout_marginVertical="24dp"
+        android:layout_marginHorizontal="16dp"
+        app:layout_constraintTop_toBottomOf="@id/deviceListHeaderSectionCurrent" />
+
+    <im.vector.app.features.settings.devices.v2.list.DevicesListHeaderView
+        android:id="@+id/deviceListHeaderSectionOther"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         app:devicesListHeaderDescription="@string/settings_sessions_other_description"
         app:devicesListHeaderTitle="@string/settings_sessions_other_title"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toBottomOf="@id/deviceListCurrentSession" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>