mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert "Rearranged message buttons" 

This reverts commit e4505a10a1.
This commit is contained in:
M66B 2021-10-09 08:57:07 +02:00
parent d8d972f6fd
commit 70977d25ce
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/src/main/res/layout/include_message_navigation.xml
View File

@ -38,12 +38,12 @@
android:layout_height="36dp" android:layout_height="36dp"
android:background="?android:attr/selectableItemBackgroundBorderless" android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/title_more" android:contentDescription="@string/title_more"
android:padding="3dp" android:padding="6dp"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:tooltipText="@string/title_legend_expander" android:tooltipText="@string/title_legend_expander"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/vSeparator" app:layout_constraintTop_toBottomOf="@id/vSeparator"
app:srcCompat="@drawable/expander" /> app:srcCompat="@drawable/expander_hor" />
<androidx.constraintlayout.helper.widget.Flow <androidx.constraintlayout.helper.widget.Flow
android:id="@+id/ibFlow" android:id="@+id/ibFlow"
@ -55,9 +55,9 @@
app:flow_horizontalGap="3dp" app:flow_horizontalGap="3dp"
app:flow_horizontalStyle="packed" app:flow_horizontalStyle="packed"
app:flow_wrapMode="chain" app:flow_wrapMode="chain"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toStartOf="@+id/ibVerify"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toEndOf="@id/ibTools"
app:layout_constraintTop_toBottomOf="@id/ibTools" /> app:layout_constraintTop_toBottomOf="@id/vSeparator" />
<ImageButton <ImageButton
android:id="@+id/ibMore" android:id="@+id/ibMore"
@ -365,8 +365,7 @@
android:tooltipText="@string/title_verify" android:tooltipText="@string/title_verify"
app:layout_constraintEnd_toStartOf="@+id/ibDecrypt" app:layout_constraintEnd_toStartOf="@+id/ibDecrypt"
app:layout_constraintTop_toBottomOf="@id/vSeparator" app:layout_constraintTop_toBottomOf="@id/vSeparator"
app:srcCompat="@drawable/twotone_gesture_24" app:srcCompat="@drawable/twotone_gesture_24" />
app:tint="?attr/colorAccent" />
<ImageButton <ImageButton
android:id="@+id/ibDecrypt" android:id="@+id/ibDecrypt"
@ -380,8 +379,7 @@
android:tooltipText="@string/title_decrypt" android:tooltipText="@string/title_decrypt"
app:layout_constraintEnd_toStartOf="@+id/ibImages" app:layout_constraintEnd_toStartOf="@+id/ibImages"
app:layout_constraintTop_toBottomOf="@id/vSeparator" app:layout_constraintTop_toBottomOf="@id/vSeparator"
app:srcCompat="@drawable/twotone_lock_open_24" app:srcCompat="@drawable/twotone_lock_open_24" />
app:tint="?attr/colorAccent" />
<ImageButton <ImageButton
android:id="@+id/ibImages" android:id="@+id/ibImages"
@ -395,8 +393,7 @@
android:tooltipText="@string/title_legend_show_images" android:tooltipText="@string/title_legend_show_images"
app:layout_constraintEnd_toStartOf="@+id/ibFull" app:layout_constraintEnd_toStartOf="@+id/ibFull"
app:layout_constraintTop_toBottomOf="@id/vSeparator" app:layout_constraintTop_toBottomOf="@id/vSeparator"
app:srcCompat="@drawable/twotone_image_24" app:srcCompat="@drawable/twotone_image_24" />
app:tint="?attr/colorAccent" />
<ImageButton <ImageButton
android:id="@+id/ibFull" android:id="@+id/ibFull"
@ -409,15 +406,14 @@
android:tooltipText="@string/title_legend_show_full" android:tooltipText="@string/title_legend_show_full"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/vSeparator" app:layout_constraintTop_toBottomOf="@id/vSeparator"
app:srcCompat="@drawable/twotone_fullscreen_24" app:srcCompat="@drawable/twotone_fullscreen_24" />
app:tint="?attr/colorAccent" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<eu.faircode.email.FixedTextView <eu.faircode.email.FixedTextView
android:id="@+id/tvReformatted" android:id="@+id/tvReformatted"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingVertical="6dp" android:paddingBottom="12dp"
android:text="@string/title_reformatted" android:text="@string/title_reformatted"
android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textStyle="italic" android:textStyle="italic"
@ -430,7 +426,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:gravity="center"
android:paddingVertical="6dp" android:paddingBottom="12dp"
android:text="@string/title_signed_data" android:text="@string/title_signed_data"
android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textStyle="italic" android:textStyle="italic"