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

Правки в гланвом экране. Стили для фаба

Browse Source
This commit is contained in:
v228a 2025-02-19 10:33:09 +03:00
parent 60d04a520b
commit 331d995ed9
3 changed files with 45 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,10 +35,11 @@
<ImageView
android:id="@+id/photo"
android:layout_width="64dp"
android:layout_height="64dp"
android:layout_width="120dp"
android:layout_height="120dp"
android:layout_marginBottom="16dp"
android:contentDescription="@null"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintBottom_toTopOf="@+id/scan"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
@ -46,12 +47,12 @@
<TextView
android:id="@+id/fullname"
style="@style/Theme.UiTemplate.TextH3"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="16dp"
android:textAlignment="center"
android:textAppearance="@style/TextAppearance.AppCompat.Headline"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/photo"
@ -59,23 +60,25 @@
<TextView
android:id="@+id/position"
style="@style/Theme.UiTemplate.TextH4"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
app:layout_constraintEnd_toStartOf="@id/lastEntry"
app:layout_constraintStart_toEndOf="@id/photo"
app:layout_constraintTop_toBottomOf="@id/fullname"
android:layout_marginTop="16dp"
app:layout_constraintEnd_toEndOf="@+id/fullname"
app:layout_constraintStart_toStartOf="@+id/fullname"
app:layout_constraintTop_toBottomOf="@+id/fullname"
tools:text="@tools:sample/cities" />
<TextView
android:id="@+id/lastEntry"
style="@style/Theme.UiTemplate.TextH4_2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="24dp"
android:layout_marginTop="16dp"
app:layout_constraintEnd_toEndOf="@+id/fullname"
app:layout_constraintStart_toStartOf="@+id/fullname"
app:layout_constraintTop_toBottomOf="@+id/fullname"
app:layout_constraintTop_toBottomOf="@+id/position"
tools:text="@tools:sample/date/hhmm" />
<TextView
@ -100,12 +103,12 @@
android:contentDescription="@string/profile_refresh_button"
android:src="@drawable/ic_refresh"
app:elevation="0dp"
tools:layout_editor_absoluteX="167dp"
tools:layout_editor_absoluteY="521dp" />
app:layout_constraintStart_toStartOf="@+id/position"
app:layout_constraintTop_toBottomOf="@+id/lastEntry" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/logout"
style="?attr/floatingActionButtonSmallStyle"
style="@style/Theme.UiTemplate.FAB.Gray"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/profile_refresh_button"
@ -116,13 +119,13 @@
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/scan"
style="@style/Theme.UiTemplate.FAB.AccentColor"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/profile_scan_button"
android:src="@drawable/ic_qr_code"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:useCompatPadding="true" />
app:layout_constraintEnd_toEndOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

21
app/src/main/res/values/FAB_Style.xml Normal file
View File

@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="Theme.UiTemplate.FAB" parent="Theme.UiTemplate.Button">
<item name="tint">@color/TextBlack</item>
<item name="backgroundTint">@color/BackgroundGray</item>
<item name="elevation">0dp</item>
<item name="android:layout_width">52dp</item>
<item name="android:layout_height">52dp</item>
<item name="cornerRadius">50dp</item>
</style>
<style name="Theme.UiTemplate.FAB.AccentColor" parent="Theme.UiTemplate.FAB">
<item name="tint">@color/white</item>
<item name="backgroundTint">@color/AccentBlue</item>
</style>
<style name="Theme.UiTemplate.FAB.Gray" parent="Theme.UiTemplate.FAB">
<item name="tint">@color/Gray5</item>
<item name="backgroundTint">@color/BackgroundGray</item>
</style>
</resources>

6
app/src/main/res/values/TextStyle.xml
View File

@ -2,32 +2,38 @@
<resources>
<style name="Theme.UiTemplate.TextH1">
<item name="android:textSize">28sp</item>
<item name="android:textAlignment">center</item>
<item name="android:fontFamily">@font/gilroyextrabold</item>
<item name="android:textColor">@color/black</item>
</style>
<style name="Theme.UiTemplate.TextH2">
<item name="android:textSize">28sp</item>
<item name="android:textAlignment">center</item>
<item name="android:textColor">@color/TextBlack</item>
<item name="android:fontFamily">@font/gilroybold</item>
</style>
<style name="Theme.UiTemplate.TextH3">
<item name="android:textSize">20sp</item>
<item name="android:textAlignment">center</item>
<item name="android:textColor">@color/TextBlack</item>
<item name="android:fontFamily">@font/montbold</item>
</style>
<style name="Theme.UiTemplate.TextH4">
<item name="android:textSize">16sp</item>
<item name="android:textAlignment">center</item>
<item name="android:textColor">@color/Gray6</item>
<item name="android:fontFamily">@font/gilroysemibold</item>
</style>
<style name="Theme.UiTemplate.TextH4_2">
<item name="android:textSize">16sp</item>
<item name="android:textColor">@color/Gray5</item>
<item name="android:textAlignment">center</item>
<item name="android:fontFamily">@font/gilroysemibold</item>
</style>
<style name="Theme.UiTemplate.TextH5">
<item name="android:textSize">14sp</item>
<item name="android:textColor">@color/Gray5</item>
<item name="android:textAlignment">center</item>
<item name="android:fontFamily">@font/montsemibold</item>
</style>
</resources>