Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65b25df5 authored by cketti's avatar cketti
Browse files

Make sure attachment box isn't cut off on small screens

parent a4018916

app/ui/legacy/src/main/res/layout/message_compose_attachment.xml

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
<androidx.cardview.widget.CardView 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="300dp"

    style="@style/AttachmentCard"

    android:layout_height="wrap_content"

    android:layout_marginStart="12dp"

    android:layout_marginEnd="12dp"

app/ui/legacy/src/main/res/layout/message_view_attachment.xml

+2 −2
Original line number Diff line number Diff line
@@ -2,13 +2,13 @@ 
<com.fsck.k9.ui.messageview.AttachmentView 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="wrap_content"

    style="@style/AttachmentView"

    android:layout_height="wrap_content"

    android:paddingBottom="4dp"

    android:id="@+id/attachment">



    <androidx.cardview.widget.CardView

        android:layout_width="300dp"

        style="@style/AttachmentCard"

        android:layout_height="wrap_content"

        android:layout_marginStart="12dp"

        android:layout_marginEnd="12dp"

app/ui/legacy/src/main/res/layout/message_view_attachment_locked.xml

+2 −2
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<com.fsck.k9.ui.messageview.LockedAttachmentView xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:app="http://schemas.android.com/apk/res-auto"

    android:layout_width="wrap_content"

    style="@style/AttachmentView"

    android:layout_height="wrap_content"

    android:paddingBottom="4dip"

    android:inAnimation="@anim/fade_in"
@@ -9,7 +9,7 @@ 
    app:previewInitialChild="0">



    <androidx.cardview.widget.CardView

        android:layout_width="300dp"

        style="@style/AttachmentCard"

        android:layout_height="wrap_content"

        android:layout_marginStart="12dp"

        android:layout_marginEnd="12dp"

app/ui/legacy/src/main/res/values-w360dp/styles.xml

0 → 100644
+13 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<resources>



    <style name="AttachmentView" parent="">

        <item name="android:layout_width">wrap_content</item>

    </style>



    <style name="AttachmentCard" parent="">

        <item name="android:layout_width">300dp</item>

    </style>



</resources>

app/ui/legacy/src/main/res/values/styles.xml

+8 −0
Original line number Diff line number Diff line
@@ -99,5 +99,13 @@ 
        <item name="android:textSize">22sp</item>

    </style>



    <style name="AttachmentView" parent="">

        <item name="android:layout_width">match_parent</item>

    </style>



    <style name="AttachmentCard" parent="">

        <item name="android:layout_width">match_parent</item>

    </style>



</resources>