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 14:21:17 +03:00
commit 9c778c9f9c
7 changed files with 133 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/src/main/res/drawable/ic_list.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 661 B

5
app/src/main/res/drawable/icon_list.xml Normal file
View File

@ -0,0 +1,5 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
<path android:fillColor="@android:color/white" android:pathData="M4,10.5c-0.83,0 -1.5,0.67 -1.5,1.5s0.67,1.5 1.5,1.5 1.5,-0.67 1.5,-1.5 -0.67,-1.5 -1.5,-1.5zM4,4.5c-0.83,0 -1.5,0.67 -1.5,1.5S3.17,7.5 4,7.5 5.5,6.83 5.5,6 4.83,4.5 4,4.5zM4,16.5c-0.83,0 -1.5,0.68 -1.5,1.5s0.68,1.5 1.5,1.5 1.5,-0.68 1.5,-1.5 -0.67,-1.5 -1.5,-1.5zM7,19h14v-2L7,17v2zM7,13h14v-2L7,11v2zM7,5v2h14L21,5L7,5z"/>
</vector>

97
app/src/main/res/layout/card_view.xml Normal file
View File

@ -0,0 +1,97 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="105dp"
tools:ignore="MissingConstraints">
<TextView
android:layout_width="200dp"
android:id="@+id/name_list"
android:textSize="16sp"
android:layout_marginStart="20dp"
android:text="@string/list_name"
android:textColor="@color/black"
android:layout_marginEnd="20dp"
android:maxLines="1"
android:layout_marginTop="15dp"
android:layout_height="wrap_content"/>
<ImageView
android:id="@+id/examPic"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_below="@+id/name_list"
android:layout_marginStart="20dp"
android:layout_marginTop="7dp" />
<TextView
android:id="@+id/time"
android:layout_toEndOf="@+id/examPic"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/name_list"
android:layout_marginTop="5dp"
android:layout_marginEnd="20dp"
android:layout_marginStart="10dp"
android:gravity="center"
android:text="May 23, 2015"
android:textSize="16sp"/>
<ImageView
android:id="@+id/examPic2"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_below="@+id/time"
android:layout_marginStart="20dp"
android:layout_marginTop="7dp" />
<TextView
android:id="@+id/identificator"
android:layout_toEndOf="@+id/examPic2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/time"
android:layout_marginEnd="20dp"
android:layout_marginTop="5dp"
android:layout_marginStart="10dp"
android:gravity="center"
android:text="Best Of Luck"
android:textSize="16sp"/>
<ImageView
android:id="@+id/examPic2"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_below="@+id/time"
android:layout_marginStart="20dp"
android:layout_marginTop="7dp" />
<TextView
android:id="@+id/type"
android:layout_toEndOf="@+id/examPic2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/time"
android:layout_marginEnd="20dp"
android:layout_marginTop="5dp"
android:layout_marginStart="10dp"
android:gravity="center"
android:text="Best Of Luck"
android:textSize="16sp"/>
<TextView
android:id="@+id/border2"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:layout_alignParentBottom="true"
android:background="#808080"/>
</RelativeLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

24
app/src/main/res/layout/fragment_profile.xml
View File

@ -15,7 +15,7 @@
android:id="@+id/showState"
android:layout_width="0dp"
android:layout_height="0dp"
app:constraint_referenced_ids="logout,fullname,photo,position,lastEntry,scan" />
app:constraint_referenced_ids="logout,fullname,photo2,position,lastEntry,scan" />
<TextView
@ -37,19 +37,31 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
<androidx.cardview.widget.CardView
android:id="@+id/photo2"
android:layout_width="120dp"
android:layout_height="120dp"
app:cardCornerRadius="12dp"
android:layout_margin="5dp"
app:layout_constraintBottom_toTopOf="@+id/scan"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:elevation="10dp">
<com.google.android.material.imageview.ShapeableImageView
android:id="@+id/photo"
android:layout_width="120dp"
android:layout_height="120dp"
android:layout_marginBottom="16dp"
android:contentDescription="@null"
style="@style/roundedImageView"
app:layout_constraintBottom_toTopOf="@+id/scan"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:src="@tools:sample/avatars" />
</androidx.cardview.widget.CardView>
<TextView
android:id="@+id/fullname"
style="@style/Theme.UiTemplate.TextH3"
@ -60,7 +72,7 @@
android:textAlignment="center"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/photo"
app:layout_constraintTop_toBottomOf="@+id/photo2"
tools:text="@tools:sample/full_names" />
<TextView
@ -128,7 +140,7 @@
android:layout_height="wrap_content"
android:layout_marginEnd="320dp"
android:contentDescription="@string/profile_scan_button"
android:src="@drawable/ic_list"
android:src="@drawable/icon_list"
app:maxImageSize="30dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" />

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

@ -3,6 +3,6 @@
<style name="Theme.UiTemplate.CardView" parent="Widget.MaterialComponents.CardView">
<item name="cardBackgroundColor">@color/BackgroundGray</item>
<item name="cardElevation">0dp</item>
<item name="cardCornerRadius">30dp</item>
<item name="cardCornerRadius">120dp</item>
</style>
</resources>

8
app/src/main/res/values/rounded_image_view_style.xml Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="roundedImageView" parent="">
<item name="cornerFamily">rounded</item>
<item name="cornerSize">20dp</item>
<item name="cornerRadius">50dp</item>
</style>
</resources>

4
app/src/main/res/values/strings_entry_list.xml Normal file
View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="list_name">Entry History</string>
</resources>