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 
# Conflicts:
#	app/src/main/res/layout/fragment_profile.xml
This commit is contained in:
Juja2025 2025-02-19 11:30:52 +03:00
commit 2d401e0f99
7 changed files with 69 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/ru/myitschool/work/ui/profile/ProfileFragment.kt
View File

@ -71,7 +71,6 @@ class ProfileFragment : Fragment(R.layout.fragment_profile) {
} }
private fun initCallback() { private fun initCallback() {
binding.refresh.setOnClickListener { viewModel.clickRefresh() }
binding.logout.setOnClickListener { viewModel.clickLogout() } binding.logout.setOnClickListener { viewModel.clickLogout() }
binding.scan.setOnClickListener { viewModel.clickScan() } binding.scan.setOnClickListener { viewModel.clickScan() }
} }

4
app/src/main/java/ru/myitschool/work/ui/profile/ProfileViewModel.kt
View File

@ -37,9 +37,7 @@ class ProfileViewModel @Inject constructor(
updateUserInfo() updateUserInfo()
} }
fun clickRefresh() {
updateUserInfo()
}
fun clickLogout() { fun clickLogout() {
viewModelScope.launch { viewModelScope.launch {

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

@ -6,18 +6,18 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:padding="16dp"> android:padding="16dp">
<androidx.constraintlayout.widget.Group
android:id="@+id/showState"
android:layout_width="0dp"
android:layout_height="0dp"
app:constraint_referenced_ids="logout,fullname,photo,position,lastEntry,scan" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="16dp"
android:orientation="vertical">
<TextView <TextView
android:id="@+id/textView" android:id="@+id/textView"
style="@style/Theme.UiTemplate.TextH1" style="@style/Theme.UiTemplate.TextH1"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="@string/profile_main_textview" android:text="@string/profile_main_textview"
app:layout_constraintBottom_toBottomOf="@+id/logout" app:layout_constraintBottom_toBottomOf="@+id/logout"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
@ -32,58 +32,54 @@
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
<ImageView <ImageView
android:id="@+id/photo" android:id="@+id/photo"
android:layout_width="140dp" android:layout_width="120dp"
android:layout_height="140dp" android:layout_height="120dp"
android:layout_marginBottom="16dp"
android:contentDescription="@null" android:contentDescription="@null"
android:layout_marginTop="20dp" app:layout_constraintBottom_toTopOf="@+id/scan"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
tools:src="@tools:sample/avatars" /> tools:src="@tools:sample/avatars" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView <TextView
android:id="@+id/fullname" android:id="@+id/fullname"
style="@style/Theme.UiTemplate.TextH3"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp" android:layout_marginHorizontal="16dp"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:textAlignment="center" android:textAlignment="center"
android:textAppearance="@style/TextAppearance.AppCompat.Headline"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/photo" app:layout_constraintTop_toBottomOf="@+id/photo"
tools:text="@tools:sample/full_names" /> tools:text="@tools:sample/full_names" />
<TextView <TextView
android:id="@+id/position" android:id="@+id/position"
style="@style/Theme.UiTemplate.TextH4"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="16dp" android:layout_marginTop="16dp"
app:layout_constraintEnd_toStartOf="@id/lastEntry"
app:layout_constraintStart_toEndOf="@id/photo"
app:layout_constraintTop_toBottomOf="@id/fullname"
tools:text="@tools:sample/cities" />
<TextView
android:id="@+id/lastEntry"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="24dp"
app:layout_constraintEnd_toEndOf="@+id/fullname" app:layout_constraintEnd_toEndOf="@+id/fullname"
app:layout_constraintStart_toStartOf="@+id/fullname" app:layout_constraintStart_toStartOf="@+id/fullname"
app:layout_constraintTop_toBottomOf="@+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="16dp"
app:layout_constraintEnd_toEndOf="@+id/fullname"
app:layout_constraintStart_toStartOf="@+id/fullname"
app:layout_constraintTop_toBottomOf="@+id/position"
tools:text="@tools:sample/date/hhmm" /> tools:text="@tools:sample/date/hhmm" />
</LinearLayout>
</LinearLayout>
<TextView <TextView
android:id="@+id/error" android:id="@+id/error"
@ -99,20 +95,9 @@
tools:text="Something wrong. Try later" /> tools:text="Something wrong. Try later" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/refresh"
style="?attr/floatingActionButtonSmallStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/profile_refresh_button"
android:src="@drawable/ic_refresh"
app:elevation="0dp"
tools:layout_editor_absoluteX="167dp"
tools:layout_editor_absoluteY="521dp" />
<com.google.android.material.floatingactionbutton.FloatingActionButton <com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/logout" android:id="@+id/logout"
style="?attr/floatingActionButtonSmallStyle" style="@style/Theme.UiTemplate.FAB.Gray"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:contentDescription="@string/profile_refresh_button" android:contentDescription="@string/profile_refresh_button"
@ -123,13 +108,13 @@
<com.google.android.material.floatingactionbutton.FloatingActionButton <com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/scan" android:id="@+id/scan"
style="@style/Theme.UiTemplate.FAB.AccentColor"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:contentDescription="@string/profile_scan_button" android:contentDescription="@string/profile_scan_button"
android:src="@drawable/ic_qr_code" android:src="@drawable/ic_qr_code"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent" />
app:useCompatPadding="true" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

1
app/src/main/res/layout/fragment_qr_scan.xml
View File

@ -29,6 +29,7 @@
android:layout_margin="16dp" android:layout_margin="16dp"
android:contentDescription="@string/close_button" android:contentDescription="@string/close_button"
android:src="@drawable/ic_close" android:src="@drawable/ic_close"
style="@style/Theme.UiTemplate.FAB.AccentColor"
app:elevation="0dp" app:elevation="0dp"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />

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

35
app/src/main/res/values/text_style.xml
View File

@ -1,35 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="Theme.UiTemplate.TextH1">
<item name="android:textSize">28sp</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: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: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: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: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:fontFamily">@font/montsemibold</item>
</style>
</resources>