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

Commit e8c7b698 authored by Stefan Niedermann's avatar Stefan Niedermann Committed by Niedermann IT-Dienstleistungen
Browse files

Adjust account chooser and remove activity spacer on < w360dp

parent dac3704d
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -630,7 +630,7 @@ public class NotesListViewActivity extends LockedActivity implements NoteClickLi
                    getResources().getDimensionPixelSize(R.dimen.spacer_5x),
                    getResources().getDimensionPixelSize(R.dimen.spacer_3x),
                    getResources().getDimensionPixelSize(R.dimen.spacer_1x),
                    getResources().getDimensionPixelSize(R.dimen.activity_padding)
                    getResources().getDimensionPixelSize(R.dimen.spacer_activity_sides)
            ));
        } else {
            LinearLayoutManager layoutManager = new LinearLayoutManager(this);
+2 −2
Original line number Diff line number Diff line
@@ -33,8 +33,8 @@
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:padding="@dimen/spacer_2x"
            android:layout_marginStart="@dimen/activity_padding"
            android:layout_marginEnd="@dimen/activity_padding"
            android:layout_marginStart="@dimen/spacer_activity_sides"
            android:layout_marginEnd="@dimen/spacer_activity_sides"
            android:paddingStart="@dimen/spacer_2x"
            android:paddingEnd="@dimen/spacer_2x"
            android:textAppearance="?android:attr/textAppearanceMedium"
+61 −56
Original line number Diff line number Diff line
@@ -6,14 +6,22 @@
    android:layout_height="wrap_content"
    android:orientation="vertical">

    <FrameLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:background="?attr/selectableItemBackground"
        android:paddingStart="@dimen/spacer_activity_sides"
        android:paddingEnd="@dimen/spacer_activity_sides">

        <LinearLayout
            android:id="@+id/accountLayout"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
        android:background="?attr/selectableItemBackground"
            android:gravity="center_vertical"
            android:orientation="horizontal"
        android:padding="@dimen/spacer_3x">
            android:padding="@dimen/spacer_2x"
            android:paddingStart="@dimen/spacer_1x"
            android:paddingEnd="@dimen/spacer_1x">

            <androidx.appcompat.widget.AppCompatImageView
                android:id="@+id/currentAccountItemAvatar"
@@ -28,7 +36,7 @@
            <LinearLayout
                android:layout_width="0dp"
                android:layout_height="wrap_content"
            android:layout_marginStart="@dimen/spacer_2x"
                android:layout_marginStart="@dimen/spacer_1x"
                android:layout_marginEnd="@dimen/spacer_2x"
                android:layout_weight="1"
                android:orientation="vertical">
@@ -61,6 +69,7 @@
                android:scaleType="center"
                app:srcCompat="@drawable/check" />
        </LinearLayout>
    </FrameLayout>

    <View
        android:layout_width="match_parent"
@@ -78,20 +87,19 @@
        tools:itemCount="3"
        tools:listitem="@layout/item_account_choose" />


    <LinearLayout
        android:id="@+id/add_account"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:background="?attr/selectableItemBackground"
        android:orientation="horizontal"
        android:paddingStart="@dimen/spacer_3x"
        android:paddingTop="@dimen/spacer_1x"
        android:paddingEnd="@dimen/spacer_3x"
        android:paddingBottom="@dimen/spacer_1x">
        android:padding="@dimen/spacer_1x">

        <androidx.appcompat.widget.AppCompatImageView
            android:layout_width="36dp"
            android:layout_height="36dp"
            android:layout_marginStart="@dimen/spacer_activity_sides"
            android:contentDescription="@null"
            android:focusable="false"
            android:scaleType="center"
@@ -117,14 +125,12 @@
        android:layout_marginBottom="@dimen/spacer_2x"
        android:background="?attr/selectableItemBackground"
        android:orientation="horizontal"
        android:paddingStart="@dimen/spacer_3x"
        android:paddingTop="@dimen/spacer_1x"
        android:paddingEnd="@dimen/spacer_3x"
        android:paddingBottom="@dimen/spacer_1x">
        android:padding="@dimen/spacer_1x">

        <androidx.appcompat.widget.AppCompatImageView
            android:layout_width="36dp"
            android:layout_height="36dp"
            android:layout_marginStart="@dimen/spacer_activity_sides"
            android:contentDescription="@null"
            android:focusable="false"
            android:scaleType="center"
@@ -140,7 +146,6 @@
            android:text="@string/manage_accounts"
            android:textAppearance="@style/TextAppearance.AppCompat.Widget.TextView.SpinnerItem"
            android:textColor="?android:textColorPrimary" />

    </LinearLayout>
</LinearLayout>
+2 −2
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@
            android:id="@+id/editContent"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_marginStart="@dimen/activity_padding"
            android:layout_marginEnd="@dimen/activity_padding"
            android:layout_marginStart="@dimen/spacer_activity_sides"
            android:layout_marginEnd="@dimen/spacer_activity_sides"
            android:background="?attr/colorPrimary"
            android:ems="10"
            android:gravity="top"
+2 −2
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@
                android:id="@+id/single_note_content"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:layout_marginStart="@dimen/activity_padding"
                android:layout_marginEnd="@dimen/activity_padding"
                android:layout_marginStart="@dimen/spacer_activity_sides"
                android:layout_marginEnd="@dimen/spacer_activity_sides"
                android:padding="@dimen/spacer_2x"
                android:paddingStart="@dimen/spacer_2x"
                android:paddingEnd="@dimen/spacer_2x"
Loading