penguin86/luna-tracker
2
1
Fork 1
Code Issues 5 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Daniele Verducci
2025-04-19 08:53:43 +02:00
parent 9fddd37fe9 07393faf41
commit 4c5c7bcf1a
8 changed files with 38 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/res/layout/activity_main.xml
View File

@ -108,7 +108,7 @@
android:text="@string/event_bottle_type"/>
<TextView
android:id="@+id/button_scale"
android:id="@+id/button_food"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
@ -116,7 +116,7 @@
android:background="@drawable/button_background"
android:gravity="center_horizontal"
android:textSize="50dp"
android:text="@string/event_scale_type"/>
android:text="@string/event_food_type"/>
</LinearLayout>

10
app/src/main/res/layout/more_events_popup.xml
View File

@ -59,6 +59,16 @@
style="@style/OverflowMenuText"
android:text="@string/overflow_event_colic"/>
<TextView
android:id="@+id/button_scale"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="10dp"
android:padding="20dp"
android:background="@drawable/dropdown_list_item_background"
style="@style/OverflowMenuText"
android:text="@string/overflow_event_scale"/>
</LinearLayout>
</ScrollView>