isoron/loop
1
1
Fork 0
mirror of https://github.com/iSoron/uhabits.git synced 2025-12-06 17:18:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'isse_1857_reset_measurable_entry' into dev

Browse Source
This commit is contained in:
Alinson S. Xavier
2025-03-21 21:41:55 -05:00
parent f68510f860 76b9dd8bd9
commit 951dabea8b
2 changed files with 31 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
uhabits-android/src/main/res/layout/checkmark_popup.xml
View File

@@ -23,32 +23,32 @@
android:id="@+id/container"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minHeight="128dp"
android:background="@drawable/checkmark_dialog_bg"
android:minWidth="208dp"
app:divider="@drawable/checkmark_dialog_divider"
app:showDividers="middle"
android:minHeight="128dp"
android:orientation="vertical"
android:background="@drawable/checkmark_dialog_bg">
app:divider="@drawable/checkmark_dialog_divider"
app:showDividers="middle">
<androidx.appcompat.widget.AppCompatEditText
android:id="@+id/notes"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:gravity="center"
android:inputType="textCapSentences|textMultiLine"
android:textSize="@dimen/smallTextSize"
android:padding="4dp"
android:background="@color/transparent"
android:gravity="center"
android:hint="@string/notes"
android:text="" />
android:inputType="textCapSentences|textMultiLine"
android:padding="4dp"
android:text=""
android:textSize="@dimen/smallTextSize" />
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/booleanButtons"
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="48dp"
android:orientation="horizontal"
android:visibility="gone"
app:divider="@drawable/checkmark_dialog_divider"
app:showDividers="middle">
@@ -75,10 +75,10 @@
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/numberButtons"
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="48dp"
android:orientation="horizontal"
android:visibility="gone"
app:divider="@drawable/checkmark_dialog_divider"
app:showDividers="middle">
@@ -86,21 +86,26 @@
android:id="@+id/value"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:layout_weight="2"
android:background="@color/transparent"
android:textAlignment="center"
android:inputType="numberDecimal"
android:selectAllOnFocus="true"
android:textAlignment="center"
android:textSize="@dimen/smallTextSize" />
<TextView
android:id="@+id/saveBtn"
style="@style/NumericalPopupBtn"
android:text="@string/save" />
<TextView
android:id="@+id/skipBtnNumber"
style="@style/NumericalPopupBtn"
android:text="@string/skip_day" />
<TextView
android:id="@+id/saveBtn"
style="@style/NumericalPopupBtn"
android:text="@string/save" />
android:id="@+id/unknownBtnNumber"
style="@style/CheckmarkPopupBtn"
android:text="@string/fa_question" />
</androidx.appcompat.widget.LinearLayoutCompat>
</androidx.appcompat.widget.LinearLayoutCompat>