filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5042 from vector-im/feature/bma/small_issues

Browse Source 
Small layout issues
This commit is contained in:
Benoit Marty 2022-01-25 09:47:19 +01:00 committed by GitHub
commit 2f67c13cda
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools/check/forbidden_strings_in_code.txt
View File

@ -159,9 +159,6 @@ Formatter\.formatShortFileSize===1
# DISABLED # DISABLED
# android\.text\.TextUtils # 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 ### Do not import temporary legacy classes
import org.matrix.android.sdk.internal.legacy.riot===3 import org.matrix.android.sdk.internal.legacy.riot===3
import org.matrix.androidsdk.crypto.data===2 import org.matrix.androidsdk.crypto.data===2

10
vector/src/main/java/im/vector/app/features/invite/InviteButtonStateBinder.kt
View File

@ -16,7 +16,7 @@
package im.vector.app.features.invite package im.vector.app.features.invite
import androidx.core.view.isInvisible import androidx.core.view.isGone
import im.vector.app.core.platform.ButtonStateView import im.vector.app.core.platform.ButtonStateView
import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState import org.matrix.android.sdk.api.session.room.members.ChangeMembershipState
@ -38,11 +38,11 @@ object InviteButtonStateBinder {
} }
// ButtonStateView.State.Loaded not used because roomSummary will not be displayed as a room invitation anymore // ButtonStateView.State.Loaded not used because roomSummary will not be displayed as a room invitation anymore
rejectView.isInvisible = requestInProgress rejectView.isGone = requestInProgress
when { when (changeMembershipState) {
changeMembershipState is ChangeMembershipState.FailedLeaving -> rejectView.render(ButtonStateView.State.Error) is ChangeMembershipState.FailedLeaving -> rejectView.render(ButtonStateView.State.Error)
else -> rejectView.render(ButtonStateView.State.Button) else -> rejectView.render(ButtonStateView.State.Button)
} }
} }
} }

29
vector/src/main/res/layout/vector_invite_view.xml
View File

@ -59,38 +59,39 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/inviteIdentifierView" /> 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="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" />
<im.vector.app.core.platform.ButtonStateView <im.vector.app.core.platform.ButtonStateView
android:id="@+id/inviteAcceptView" android:id="@+id/inviteAcceptView"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:minWidth="120dp" android:minWidth="120dp"
app:bsv_button_text="@string/action_accept" app:bsv_button_text="@string/action_accept"
app:bsv_loaded_image_src="@drawable/ic_tick" app:bsv_loaded_image_src="@drawable/ic_tick"
app:bsv_use_flat_button="false" 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" />
<im.vector.app.core.platform.ButtonStateView <im.vector.app.core.platform.ButtonStateView
android:id="@+id/inviteRejectView" android:id="@+id/inviteRejectView"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginEnd="4dp"
android:minWidth="120dp" android:minWidth="120dp"
app:bsv_button_text="@string/action_reject" app:bsv_button_text="@string/action_reject"
app:bsv_loaded_image_src="@drawable/ic_tick" app:bsv_loaded_image_src="@drawable/ic_tick"
app:bsv_use_flat_button="true" 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" />
<Space <Space
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="16dp" android:layout_height="16dp"
app:layout_constraintTop_toBottomOf="@id/inviteAcceptView" /> app:layout_constraintTop_toBottomOf="@id/actionsFlow" />
</merge> </merge>