diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0599e1a..9c7afac 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -13,6 +13,7 @@ android:fullBackupContent="@xml/backup_rules" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" + android:usesCleartextTraffic="true" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/Theme.UiTemplate" diff --git a/app/src/main/java/ru/myitschool/work/core/Constants.kt b/app/src/main/java/ru/myitschool/work/core/Constants.kt index 8f8138d..56697d1 100644 --- a/app/src/main/java/ru/myitschool/work/core/Constants.kt +++ b/app/src/main/java/ru/myitschool/work/core/Constants.kt @@ -1,5 +1,6 @@ package ru.myitschool.work.core object Constants { - const val SERVER_ADDRESS = "http://localhost:8090" +// "http://localhost:8080" + const val SERVER_ADDRESS = "http://10.0.2.2:8080" } \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml index 02a3619..0abc630 100644 --- a/app/src/main/res/layout/fragment_profile.xml +++ b/app/src/main/res/layout/fragment_profile.xml @@ -12,6 +12,17 @@ android:layout_height="0dp" app:constraint_referenced_ids="logout,fullname,photo,position,lastEntry,scan" /> + + + @@ -36,10 +49,12 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginHorizontal="16dp" + android:layout_marginTop="16dp" + android:textAlignment="center" android:textAppearance="@style/TextAppearance.AppCompat.Headline" - app:layout_constraintEnd_toStartOf="@id/buttons" - app:layout_constraintStart_toEndOf="@id/photo" - app:layout_constraintTop_toTopOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/photo" tools:text="@tools:sample/full_names" /> - - - + app:elevation="0dp" + tools:layout_editor_absoluteX="167dp" + tools:layout_editor_absoluteY="521dp" /> + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_qr_result.xml b/app/src/main/res/layout/fragment_qr_result.xml index 8f4c92b..f49e321 100644 --- a/app/src/main/res/layout/fragment_qr_result.xml +++ b/app/src/main/res/layout/fragment_qr_result.xml @@ -28,6 +28,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" + style="@style/Theme.UiTemplate.TextH2" tools:text="This is test text with result scanning" tools:visibility="visible" /> @@ -37,6 +38,7 @@ android:layout_height="wrap_content" android:layout_margin="16dp" android:text="@string/close_button" + style="@style/Theme.UiTemplate.Button" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" /> diff --git a/app/src/main/res/values/TextStyle.xml b/app/src/main/res/values/TextStyle.xml new file mode 100644 index 0000000..639155c --- /dev/null +++ b/app/src/main/res/values/TextStyle.xml @@ -0,0 +1,33 @@ + + + + + + + + + diff --git a/app/src/main/res/values/strings_profile.xml b/app/src/main/res/values/strings_profile.xml index 1c399af..3fa8596 100644 --- a/app/src/main/res/values/strings_profile.xml +++ b/app/src/main/res/values/strings_profile.xml @@ -2,4 +2,5 @@ Refresh Scan QR + Home \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index d164577..cc9f550 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -3,6 +3,8 @@