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

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
DKaverznev 2025-02-20 15:53:13 +03:00
commit 42355b8e22
4 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/res/drawable/ic_profile.xml Normal file
View File

@ -0,0 +1,12 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="128dp"
android:height="128dp"
android:viewportWidth="128"
android:viewportHeight="128">
<path
android:fillColor="#FF000000"
android:pathData="M30,49c0,18.7 15.3,34 34,34s34,-15.3 34,-34S82.7,15 64,15S30,30.3 30,49zM90,49c0,14.3 -11.7,26 -26,26S38,63.3 38,49s11.7,-26 26,-26S90,34.7 90,49z"/>
<path
android:fillColor="#FF000000"
android:pathData="M24.4,119.4C35,108.8 49,103 64,103s29,5.8 39.6,16.4l5.7,-5.7C97.2,101.7 81.1,95 64,95s-33.2,6.7 -45.3,18.7L24.4,119.4z"/>
</vector>

9
app/src/main/res/layout/fragment_admin.xml
View File

@ -10,14 +10,14 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
app:layout_constraintGuide_percent="0.17" /> app:layout_constraintGuide_percent="0.15" />
<androidx.constraintlayout.widget.Guideline <androidx.constraintlayout.widget.Guideline
android:id="@+id/guideline2" android:id="@+id/guideline2"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
app:layout_constraintGuide_percent="0.38" /> app:layout_constraintGuide_percent="0.37" />
<ProgressBar <ProgressBar
android:id="@+id/loading" android:id="@+id/loading"
@ -66,12 +66,11 @@
<com.google.android.material.textfield.TextInputLayout <com.google.android.material.textfield.TextInputLayout
android:id="@+id/username_box" android:id="@+id/username_box"
android:layout_width="320dp" android:layout_width="320dp"
android:layout_height="40dp" android:layout_height="50dp"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:hint="@string/loginText" android:hint="@string/loginText"
app:boxStrokeColor="@color/beige" app:boxStrokeColor="@color/beige"
app:boxStrokeWidth="0dp" app:boxStrokeWidth="0dp"
app:layout_constraintBottom_toTopOf="@+id/line"
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/text_for"> app:layout_constraintTop_toBottomOf="@+id/text_for">
@ -192,7 +191,7 @@
android:id="@+id/block" android:id="@+id/block"
android:layout_width="320dp" android:layout_width="320dp"
android:layout_height="80dp" android:layout_height="80dp"
android:layout_marginTop="40dp" android:layout_marginTop="35dp"
android:background="@drawable/button_grey" android:background="@drawable/button_grey"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"

9
app/src/main/res/layout/fragment_main.xml
View File

@ -10,7 +10,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
app:layout_constraintGuide_percent="0.36" /> app:layout_constraintGuide_percent="0.3" />
<View <View
android:id="@+id/refresh" android:id="@+id/refresh"
@ -43,9 +43,9 @@
<View <View
android:id="@+id/icon_profile" android:id="@+id/icon_profile"
android:layout_width="170dp" android:layout_width="70dp"
android:layout_height="170dp" android:layout_height="70dp"
android:background="@drawable/ic_profile_data" android:background="@drawable/ic_profile"
app:layout_constraintBottom_toTopOf="@+id/guideline" app:layout_constraintBottom_toTopOf="@+id/guideline"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent" />
@ -229,5 +229,4 @@
app:layout_constraintTop_toBottomOf="@+id/scan" /> app:layout_constraintTop_toBottomOf="@+id/scan" />
</LinearLayout> </LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

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

@ -6,9 +6,9 @@
<item name="colorPrimaryVariant">@color/black</item> <item name="colorPrimaryVariant">@color/black</item>
<item name="colorOnPrimary">@color/white</item> <item name="colorOnPrimary">@color/white</item>
<!-- Secondary brand color. --> <!-- Secondary brand color. -->
<item name="colorSecondary">@color/teal_200</item> <item name="colorSecondary">@color/black</item>
<item name="colorSecondaryVariant">@color/teal_700</item> <item name="colorSecondaryVariant">@color/black</item>
<item name="colorOnSecondary">@color/black</item> <item name="colorOnSecondary">@color/white</item>
<!-- Status bar color. --> <!-- Status bar color. -->
<item name="android:statusBarColor">?attr/colorPrimaryVariant</item> <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
<!-- Customize your theme here. --> <!-- Customize your theme here. -->