diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png index 8ac2d3f..e31d396 100644 Binary files a/app/src/main/ic_launcher-playstore.png and b/app/src/main/ic_launcher-playstore.png differ diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml index fc9b91c..f2750b4 100644 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -1,265 +1,59 @@ - + android:viewportWidth="230" + android:viewportHeight="162"> + + android:pathData="M219.6,63.04H10.27C7.32,63.04 4.93,65.44 4.93,68.39V155.69C4.93,158.64 7.32,161.04 10.27,161.04H219.6C222.56,161.04 224.95,158.64 224.95,155.69V68.39C224.95,65.44 222.56,63.04 219.6,63.04Z" + android:fillColor="#ffffff"/> + android:pathData="M143.48,47.45H86.37C82.04,47.44 77.89,45.72 74.82,42.66C71.76,39.59 70.04,35.44 70.03,31.11V16.45C70.04,12.12 71.76,7.96 74.82,4.9C77.89,1.84 82.04,0.12 86.37,0.11H143.48C147.82,0.11 151.97,1.83 155.04,4.9C158.1,7.96 159.82,12.11 159.82,16.45V31.04C159.83,33.19 159.41,35.32 158.6,37.31C157.78,39.3 156.58,41.11 155.06,42.64C153.54,44.16 151.74,45.37 149.75,46.2C147.76,47.02 145.63,47.45 143.48,47.45ZM86.37,12.11C85.22,12.12 84.12,12.58 83.3,13.39C82.49,14.2 82.02,15.3 82,16.45V31.04C82,32.21 82.47,33.33 83.3,34.16C84.12,34.99 85.25,35.45 86.42,35.45H143.53C144.7,35.45 145.82,34.99 146.65,34.16C147.48,33.33 147.94,32.21 147.94,31.04V16.45C147.94,15.28 147.48,14.15 146.65,13.33C145.82,12.5 144.7,12.03 143.53,12.03L86.37,12.11Z" + android:fillColor="#2E2E2E"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + android:pathData="M126.24,97.55H103.66C100.87,97.55 98.6,99.82 98.6,102.61V116.89C98.6,119.68 100.87,121.95 103.66,121.95H126.24C129.03,121.95 131.3,119.68 131.3,116.89V102.61C131.3,99.82 129.03,97.55 126.24,97.55Z" + android:fillColor="#2E2E2E"/> + android:pathData="M167.68,38H212V63.91" + android:strokeLineJoin="round" + android:strokeWidth="8" + android:fillColor="#00000000" + android:strokeColor="#000000" + android:strokeLineCap="round"/> + + + diff --git a/app/src/main/res/layout/fragment_admin.xml b/app/src/main/res/layout/fragment_admin.xml index 3444646..a414c92 100644 --- a/app/src/main/res/layout/fragment_admin.xml +++ b/app/src/main/res/layout/fragment_admin.xml @@ -17,7 +17,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="horizontal" - app:layout_constraintGuide_percent="0.36" /> + app:layout_constraintGuide_percent="0.37" /> - + tools:layout_editor_absoluteY="278dp" /> + app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintGuide_percent="0.19" /> + app:layout_constraintGuide_percent="0.45" /> - - @@ -64,27 +54,27 @@ android:id="@+id/textView2" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="15dp" android:gravity="center" android:text="@string/inputLoginText" - android:textStyle="bold" android:textColor="@color/black" android:textSize="18sp" + android:textStyle="bold" + app:layout_constraintBottom_toTopOf="@+id/textView3" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/textView" /> + app:layout_constraintStart_toStartOf="parent" /> + app:layout_constraintStart_toStartOf="parent" /> + app:layout_constraintTop_toBottomOf="@+id/line" /> @@ -159,11 +149,11 @@ android:id="@+id/line" android:layout_width="320dp" android:layout_height="10dp" - android:layout_marginTop="10dp" + android:layout_marginTop="15dp" android:background="@drawable/ic_line" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/login" /> + app:layout_constraintTop_toBottomOf="@+id/field_view2" /> diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp index f1c37fa..d56514b 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.webp and b/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp index bf4994b..04a1b86 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp index 6864a04..b36e4b3 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.webp and b/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp index 9fe92e5..cc62861 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp index 7a7b2d4..f089a78 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp and b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp index 23f5133..1cca706 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp index 39ec0dc..a01c418 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp index eee2d21..84a2ca8 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp index 0f801f5..079c10f 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp index 7fbbad0..fba9525 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml index c5d5899..e1c746b 100644 --- a/app/src/main/res/values/ic_launcher_background.xml +++ b/app/src/main/res/values/ic_launcher_background.xml @@ -1,4 +1,4 @@ - #FFFFFF + #D0D0C3 \ No newline at end of file