From 67e39534d4d0ef5eef46ebbe7cde6945fdd691ed Mon Sep 17 00:00:00 2001
From: Taras Smakula <tarassmakula@gmail.com>
Date: Tue, 26 Dec 2023 16:14:55 +0200
Subject: [PATCH] Add navigation to accept circle invite
---
.../res/layout/list_item_people_request.xml | 97 -------------------
.../main/res/navigation/invites_nav_graph.xml | 12 +++
core/src/main/res/values/ids.xml | 1 +
3 files changed, 13 insertions(+), 97 deletions(-)
delete mode 100644 app/src/main/res/layout/list_item_people_request.xml
diff --git a/app/src/main/res/layout/list_item_people_request.xml b/app/src/main/res/layout/list_item_people_request.xml
deleted file mode 100644
index e6a90d02a..000000000
--- a/app/src/main/res/layout/list_item_people_request.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
- xmlns:tools="http://schemas.android.com/tools"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingHorizontal="8dp"
- android:paddingVertical="4dp"
- tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
-
- <com.google.android.material.imageview.ShapeableImageView
- android:id="@+id/ivUserImage"
- android:layout_width="72dp"
- android:layout_height="0dp"
- android:scaleType="centerCrop"
- app:layout_constraintDimensionRatio="w,1:1"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.App.CornerSize50Percent"
- tools:background="@color/blue" />
-
- <TextView
- android:id="@+id/tvUserName"
- style="@style/title2"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_marginStart="8dp"
- android:layout_marginEnd="8dp"
- android:ellipsize="end"
- android:lines="1"
- app:layout_constraintBottom_toTopOf="@id/tvFollowText"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toEndOf="@id/ivUserImage"
- app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintVertical_chainStyle="packed"
- tools:text="Android01" />
-
- <TextView
- android:id="@+id/tvFollowText"
- style="@style/subheadline"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:ellipsize="end"
- android:lines="1"
- android:text="@string/wants_to_follow_you"
- android:textSize="13sp"
- app:layout_constraintEnd_toEndOf="@id/tvUserName"
- app:layout_constraintStart_toStartOf="@id/tvUserName"
- app:layout_constraintTop_toBottomOf="@id/tvUserName" />
-
- <TextView
- android:id="@+id/tvReasonMessage"
- style="@style/subheadline"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_marginTop="4dp"
- android:ellipsize="end"
- android:maxLines="3"
- android:textSize="13sp"
- android:visibility="gone"
- app:layout_constraintEnd_toEndOf="@id/tvUserName"
- app:layout_constraintStart_toStartOf="@id/tvUserName"
- app:layout_constraintTop_toBottomOf="@id/tvFollowText"
- tools:text="Reason message messagemessagemessagemessagemessagemessagemessagemessagemessagemessagemessage"
- tools:visibility="visible" />
-
- <com.google.android.material.button.MaterialButton
- android:id="@+id/btnAccept"
- style="@style/AccentButtonStyle"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginTop="4dp"
- android:layout_marginEnd="8dp"
- android:padding="0dp"
- android:text="@string/accept"
- android:textSize="14sp"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toStartOf="@id/btnDecline"
- app:layout_constraintStart_toEndOf="@id/ivUserImage"
- app:layout_constraintTop_toBottomOf="@id/tvReasonMessage"
-
- />
-
- <com.google.android.material.button.MaterialButton
- android:id="@+id/btnDecline"
- style="@style/NegativeButtonStyle"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:padding="0dp"
- android:text="@string/decline"
- android:textSize="14sp"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toEndOf="@id/btnAccept"
- app:layout_constraintTop_toTopOf="@id/btnAccept" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/core/src/main/res/navigation/invites_nav_graph.xml b/core/src/main/res/navigation/invites_nav_graph.xml
index 59821e1bf..8f24cb03e 100644
--- a/core/src/main/res/navigation/invites_nav_graph.xml
+++ b/core/src/main/res/navigation/invites_nav_graph.xml
@@ -15,4 +15,16 @@
app:nullable="false" />
</dialog>
+
+ <action
+ android:id="@+id/to_acceptCircleInviteDialogFragment"
+ app:destination="@id/acceptCircleInviteDialogFragment">
+
+ <argument
+ android:name="roomId"
+ app:argType="string"
+ app:nullable="false" />
+
+ </action>
+
</navigation>
\ No newline at end of file
diff --git a/core/src/main/res/values/ids.xml b/core/src/main/res/values/ids.xml
index 2a4f8dfd5..dccd7ae29 100644
--- a/core/src/main/res/values/ids.xml
+++ b/core/src/main/res/values/ids.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<item name="toolbar" type="id" />
+ <item name="acceptCircleInviteDialogFragment" type="id" />
</resources>
\ No newline at end of file
--
GitLab