Skip to content

Commit 454563d

Browse files
tevincenttevincent
committed
Fix issue when using useDefaultLayout
1 parent d1da29d commit 454563d

File tree

7 files changed

+40
-48
lines changed

7 files changed

+40
-48
lines changed

‎app/src/main/java/com/infomaniak/mail/views/BottomSheetScaffoldingView.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import android.widget.LinearLayout
2828
import androidx.core.view.isVisible
2929
import androidx.core.widget.NestedScrollView
3030
import com.infomaniak.lib.core.utils.getAttributes
31-
import com.infomaniak.lib.core.utils.setMarginsRelative
31+
import com.infomaniak.lib.core.utils.setPaddingRelative
3232
import com.infomaniak.mail.R
3333
import com.infomaniak.mail.databinding.ViewBottomSheetScaffoldingBinding
3434
import com.infomaniak.lib.core.R as RCore
@@ -88,7 +88,7 @@ class BottomSheetScaffoldingView @JvmOverloads constructor(
8888
layoutParams = createMatchWrapLayoutParams()
8989
orientation = LinearLayout.VERTICAL
9090
if (centerHorizontally) gravity = Gravity.CENTER_HORIZONTAL
91-
setMarginsRelative(bottom = context.resources.getDimensionPixelSize(RCore.dimen.marginStandardMedium))
91+
setPaddingRelative(bottom = context.resources.getDimensionPixelSize(RCore.dimen.marginStandardMedium))
9292
}
9393

9494
nestedScrollView.addView(linearLayout)

‎app/src/main/res/layout/bottom_sheet_account.xml

Lines changed: 38 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -20,51 +20,48 @@
2020
xmlns:tools="http://schemas.android.com/tools"
2121
android:layout_width="match_parent"
2222
android:layout_height="match_parent"
23-
app:useDefaultLayout="false"
24-
tools:context=".ui.bottomSheetDialogs.AccountBottomSheetDialog">
23+
tools:context=".ui.bottomSheetDialogs.AccountBottomSheetDialog"
24+
tools:title="My Account">
2525

26-
<LinearLayout
27-
android:layout_width="match_parent"
28-
android:layout_height="match_parent"
29-
android:orientation="vertical">
30-
31-
<androidx.recyclerview.widget.RecyclerView
32-
android:id="@+id/recyclerViewAccount"
33-
android:layout_width="match_parent"
34-
android:layout_height="wrap_content"
35-
android:clipToPadding="false"
36-
android:overScrollMode="never"
37-
android:paddingTop="@dimen/marginStandardMedium"
38-
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
39-
tools:itemCount="4"
40-
tools:listitem="@layout/item_switch_user_account" />
26+
<!--
27+
We use useDefaultLayout to true, which embed recyclerViewAccount into a NestedScrollView. This
28+
This prevent elements of the RecyclerView to be recycled. It should not be a big problem
29+
since we shouldn't have a lot of items here but this can be improved.
30+
-->
4131

42-
<com.google.android.material.divider.MaterialDivider
43-
style="@style/ItemDivider"
44-
android:layout_marginVertical="@dimen/marginStandardSmall" />
32+
<androidx.recyclerview.widget.RecyclerView
33+
android:id="@+id/recyclerViewAccount"
34+
android:layout_width="match_parent"
35+
android:layout_height="wrap_content"
36+
android:overScrollMode="never"
37+
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
38+
tools:itemCount="4"
39+
tools:listitem="@layout/item_switch_user_account" />
4540

46-
<com.infomaniak.mail.ui.main.thread.actions.ActionItemView
47-
android:id="@+id/addAccount"
48-
android:layout_width="match_parent"
49-
android:layout_height="wrap_content"
50-
app:icon="@drawable/ic_add_thin"
51-
app:iconPaddingEnd="@dimen/marginStandardMedium"
52-
app:iconPaddingStart="@dimen/marginStandard"
53-
app:text="@string/buttonAddAccount"
54-
app:visibleDivider="false" />
41+
<com.google.android.material.divider.MaterialDivider
42+
style="@style/ItemDivider"
43+
android:layout_marginVertical="@dimen/marginStandardSmall" />
5544

56-
<com.infomaniak.mail.ui.main.thread.actions.ActionItemView
57-
android:id="@+id/logout"
58-
android:layout_width="match_parent"
59-
android:layout_height="wrap_content"
60-
app:icon="@drawable/ic_logout"
61-
app:iconColor="@color/redDestructiveAction"
62-
app:iconPaddingEnd="@dimen/marginStandardMedium"
63-
app:iconPaddingStart="@dimen/marginStandard"
64-
app:text="@string/buttonAccountLogOut"
65-
app:textColor="@color/redDestructiveAction"
66-
app:visibleDivider="false" />
45+
<com.infomaniak.mail.ui.main.thread.actions.ActionItemView
46+
android:id="@+id/addAccount"
47+
android:layout_width="match_parent"
48+
android:layout_height="wrap_content"
49+
app:icon="@drawable/ic_add_thin"
50+
app:iconPaddingEnd="@dimen/marginStandardMedium"
51+
app:iconPaddingStart="@dimen/marginStandard"
52+
app:text="@string/buttonAddAccount"
53+
app:visibleDivider="false" />
6754

68-
</LinearLayout>
55+
<com.infomaniak.mail.ui.main.thread.actions.ActionItemView
56+
android:id="@+id/logout"
57+
android:layout_width="match_parent"
58+
android:layout_height="wrap_content"
59+
app:icon="@drawable/ic_logout"
60+
app:iconColor="@color/redDestructiveAction"
61+
app:iconPaddingEnd="@dimen/marginStandardMedium"
62+
app:iconPaddingStart="@dimen/marginStandard"
63+
app:text="@string/buttonAccountLogOut"
64+
app:textColor="@color/redDestructiveAction"
65+
app:visibleDivider="false" />
6966

7067
</com.infomaniak.mail.views.BottomSheetScaffoldingView>

‎app/src/main/res/values-de/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@
114114
<string name="buttonAccept">Akzeptieren</string>
115115
<string name="buttonAccountAssociatedEmailAddresses">Mit diesem Konto verbundene E-Mail-Adressen</string>
116116
<string name="buttonAccountDelete">Konto löschen</string>
117-
<string name="buttonAccountDisconnect">Konto abmelden</string>
118117
<string name="buttonAccountLogOut">Abmelden</string>
119118
<string name="buttonAccountSwitch">Konto ändern</string>
120119
<string name="buttonAddAccount">Account hinzufügen</string>

‎app/src/main/res/values-es/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@
114114
<string name="buttonAccept">Acepte</string>
115115
<string name="buttonAccountAssociatedEmailAddresses">Direcciones de correo electrónico asociadas a esta cuenta</string>
116116
<string name="buttonAccountDelete">Eliminar cuenta</string>
117-
<string name="buttonAccountDisconnect">Desconectar cuenta</string>
118117
<string name="buttonAccountLogOut">Cerrar sesión</string>
119118
<string name="buttonAccountSwitch">Cambiar de cuenta</string>
120119
<string name="buttonAddAccount">Añadir una cuenta</string>

‎app/src/main/res/values-fr/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@
116116
<string name="buttonAccept">Accepter</string>
117117
<string name="buttonAccountAssociatedEmailAddresses">Adresses mail associées au compte</string>
118118
<string name="buttonAccountDelete">Supprimer mon compte</string>
119-
<string name="buttonAccountDisconnect">Me déconnecter de ce compte</string>
120119
<string name="buttonAccountLogOut">Se déconnecter</string>
121120
<string name="buttonAccountSwitch">Changer de compte</string>
122121
<string name="buttonAddAccount">Ajouter un compte</string>

‎app/src/main/res/values-it/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@
114114
<string name="buttonAccept">Accetta</string>
115115
<string name="buttonAccountAssociatedEmailAddresses">Indirizzi e-mail associati a questo account</string>
116116
<string name="buttonAccountDelete">Cancellare l’account</string>
117-
<string name="buttonAccountDisconnect">Disconnettere l’account</string>
118117
<string name="buttonAccountLogOut">Disconnettersi</string>
119118
<string name="buttonAccountSwitch">Modifica del conto</string>
120119
<string name="buttonAddAccount">Aggiungere un account</string>

‎app/src/main/res/values/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@
120120
<string name="buttonAccept">Accept</string>
121121
<string name="buttonAccountAssociatedEmailAddresses">Email addresses associated with this account</string>
122122
<string name="buttonAccountDelete">Delete account</string>
123-
<string name="buttonAccountDisconnect">Disconnect account</string>
124123
<string name="buttonAccountLogOut">Log out</string>
125124
<string name="buttonAccountSwitch">Change account</string>
126125
<string name="buttonAddAccount">Add an account</string>

0 commit comments

Comments
 (0)