diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e47f0c0..da1553b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -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" diff --git a/app/src/main/res/layout/fragment_admin.xml b/app/src/main/res/layout/fragment_admin.xml index 65f556d..62ecc25 100644 --- a/app/src/main/res/layout/fragment_admin.xml +++ b/app/src/main/res/layout/fragment_admin.xml @@ -1,15 +1,15 @@ - + > - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_auth.xml b/app/src/main/res/layout/fragment_auth.xml index 8efeff1..ca53562 100644 --- a/app/src/main/res/layout/fragment_auth.xml +++ b/app/src/main/res/layout/fragment_auth.xml @@ -1,8 +1,10 @@ - @@ -76,6 +78,24 @@ android:textColor="?attr/colorSecondary" /> + + + + - \ No newline at end of file + \ 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 90b30b7..a0f76a0 100644 --- a/app/src/main/res/layout/fragment_profile.xml +++ b/app/src/main/res/layout/fragment_profile.xml @@ -1,9 +1,10 @@ - @@ -58,7 +59,7 @@ @@ -78,6 +79,7 @@ - + diff --git a/app/src/main/res/layout/item_scanner_view.xml b/app/src/main/res/layout/item_scanner_view.xml index b1f69f7..159e593 100644 --- a/app/src/main/res/layout/item_scanner_view.xml +++ b/app/src/main/res/layout/item_scanner_view.xml @@ -1,4 +1,16 @@ + + android:text="Время и дата сканирования: 17.02.2021 12:34" /> - \ No newline at end of file + + \ No newline at end of file