DisplayNone/DisplayNone-front
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Implemented landscape orientation and portrait and aesthetics for everything

Browse Source
This commit is contained in:
Serafim_Pankin 2025-02-19 12:21:42 +03:00
parent 66bf626a0a
commit 12c6b6e1c2
5 changed files with 53 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,7 +12,7 @@
android:name="com.displaynone.ACSSApplication"
android:dataExtractionRules="@xml/data_extraction_rules"
android:fullBackupContent="@xml/backup_rules"
android:icon="@mipmap/ic_launcher"
android:icon="@mipmap/ic_app"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_app"
android:supportsRtl="true"

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

@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
<androidx.core.widget.NestedScrollView xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:fillViewport="true"
android:layout_height="match_parent">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:layout_editor_absoluteX="1dp"
tools:layout_editor_absoluteY="1dp">
>
<TextView
android:id="@+id/textView"
@ -79,4 +79,4 @@
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.core.widget.NestedScrollView>

24
app/src/main/res/layout/fragment_auth.xml
View File

@ -1,8 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.core.widget.NestedScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:fillViewport="true"
android:layout_height="match_parent"
android:background="?android:attr/colorBackground">
@ -76,6 +78,24 @@
android:textColor="?attr/colorSecondary" />
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:boxStrokeColor="@color/primary"
app:hintTextColor="?attr/colorOnBackground"
app:helperTextTextColor="?attr/colorOnBackground"
android:layout_marginBottom="10dp">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/password"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="14dp"
android:hint="@string/login"
android:textColorHint="?attr/colorSecondary"
android:textColor="?attr/colorSecondary" />
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -127,4 +147,4 @@
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.core.widget.NestedScrollView>

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

@ -1,9 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
<androidx.core.widget.NestedScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/swipeRefresh"
android:fillViewport="true"
android:layout_width="match_parent"
android:layout_height="match_parent">
@ -58,7 +59,7 @@
<LinearLayout
android:layout_width="280dp"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:gravity="center_horizontal">
@ -78,6 +79,7 @@
<com.google.android.material.textview.MaterialTextView
android:id="@+id/position"
android:padding="15dp"
android:layout_margin="16dp"
android:layout_marginTop="10dp"
android:textAlignment="center"
@ -93,12 +95,13 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/logout"
android:layout_margin="16dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/logout"
android:layout_marginTop="10dp"
android:padding="12dp"
android:textSize="16sp"
android:textColor="@color/white"
app:cornerRadius="8dp"
@ -106,6 +109,8 @@
app:rippleColor="@color/white"/>
<com.google.android.material.button.MaterialButton
android:id="@+id/scan"
android:layout_margin="16dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/scan"
@ -128,7 +133,7 @@
android:padding="12dp"
android:textSize="16sp"
android:layout_marginTop="10dp"
android:layout_margin="16dp"
android:textColor="@color/white"
app:cornerRadius="8dp"
@ -155,4 +160,4 @@
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
</androidx.core.widget.NestedScrollView>

17
app/src/main/res/layout/item_scanner_view.xml
View File

@ -1,4 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<com.google.android.material.card.MaterialCardView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="6dp"
app:cardCornerRadius="16dp"
app:cardElevation="8dp"
app:strokeWidth="2dp"
app:strokeColor="@color/primary"
android:backgroundTint="@android:color/white">
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
@ -14,7 +26,7 @@
android:textSize="16sp"
android:textColor="?attr/colorOnBackground"
android:textAlignment="center"
android:text="Время сканирования: 12:34" />
android:text="Время и дата сканирования: 17.02.2021 12:34" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/scannerId"
@ -36,4 +48,5 @@
android:textAlignment="center"
android:layout_marginTop="8dp"
android:text="Тип прохода: Карта" />
</LinearLayout>
</LinearLayout>
</com.google.android.material.card.MaterialCardView>