From e35234eda1925c6714ac92984fbd2fe860fd3b4f Mon Sep 17 00:00:00 2001
From: jacques <jacques+commit@foucry.net>
Date: Tue, 5 Oct 2021 12:23:04 +0200
Subject: [PATCH] Replace save button and fix typo in file name

---
 .../foucry/pilldroid/DrugDetailActivity.java   |  2 +-
 ...urg_detail.xml => activity_drug_detail.xml} | 18 +++++++-----------
 app/src/main/res/layout/drug_detail.xml        | 17 ++++++++---------
 app/src/main/res/values/dimens.xml             |  3 +++
 4 files changed, 19 insertions(+), 21 deletions(-)
 rename app/src/main/res/layout/{activity_durg_detail.xml => activity_drug_detail.xml} (85%)

diff --git a/app/src/main/java/net/foucry/pilldroid/DrugDetailActivity.java b/app/src/main/java/net/foucry/pilldroid/DrugDetailActivity.java
index f5f2bae..d52e90d 100644
--- a/app/src/main/java/net/foucry/pilldroid/DrugDetailActivity.java
+++ b/app/src/main/java/net/foucry/pilldroid/DrugDetailActivity.java
@@ -42,7 +42,7 @@ public class DrugDetailActivity extends AppCompatActivity {
         assert drug != null;
         Log.d(TAG, "drug == " + drug.toString());
 
-        setContentView(R.layout.activity_durg_detail);
+        setContentView(R.layout.activity_drug_detail);
         Toolbar toolbar = findViewById(detail_toolbar);
 
 
diff --git a/app/src/main/res/layout/activity_durg_detail.xml b/app/src/main/res/layout/activity_drug_detail.xml
similarity index 85%
rename from app/src/main/res/layout/activity_durg_detail.xml
rename to app/src/main/res/layout/activity_drug_detail.xml
index e828f74..8cf6e94 100644
--- a/app/src/main/res/layout/activity_durg_detail.xml
+++ b/app/src/main/res/layout/activity_drug_detail.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@drawable/list_selector"
-    android:backgroundTint="@android:color/transparent"
+    android:backgroundTint="@color/cardview_shadow_start_color"
     android:fitsSystemWindows="true"
     tools:context="net.foucry.pilldroid.DrugDetailActivity"
     tools:ignore="MergeRootFrame">
@@ -31,26 +31,22 @@
             android:layout_height="?attr/actionBarSize"
             app:layout_collapseMode="pin"
             app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
-
     </com.google.android.material.appbar.AppBarLayout>
 
     <androidx.core.widget.NestedScrollView
         android:id="@+id/drug_detail_container"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
-
-
+        app:layout_behavior="@string/appbar_scrolling_view_behavior" >
+    </androidx.core.widget.NestedScrollView>
     <ImageButton
         android:id="@+id/fab"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical|start"
+        android:layout_width="@dimen/fab_width"
+        android:layout_height="@dimen/fab_height"
+        android:layout_gravity="end|top"
         android:layout_margin="@dimen/fab_margin"
         android:backgroundTint="@android:color/transparent"
         android:contentDescription="@string/save_button"
         android:src="@drawable/ic_save_black_24dp"
-        app:backgroundTint="@android:color/transparent"
-        app:layout_anchor="@+id/drug_detail_container"
-        app:layout_anchorGravity="bottom|end" />
+        app:backgroundTint="@android:color/transparent" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/drug_detail.xml b/app/src/main/res/layout/drug_detail.xml
index 6a8bf9d..b4cba33 100644
--- a/app/src/main/res/layout/drug_detail.xml
+++ b/app/src/main/res/layout/drug_detail.xml
@@ -10,29 +10,28 @@
         android:id="@+id/name_cell"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="5sp"
         layout="@layout/info_cell" />
 
     <include
         android:id="@+id/presentation_cell"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        layout="@layout/info_cell"
-        android:layout_marginTop="5sp" />
+        layout="@layout/info_cell"/>
+<!--        android:layout_marginTop="5sp" />-->
 
     <include
         android:id="@+id/administration_cell"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        layout="@layout/info_cell"
-        android:layout_marginTop="5sp" />
+        layout="@layout/info_cell"/>
+<!--        android:layout_marginTop="5sp" />-->
 
     <include
         android:id="@+id/stock_cell"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        layout="@layout/value_input"
-        android:layout_marginTop="30sp" />
+        layout="@layout/value_input"/>
+<!--        android:layout_marginTop="30sp" />-->
 
     <include
         android:id="@+id/take_cell"
@@ -44,8 +43,8 @@
         android:id="@+id/warning_cell"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        layout="@layout/value_input"
-        android:layout_marginTop="15sp" />
+        layout="@layout/value_input"/>
+<!--        android:layout_marginTop="15sp" />-->
 
     <include
         android:id="@+id/alert_cell"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index ea39adf..b0d7a45 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -4,6 +4,9 @@
     <dimen name="app_bar_height">75dp</dimen>
     <dimen name="item_width">200dp</dimen>
     <dimen name="dp19">19dp</dimen>
+    <dimen name="fab_height">48dp</dimen>
+    <dimen name="fab_width">48dp</dimen>
+    <dimen name="fab_marginTop">32dp</dimen>
     <!-- Default screen margins, per the Android Design guidelines. -->
 
     <!-- Slide dimens -->