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:
Juja2025 2025-02-19 10:31:33 +03:00
commit 7a78b6ba8e
7 changed files with 80 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/AndroidManifest.xml
View File

@ -13,6 +13,7 @@
android:fullBackupContent="@xml/backup_rules" android:fullBackupContent="@xml/backup_rules"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:label="@string/app_name" android:label="@string/app_name"
android:usesCleartextTraffic="true"
android:roundIcon="@mipmap/ic_launcher_round" android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@style/Theme.UiTemplate" android:theme="@style/Theme.UiTemplate"

3
app/src/main/java/ru/myitschool/work/core/Constants.kt
View File

@ -1,5 +1,6 @@
package ru.myitschool.work.core package ru.myitschool.work.core
object Constants { object Constants {
const val SERVER_ADDRESS = "http://localhost:8090" // "http://localhost:8080"
const val SERVER_ADDRESS = "http://10.0.2.2:8080"
} }

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

@ -12,6 +12,17 @@
android:layout_height="0dp" android:layout_height="0dp"
app:constraint_referenced_ids="logout,fullname,photo,position,lastEntry,scan" /> app:constraint_referenced_ids="logout,fullname,photo,position,lastEntry,scan" />
<TextView
android:id="@+id/textView"
style="@style/Theme.UiTemplate.TextH1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/profile_main_textview"
app:layout_constraintBottom_toBottomOf="@+id/logout"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ProgressBar <ProgressBar
android:id="@+id/loading" android:id="@+id/loading"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -27,6 +38,8 @@
android:layout_width="64dp" android:layout_width="64dp"
android:layout_height="64dp" android:layout_height="64dp"
android:contentDescription="@null" android:contentDescription="@null"
app:layout_constraintBottom_toBottomOf="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" />
@ -36,10 +49,12 @@
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:textAlignment="center"
android:textAppearance="@style/TextAppearance.AppCompat.Headline" android:textAppearance="@style/TextAppearance.AppCompat.Headline"
app:layout_constraintEnd_toStartOf="@id/buttons" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/photo" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toBottomOf="@+id/photo"
tools:text="@tools:sample/full_names" /> tools:text="@tools:sample/full_names" />
<TextView <TextView
@ -57,9 +72,10 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp" android:layout_marginHorizontal="16dp"
app:layout_constraintEnd_toStartOf="@id/buttons" android:layout_marginTop="24dp"
app:layout_constraintStart_toEndOf="@id/position" app:layout_constraintEnd_toEndOf="@+id/fullname"
app:layout_constraintTop_toTopOf="@id/position" app:layout_constraintStart_toStartOf="@+id/fullname"
app:layout_constraintTop_toBottomOf="@+id/fullname"
tools:text="@tools:sample/date/hhmm" /> tools:text="@tools:sample/date/hhmm" />
<TextView <TextView
@ -68,30 +84,13 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp" android:layout_marginHorizontal="16dp"
android:textAlignment="center" android:textAlignment="center"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent" 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:text="Something wrong. Try later" /> tools:text="Something wrong. Try later" />
<androidx.constraintlayout.helper.widget.Flow
android:id="@+id/buttons"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
app:constraint_referenced_ids="logout,refresh"
app:flow_horizontalGap="4dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/logout"
style="?attr/floatingActionButtonSmallStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/profile_refresh_button"
android:src="@drawable/ic_logout"
app:elevation="0dp" />
<com.google.android.material.floatingactionbutton.FloatingActionButton <com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/refresh" android:id="@+id/refresh"
@ -100,7 +99,20 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:contentDescription="@string/profile_refresh_button" android:contentDescription="@string/profile_refresh_button"
android:src="@drawable/ic_refresh" android:src="@drawable/ic_refresh"
app:elevation="0dp" /> app:elevation="0dp"
tools:layout_editor_absoluteX="167dp"
tools:layout_editor_absoluteY="521dp" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/logout"
style="?attr/floatingActionButtonSmallStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/profile_refresh_button"
android:src="@drawable/ic_logout"
app:elevation="0dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<com.google.android.material.floatingactionbutton.FloatingActionButton <com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/scan" android:id="@+id/scan"
@ -110,6 +122,7 @@
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:layout_constraintStart_toStartOf="parent"
app:useCompatPadding="true" /> app:useCompatPadding="true" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

2
app/src/main/res/layout/fragment_qr_result.xml
View File

@ -28,6 +28,7 @@
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"
style="@style/Theme.UiTemplate.TextH2"
tools:text="This is test text with result scanning" tools:text="This is test text with result scanning"
tools:visibility="visible" /> tools:visibility="visible" />
@ -37,6 +38,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="16dp" android:layout_margin="16dp"
android:text="@string/close_button" android:text="@string/close_button"
style="@style/Theme.UiTemplate.Button"
app:layout_constraintBottom_toBottomOf="parent" 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" />

33
app/src/main/res/values/TextStyle.xml Normal file
View File

@ -0,0 +1,33 @@
<?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>

1
app/src/main/res/values/strings_profile.xml
View File

@ -2,4 +2,5 @@
<resources> <resources>
<string name="profile_refresh_button">Refresh</string> <string name="profile_refresh_button">Refresh</string>
<string name="profile_scan_button">Scan QR</string> <string name="profile_scan_button">Scan QR</string>
<string name="profile_main_textview">Home</string>
</resources> </resources>

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

@ -3,6 +3,8 @@
<style name="Base.Theme.UiTemplate" parent="Theme.MaterialComponents.DayNight.NoActionBar"> <style name="Base.Theme.UiTemplate" parent="Theme.MaterialComponents.DayNight.NoActionBar">
<!-- Customize your light theme here. --> <!-- Customize your light theme here. -->
<item name="colorPrimary">@color/AccentBlue</item> <item name="colorPrimary">@color/AccentBlue</item>
<item name="colorPrimaryDark">@color/white</item>
<item name="android:navigationBarColor">@color/white</item>
<item name="android:colorBackground">@color/white</item> <item name="android:colorBackground">@color/white</item>
</style> </style>