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

Commit 30298b0b authored by Fahim Salam Chowdhury's avatar Fahim Salam Chowdhury 👽
Browse files

Merge branch '1084-Fix_UI_regression' into 'main' 

1084-Fix_UI_regression

See merge request !36
parents a706db55 e4328b93

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

+1 −0
Original line number Diff line number Diff line
@@ -146,5 +146,6 @@ 
        android:title="@string/action_create"

        app:backgroundTint="@color/e_accent"

        app:tint="@color/e_background"

        app:shapeAppearanceOverlay="@style/floatingActionButtonStyle"

        app:srcCompat="@drawable/ic_add_white_24dp" />

</androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 No newline at end of file

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

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:layout_gravity="start"

        app:drawerLayoutCornerSize="0dp"

        android:background="@color/fg_default"

        android:fitsSystemWindows="true">
@@ -34,6 +35,7 @@ 


                <RelativeLayout

                    android:id="@+id/header_view"

                    android:visibility="gone"

                    android:layout_width="match_parent"

                    android:layout_height="@dimen/drawer_header_height"

                    android:background="?attr/colorAccent"

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

+4 −1
Original line number Diff line number Diff line
@@ -50,7 +50,8 @@ 
        android:visibility="gone"

        app:backgroundTint="@color/defaultBrand"

        app:srcCompat="@drawable/ic_keyboard_arrow_up_white_24dp"

        android:tint="@color/e_background"

        app:shapeAppearanceOverlay="@style/floatingActionButtonStyle"

        app:tint="@color/e_background"

        tools:visibility="visible" />



    <com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -63,6 +64,8 @@ 
        android:contentDescription="@string/simple_next"

        android:visibility="gone"

        app:backgroundTint="@color/defaultBrand"

        app:shapeAppearanceOverlay="@style/floatingActionButtonStyle"

        app:tint="@color/e_background"

        app:srcCompat="@drawable/ic_keyboard_arrow_down_white_24dp"

        tools:visibility="visible" />

</androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 No newline at end of file

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

+4 −1
Original line number Diff line number Diff line
@@ -46,7 +46,8 @@ 
        android:translationY="-56dp"

        android:visibility="gone"

        app:backgroundTint="@color/defaultBrand"

        android:tint="@color/e_background"

        app:tint="@color/e_background"

        app:shapeAppearanceOverlay="@style/floatingActionButtonStyle"

        app:srcCompat="@drawable/ic_keyboard_arrow_up_white_24dp"

        tools:visibility="visible" />
@@ -60,6 +61,8 @@ 
        android:contentDescription="@string/simple_next"

        android:visibility="gone"

        app:backgroundTint="@color/defaultBrand"

        app:shapeAppearanceOverlay="@style/floatingActionButtonStyle"

        app:srcCompat="@drawable/ic_keyboard_arrow_down_white_24dp"

        app:tint="@color/e_background"

        tools:visibility="visible" />

</androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 No newline at end of file

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

+5 −0
Original line number Diff line number Diff line
@@ -111,4 +111,9 @@ 
        <item name="windowSplashScreenAnimatedIcon">@drawable/ic_launcher_foreground_full</item>

        <item name="postSplashScreenTheme">@style/AppTheme</item>

    </style>



    <style name="floatingActionButtonStyle">

        <item name="cornerFamily">rounded</item>

        <item name="cornerSize">50%</item>

    </style>

</resources>
 
 No newline at end of file