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

Commit c641c953 authored by Stefan Niedermann's avatar Stefan Niedermann
Browse files

Merge remote-tracking branch 'origin/master'

parents 60f614c9 38295cc3

app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java

+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.spacer_1x)

                    getResources().getDimensionPixelSize(R.dimen.spacer_activity_sides)

            ));

        } else {

            LinearLayoutManager layoutManager = new LinearLayoutManager(this);

app/src/main/res/layout/activity_about.xml

+5 −4
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
            android:id="@+id/toolbar"

            android:layout_width="match_parent"

            android:layout_height="?attr/actionBarSize"

            android:background="?attr/colorPrimary"

            app:contentInsetStartWithNavigation="0dp"

            app:navigationIcon="@drawable/ic_arrow_back_grey600_24dp"

            app:titleMarginStart="0dp"
@@ -24,14 +23,16 @@ 
            android:id="@+id/tabs"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            app:tabIndicatorColor="@color/defaultBrand"

            android:background="?attr/colorPrimary" />

            android:background="?attr/colorPrimary"

            app:tabIndicatorColor="@color/defaultBrand" />

    </com.google.android.material.appbar.AppBarLayout>



    <androidx.viewpager.widget.ViewPager

        android:id="@+id/pager"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:background="?attr/colorPrimary" />

        android:background="?attr/colorPrimary"

        android:paddingStart="@dimen/spacer_1x"

        android:paddingEnd="@dimen/spacer_1x" />



</LinearLayout>
 
 No newline at end of file

app/src/main/res/layout/activity_edit.xml

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
            android:id="@+id/toolbar"

            android:layout_width="match_parent"

            android:layout_height="?attr/actionBarSize"

            android:background="?attr/colorPrimary"

            app:contentInsetStartWithNavigation="0dp"

            app:navigationIcon="@drawable/ic_arrow_back_grey600_24dp"

            app:titleMarginStart="0dp"

app/src/main/res/layout/activity_exception.xml

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
        android:id="@+id/toolbar"

        android:layout_width="match_parent"

        android:layout_height="?attr/actionBarSize"

        android:background="?attr/colorPrimary"

        app:contentInsetStartWithNavigation="0dp"

        app:elevation="4dp"

        app:titleMarginStart="0dp"

app/src/main/res/layout/activity_formatting_help.xml

+4 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
            android:id="@+id/toolbar"

            android:layout_width="match_parent"

            android:layout_height="?attr/actionBarSize"

            android:background="?attr/colorPrimary"

            app:contentInsetStartWithNavigation="0dp"

            app:navigationIcon="@drawable/ic_arrow_back_grey600_24dp"

            app:title="@string/action_formatting_help"
@@ -34,6 +33,10 @@ 
            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:padding="@dimen/spacer_2x"

            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"

            android:textColor="@color/fg_default"

            android:textIsSelectable="true"