From 17de88e5f67e98170c34fd54899f3657981fc0b0 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 24 Jan 2022 18:12:41 +0100
Subject: [PATCH 1/5] Remove the check on number of enum class. Now that we
have more developers, we can have conflict because ot the number of
exception. Let's hope we will not do the mistake...
---
tools/check/forbidden_strings_in_code.txt | 3 ---
1 file changed, 3 deletions(-)
diff --git a/tools/check/forbidden_strings_in_code.txt b/tools/check/forbidden_strings_in_code.txt
index 4cbb2955db..21ab0bab77 100644
--- a/tools/check/forbidden_strings_in_code.txt
+++ b/tools/check/forbidden_strings_in_code.txt
@@ -159,9 +159,6 @@ Formatter\.formatShortFileSize===1
# DISABLED
# android\.text\.TextUtils
-### This is not a rule, but a warning: the number of "enum class" has changed. For Json classes, it is mandatory that they have `@JsonClass(generateAdapter = false)`. If the enum is not used as a Json class, change the value in file forbidden_strings_in_code.txt
-enum class===121
-
### Do not import temporary legacy classes
import org.matrix.android.sdk.internal.legacy.riot===3
import org.matrix.androidsdk.crypto.data===2
From 3a8c788657a094c87c3e806caa9492f104c0fdfd Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 24 Jan 2022 18:47:26 +0100
Subject: [PATCH 2/5] Add a Flow to ba able to hide one of the button
---
.../main/res/layout/vector_invite_view.xml | 28 +++++++++----------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/vector/src/main/res/layout/vector_invite_view.xml b/vector/src/main/res/layout/vector_invite_view.xml
index c39c8c3422..73cfa7f4b0 100644
--- a/vector/src/main/res/layout/vector_invite_view.xml
+++ b/vector/src/main/res/layout/vector_invite_view.xml
@@ -59,38 +59,38 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/inviteIdentifierView" />
+ <androidx.constraintlayout.helper.widget.Flow
+ android:id="@+id/actionsFlow"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="16dp"
+ app:constraint_referenced_ids="inviteAcceptView,inviteRejectView"
+ app:flow_horizontalGap="4dp"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/inviteLabelView" />
+
<im.vector.app.core.platform.ButtonStateView
android:id="@+id/inviteAcceptView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginStart="4dp"
android:minWidth="120dp"
app:bsv_button_text="@string/action_accept"
app:bsv_loaded_image_src="@drawable/ic_tick"
- app:bsv_use_flat_button="false"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_chainStyle="packed"
- app:layout_constraintStart_toEndOf="@id/inviteRejectView"
- app:layout_constraintTop_toTopOf="@id/inviteRejectView" />
+ app:bsv_use_flat_button="false" />
<im.vector.app.core.platform.ButtonStateView
android:id="@+id/inviteRejectView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginTop="16dp"
- android:layout_marginEnd="4dp"
android:minWidth="120dp"
app:bsv_button_text="@string/action_reject"
app:bsv_loaded_image_src="@drawable/ic_tick"
- app:bsv_use_flat_button="true"
- app:layout_constraintEnd_toStartOf="@id/inviteAcceptView"
- app:layout_constraintHorizontal_chainStyle="packed"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@id/inviteLabelView" />
+ app:bsv_use_flat_button="true" />
<Space
android:layout_width="match_parent"
android:layout_height="16dp"
- app:layout_constraintTop_toBottomOf="@id/inviteAcceptView" />
+ app:layout_constraintTop_toBottomOf="@id/actionsFlow" />
</merge>
From 6c560679a59e9eaeeb5017774026e6bca4ec5562 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 24 Jan 2022 18:49:20 +0100
Subject: [PATCH 3/5] Hide the button to make the loading wheel centered
---
.../im/vector/app/features/invite/InviteButtonStateBinder.kt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/vector/src/main/java/im/vector/app/features/invite/InviteButtonStateBinder.kt b/vector/src/main/java/im/vector/app/features/invite/InviteButtonStateBinder.kt
index 2c8589eca1..e5d7ab28cc 100644
--- a/vector/src/main/java/im/vector/app/features/invite/InviteButtonStateBinder.kt
+++ b/vector/src/main/java/im/vector/app/features/invite/InviteButtonStateBinder.kt
@@ -16,7 +16,7 @@
package im.vector.app.features.invite
-import androidx.core.view.isInvisible
+import androidx.core.view.isGone
import im.vector.app.core.platform.ButtonStateView
import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
@@ -38,7 +38,7 @@ object InviteButtonStateBinder {
}
// ButtonStateView.State.Loaded not used because roomSummary will not be displayed as a room invitation anymore
- rejectView.isInvisible = requestInProgress
+ rejectView.isGone = requestInProgress
when {
changeMembershipState is ChangeMembershipState.FailedLeaving -> rejectView.render(ButtonStateView.State.Error)
From d24a51ce67785ea850bbf2d64e39400ba88056ac Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 24 Jan 2022 18:49:50 +0100
Subject: [PATCH 4/5] tiny rework
---
.../vector/app/features/invite/InviteButtonStateBinder.kt | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/vector/src/main/java/im/vector/app/features/invite/InviteButtonStateBinder.kt b/vector/src/main/java/im/vector/app/features/invite/InviteButtonStateBinder.kt
index e5d7ab28cc..43763cdf37 100644
--- a/vector/src/main/java/im/vector/app/features/invite/InviteButtonStateBinder.kt
+++ b/vector/src/main/java/im/vector/app/features/invite/InviteButtonStateBinder.kt
@@ -40,9 +40,9 @@ object InviteButtonStateBinder {
rejectView.isGone = requestInProgress
- when {
- changeMembershipState is ChangeMembershipState.FailedLeaving -> rejectView.render(ButtonStateView.State.Error)
- else -> rejectView.render(ButtonStateView.State.Button)
+ when (changeMembershipState) {
+ is ChangeMembershipState.FailedLeaving -> rejectView.render(ButtonStateView.State.Error)
+ else -> rejectView.render(ButtonStateView.State.Button)
}
}
}
From 3bc7b0acee1e45a3b328faf3418afd5de6da1841 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 24 Jan 2022 18:56:22 +0100
Subject: [PATCH 5/5] Small issue
---
vector/src/main/res/layout/vector_invite_view.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/vector/src/main/res/layout/vector_invite_view.xml b/vector/src/main/res/layout/vector_invite_view.xml
index 73cfa7f4b0..e27858e339 100644
--- a/vector/src/main/res/layout/vector_invite_view.xml
+++ b/vector/src/main/res/layout/vector_invite_view.xml
@@ -64,8 +64,9 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
- app:constraint_referenced_ids="inviteAcceptView,inviteRejectView"
+ app:constraint_referenced_ids="inviteRejectView,inviteAcceptView"
app:flow_horizontalGap="4dp"
+ app:flow_horizontalStyle="packed"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/inviteLabelView" />