Merge branch 'feature/place_save_icon' into develop

app/build.gradle

@@ -25,12 +25,6 @@ android {
         versionName generateVersionName() // 1.2.3-SNAPSHOT
         multiDexEnabled true
     }
-/*    flavorDimensions "version"
-    productFlavors {
-        unsigned {
-            applicationIdSuffix ".unsigned"
-        }
-    }*/
 
     buildTypes {
         release {

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);
 
 

app/src/main/res/drawable/ic_launcher_foreground.xml

@@ -4,10 +4,10 @@
     android:height="108dp"
     android:viewportWidth="108"
     android:viewportHeight="108">
-  <group android:scaleX="0.053821683"
-      android:scaleY="0.053821683"
-      android:translateX="27.719072"
-      android:translateY="26.953608">
+  <group android:scaleX="0.052734375"
+      android:scaleY="0.052734375"
+      android:translateX="27"
+      android:translateY="27">
     <path
         android:pathData="M270.22,597.99C100.34,468.26 112.04,477.27 103.99,469.93 97.09,463.64 83.3,448.12 77.72,440.37 54.48,408.06 39.25,368.39 32.91,323.68 31.24,311.91 29.8,281.09 30.41,270.33 33.3,219.55 47.02,174.11 70.82,136.45 123.21,53.59 211.33,30.75 283.15,81.44c8.33,5.88 308.41,236.73 308.98,237.2 0.64,0.54 -1.77,0.64 -3.69,2.27 -43.37,36.83 -86.69,97.08 -118.01,164.15 -26.24,56.19 -44.75,120.88 -50.07,174.99 -1.65,16.78 -1.98,36.46 -1.39,45.82 0.17,2.65 0.49,5.38 0.24,5.41 -0.25,0.03 -67.76,-51.25 -148.99,-113.28z"
         android:fillColor="#ff0000"

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">
@@ -13,6 +13,7 @@
         android:id="@+id/app_bar"
         android:layout_width="match_parent"
         android:layout_height="@dimen/app_bar_height"
+        android:background="@color/ic_launcher_background"
         android:fitsSystemWindows="true"
         android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
 
@@ -31,26 +32,26 @@
             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" />
+        android:contentDescription="@string/drug_list"
+        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_margin="@dimen/fab_margin"
+        android:layout_width="@dimen/fab_width"
+        android:layout_height="@dimen/fab_height"
+        android:layout_gravity="end|top"
+        android:layout_marginTop="?attr/actionBarSize"
+        android:layout_marginEnd="@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>

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"

app/src/main/res/values-fr-rFR/strings.xml

@@ -73,4 +73,5 @@
     <string name="Date">lundi 1 janvier 2001</string>
     <string name="Value">Valeur</string>
     <string name="label">Libellé</string>
+    <string name="drug_list">Attributs d\'un médicament</string>
 </resources>

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 -->

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

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="ic_launcher_background">#2C75FF</color>
+    <color name="ic_launcher_background">#3D75DC</color>
 </resources>

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

@@ -75,4 +75,5 @@
     <string name="Date">Monday January 1st 2001</string>
     <string name="Value">Value</string>
     <string name="label">Label</string>
+    <string name="drug_list">Drug\'s attributes</string>
 </resources>

build.gradle

@@ -9,7 +9,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.2'
+        classpath 'com.android.tools.build:gradle:7.0.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files