From 8099193a1a52d11dd656acccd252c5717378372e Mon Sep 17 00:00:00 2001 From: mariamusinkina Date: Wed, 19 Feb 2025 20:05:53 +0500 Subject: [PATCH] from muschinkina_maria --- app/src/main/res/drawable/ic_close.xml | 10 +- .../res/drawable/ic_launcher_background.xml | 340 +++++++++--------- .../res/drawable/ic_launcher_foreground.xml | 58 +-- app/src/main/res/drawable/ic_logout.xml | 10 +- app/src/main/res/drawable/ic_no_img.xml | 10 +- app/src/main/res/drawable/ic_qr_code.xml | 50 +-- app/src/main/res/drawable/ic_refresh.xml | 10 +- app/src/main/res/drawable/inactive_button.xml | 12 +- app/src/main/res/drawable/input_field.xml | 8 +- app/src/main/res/drawable/main_button.xml | 12 +- .../main/res/drawable/main_button_outline.xml | 12 +- app/src/main/res/drawable/warn_button.xml | 12 +- .../main/res/drawable/warn_button_outline.xml | 12 +- .../main/res/layout-land/fragment_user.xml | 289 ++++++++------- app/src/main/res/layout/activity_root.xml | 20 +- app/src/main/res/layout/fragment_login.xml | 136 +++---- .../main/res/layout/fragment_qr_result.xml | 62 ++-- app/src/main/res/layout/fragment_qr_scan.xml | 68 ++-- app/src/main/res/layout/fragment_splash.xml | 10 +- app/src/main/res/layout/fragment_user.xml | 265 ++++++++------ .../res/mipmap-anydpi-v26/ic_launcher.xml | 10 +- .../mipmap-anydpi-v26/ic_launcher_round.xml | 10 +- app/src/main/res/navigation/nav_graph.xml | 130 +++---- app/src/main/res/values-en-rUS/strings.xml | 30 +- app/src/main/res/values/colors.xml | 27 +- app/src/main/res/values/ids.xml | 6 +- app/src/main/res/values/strings.xml | 35 +- app/src/main/res/values/strings_qr.xml | 6 +- app/src/main/res/values/themes.xml | 22 +- app/src/main/res/xml/backup_rules.xml | 24 +- .../main/res/xml/data_extraction_rules.xml | 36 +- .../main/res/xml/network_security_config.xml | 6 +- 32 files changed, 924 insertions(+), 824 deletions(-) diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml index f8ca0c6..8728226 100644 --- a/app/src/main/res/drawable/ic_close.xml +++ b/app/src/main/res/drawable/ic_close.xml @@ -1,5 +1,5 @@ - - - - - + + + + + diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml index 07d5da9..a4f78de 100644 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -1,170 +1,170 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml index 2b068d1..cc14f03 100644 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -1,30 +1,30 @@ - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_logout.xml b/app/src/main/res/drawable/ic_logout.xml index c22a96f..ea3a10f 100644 --- a/app/src/main/res/drawable/ic_logout.xml +++ b/app/src/main/res/drawable/ic_logout.xml @@ -1,5 +1,5 @@ - - - - - + + + + + diff --git a/app/src/main/res/drawable/ic_no_img.xml b/app/src/main/res/drawable/ic_no_img.xml index 44206c9..745343b 100644 --- a/app/src/main/res/drawable/ic_no_img.xml +++ b/app/src/main/res/drawable/ic_no_img.xml @@ -1,5 +1,5 @@ - - - - - + + + + + diff --git a/app/src/main/res/drawable/ic_qr_code.xml b/app/src/main/res/drawable/ic_qr_code.xml index b03f9ae..c1239e4 100644 --- a/app/src/main/res/drawable/ic_qr_code.xml +++ b/app/src/main/res/drawable/ic_qr_code.xml @@ -1,25 +1,25 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_refresh.xml b/app/src/main/res/drawable/ic_refresh.xml index 86504d0..78e8d2e 100644 --- a/app/src/main/res/drawable/ic_refresh.xml +++ b/app/src/main/res/drawable/ic_refresh.xml @@ -1,5 +1,5 @@ - - - - - + + + + + diff --git a/app/src/main/res/drawable/inactive_button.xml b/app/src/main/res/drawable/inactive_button.xml index dfe6c28..cded8ed 100644 --- a/app/src/main/res/drawable/inactive_button.xml +++ b/app/src/main/res/drawable/inactive_button.xml @@ -1,7 +1,7 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/input_field.xml b/app/src/main/res/drawable/input_field.xml index 9bb6e7e..74ce057 100644 --- a/app/src/main/res/drawable/input_field.xml +++ b/app/src/main/res/drawable/input_field.xml @@ -1,5 +1,5 @@ - - - - + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/main_button.xml b/app/src/main/res/drawable/main_button.xml index 7316b2c..a377926 100644 --- a/app/src/main/res/drawable/main_button.xml +++ b/app/src/main/res/drawable/main_button.xml @@ -1,7 +1,7 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/main_button_outline.xml b/app/src/main/res/drawable/main_button_outline.xml index ab02056..6a150e3 100644 --- a/app/src/main/res/drawable/main_button_outline.xml +++ b/app/src/main/res/drawable/main_button_outline.xml @@ -1,7 +1,7 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/warn_button.xml b/app/src/main/res/drawable/warn_button.xml index e37f411..2b7552c 100644 --- a/app/src/main/res/drawable/warn_button.xml +++ b/app/src/main/res/drawable/warn_button.xml @@ -1,7 +1,7 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/warn_button_outline.xml b/app/src/main/res/drawable/warn_button_outline.xml index 0c9e4be..77fa9e1 100644 --- a/app/src/main/res/drawable/warn_button_outline.xml +++ b/app/src/main/res/drawable/warn_button_outline.xml @@ -1,7 +1,7 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout-land/fragment_user.xml b/app/src/main/res/layout-land/fragment_user.xml index 24b1106..1c946e9 100644 --- a/app/src/main/res/layout-land/fragment_user.xml +++ b/app/src/main/res/layout-land/fragment_user.xml @@ -1,121 +1,170 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - -