lovis_ix/Pilldroid
1
1
Fork 0
mirror of https://github.com/jfoucry/Pilldroid.git synced 2024-11-22 04:29:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replace save button and fix typo in file name

Browse source
This commit is contained in:
jacques 2021-10-05 12:23:04 +02:00
parent 917eab7f20
commit e35234eda1
4 changed files with 19 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/net/foucry/pilldroid/DrugDetailActivity.java
View file

@ -42,7 +42,7 @@ public class DrugDetailActivity extends AppCompatActivity {
assert drug != null; assert drug != null;
Log.d(TAG, "drug == " + drug.toString()); Log.d(TAG, "drug == " + drug.toString());
setContentView(R.layout.activity_durg_detail); setContentView(R.layout.activity_drug_detail);
Toolbar toolbar = findViewById(detail_toolbar); Toolbar toolbar = findViewById(detail_toolbar);

18
app/src/main/res/layout/activity_durg_detail.xml → app/src/main/res/layout/activity_drug_detail.xml
View file

@ -4,7 +4,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@drawable/list_selector" android:background="@drawable/list_selector"
android:backgroundTint="@android:color/transparent" android:backgroundTint="@color/cardview_shadow_start_color"
android:fitsSystemWindows="true" android:fitsSystemWindows="true"
tools:context="net.foucry.pilldroid.DrugDetailActivity" tools:context="net.foucry.pilldroid.DrugDetailActivity"
tools:ignore="MergeRootFrame"> tools:ignore="MergeRootFrame">
@ -31,26 +31,22 @@
android:layout_height="?attr/actionBarSize" android:layout_height="?attr/actionBarSize"
app:layout_collapseMode="pin" app:layout_collapseMode="pin"
app:popupTheme="@style/ThemeOverlay.AppCompat.Light" /> app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
</com.google.android.material.appbar.AppBarLayout> </com.google.android.material.appbar.AppBarLayout>
<androidx.core.widget.NestedScrollView <androidx.core.widget.NestedScrollView
android:id="@+id/drug_detail_container" android:id="@+id/drug_detail_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="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 <ImageButton
android:id="@+id/fab" android:id="@+id/fab"
android:layout_width="wrap_content" android:layout_width="@dimen/fab_width"
android:layout_height="wrap_content" android:layout_height="@dimen/fab_height"
android:layout_gravity="center_vertical|start" android:layout_gravity="end|top"
android:layout_margin="@dimen/fab_margin" android:layout_margin="@dimen/fab_margin"
android:backgroundTint="@android:color/transparent" android:backgroundTint="@android:color/transparent"
android:contentDescription="@string/save_button" android:contentDescription="@string/save_button"
android:src="@drawable/ic_save_black_24dp" android:src="@drawable/ic_save_black_24dp"
app:backgroundTint="@android:color/transparent" app:backgroundTint="@android:color/transparent" />
app:layout_anchor="@+id/drug_detail_container"
app:layout_anchorGravity="bottom|end" />
</androidx.coordinatorlayout.widget.CoordinatorLayout> </androidx.coordinatorlayout.widget.CoordinatorLayout>

17
app/src/main/res/layout/drug_detail.xml
View file

@ -10,29 +10,28 @@
android:id="@+id/name_cell" android:id="@+id/name_cell"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="5sp"
layout="@layout/info_cell" /> layout="@layout/info_cell" />
<include <include
android:id="@+id/presentation_cell" android:id="@+id/presentation_cell"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
layout="@layout/info_cell" layout="@layout/info_cell"/>
android:layout_marginTop="5sp" /> <!-- android:layout_marginTop="5sp" />-->
<include <include
android:id="@+id/administration_cell" android:id="@+id/administration_cell"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
layout="@layout/info_cell" layout="@layout/info_cell"/>
android:layout_marginTop="5sp" /> <!-- android:layout_marginTop="5sp" />-->
<include <include
android:id="@+id/stock_cell" android:id="@+id/stock_cell"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
layout="@layout/value_input" layout="@layout/value_input"/>
android:layout_marginTop="30sp" /> <!-- android:layout_marginTop="30sp" />-->
<include <include
android:id="@+id/take_cell" android:id="@+id/take_cell"
@ -44,8 +43,8 @@
android:id="@+id/warning_cell" android:id="@+id/warning_cell"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
layout="@layout/value_input" layout="@layout/value_input"/>
android:layout_marginTop="15sp" /> <!-- android:layout_marginTop="15sp" />-->
<include <include
android:id="@+id/alert_cell" android:id="@+id/alert_cell"

3
app/src/main/res/values/dimens.xml
View file

@ -4,6 +4,9 @@
<dimen name="app_bar_height">75dp</dimen> <dimen name="app_bar_height">75dp</dimen>
<dimen name="item_width">200dp</dimen> <dimen name="item_width">200dp</dimen>
<dimen name="dp19">19dp</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. --> <!-- Default screen margins, per the Android Design guidelines. -->
<!-- Slide dimens --> <!-- Slide dimens -->