v228a/droidocat-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
v228a 2025-02-19 15:34:25 +03:00
commit aa79c2b5de
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/res/layout/card_view.xml
View File

@ -4,10 +4,9 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="5dp" android:layout_margin="5dp"
app:cardBackgroundColor="@color/white"
app:cardCornerRadius="8dp" app:cardCornerRadius="8dp"
app:cardElevation="8dp" app:cardElevation="0dp"
app:cardMaxElevation="10dp" style="@style/Theme.UiTemplate.CardView"
app:cardPreventCornerOverlap="true" app:cardPreventCornerOverlap="true"
app:cardUseCompatPadding="true"> app:cardUseCompatPadding="true">
<RelativeLayout <RelativeLayout

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

@ -13,6 +13,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:clickable="true" android:clickable="true"
style="@style/Theme.UiTemplate.FAB.AccentColor"
android:src="@drawable/ic_close" android:src="@drawable/ic_close"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
@ -21,7 +22,8 @@
android:id="@+id/textView5" android:id="@+id/textView5"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="TextView" android:text="Entry History"
style="@style/Theme.UiTemplate.TextH2"
app:layout_constraintBottom_toBottomOf="@+id/floatingActionButton2" app:layout_constraintBottom_toBottomOf="@+id/floatingActionButton2"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/floatingActionButton2" app:layout_constraintStart_toEndOf="@+id/floatingActionButton2"

7
app/src/main/res/layout/fragment_login.xml
View File

@ -34,14 +34,14 @@
android:id="@+id/text_welcome" android:id="@+id/text_welcome"
style="@style/Theme.UiTemplate.TextH4" style="@style/Theme.UiTemplate.TextH4"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_marginBottom="10dp" android:layout_marginBottom="2dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/login_welcome" /> android:text="@string/login_welcome" />
<TextView <TextView
android:id="@+id/text_login_small" android:id="@+id/text_login_small"
style="@style/Theme.UiTemplate.TextH4" style="@style/Theme.UiTemplate.TextH4"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_marginBottom="50dp" android:layout_marginBottom="30dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/login_text" /> android:text="@string/login_text" />
<com.google.android.material.textfield.TextInputLayout <com.google.android.material.textfield.TextInputLayout
@ -71,6 +71,7 @@
app:layout_constraintWidth_max="400dp" app:layout_constraintWidth_max="400dp"
app:layout_constraintWidth_percent="0.8" app:layout_constraintWidth_percent="0.8"
android:layout_height="58dp" android:layout_height="58dp"
app:passwordToggleEnabled="true"
tools:ignore="MissingConstraints"> tools:ignore="MissingConstraints">
<com.google.android.material.textfield.TextInputEditText <com.google.android.material.textfield.TextInputEditText
@ -78,7 +79,7 @@
style="@style/Theme.UiTemplate.Input.Text" style="@style/Theme.UiTemplate.Input.Text"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:inputType="text" android:inputType="textPassword"
android:maxLines="1" android:maxLines="1"
android:hint="@string/login_password_hint"> android:hint="@string/login_password_hint">
</com.google.android.material.textfield.TextInputEditText> </com.google.android.material.textfield.TextInputEditText>

2
app/src/main/res/values/card_view_style.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<style name="Theme.UiTemplate.CardView" parent="Widget.MaterialComponents.CardView"> <style name="Theme.UiTemplate.CardView" parent="Widget.MaterialComponents.CardView">
<item name="cardBackgroundColor">@color/BackgroundGray</item>
<item name="cardElevation">0dp</item> <item name="cardElevation">0dp</item>
<item name="cardCornerRadius">120dp</item> <item name="cardCornerRadius">120dp</item>
<item name="cornerSize">10dp</item>
</style> </style>
</resources> </resources>