From 714cee5f48eb2d00dc2d5ce50c1879f9d21bedea Mon Sep 17 00:00:00 2001
From: Fahim Salam Chowdhury <fahim@e.email>
Date: Tue, 28 Feb 2023 12:25:22 +0600
Subject: [PATCH] 1084-Fix_UI_regression

issue: https://gitlab.e.foundation/e/os/backlog/-/issues/1084

- hide headerView from navigationDrawer
- set drawer corner radius to 0
- make the floatingActionButtons rounded
---
 app/src/main/res/layout/activity_notes_list_view.xml | 1 +
 app/src/main/res/layout/drawer_layout.xml            | 2 ++
 app/src/main/res/layout/fragment_note_edit.xml       | 5 ++++-
 app/src/main/res/layout/fragment_note_preview.xml    | 5 ++++-
 app/src/main/res/values/styles.xml                   | 5 +++++
 5 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/layout/activity_notes_list_view.xml b/app/src/main/res/layout/activity_notes_list_view.xml
index 5239a179f..cd71677f5 100644
--- a/app/src/main/res/layout/activity_notes_list_view.xml
+++ b/app/src/main/res/layout/activity_notes_list_view.xml
@@ -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
diff --git a/app/src/main/res/layout/drawer_layout.xml b/app/src/main/res/layout/drawer_layout.xml
index 4416c5553..c2b8ddf5f 100644
--- a/app/src/main/res/layout/drawer_layout.xml
+++ b/app/src/main/res/layout/drawer_layout.xml
@@ -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"
diff --git a/app/src/main/res/layout/fragment_note_edit.xml b/app/src/main/res/layout/fragment_note_edit.xml
index eebd5a02b..1eafb0c88 100644
--- a/app/src/main/res/layout/fragment_note_edit.xml
+++ b/app/src/main/res/layout/fragment_note_edit.xml
@@ -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
diff --git a/app/src/main/res/layout/fragment_note_preview.xml b/app/src/main/res/layout/fragment_note_preview.xml
index 93a2f3de7..7b9282a26 100644
--- a/app/src/main/res/layout/fragment_note_preview.xml
+++ b/app/src/main/res/layout/fragment_note_preview.xml
@@ -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
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 07e760ac3..8bbadf582 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -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
-- 
GitLab