From cf7944d8f6965f45d87836484a0490b5c32186c4 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1A3P75F\\lee" Date: Fri, 30 Sep 2022 04:02:24 +0900 Subject: [PATCH] =?UTF-8?q?=EB=94=94=EC=9E=90=EC=9D=B8=20=EC=9D=BC?= =?UTF-8?q?=EB=B6=80=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 6 +- .../generate_cxx_metadata_10256_timing.txt | 2 + .../generate_cxx_metadata_10612_timing.txt | 2 + .../generate_cxx_metadata_10894_timing.txt | 2 + .../generate_cxx_metadata_11168_timing.txt | 2 + .../generate_cxx_metadata_11519_timing.txt | 2 + .../generate_cxx_metadata_11862_timing.txt | 2 + .../generate_cxx_metadata_1197_timing.txt | 2 + .../generate_cxx_metadata_12196_timing.txt | 2 + .../generate_cxx_metadata_12541_timing.txt | 2 + .../generate_cxx_metadata_12882_timing.txt | 2 + .../generate_cxx_metadata_13211_timing.txt | 2 + .../generate_cxx_metadata_13547_timing.txt | 2 + .../generate_cxx_metadata_13735_timing.txt | 2 + .../generate_cxx_metadata_14174_timing.txt | 2 + .../generate_cxx_metadata_14487_timing.txt | 3 + .../generate_cxx_metadata_14673_timing.txt | 2 + .../generate_cxx_metadata_15162_timing.txt | 2 + .../generate_cxx_metadata_1533_timing.txt | 2 + .../generate_cxx_metadata_1817_timing.txt | 2 + .../generate_cxx_metadata_212_timing.txt | 2 + .../generate_cxx_metadata_2135_timing.txt | 2 + .../generate_cxx_metadata_2484_timing.txt | 2 + .../generate_cxx_metadata_2804_timing.txt | 2 + .../generate_cxx_metadata_3107_timing.txt | 2 + .../generate_cxx_metadata_3429_timing.txt | 2 + .../generate_cxx_metadata_3778_timing.txt | 2 + .../generate_cxx_metadata_4064_timing.txt | 2 + .../generate_cxx_metadata_4239_timing.txt | 2 + .../generate_cxx_metadata_4408_timing.txt | 2 + .../generate_cxx_metadata_5023_timing.txt | 2 + .../generate_cxx_metadata_5349_timing.txt | 2 + .../generate_cxx_metadata_556_timing.txt | 2 + .../generate_cxx_metadata_5702_timing.txt | 2 + .../generate_cxx_metadata_6034_timing.txt | 2 + .../generate_cxx_metadata_6298_timing.txt | 2 + .../generate_cxx_metadata_6477_timing.txt | 2 + .../generate_cxx_metadata_6970_timing.txt | 2 + .../generate_cxx_metadata_7309_timing.txt | 2 + .../generate_cxx_metadata_7624_timing.txt | 2 + .../generate_cxx_metadata_7954_timing.txt | 2 + .../generate_cxx_metadata_8283_timing.txt | 2 + .../generate_cxx_metadata_8463_timing.txt | 2 + .../generate_cxx_metadata_8624_timing.txt | 2 + .../generate_cxx_metadata_8974_timing.txt | 2 + .../generate_cxx_metadata_909_timing.txt | 2 + .../generate_cxx_metadata_9630_timing.txt | 2 + .../generate_cxx_metadata_9915_timing.txt | 2 + .../arm64-v8a/metadata_generation_record.json | 6 +- .../cxx/abi_configuration_311k5o12.log | 2 +- .../cxx/create_cxx_tasks_10106_timing.txt | 10 + .../cxx/create_cxx_tasks_1039_timing.txt | 15 ++ .../cxx/create_cxx_tasks_10737_timing.txt | 5 + .../cxx/create_cxx_tasks_11020_timing.txt | 5 + .../cxx/create_cxx_tasks_11356_timing.txt | 5 + .../cxx/create_cxx_tasks_11694_timing.txt | 5 + .../cxx/create_cxx_tasks_12027_timing.txt | 5 + .../cxx/create_cxx_tasks_12372_timing.txt | 5 + .../cxx/create_cxx_tasks_12730_timing.txt | 5 + .../cxx/create_cxx_tasks_13064_timing.txt | 5 + .../cxx/create_cxx_tasks_13401_timing.txt | 5 + .../cxx/create_cxx_tasks_13735_timing.txt | 10 + .../cxx/create_cxx_tasks_14324_timing.txt | 5 + .../cxx/create_cxx_tasks_14673_timing.txt | 5 + .../cxx/create_cxx_tasks_15012_timing.txt | 5 + .../cxx/create_cxx_tasks_1983_timing.txt | 5 + .../cxx/create_cxx_tasks_2318_timing.txt | 10 + .../cxx/create_cxx_tasks_2939_timing.txt | 5 + .../cxx/create_cxx_tasks_30_timing.txt | 16 ++ .../cxx/create_cxx_tasks_3277_timing.txt | 5 + .../cxx/create_cxx_tasks_3620_timing.txt | 5 + .../cxx/create_cxx_tasks_3903_timing.txt | 5 + .../cxx/create_cxx_tasks_4239_timing.txt | 15 ++ .../cxx/create_cxx_tasks_5195_timing.txt | 5 + .../cxx/create_cxx_tasks_5536_timing.txt | 10 + .../cxx/create_cxx_tasks_6145_timing.txt | 5 + .../cxx/create_cxx_tasks_6477_timing.txt | 5 + .../cxx/create_cxx_tasks_6809_timing.txt | 5 + .../cxx/create_cxx_tasks_7143_timing.txt | 5 + .../cxx/create_cxx_tasks_7474_timing.txt | 5 + .../cxx/create_cxx_tasks_748_timing.txt | 5 + .../cxx/create_cxx_tasks_7804_timing.txt | 10 + .../cxx/create_cxx_tasks_8463_timing.txt | 15 ++ .../cxx/create_cxx_tasks_9470_timing.txt | 5 + .../cxx/create_cxx_tasks_9763_timing.txt | 5 + .../cxx/ndk_locator_record_g55441w3.log | 12 +- .../java/com/qtagger/Activity/AccountAdd.java | 44 ++++ .../Activity/Search/BarcodeFragment.java | 7 +- .../qtagger/Activity/Search/RfidFragment.java | 100 ++++--- .../com/qtagger/Activity/SearchActivity.java | 111 ++++++-- .../com/qtagger/Activity/TestActivity.java | 98 ++++--- .../qtagger/Activity/TestSelectActivity.java | 4 +- .../CustomPalette/CommonNavigationView.java | 51 +++- .../main/java/com/qtagger/MainActivity.java | 42 ++- app/src/main/res/drawable-v24/btn_close.png | Bin 0 -> 1090 bytes .../main/res/drawable-v24/btn_close_white.png | Bin 0 -> 1075 bytes .../main/res/drawable-v24/btn_list_del.png | Bin 0 -> 1075 bytes app/src/main/res/drawable-v24/btn_retake.png | Bin 0 -> 1710 bytes app/src/main/res/drawable-v24/btn_save.png | Bin 0 -> 1642 bytes app/src/main/res/drawable-v24/img_barcode.png | Bin 0 -> 3224 bytes app/src/main/res/drawable-v24/img_cam01.png | Bin 0 -> 1532 bytes app/src/main/res/drawable-v24/img_cam02.png | Bin 0 -> 1886 bytes .../main/res/drawable-v24/img_data_export.png | Bin 0 -> 1258 bytes .../main/res/drawable-v24/img_data_import.png | Bin 0 -> 1263 bytes .../main/res/drawable-v24/img_drum_list.png | Bin 0 -> 1146 bytes .../main/res/drawable-v24/img_excel_down.png | Bin 0 -> 1310 bytes .../main/res/drawable-v24/img_infor_edit.png | Bin 0 -> 1319 bytes app/src/main/res/drawable-v24/img_rfid.png | Bin 0 -> 5258 bytes app/src/main/res/drawable-v24/img_search.png | Bin 0 -> 1288 bytes .../main/res/drawable-v24/img_user_add.png | Bin 0 -> 1299 bytes .../main/res/drawable-v24/img_user_logout.png | Bin 0 -> 1276 bytes .../main/res/drawable-v24/img_user_server.png | Bin 0 -> 1311 bytes app/src/main/res/drawable-v24/logo_nse.png | Bin 0 -> 2663 bytes .../main/res/drawable-v24/logo_qtagger.png | Bin 0 -> 7812 bytes app/src/main/res/drawable-v24/main_menu01.png | Bin 0 -> 2971 bytes app/src/main/res/drawable-v24/main_menu02.png | Bin 0 -> 2631 bytes app/src/main/res/drawable-v24/main_menu03.png | Bin 0 -> 2197 bytes app/src/main/res/drawable-v24/main_menu04.png | Bin 0 -> 2352 bytes app/src/main/res/drawable-v24/sub_menu01.png | Bin 0 -> 1801 bytes app/src/main/res/drawable-v24/sub_menu02.png | Bin 0 -> 1661 bytes app/src/main/res/drawable-v24/sub_menu03.png | Bin 0 -> 1518 bytes app/src/main/res/drawable-v24/sub_menu04.png | Bin 0 -> 1571 bytes .../res/drawable/account_edit_background.xml | 24 ++ .../account_edit_focus_background.xml | 24 ++ .../button_new_default_disable_background.xml | 22 ++ .../main/res/drawable/dialog_background.xml | 2 +- .../res/drawable/squrebutton_background.xml | 4 +- .../main/res/layout/activity_account_add.xml | 124 +++++---- .../main/res/layout/activity_layout_test.xml | 2 +- app/src/main/res/layout/activity_main.xml | 74 ++---- app/src/main/res/layout/activity_search.xml | 175 ++++++------ app/src/main/res/layout/activity_test2.xml | 248 ++++++++---------- .../main/res/layout/activity_test_select.xml | 94 ++++--- app/src/main/res/layout/fragment_barcode.xml | 12 +- app/src/main/res/layout/fragment_rfid.xml | 133 ++++------ app/src/main/res/layout/layout_dialog.xml | 30 ++- app/src/main/res/layout/layout_side_menu.xml | 40 +-- app/src/main/res/values/colors.xml | 8 + app/src/main/res/values/styles.xml | 1 + 139 files changed, 1205 insertions(+), 631 deletions(-) create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_10256_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_10612_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_10894_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_11168_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_11519_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_11862_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1197_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_12196_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_12541_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_12882_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_13211_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_13547_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_13735_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_14174_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_14487_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_14673_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_15162_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1533_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1817_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2135_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2484_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2804_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3107_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3429_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3778_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4064_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4239_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4408_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5023_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5349_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_556_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5702_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6034_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6298_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6477_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6970_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_7309_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_7624_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_7954_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8283_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8463_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8624_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_909_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_9630_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_9915_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_10106_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_1039_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_10737_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_11020_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_11356_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_11694_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_12027_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_12372_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_12730_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_13064_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_13401_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_13735_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_14324_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_14673_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_15012_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_1983_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_2318_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_2939_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_3277_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_3620_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_3903_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_4239_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_5195_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_5536_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_6145_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_6477_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_7143_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_7474_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_7804_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_8463_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_9470_timing.txt create mode 100644 OpenCV/build/intermediates/cxx/create_cxx_tasks_9763_timing.txt create mode 100644 app/src/main/res/drawable-v24/btn_close.png create mode 100644 app/src/main/res/drawable-v24/btn_close_white.png create mode 100644 app/src/main/res/drawable-v24/btn_list_del.png create mode 100644 app/src/main/res/drawable-v24/btn_retake.png create mode 100644 app/src/main/res/drawable-v24/btn_save.png create mode 100644 app/src/main/res/drawable-v24/img_barcode.png create mode 100644 app/src/main/res/drawable-v24/img_cam01.png create mode 100644 app/src/main/res/drawable-v24/img_cam02.png create mode 100644 app/src/main/res/drawable-v24/img_data_export.png create mode 100644 app/src/main/res/drawable-v24/img_data_import.png create mode 100644 app/src/main/res/drawable-v24/img_drum_list.png create mode 100644 app/src/main/res/drawable-v24/img_excel_down.png create mode 100644 app/src/main/res/drawable-v24/img_infor_edit.png create mode 100644 app/src/main/res/drawable-v24/img_rfid.png create mode 100644 app/src/main/res/drawable-v24/img_search.png create mode 100644 app/src/main/res/drawable-v24/img_user_add.png create mode 100644 app/src/main/res/drawable-v24/img_user_logout.png create mode 100644 app/src/main/res/drawable-v24/img_user_server.png create mode 100644 app/src/main/res/drawable-v24/logo_nse.png create mode 100644 app/src/main/res/drawable-v24/logo_qtagger.png create mode 100644 app/src/main/res/drawable-v24/main_menu01.png create mode 100644 app/src/main/res/drawable-v24/main_menu02.png create mode 100644 app/src/main/res/drawable-v24/main_menu03.png create mode 100644 app/src/main/res/drawable-v24/main_menu04.png create mode 100644 app/src/main/res/drawable-v24/sub_menu01.png create mode 100644 app/src/main/res/drawable-v24/sub_menu02.png create mode 100644 app/src/main/res/drawable-v24/sub_menu03.png create mode 100644 app/src/main/res/drawable-v24/sub_menu04.png create mode 100644 app/src/main/res/drawable/account_edit_background.xml create mode 100644 app/src/main/res/drawable/account_edit_focus_background.xml create mode 100644 app/src/main/res/drawable/button_new_default_disable_background.xml diff --git a/.idea/misc.xml b/.idea/misc.xml index 60be16a..4f2e8be 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -43,12 +43,15 @@ + + + @@ -63,6 +66,7 @@ + @@ -71,7 +75,7 @@ - + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_10256_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_10256_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_10256_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_10612_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_10612_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_10612_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_10894_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_10894_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_10894_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_11168_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_11168_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_11168_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_11519_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_11519_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_11519_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_11862_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_11862_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_11862_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1197_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1197_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1197_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_12196_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_12196_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_12196_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_12541_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_12541_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_12541_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_12882_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_12882_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_12882_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_13211_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_13211_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_13211_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_13547_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_13547_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_13547_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_13735_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_13735_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_13735_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_14174_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_14174_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_14174_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_14487_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_14487_timing.txt new file mode 100644 index 0000000..6443fc5 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_14487_timing.txt @@ -0,0 +1,3 @@ +# C/C++ build system timings +generate_cxx_metadata 14ms + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_14673_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_14673_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_14673_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_15162_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_15162_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_15162_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1533_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1533_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1533_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1817_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1817_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_1817_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_212_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_212_timing.txt index 9708df4..ad5cad1 100644 --- a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_212_timing.txt +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_212_timing.txt @@ -1,2 +1,4 @@ # C/C++ build system timings +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2135_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2135_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2135_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2484_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2484_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2484_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2804_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2804_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_2804_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3107_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3107_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3107_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3429_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3429_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3429_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3778_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3778_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_3778_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4064_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4064_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4064_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4239_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4239_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4239_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4408_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4408_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_4408_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5023_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5023_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5023_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5349_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5349_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5349_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_556_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_556_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_556_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5702_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5702_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_5702_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6034_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6034_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6034_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6298_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6298_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6298_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6477_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6477_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6477_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6970_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6970_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_6970_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_7309_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_7309_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_7309_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_7624_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_7624_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_7624_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_7954_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_7954_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_7954_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8283_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8283_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8283_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8463_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8463_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8463_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8624_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8624_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8624_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8974_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8974_timing.txt index 9708df4..ad5cad1 100644 --- a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8974_timing.txt +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_8974_timing.txt @@ -1,2 +1,4 @@ # C/C++ build system timings +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_909_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_909_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_909_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_9630_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_9630_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_9630_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_9915_timing.txt b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_9915_timing.txt new file mode 100644 index 0000000..9708df4 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/generate_cxx_metadata_9915_timing.txt @@ -0,0 +1,2 @@ +# C/C++ build system timings + diff --git a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/metadata_generation_record.json b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/metadata_generation_record.json index 1d61e91..2d53876 100644 --- a/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/metadata_generation_record.json +++ b/OpenCV/build/intermediates/cxx/Debug/111w1j12/meta/arm64-v8a/metadata_generation_record.json @@ -11,7 +11,7 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": -780626890 + "memoizedHashCode": -1973867061 }, { "level_": 0, @@ -25,7 +25,7 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": -417137208 + "memoizedHashCode": -1610377379 }, { "level_": 0, @@ -39,6 +39,6 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": 322079189 + "memoizedHashCode": -871160982 } ] \ No newline at end of file diff --git a/OpenCV/build/intermediates/cxx/abi_configuration_311k5o12.log b/OpenCV/build/intermediates/cxx/abi_configuration_311k5o12.log index 4cac6aa..82d2686 100644 --- a/OpenCV/build/intermediates/cxx/abi_configuration_311k5o12.log +++ b/OpenCV/build/intermediates/cxx/abi_configuration_311k5o12.log @@ -11,6 +11,6 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": -2000428813 + "memoizedHashCode": 1101298312 } ] \ No newline at end of file diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_10106_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_10106_timing.txt new file mode 100644 index 0000000..695c14b --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_10106_timing.txt @@ -0,0 +1,10 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 19ms +create_cxx_tasks completed in 20ms + +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 17ms +create_cxx_tasks completed in 18ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_1039_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_1039_timing.txt new file mode 100644 index 0000000..c42cba7 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_1039_timing.txt @@ -0,0 +1,15 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 26ms +create_cxx_tasks completed in 27ms + +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 21ms +create_cxx_tasks completed in 22ms + +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 26ms +create_cxx_tasks completed in 26ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_10737_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_10737_timing.txt new file mode 100644 index 0000000..7ea5966 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_10737_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 14ms +create_cxx_tasks completed in 14ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_11020_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_11020_timing.txt new file mode 100644 index 0000000..5215f74 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_11020_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 14ms +create_cxx_tasks completed in 15ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_11356_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_11356_timing.txt new file mode 100644 index 0000000..dafe0c3 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_11356_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 15ms +create_cxx_tasks completed in 15ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_11694_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_11694_timing.txt new file mode 100644 index 0000000..c6c4836 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_11694_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 15ms +create_cxx_tasks completed in 16ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_12027_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_12027_timing.txt new file mode 100644 index 0000000..c6c4836 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_12027_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 15ms +create_cxx_tasks completed in 16ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_12372_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_12372_timing.txt new file mode 100644 index 0000000..713f975 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_12372_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 20ms +create_cxx_tasks completed in 20ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_12730_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_12730_timing.txt new file mode 100644 index 0000000..c6c4836 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_12730_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 15ms +create_cxx_tasks completed in 16ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_13064_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_13064_timing.txt new file mode 100644 index 0000000..5cac512 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_13064_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 16ms +create_cxx_tasks completed in 16ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_13401_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_13401_timing.txt new file mode 100644 index 0000000..c6c4836 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_13401_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 15ms +create_cxx_tasks completed in 16ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_13735_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_13735_timing.txt new file mode 100644 index 0000000..59c7b0d --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_13735_timing.txt @@ -0,0 +1,10 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 15ms +create_cxx_tasks completed in 16ms + +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 16ms +create_cxx_tasks completed in 17ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_14324_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_14324_timing.txt new file mode 100644 index 0000000..dafe0c3 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_14324_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 15ms +create_cxx_tasks completed in 15ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_14673_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_14673_timing.txt new file mode 100644 index 0000000..e340677 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_14673_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 18ms +create_cxx_tasks completed in 18ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_15012_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_15012_timing.txt new file mode 100644 index 0000000..7ea5966 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_15012_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 14ms +create_cxx_tasks completed in 14ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_1983_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_1983_timing.txt new file mode 100644 index 0000000..3eb6969 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_1983_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 19ms +create_cxx_tasks completed in 20ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_2318_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_2318_timing.txt new file mode 100644 index 0000000..88bbee0 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_2318_timing.txt @@ -0,0 +1,10 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 19ms +create_cxx_tasks completed in 20ms + +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 17ms +create_cxx_tasks completed in 17ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_2939_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_2939_timing.txt new file mode 100644 index 0000000..e340677 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_2939_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 18ms +create_cxx_tasks completed in 18ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_30_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_30_timing.txt index 02aef73..a397ee6 100644 --- a/OpenCV/build/intermediates/cxx/create_cxx_tasks_30_timing.txt +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_30_timing.txt @@ -186,3 +186,19 @@ create_cxx_tasks create-initial-cxx-model completed in 55ms create_cxx_tasks completed in 57ms +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model + [gap of 24ms] + create-ARMEABI_V7A-model 25ms + create-initial-cxx-model completed in 57ms +create_cxx_tasks completed in 58ms + +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model + create-module-model 11ms + [gap of 36ms] + create-initial-cxx-model completed in 47ms +create_cxx_tasks completed in 48ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_3277_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_3277_timing.txt new file mode 100644 index 0000000..c7f6fcd --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_3277_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 20ms +create_cxx_tasks completed in 21ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_3620_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_3620_timing.txt new file mode 100644 index 0000000..e340677 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_3620_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 18ms +create_cxx_tasks completed in 18ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_3903_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_3903_timing.txt new file mode 100644 index 0000000..a3122bf --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_3903_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 16ms +create_cxx_tasks completed in 17ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_4239_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_4239_timing.txt new file mode 100644 index 0000000..810890e --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_4239_timing.txt @@ -0,0 +1,15 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 17ms +create_cxx_tasks completed in 17ms + +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 17ms +create_cxx_tasks completed in 18ms + +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 17ms +create_cxx_tasks completed in 19ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_5195_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_5195_timing.txt new file mode 100644 index 0000000..87db03f --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_5195_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 27ms +create_cxx_tasks completed in 28ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_5536_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_5536_timing.txt new file mode 100644 index 0000000..438d127 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_5536_timing.txt @@ -0,0 +1,10 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 19ms +create_cxx_tasks completed in 19ms + +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 20ms +create_cxx_tasks completed in 21ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_6145_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_6145_timing.txt new file mode 100644 index 0000000..7b0b2cd --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_6145_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 17ms +create_cxx_tasks completed in 19ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_6477_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_6477_timing.txt new file mode 100644 index 0000000..c37f43a --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_6477_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 19ms +create_cxx_tasks completed in 19ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_6809_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_6809_timing.txt index 9691afc..f75b6e7 100644 --- a/OpenCV/build/intermediates/cxx/create_cxx_tasks_6809_timing.txt +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_6809_timing.txt @@ -3,3 +3,8 @@ create_cxx_tasks create-initial-cxx-model 17ms create_cxx_tasks completed in 17ms +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 19ms +create_cxx_tasks completed in 19ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_7143_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_7143_timing.txt new file mode 100644 index 0000000..e10017d --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_7143_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 17ms +create_cxx_tasks completed in 18ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_7474_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_7474_timing.txt new file mode 100644 index 0000000..c7f6fcd --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_7474_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 20ms +create_cxx_tasks completed in 21ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_748_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_748_timing.txt index 13e41fc..9afd6e8 100644 --- a/OpenCV/build/intermediates/cxx/create_cxx_tasks_748_timing.txt +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_748_timing.txt @@ -6,3 +6,8 @@ create_cxx_tasks create-initial-cxx-model completed in 31ms create_cxx_tasks completed in 31ms +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 25ms +create_cxx_tasks completed in 26ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_7804_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_7804_timing.txt new file mode 100644 index 0000000..635b424 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_7804_timing.txt @@ -0,0 +1,10 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 17ms +create_cxx_tasks completed in 17ms + +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 16ms +create_cxx_tasks completed in 17ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_8463_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_8463_timing.txt new file mode 100644 index 0000000..976358b --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_8463_timing.txt @@ -0,0 +1,15 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 20ms +create_cxx_tasks completed in 21ms + +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 16ms +create_cxx_tasks completed in 16ms + +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 14ms +create_cxx_tasks completed in 15ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_9470_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_9470_timing.txt new file mode 100644 index 0000000..c6c4836 --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_9470_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 15ms +create_cxx_tasks completed in 16ms + diff --git a/OpenCV/build/intermediates/cxx/create_cxx_tasks_9763_timing.txt b/OpenCV/build/intermediates/cxx/create_cxx_tasks_9763_timing.txt new file mode 100644 index 0000000..a3122bf --- /dev/null +++ b/OpenCV/build/intermediates/cxx/create_cxx_tasks_9763_timing.txt @@ -0,0 +1,5 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 16ms +create_cxx_tasks completed in 17ms + diff --git a/OpenCV/build/intermediates/cxx/ndk_locator_record_g55441w3.log b/OpenCV/build/intermediates/cxx/ndk_locator_record_g55441w3.log index 3f49791..2f7cf18 100644 --- a/OpenCV/build/intermediates/cxx/ndk_locator_record_g55441w3.log +++ b/OpenCV/build/intermediates/cxx/ndk_locator_record_g55441w3.log @@ -11,7 +11,7 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": -1158394195 + "memoizedHashCode": 1943332930 }, { "level_": 0, @@ -25,7 +25,7 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": -366206092 + "memoizedHashCode": -1559446263 }, { "level_": 0, @@ -39,7 +39,7 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": 338255101 + "memoizedHashCode": -854985070 }, { "level_": 0, @@ -53,7 +53,7 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": -2093898125 + "memoizedHashCode": 1007829000 }, { "level_": 0, @@ -67,7 +67,7 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": -1816870277 + "memoizedHashCode": 1284856848 }, { "level_": 0, @@ -81,6 +81,6 @@ "fieldsDescending": {} }, "memoizedSize": -1, - "memoizedHashCode": 1644359808 + "memoizedHashCode": 451119637 } ] \ No newline at end of file diff --git a/app/src/main/java/com/qtagger/Activity/AccountAdd.java b/app/src/main/java/com/qtagger/Activity/AccountAdd.java index 39cda3c..b59cf5e 100644 --- a/app/src/main/java/com/qtagger/Activity/AccountAdd.java +++ b/app/src/main/java/com/qtagger/Activity/AccountAdd.java @@ -2,7 +2,9 @@ package com.qtagger.Activity; import androidx.appcompat.app.AppCompatActivity; import androidx.constraintlayout.utils.widget.ImageFilterButton; +import androidx.core.content.ContextCompat; +import android.graphics.Color; import android.os.Bundle; import android.view.View; import android.widget.EditText; @@ -27,6 +29,48 @@ public class AccountAdd extends AppCompatActivity { editAccountDapt = (EditText) findViewById(R.id.textView_AccountDapt); backBtn = (ImageFilterButton) findViewById(R.id.imageFilterButton_Back); + editAccountId.setOnFocusChangeListener(new View.OnFocusChangeListener() { + @Override + public void onFocusChange(View v, boolean hasFocus) { + + if(hasFocus) + { + editAccountId.setBackgroundResource(R.drawable.account_edit_focus_background); + } + else{ + editAccountId.setBackgroundResource(R.drawable.account_edit_background); + } + } + }); + + editAccountName.setOnFocusChangeListener(new View.OnFocusChangeListener() { + @Override + public void onFocusChange(View v, boolean hasFocus) { + + if(hasFocus) + { + editAccountName.setBackgroundResource(R.drawable.account_edit_focus_background); + } + else{ + editAccountName.setBackgroundResource(R.drawable.account_edit_background); + } + } + }); + + editAccountDapt.setOnFocusChangeListener(new View.OnFocusChangeListener() { + @Override + public void onFocusChange(View v, boolean hasFocus) { + + if(hasFocus) + { + editAccountDapt.setBackgroundResource(R.drawable.account_edit_focus_background); + } + else{ + editAccountDapt.setBackgroundResource(R.drawable.account_edit_background); + } + } + }); + findViewById(R.id.button_save).setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/com/qtagger/Activity/Search/BarcodeFragment.java b/app/src/main/java/com/qtagger/Activity/Search/BarcodeFragment.java index 53143c0..9ce8ab0 100644 --- a/app/src/main/java/com/qtagger/Activity/Search/BarcodeFragment.java +++ b/app/src/main/java/com/qtagger/Activity/Search/BarcodeFragment.java @@ -118,8 +118,6 @@ public class BarcodeFragment extends Fragment { barcodeReadData(); else openDialogChecker = false; - - } private void showCustomDialog() { @@ -193,6 +191,9 @@ public class BarcodeFragment extends Fragment { dataManager.selPkg = searchPkg; ((SearchActivity) getActivity()).callTestActivity(); } else { + + //방폐물 추가가 + /* new AlertDialog.Builder(context).setTitle("해당 방폐물을 추가하시겠습니까?").setPositiveButton("확인", new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { @@ -200,7 +201,7 @@ public class BarcodeFragment extends Fragment { } }).setNegativeButton("취소", null).show(); - + */ } } else { diff --git a/app/src/main/java/com/qtagger/Activity/Search/RfidFragment.java b/app/src/main/java/com/qtagger/Activity/Search/RfidFragment.java index 6e5fede..a3b64ad 100644 --- a/app/src/main/java/com/qtagger/Activity/Search/RfidFragment.java +++ b/app/src/main/java/com/qtagger/Activity/Search/RfidFragment.java @@ -16,6 +16,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.Button; +import android.widget.ImageView; import android.widget.SeekBar; import android.widget.TextView; import android.widget.Toast; @@ -46,8 +47,9 @@ public class RfidFragment extends Fragment { DataManager dataManager = DataManager.getInstance(); private String rfidStr = ""; private Context context; - Button button_RfidReader; + ImageView button_RfidReader; View thumbView; + SeekBar seekBar; // TODO: Rename parameter arguments, choose names that match // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER private static final String ARG_PARAM1 = "param1"; @@ -94,61 +96,34 @@ public class RfidFragment extends Fragment { Bundle savedInstanceState) { View view = inflater.inflate(R.layout.fragment_rfid, container, false); context = container.getContext(); - TextView textViewPower = view.findViewById(R.id.textView_RfidPower); - TextView textViewRfidText = view.findViewById(R.id.textView_RfidText); - SeekBar seekBar = view.findViewById(R.id.seekbar_reader_type); + seekBar = view.findViewById(R.id.seekbar_reader_type); button_RfidReader = view.findViewById(R.id.button_RfidReader); - thumbView =inflater.inflate(R.layout.layout_seekbar_thumb, null, false); - try { - ApplicationClass.rfidSetOperationTime(); - int power = rfidReader.getPower(); - if(power == -1){ - sleep(500); - rfidReader.setPower(100); - power = rfidReader.getPower(); - } - seekBar.setProgress(power); - textViewPower.setText("강도 : " + power); - if(rfidReader.getAction() != ActionState.Stop) - { - rfidReader.stop(); - rfidReader.removeEventListener(); + thumbView = inflater.inflate(R.layout.layout_seekbar_thumb, null, false); + ApplicationClass.rfidSetOperationTime(); + + + rfidReader.setEventListener(new RfidReaderEventListener() { + @Override + public void onReaderStateChanged(ATRfidReader atRfidReader, ConnectionState connectionState) { + Log.d("상태 변경", connectionState + ""); } + @Override + public void onReaderActionChanged(ATRfidReader atRfidReader, ActionState actionState) { + Log.d("태그 변경", actionState + ""); + } - rfidReader.setEventListener(new RfidReaderEventListener() { - @Override - public void onReaderStateChanged(ATRfidReader atRfidReader, ConnectionState connectionState) { - Log.d("상태 변경",connectionState+""); - } + @Override + public void onReaderReadTag(ATRfidReader atRfidReader, String s, float v, float v1) { + rfidStr = s; + } - @Override - public void onReaderActionChanged(ATRfidReader atRfidReader, ActionState actionState) { - Log.d("태그 변경",actionState+""); - } + @Override + public void onReaderResult(ATRfidReader atRfidReader, ResultCode resultCode, ActionState actionState, String s, String s1, float v, float v1) { - @Override - public void onReaderReadTag(ATRfidReader atRfidReader, String s, float v, float v1) { - rfidStr = s; - textViewRfidText.setText(s); - } - @Override - public void onReaderResult(ATRfidReader atRfidReader, ResultCode resultCode, ActionState actionState, String s, String s1, float v, float v1) { - - } - }); - - - } catch (ATRfidReaderException e) { - e.printStackTrace(); - - } - catch (Exception ex) - { - //연결이 안된상황 - ex.printStackTrace(); - } + } + }); button_RfidReader.setOnClickListener(new View.OnClickListener() { @Override @@ -173,7 +148,6 @@ public class RfidFragment extends Fragment { try { seekBar.setThumb(getThumb(progress)); rfidReader.setPower(progress); - textViewPower.setText("강도 : " + rfidReader.getPower()); } catch (ATRfidReaderException e) { e.printStackTrace(); @@ -191,7 +165,7 @@ public class RfidFragment extends Fragment { } }); - +/* view.findViewById(R.id.button_Ok).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -219,7 +193,7 @@ public class RfidFragment extends Fragment { Toast.makeText(context, "RFID를 인식해주세요.", Toast.LENGTH_SHORT).show(); } } - }); + });*/ // Inflate the layout for this fragment return view; } @@ -234,6 +208,28 @@ public class RfidFragment extends Fragment { thumbView.draw(canvas); return new BitmapDrawable(getResources(), bitmap); + } + + @Override + public void onStart() { + super.onStart(); + + int power = 0; + try { + power = rfidReader.getPower(); + if(power == -1){ + sleep(500); + rfidReader.setPower(100); + power = rfidReader.getPower(); + } + seekBar.setProgress(power); + } catch (ATRfidReaderException e) { + e.printStackTrace(); + } + + + + } @Override diff --git a/app/src/main/java/com/qtagger/Activity/SearchActivity.java b/app/src/main/java/com/qtagger/Activity/SearchActivity.java index 4f01587..b1be391 100644 --- a/app/src/main/java/com/qtagger/Activity/SearchActivity.java +++ b/app/src/main/java/com/qtagger/Activity/SearchActivity.java @@ -1,71 +1,123 @@ package com.qtagger.Activity; import androidx.appcompat.app.AppCompatActivity; +import androidx.drawerlayout.widget.DrawerLayout; import androidx.fragment.app.Fragment; import android.content.Intent; +import android.graphics.Typeface; import android.os.Bundle; import android.view.KeyEvent; +import android.view.LayoutInflater; import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; +import com.google.android.material.navigation.NavigationView; import com.google.android.material.tabs.TabLayout; import com.qtagger.Activity.Search.BarcodeFragment; import com.qtagger.Activity.Search.ListFragment; import com.qtagger.Activity.Search.RfidFragment; +import com.qtagger.CustomPalette.CommonNavigationView; import com.qtagger.R; import com.qtagger.util.DataManager; public class SearchActivity extends AppCompatActivity { + DrawerLayout drawerLayout; + NavigationView navigationView; Fragment rfidFragment, barcodeFragment, listFragment; TabLayout tabs; boolean skipCheck; DataManager dataManager = DataManager.getInstance(); + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_search); Intent intent = getIntent(); - skipCheck = intent.getBooleanExtra("boolean",true); + skipCheck = intent.getBooleanExtra("boolean", true); + + drawerLayout = (DrawerLayout) findViewById(R.id.drawerLayout); + navigationView = (NavigationView) findViewById(R.id.navigationView); rfidFragment = new RfidFragment(); barcodeFragment = new BarcodeFragment(); listFragment = new ListFragment(); - getSupportFragmentManager().beginTransaction().add(R.id.frame,barcodeFragment).commit(); - if(dataManager.searchTabPosition == -1) + getSupportFragmentManager().beginTransaction().add(R.id.frame, barcodeFragment).commit(); + if (dataManager.searchTabPosition == -1) dataManager.searchTabPosition = 0; tabs = (TabLayout) findViewById(R.id.tabs); + for (int i = 0; i < tabs.getTabCount(); i++) { + + TabLayout.Tab tab = tabs.getTabAt(i); + if (tab != null) { + + TextView tabTextView = new TextView(this); + tab.setCustomView(tabTextView); + + tabTextView.getLayoutParams().width = ViewGroup.LayoutParams.WRAP_CONTENT; + tabTextView.getLayoutParams().height = ViewGroup.LayoutParams.WRAP_CONTENT; + tabTextView.setText(tab.getText()); + } + } + findViewById(R.id.imageFilterButton_Setting).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - Intent intent = new Intent(getApplicationContext(), MoreActivity.class); - startActivity(intent); + //Intent intent = new Intent(getApplicationContext(), MoreActivity.class); + //startActivity(intent); + drawerLayout.openDrawer(navigationView,true); } }); + tabs.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() { @Override public void onTabSelected(TabLayout.Tab tab) { + + ViewGroup vg = (ViewGroup) tabs.getChildAt(0); + ViewGroup vgTab = (ViewGroup) vg.getChildAt(tab.getPosition()); + int tabChildsCount = vgTab.getChildCount(); + for (int i = 0; i < tabChildsCount; i++) { + View tabViewChild = vgTab.getChildAt(i); + if (tabViewChild instanceof TextView) { + ((TextView) tabViewChild).setTextSize(16); + } + } + + + + int position = tab.getPosition(); dataManager.searchTabPosition = position; Fragment selected = null; - if(position == 0){ + if (position == 0) { selected = barcodeFragment; - }else if (position == 1){ + } else if (position == 1) { selected = rfidFragment; - }else if (position == 2){ + } else if (position == 2) { selected = listFragment; } - if(selected != null) { + if (selected != null) { getSupportFragmentManager().beginTransaction().replace(R.id.frame, selected).commit(); } } @Override public void onTabUnselected(TabLayout.Tab tab) { + ViewGroup vg = (ViewGroup) tabs.getChildAt(0); + ViewGroup vgTab = (ViewGroup) vg.getChildAt(tab.getPosition()); + int tabChildsCount = vgTab.getChildCount(); + for (int i = 0; i < tabChildsCount; i++) { + View tabViewChild = vgTab.getChildAt(i); + if (tabViewChild instanceof TextView) { + ((TextView) tabViewChild).setTextSize(14); + } + } } @@ -82,9 +134,10 @@ public class SearchActivity extends AppCompatActivity { } }); + CommonNavigationView.setDefaultViewEvent(this); } - public void callTestActivity(){ + public void callTestActivity() { //데이터 초기화, 없으면 null String pkgNo = dataManager.selPkg.getPKG_NO(); @@ -93,7 +146,7 @@ public class SearchActivity extends AppCompatActivity { dataManager.selACCEPT_TEST = dataManager.dbHelper.getACCEPT_TEST(pkgNo); dataManager.selPREPAR_TEST = dataManager.dbHelper.getPREPAR_TEST(pkgNo); - if(skipCheck) { + if (skipCheck) { Intent intent = new Intent(getApplicationContext(), TestActivity.class); startActivity(intent); } @@ -103,8 +156,30 @@ public class SearchActivity extends AppCompatActivity { @Override protected void onStart() { super.onStart(); - if(dataManager.searchTabPosition != -1) - { + ViewGroup vg = (ViewGroup) tabs.getChildAt(0); + for (int i = 0; i < tabs.getTabCount(); i++) { + TabLayout.Tab tab = tabs.getTabAt(i); + if (tab != null) { + ViewGroup vgTab = (ViewGroup) vg.getChildAt(i); + int tabChildsCount = vgTab.getChildCount(); + for (int j = 0; j < tabChildsCount; j++) { + View tabViewChild = vgTab.getChildAt(j); + if (tabViewChild instanceof TextView) { + if(i==0) + { + ((TextView) tabViewChild).setTextSize(16); + } + else{ + ((TextView) tabViewChild).setTextSize(14); + } + } + } + } + } + + + + if (dataManager.searchTabPosition != -1) { tabs.getTabAt(dataManager.searchTabPosition).select(); } } @@ -113,16 +188,14 @@ public class SearchActivity extends AppCompatActivity { public boolean onKeyUp(int keyCode, KeyEvent event) { if (keyCode == 138) { //키 입력시 - if(dataManager.searchTabPosition == 0) - { - ((BarcodeFragment)barcodeFragment).KeyUpEvent(); - } - else if(dataManager.searchTabPosition == 1) - { + if (dataManager.searchTabPosition == 0) { + ((BarcodeFragment) barcodeFragment).KeyUpEvent(); + } else if (dataManager.searchTabPosition == 1) { //rfidFragment } } return super.onKeyUp(keyCode, event); } + } \ No newline at end of file diff --git a/app/src/main/java/com/qtagger/Activity/TestActivity.java b/app/src/main/java/com/qtagger/Activity/TestActivity.java index b9c2850..6a7cdf1 100644 --- a/app/src/main/java/com/qtagger/Activity/TestActivity.java +++ b/app/src/main/java/com/qtagger/Activity/TestActivity.java @@ -18,6 +18,7 @@ import android.text.SpannableStringBuilder; import android.text.style.ForegroundColorSpan; import android.util.Log; import android.view.View; +import android.view.ViewGroup; import android.widget.TextView; import com.google.android.material.tabs.TabLayout; import com.hoho.android.usbserial.driver.UsbSerialDriver; @@ -42,16 +43,11 @@ import com.qtagger.util.TextUtil; public class TestActivity extends AppCompatActivity { - - - Fragment surfaceFragment, m1Fragment, weightFragment, fillFragment, pictureFragment, infoFragment; - TextView textViewRadiation,textView_TestEnum,textView_TestEnum2; + TextView textViewRadiation; TabLayout tabs; DataManager dataManager = DataManager.getInstance(); - - @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -64,8 +60,6 @@ public class TestActivity extends AppCompatActivity { pictureFragment = new PhotographFragment(); infoFragment = new InfoFragment(); textViewRadiation = findViewById(R.id.textViewRadiation); - textView_TestEnum = findViewById(R.id.textView_TestEnum); - textView_TestEnum2 = findViewById(R.id.textView_TestEnum2); findViewById(R.id.imageFilterButton_Back).setOnClickListener(new View.OnClickListener() { @Override @@ -74,10 +68,6 @@ public class TestActivity extends AppCompatActivity { } }); - - - - textViewRadiation.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -100,10 +90,34 @@ public class TestActivity extends AppCompatActivity { getSupportFragmentManager().beginTransaction().add(R.id.frame,surfaceFragment).commit(); tabs = (TabLayout) findViewById(R.id.tabs); + for (int i = 0; i < tabs.getTabCount(); i++) { + + TabLayout.Tab tab = tabs.getTabAt(i); + if (tab != null) { + + TextView tabTextView = new TextView(this); + tab.setCustomView(tabTextView); + tabTextView.getLayoutParams().width = ViewGroup.LayoutParams.WRAP_CONTENT; + tabTextView.getLayoutParams().height = ViewGroup.LayoutParams.WRAP_CONTENT; + tabTextView.setText(tab.getText()); + } + } + tabs.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() { @Override public void onTabSelected(TabLayout.Tab tab) { int position = tab.getPosition(); + + ViewGroup vg = (ViewGroup) tabs.getChildAt(0); + ViewGroup vgTab = (ViewGroup) vg.getChildAt(tab.getPosition()); + int tabChildsCount = vgTab.getChildCount(); + for (int i = 0; i < tabChildsCount; i++) { + View tabViewChild = vgTab.getChildAt(i); + if (tabViewChild instanceof TextView) { + ((TextView) tabViewChild).setTextSize(16); + } + } + Fragment selected = null; dataManager.testTabPosition = position; if(position == 0){ @@ -132,7 +146,15 @@ public class TestActivity extends AppCompatActivity { @Override public void onTabUnselected(TabLayout.Tab tab) { - + ViewGroup vg = (ViewGroup) tabs.getChildAt(0); + ViewGroup vgTab = (ViewGroup) vg.getChildAt(tab.getPosition()); + int tabChildsCount = vgTab.getChildCount(); + for (int i = 0; i < tabChildsCount; i++) { + View tabViewChild = vgTab.getChildAt(i); + if (tabViewChild instanceof TextView) { + ((TextView) tabViewChild).setTextSize(14); + } + } } @Override @@ -149,6 +171,28 @@ public class TestActivity extends AppCompatActivity { protected void onStart() { super.onStart(); + ViewGroup vg = (ViewGroup) tabs.getChildAt(0); + for (int i = 0; i < tabs.getTabCount(); i++) { + TabLayout.Tab tab = tabs.getTabAt(i); + if (tab != null) { + ViewGroup vgTab = (ViewGroup) vg.getChildAt(i); + int tabChildsCount = vgTab.getChildCount(); + for (int j = 0; j < tabChildsCount; j++) { + View tabViewChild = vgTab.getChildAt(j); + if (tabViewChild instanceof TextView) { + if(i==0) + { + ((TextView) tabViewChild).setTextSize(16); + } + else{ + ((TextView) tabViewChild).setTextSize(14); + } + } + } + } + } + + if(dataManager.testEnum != TestEnum.선택안함) { if(dataManager.selPkg != null) @@ -156,39 +200,11 @@ public class TestActivity extends AppCompatActivity { textViewRadiation.setText(dataManager.selPkg.getPKG_NO()); } } - //textView_TestEnum - if(dataManager.testEnum == TestEnum.발생지특성규명) - { - textView_TestEnum.setVisibility(View.VISIBLE); - textView_TestEnum2.setVisibility(View.GONE); - } - else if(dataManager.testEnum != TestEnum.선택안함) - { - textView_TestEnum.setVisibility(View.INVISIBLE); - textView_TestEnum2.setVisibility(View.VISIBLE); - - if(dataManager.testEnum == TestEnum.처분검사) - { - textView_TestEnum2.setText("처분검사"); - } - else if(dataManager.testEnum == TestEnum.인수검사) - { - textView_TestEnum2.setText("인수검사"); - } - else if(dataManager.testEnum == TestEnum.예비검사) - { - textView_TestEnum2.setText("예비검사"); - } - } if(dataManager.testTabPosition != -1) { tabs.getTabAt(dataManager.testTabPosition).select(); } - - - - } @Override diff --git a/app/src/main/java/com/qtagger/Activity/TestSelectActivity.java b/app/src/main/java/com/qtagger/Activity/TestSelectActivity.java index f46a73a..97e1a53 100644 --- a/app/src/main/java/com/qtagger/Activity/TestSelectActivity.java +++ b/app/src/main/java/com/qtagger/Activity/TestSelectActivity.java @@ -20,6 +20,7 @@ import androidx.core.content.ContextCompat; import androidx.drawerlayout.widget.DrawerLayout; import com.google.android.material.navigation.NavigationView; +import com.qtagger.CustomPalette.CommonNavigationView; import com.qtagger.Data.TestEnum; import com.qtagger.Database.PKG; import com.qtagger.R; @@ -111,13 +112,14 @@ public class TestSelectActivity extends AppCompatActivity { @Override public void onClick(View v) { drawerLayout.openDrawer(navigationView,true); - /* Intent intent = new Intent(getApplicationContext(), MoreActivity.class); startActivity(intent);*/ } }); + CommonNavigationView.setDefaultViewEvent(this); + } //권한 점검 및 실행 diff --git a/app/src/main/java/com/qtagger/CustomPalette/CommonNavigationView.java b/app/src/main/java/com/qtagger/CustomPalette/CommonNavigationView.java index 73140cf..5719746 100644 --- a/app/src/main/java/com/qtagger/CustomPalette/CommonNavigationView.java +++ b/app/src/main/java/com/qtagger/CustomPalette/CommonNavigationView.java @@ -6,26 +6,52 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.view.View; +import android.widget.TextView; import androidx.core.view.GravityCompat; import androidx.drawerlayout.widget.DrawerLayout; import com.google.android.material.navigation.NavigationView; +import com.qtagger.Activity.AccountAdd; +import com.qtagger.Activity.AccountModify; +import com.qtagger.Activity.DbSettingActivity; import com.qtagger.Activity.MoreActivity; import com.qtagger.Activity.SyncActivity; import com.qtagger.Data.TestEnum; +import com.qtagger.Database.AccountData; import com.qtagger.R; +import com.qtagger.util.DataManager; public class CommonNavigationView { - + public static DataManager dataManager = DataManager.getInstance(); public static void setDefaultViewEvent(Activity activity) { + //textview_id + AccountData account = dataManager.loginAccount; + TextView textId = activity.findViewById(R.id.textview_id); + TextView textDapt = activity.findViewById(R.id.textview_dapt); + TextView textName = activity.findViewById(R.id.textview_name); + + if(account == null) + { + textId.setText(""); + textDapt.setText(""); + textName.setText(""); + } + else + { + textId.setText(account.getAccountId()); + textDapt.setText(account.getAccountDapt()); + textName.setText(account.getAccountName()); + } + activity.findViewById(R.id.button_serverInfo).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - + Intent intent = new Intent(activity.getApplicationContext(), DbSettingActivity.class); + activity.startActivity(intent); } }); activity.findViewById(R.id.button_Upload).setOnClickListener(new View.OnClickListener() { @@ -68,12 +94,31 @@ public class CommonNavigationView { activity.findViewById(R.id.button_AccountAdd).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - + Intent intent = new Intent(activity.getApplicationContext(), AccountAdd.class); + activity.startActivity(intent); } }); activity.findViewById(R.id.button_AccountModify).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { + if(dataManager.loginAccount == null) + { + //알림 줄것 + } + else + { + Intent intent = new Intent(activity.getApplicationContext(), AccountModify.class); + intent.putExtra("Id",dataManager.loginAccount.getId()); + activity.startActivity(intent); + } + } + }); + activity.findViewById(R.id.button_small_close).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + DrawerLayout drawerLayout = (DrawerLayout) activity.findViewById(R.id.drawerLayout); + NavigationView navigationView = (NavigationView) activity.findViewById(R.id.navigationView); + drawerLayout.closeDrawer(navigationView,true); } }); diff --git a/app/src/main/java/com/qtagger/MainActivity.java b/app/src/main/java/com/qtagger/MainActivity.java index c5d1cec..59d5dfe 100644 --- a/app/src/main/java/com/qtagger/MainActivity.java +++ b/app/src/main/java/com/qtagger/MainActivity.java @@ -5,11 +5,13 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; +import android.graphics.Color; import android.net.ConnectivityManager; import android.net.NetworkInfo; import android.os.Build; import android.os.Bundle; import android.view.View; +import android.widget.AdapterView; import android.widget.ArrayAdapter; import android.widget.Button; import android.widget.ImageView; @@ -18,6 +20,7 @@ import android.widget.Toast; import androidx.annotation.RequiresApi; import androidx.appcompat.app.AppCompatActivity; +import androidx.core.content.ContextCompat; import androidx.drawerlayout.widget.DrawerLayout; import com.google.android.material.navigation.NavigationView; @@ -27,6 +30,7 @@ import com.qtagger.Activity.CameraActivity; import com.qtagger.Activity.LayoutTestActivity; import com.qtagger.Activity.NavigationActivity; import com.qtagger.Activity.TestSelectActivity; +import com.qtagger.CustomPalette.CommonNavigationView; import com.qtagger.Data.OracleConnectionString; import com.qtagger.Database.AccountData; import com.qtagger.Database.DBHelper; @@ -44,11 +48,13 @@ import java.nio.file.Files; import java.util.List; public class MainActivity extends AppCompatActivity { + Context context; private Spinner mSpinner; private Button btnLogin; private DataManager dataManager= DataManager.getInstance(); private List accountList; private ImageView imageview_navTab; + Button button_login; DrawerLayout drawerLayout; NavigationView navigationView; @@ -62,6 +68,7 @@ public class MainActivity extends AppCompatActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); + context = this; mSpinner = findViewById(R.id.spinner_account); CommonHelper.usbDevicePermission(this); CommonHelper.FolderClear(); @@ -70,6 +77,7 @@ public class MainActivity extends AppCompatActivity { drawerLayout = (DrawerLayout) findViewById(R.id.drawerLayout); navigationView = (NavigationView) findViewById(R.id.navigationView); imageview_navTab = findViewById(R.id.imageview_navTab); + button_login = findViewById(R.id.button_login); imageview_navTab.setOnClickListener(new View.OnClickListener() { @Override @@ -92,8 +100,30 @@ public class MainActivity extends AppCompatActivity { }); + mSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { + @Override + public void onItemSelected(AdapterView parent, View view, int position, long id) { + if(position == 0) + { + button_login.setBackgroundResource(R.drawable.button_new_default_disable_background); + button_login.setTextColor(ContextCompat.getColor(context,R.color.defaultDisableTextColor)); + + } + else + { + button_login.setBackgroundResource(R.drawable.button_new_default_background); + button_login.setTextColor(Color.WHITE); + } + } + + @Override + public void onNothingSelected(AdapterView parent) { + + } + }); + //로그인 - findViewById(R.id.button_login).setOnClickListener(new View.OnClickListener() { + button_login.setOnClickListener(new View.OnClickListener() { @RequiresApi(api = Build.VERSION_CODES.N) @Override public void onClick(View v) { @@ -109,13 +139,13 @@ public class MainActivity extends AppCompatActivity { dataManager.loginAccount = accountList.get(selId-1); Intent intent = new Intent(getApplicationContext(), TestSelectActivity.class); startActivity(intent); - finish(); - //Intent intent2 = new Intent(getApplicationContext(), NavigationActivity.class); - //startActivity(intent2); + //finish(); } } }); + CommonNavigationView.setDefaultViewEvent(this); + /* //계정 추가 findViewById(R.id.text_accountInsert).setOnClickListener(new View.OnClickListener() { @Override @@ -133,7 +163,7 @@ public class MainActivity extends AppCompatActivity { Intent intent = new Intent(getApplicationContext(), AccountList.class); startActivity(intent); } - }); + });*/ if(getConnectStatus())//온라인 모드 { @@ -152,6 +182,7 @@ public class MainActivity extends AppCompatActivity { ArrayAdapter aa_items = new ArrayAdapter(this, androidx.appcompat.R.layout.support_simple_spinner_dropdown_item); aa_items.add("사용자를 선택해주세요"); + dataManager.loginAccount = null; //초기 데이터 세팅 accountList = dataManager.dbHelper.getAllAccount(); @@ -160,6 +191,7 @@ public class MainActivity extends AppCompatActivity { } mSpinner.setAdapter(aa_items); + button_login.setBackgroundResource(R.drawable.button_new_default_disable_background); } diff --git a/app/src/main/res/drawable-v24/btn_close.png b/app/src/main/res/drawable-v24/btn_close.png new file mode 100644 index 0000000000000000000000000000000000000000..bf48d1e8bb13c39d360858abc0dd642fd960b4b3 GIT binary patch literal 1090 zcmbVL%TLrm9IgQjpoD`5gN8U1jgPo}?#}KO7Sh-18W+j3%0^7Iv;#EIPH6|Xkf=ms z3>+mM)T>@hG|_{Jk3>BY4<;ri9E>M#p8OY_!Y+Cs9BkUo>-)anV}8Gt(UCJ_n-DTvV7HvAl}CY&Lj*FMoU#Q` z1Q2p!Is>728c2dD@dABeN=z#ms7P7RcvxyJbf%PwQEb?vs{%ViNTBe1yQNZa`e@gGAAq#0#XrQct%+@PcxATiA~piJ~dv zV=LfAPT)N+iE9%bkqY|j#*XNyx)>n7f+D;S+VnoA`kQ2$yWI^XKi3<_@p@gDVF9It-xfuUHWvf-8{&r9TU>lc=PSpC)!qF$xy5D_a|!;ogcye z*2hoRzs$eKM@Ltmm#$0Pdv*QS+A~Fk;l||ySN3(kO8vMi%t^~A zmVdeJoVon9)TC{Z89;Ly6K{5 zwMeVrt+(P)5W!ybE$X2~P%p)U;6ao++3r>kr3XWjd41paKj!~udb&?F z@7TA4qNwIv7buW%SM+V$O8&>+&YmViE7tpQFDl`(;X_Kb&=90^jxh`i(6A;hzJwhV zwWVYi`*DB%jA9}uZbX=P=y-%pQ5~J3XPBc9(?f9BcGJwaCr=sLw$e;rBG2VL4UX7d z6(9Cix{GFI)J$1S=LxzaREU5Bu|bEVcznyKn4WFBp^3|)ob(KNH>RDZsQ){qbB zL|lxS9M99T9OtEkEc3@`f#U_1Bd;9eB_$y%LXxgM46){0C8YqeHCtqrW=1gf6qYTQ z%ki=pNB%I&r&6g%Ll9yF5ep_%0q-YGGahzs|r)wcNUOvAr z>;|<&k(9Ba;jw(2V;v`otBMYA0seJkLv&D_@E}`&0UGyBav!C(I+^5db3+l3c%z*4 zZE`8b7(nK@16`a0X@;D{E!$E!QIt6~Ba5=A>VW4}4XCP?QPqT`Yg#f{*Vu@gNr_1f zWD{am)p=eAsw8Ndq|2aPll6qk*SR@2z=mtWx?P*tt#PGIxr*jP10%nP&{(|!dPWdN z!3gqbtyiWG_t~z6%E6K7de))^(6=u^E9)bNuI5*RY4&qv?9-lf`=TK$mokPg-N;;I&tzt;`%yi{bmZ zHy?JMY-s}LR#sQP&jC>R`g(cc_Tz;G>e0Jp^L*p<;uQ7b=gfo2?R}RUe+}NeFnFVB zescF+uW51Re)sUytxtEPrP%@4F#qvrW7u-9VeitO>8k^+SAHLQMwOl)*#G0p=h>)@ Mb9y&;m>InO2Sa3A$^ZZW literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-v24/btn_list_del.png b/app/src/main/res/drawable-v24/btn_list_del.png new file mode 100644 index 0000000000000000000000000000000000000000..9479a959093e8f9860204efb6d20f3370c2d1141 GIT binary patch literal 1075 zcmbVLPiWIn7>_Gf84jFyu#T~iIdQP&Pt&GNTrFvmxL?`@Zje-}>C_)uF-j zg9Jeg6=&26o==D0$tWJje(mXaiXp9r=3xW1bPo`+3G09?+WI1>0NrfgdJCorBGRy` zHB>8?Bm>&C9@@}>?P4@ROy>euHtNAxveeI)TNG)TS!y9wX3MSun%2y!2j*92 ztH$b*A(~X~3OOA}n7{@|Cj)!g@ueV3b$KPc4v!g%?3$pZEY)+WR-Pjj=m9cC^Kpaa zI8qR3E}0SpZi-B>T!LZoE5x~^loF&wn%sXVtmc^wsiGG4weT)WH4$ybh{kDVjAny3%eFhcyhG)6Rf({un>UFq+vK02T7lQ4U%Ll}czn>_a zGA7VnhND@=w!^r();_9$ziu3A?N{3_U@E|eE1rSxqcPqG`q-l5Bi%7TU)RFAJ*-?f5-TYl&=K^i5H9yCV6F)f^qbHn zm3e`@v|u?VZ26Pn_4J}ufoI(YX2F9t+0CzH9ilI%g@T9&CCzJL+@i*+nx#(S F{Q)QBQ277= literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-v24/btn_retake.png b/app/src/main/res/drawable-v24/btn_retake.png new file mode 100644 index 0000000000000000000000000000000000000000..51fdb59248e1aec1f78331f03be93a0d3fad248f GIT binary patch literal 1710 zcmbVNeNfY87%w^y6y15U;TM<-xPu{W)6$d%3pQyhG4ng&`KCs^GC zbO?e1o*Qr+h#w$&6PSwN)Tw;m&fSQqC zu+a4j=P#enVzCw~f~Dci>S=o%9hmn6R#6eNETd)7bOaesn^Y9el4!^{98l;~33xcJ z((KxK8(+&}&5b7_qv>en21HHj*eaV2+pIG%XclX2klCP8YjGNg!xIR-7_?q$0s%rJ z2BQQ@uF`Upp183Dcpg?Jn;bHl!nA0mJeo)DP1K*k!S ziATbv@)=vqNem{^v;pC8OePcC#AlOK0tXU_L^ci{&zI5gHSW^WDzmTN=rPM6#f@r; zFwg|42W*V0I5L?QgN&!IL(mzN$~VM%<4mHMlyS@|0|#PrIXay!u4!!}9ghF&##^Fia?%<#-zwmB>+{1eNpUA{hk9q^OAJkMdB75S9s0 zSjL^jD)dHLrB~y#b_vGr3|96|EP_$EiYBQ@l1!TIfUrc8CXI=t0l*?)z$=Q-Ye`TeLwgTcT(carnJ;{?)3e$yA z-ggocgcPSYeVKE1r2O&Svem5?q4bZA3)oOWqeCNBP!bbB=ThyZzh{kPX!kpKxjLtg z7OZE4n?LA00wX?Y)^ou~@~uH2oY;TWWx}z}`$YE@e9O7&x|~6WOS(^12DnAkEX%fv zdO{kB?ngId;5gqaQs%H0rJxT@ns7u|FpVNUEcN`1~ zj0kAFc-bvw()6Un7<~48+CbW<-G=99?hPLf%Fix4m5@K>mHlGt)Yk<+r`+6LBD}oO zK@4L46P`KYEL;V z0x#OlE2>m(6S*RMr{x>=fIY2gQGZoLzYk&TFeO z=N-@MTls@(Y~n)Twb)WsR_s!_*5ZR7SBSC6?B)K)FLtq8r+81T+y=Kre_|PStW|RN TE^N^t*Y*cd$U>zx=yuCLXl8WZ=ND;~-!$ z%D{AymZv2U%xqb(ip2D*5>pMUatsn97(W+?b4nQjD@LP$)0%6eq)r()sw-vYzHKfD zj6&!f8Tizx3~e%i;3Ni!ID!}h4}t&~=0HLb3`1;y&x80}9&^JnkWeaurF=0kc7cpF z(wHsPDb-`Pn3W7P(=;LFavcr_$06Y0q=^ejBodznpC7{@VyFTejXGm&)U0s@B}N%Y z3qf0O8{kt!vv4~t0~t@BhF~SM+GoNxYAjJq%D7IH;6fZ8*J|~}HHxNa9rm9a&qY(I z1q8;`VH9pB4a|9D&l)E)xqGo8ACU1znnYTdLqT(uxWR74Y_vux1DP)zqs1uY2?Q`t zu7CxwK(10kkQ`CU<%mKq7YS7eA{LKpJdca0`6`hFMg(e!3W8Khg-D=MhjgzT3o;zLv$!46!DKkz0h#m$a(k(V4?w}%l z$MZB=B}Q8EF{7Hqt-xr0rIzQ|7b*~lui~pEu>$pI+IWn(rVYFvzaC+vPCkvZ4Wj4N3R~FVtoPV4W-&hB_ zfDbz{#nO=OLidd6%~$VxZY?|A>^HT{+g3Orq3$H?zcKLc$G4j%CchH6A}qLRW-RN; zir4zq){FqPZ_tz3YrmUdD0Z3LYu{=JnPMSNysr-t*I)$_Mc!c^&Eds{1R3z>eMCruyt{H&-9s6>|7w zaI-1=ui8U?{kq~)BMs%Z4lPRl(wk7F)pbtk73@v&_ry(|W7Q-UN+yZ@hV||@V>`$w z-cX2B%<-O^@9#~i486(Mm!R6~34->Gd2DLsjeR#ip?YIqFZ!Uqw7=Nid#ZCVyRGkd zb;?A|l>-wq*}K|8G|4A(c(=T_b$JQuou05Iin3Xjo3?lUb~a2j zbh?Y*bKv^LhP_Bi^pdvhPiGX_kHtlt2&)zomW>eyTD|#ythBlTOr%V0`IIQma_PEWJ?gT-uL&{s1lX?6)Rl- E0`8N4M*si- literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-v24/img_barcode.png b/app/src/main/res/drawable-v24/img_barcode.png new file mode 100644 index 0000000000000000000000000000000000000000..dc91f648df9f5eb1c0fda91f16f89d22d8b760ed GIT binary patch literal 3224 zcmbVPXH*mE8cqTPEQo7ar3kq}R1i`K2_e*Uf=iHQ5CM&35+WqQFh~_q@PdnA0Yns} zsi1(kQd9&CqA0~hWL=sxSJ+S@s0a#*H(2)GAA9!4oij6Ed!FYl-}{|8b8I`Csku~V zDFg!1WI58@lx_6lqXAdGi}io2Q#RTl-3xS=@WC*y6o8ONnNG!pRz z0tVV5zdGgRyd6Q6NC5;Mg){TVV6g}S0fn`|69`ySggFLlj>af&f*IC=geQ>9EfL=? zq|%y{$0xbb7~gCuN4CfS5DX@v(P3d>s4yH#A{C&qR#sMv8s_F^N`zTRgc#(8n~6gV zzbnvy5PzvK7!*pxh($&2UP&lui&T30H3U(xv-4lV;*f8NQl<4YH zbO`7M{MU`YMTdAq1OsR{AVd->^;hl(-|#zGnY({Bv;0QP}orcAdsWdW~N+FZ+7IZ4r((=2;-*Is?3J#C8q~I7B zJQho*kqKlfm4?URi9`zCf`I$ZWr;&TuGk;=Zda(Z`;ANfM=psf1-PI@>LHN?eXoG+ z0TNIW5+DgiP~8cLEgYekCkYENUfiCq(b52^@BqMLNF^e~m;921e`DX$!rT%^$6zt$ zIL2b!R&)%FPNx!aL@XU+Nj67*Mr$iN>>+F8Lhb9J<>#P||Tj zaHo8JL@{|jy1Y*@F;O!q;Lp_Fl=R=g}%iQ^dA%|A9YWCUy`{%m*L zE^$Ho;KP)>2i+5C{mXoh>mNf=Zl*jv@SHx$oTN#HaEBpUsnz+rDH-{1*Y-6U$~EQh zKO3q`VuE6dK;PZ`ie9wd5?-@oY+5Og4%W!GV2G8 zT6Pd#yEMCie3Y2bBK>#E8KkT)$6nJn*)QeQMQ+E<)fuJdT67GGWl6Vgyfx;uf*cNN zYkGv2DYWgS(_=pnb^k(9YZNi=K(&fNl3nrzwwY?8?}PpDLgH#gY@t+*kE_NdE)N~i z`E<_l*@z*uM(frcvOhH^KJ$*Zl#oWBk;So-Q; zR!BTPTl=UQ(X5=p9&XO*;ixv?)(={oA#uz-{cg8jrOQSIx9O)Zi7GT;AJcR+h@SK1 zM$FzV*4xXi>}2h>yUi=IN9L`YKS2*^_qo0)&ra+v&VvLz z*k;W8)jQ)`BGW zO;2}icr5GKsHI5f!}ZZhpejxdHc_K0PZ?Un0mxk=*MPEJ{J|B;pX#%7L?Pbp0WJ) zX~OI!gH)f2^n}ug%L#G0k4lT&+}(X}X7?Z5E(}w2<<*Yg&U+s|8*{F=tW1!JZAg-h zf)qZZTCia?V|myoQB8*5+rpu^3$cfEbbN4Bq8?lROfke5-=sZmfCVuYM4eg3j(JBl z6?KQblp{_utq-tk@vByDaW3X=F~b4jcF3C4$tw~KN{gB3xWOD7ri@d*|iXxYNxI} z&S(Bm-WL6-!ytHUpD*%5H+x&A?;{zjxcyHfYHy-f>6@Dlh{1|N(=`6@$j_PT;}R$cRzDGcx%`vdE@Xg*!vZk%))(WrEOP4UZIru*xn`KrN!)hJgoVfL4@XSi#;Kc`S$CAR0 zMEkexSebI{L%)M$)sJTaR|_=T;q1N$u=mA=d-u&1gU2_RKsNU=T~^7@)L*!-9cLm- z9`RmM?X&)<^KjOvBDfUuJazo3-+S2m^;qMjEQ63UvkkZ1w({LCPil`1WTO?+{F~(i z)Hc|%5m}{lE=WgXxcvDI6~I^V7)ABYDWvPVixNf^P+LR+Nny?t0a@BY} z8*~S{xzE9cX|MT%~JQUVmMkYF0sd0v3bQiJ|0`R(<5`!H!yTw)694)o{hF`e?<9Io=;0GD8U`;ERk>BV zSN6G#*2fG?9&POO0P@t|Wag?@Ta$F3&oT>*(}i=xJ8H_;kKcNDqO(hNR_~T%DV6zZ r$+V~Mx#h=lGc;PoRgaPuR_}p;Kh?Ob?7_cS{8wPn*|ckvJxBfnEAfp@ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-v24/img_cam01.png b/app/src/main/res/drawable-v24/img_cam01.png new file mode 100644 index 0000000000000000000000000000000000000000..9e37eacd10b861b88fb3bda230a2ad1b4a149d67 GIT binary patch literal 1532 zcmbVMdvMcq91k1p=5XAGyv7C#DW`0-P13As8{0wJw5&*L*$S(>IhQtB8`mZ!3A7!D zdV}#eHeLtk!8vanryh4qoG3VlI^K_i9pV@#?9TI0K*S-kp`w84SkXT?{xFy1_sHk- z`96N%Z`OI-^Rlz1W&r?@?JT3pl@U^&g3Ju%J=zc{RE9j+?vpEoIypv*EI=}Xp9P%} zI>?r@G?Q3ziZug3dL8HW$v)QtA|OPxbP}VDN1_TF0L*jZQ94l1%AlVOa=Zn))%6tw za*PG4)VmN@)W(LmvIdc@XmEQ24fO#N1I;M~&2d5zh_EsZ#v@@~BH|WkSeH=d$!!<{ zhaqyk1$yL^&*cGag2;k;Ev5+|C<@}Z7A?`^II0G92&#h-<;FE=38BXcodF!VAjO)< z)Dh*BW5kxSvOpnOjuJ2&i^a4tOe=^%7&VzpNe!J&qaZX=f|u#IhL=<+1&WmdA{Ui8 zfd`X{v|m^%TOh^LMM`2Wpz>!EYu3@w!m$U!6@kF%bO+;C^ zoRx&7Vn8{MI#r6S!*GPO;uwyR zb_zvF8%2^fD@p20>^7UhkkWV(S5M+blO1zlcFcgHcFIU16lt&_MuP*ll^~`R*U3vV z%?H?&T~4t(!nHq@OV~t~mIcu(2;o!(ctV0KNFgB#+A45xRwc(XLQE=39?zp_DOTi` zv5Z3$BH(a-3GNB@aa?CaC=Ayr9wg&7Iw*{?8m)Sx38Qc;4vlb`|C2LVaRyEn$A5|? zwWU;Ga{9RRmBr)cVR@xvM5Q$vX3}>6AWiM0NN@bonaVDA+QOXHR})i_QR-)BT6cP% zcZ?lMR}W%0)f%dX6!THO`8?FBzq?!CCXs(or>)?a@0m``qWsMm{~1;_jyH1e(Gjj?NvtgbEI zrt6k=d(Us`_~O0o*IQ393*O=ny!4~^=ZV32Q10oveXBE1E-s#Up>|PA{9yHIbi=C6 zX%90Br}Wjf3&HG~wS)Efxuw4z+u^)lGBHv>pu{?_kjU)b8FzrF3#FLMqZ-TMB89e?bv(mY(-cH1+(y}&-;`zDOvS3%+`+Sj65 zDP=zA!`m#e-pTJ)wb$JkXS#YPp<-_??wz5kncpb-Tl#ucH9h$S4O51$Ovu;*qD`07 zGa4gJy_28Owp6Dx?zz)K3mEQnJ+QjMx7Mt?``|j9?Jq3bSMzyni#^|8lUQ`8+vqoU p?%r`=sNZ*j4-XaY>AZXZNC!Oqw`JYErmp1w*lBlDA6jc0{{f~gDaZf- literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-v24/img_cam02.png b/app/src/main/res/drawable-v24/img_cam02.png new file mode 100644 index 0000000000000000000000000000000000000000..4fa503c837aab2a4795beae86f8a7526a09a2168 GIT binary patch literal 1886 zcmbVNdsIw$93MpwNsog)Nx7y}qIuR#Gc~x)Obn*yq*+Q$GnbjInLF;>X{KboT8}6> zwxviRQVHA2t0>ANuS%J08%3-%MM#Fy**lcoKOBGTJ@?+<<9oT#qahr$-K10xW z7XFJ zRx-mlfg`rC6$>v#Q6-Z|)MzvW4V3^RtB7Om!COBqosQWD7o5>YNU#`PJkLc^ec-S{S2 zB}h_2#4tz&s}V7F9xGi&$yn~bZ^#J5ykQ0-GVD-92^?6gmO~1Z$6?{IF9eB9!X#0t zG!hs7yFo;?hapz7#HOD3_;Dp(2GC8nr9K?2d5B-{msd2qZ#bL;%AHqZJS$g;7`~g_Qt1oCbJA$`le< zqnc$ro-fgIAVii3NdggA4t&lpQ}zw}AV>>jfOHz0PURZoW^hRyE|={~^(AvjbdZ7{ z;Y$8b&WM;ZL}PLMr&va}unIIzzm`6>_}V;>0_zwAYmJP*mps8bE`!Gb1=`kT;o{(B zp|;M>*(q~e~CUTyP&>rFuhRzqU=Sz^j@u;9{m@$g`XpB%8J+# zy%j8QeG@X)ul>AD#-dEsbTfB{iEVz==YBQ&8SNJjY~OBmA^yqrE!R6kk=C|0&o_Ms z-ZAuRt=RM*ry&G)XMLpBP@7!8p+GHcC-tdY=Ib4XAKS({7@9(< z6DwC-wbV^BTasMqGub?%;TEB{6rzKLQ6{C6-iPs3cQ$K@!pPk&v0^7vcvgB;C|F{HkBx31FC7zfv7^)JtjFB>ih(WXe7`~3=W z<|bou_U|tc&T$JIN?dp}ozU4rtSqzg&J7CncXqF8U)MYQ;REBoUR^B6=<4aYeOFNZ zLAQ5C{7jR9E4OcZ^Z9&hR{km52d=w$#Y;<2Wr*AM{qD0@Ez3Pk%8Vi`c-&Weq^bMq z)6~}9GdBnc0S9flheLn&ka}jt!H{ElCtU81qLz=|IV=elkdU#xaTibEVb4@QA1_q{k?y)g9+1$Z=Su=6K*5HzH zq@akIS|eKIYX8Kq>~zI)`)8!I>WKq^iFW3%qs(*b3I@}6|Dj1vE`DmW#$cWHe7v;T zE%{{QwFb-M7DGGuTeVyDQ@a+rCY+)5N0;pUsc%zNBh9YGr(whVhM`9ZXA+#?vZ`q< zS#L6f8GiV|ie=77a73GDSns&;a=urC5wp4hak|z?UY-xFyZ`Cn*r^jr z@85I76_Q%>imPpgZEM4!pKort)fieuufKcO!uin66&2NCibrZLPqIsFlycldS$5BL$7UJWMFRW&d(Ypd zeT)+BEet$7BZ!$EtjP`@tY!H(-q>yuYbbd$WqE$NQ~RV8-+gOi6`r_?S)D>#ioYjy zn%PtiaH4z1w#&PA*QEl68t1si8GZT6lqeU+lY8_OX=UPCdDf7ig>AB6F$1=7yCUsq~3HUyu<9?WT!$MEA8r)VCSXp96LR#%ZodE&iY^K x%ic0mM=ZElG~K*Nul)^8`Se4khCggY!uhvt<#aPA%rO4(c-$b)iGbLR{{WS``kDX$ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-v24/img_data_export.png b/app/src/main/res/drawable-v24/img_data_export.png new file mode 100644 index 0000000000000000000000000000000000000000..b684fb589103de13b5977e59c55ff2a8fd818c8b GIT binary patch literal 1258 zcmbVMZD<>19KR-A>_+P2_{S^H$wtWy(n5flNaG=Npp&z6jOa@L6h8>O#L9EZUP4z?B2amgZ zUhen%{a>E{|ITEF2ix}S--BUTTWUzmqOsk5T72m3|6^T7L$@Q1IwMBWDa#hb_=1s# zAf?G;Fbn0v)QRt4ABK60YHrjSO&{SDLkr3-CRou-#Ky3`{)#CpCFp=W98>i;{`(hK zaiA9B_|Zt3Oq&86SBIu8I5It)Q>IG_TfqCD0euw?324xfK}DO;ZLSi>H*`5Pcee=~ zY(Sh+9N%M#hAREQwa%><}07h$+i6l`5MvSt;E zTvi;|vV~T0eB5zNjv&hAa}A^9XjGc+%W6vYc7 z&kISOkAx*bh(;S4J8?yplIU2Nq@@9hq9l^Q-36`;W}M<2gZPeoQ@CYpX5~g8RO+{@1Q~KEJb)_zkqL z_LN@tWD={MyHD4-W9Kkt-=goXR00iFz<&;S4c literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-v24/img_data_import.png b/app/src/main/res/drawable-v24/img_data_import.png new file mode 100644 index 0000000000000000000000000000000000000000..68274fa66dd7cfb63e0306f46236681da511cab4 GIT binary patch literal 1263 zcmbVMO>Em_7OD zC{wTi6>a{^O*n#K{;FOoyXD+TPPL4P;$b2UqlVZRHZt0%De4S#K?P3fW(r^b`db|6 zS_(fE%aOU72&eV21sfI@#!KqLjGEN&(c@sG!65+yx(a9*v!=r}QuwAWhvwckfrCwm zJCnkF!mc7#o5J5eZQL_?_&RD>i9!;5PZ?YIT_uN%9fozi>_5(Vg3bGC}k zqdL?fquf2&kOxHGaBtW;IuvDAveY>Pnr>D~;pj_5(>0D{7?u>$EWk{^ULYG z*iR>78Br9Y63xh7+)0^~WLZow2}&m80*!BTwf~bd0y#r?#qpnF>1?42^rkzdj}|-4 z15MO1Hfjz3JMIdG`3AF+P-^^C*=V;%{lkmHi9{pNy4_Vd{L-1$mCG}CucrQ3t2fV` z`}q44vlp6ncZlbLOK&wlSg*W!Y0vVnd#A zpFH^ah5bMH?&HyipYh*3zx4MayFSI!hq|$0fy(!}H{;;6e}!nSbuU@IU*2o3V(RU| zu}^(H8^yyD4}+zN;PSEN<5yenc3&O{1cV=NE%yJl*7qA$n18%V9(YaXMYgD6FY-_O z`OhOKzwDXp`-(rf`gS=wzE?hwKmXL-iLU!1=o$Lr-T?Rxd&Vp?$6xn7@_s>Cd0e`h Ho;?2#4zib6 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-v24/img_drum_list.png b/app/src/main/res/drawable-v24/img_drum_list.png new file mode 100644 index 0000000000000000000000000000000000000000..1a87c13da80f45cd27d25e0ccb628ea747d34df2 GIT binary patch literal 1146 zcmbVMO=uKX93M?L4N+4IMN$tsOemzq-I+JDGn*ZDn|+x#n=H67Y!+O5kWOY^vO_ZS z#+es)vWTwn6h(*!DZN=ygwhIv^it3qf+C30Yw_Yu=%I%qr4Wd3l5F%4Jam|Opa0+Q z|2->HljDc_kM?sMcc?OfYHU87e0{xaJpRw7#ilQ**`U*8mbR=AbI>6(n6G%&9Ij!@ zSvvO&7dWnG)~z>aqk2-eiI=ewnM~{j49#(c(KxW|c})2kJm>mF;qTuc3%u(Th0|(P zss;vbx)bdXPq!!Qc6;8=JHqI2Xom;?>zYITi(eON7oBg>9o6 z)hXT}A?DSLlC~uPcumWItg30?1TRZK7A5v-X^_=bO_y{0&Lc2wp);%3Pb%_P#%l25HT?MFjh281I!bOY)VpHCRA8L~)=0<(16 z1uv*pcZvOICr~V8Vr&H>$Vj5+C4Oy5N3@3Do3W>KR9_0PSi=!n3~iQ=*`Y3&#qQ&Z z5_rdzw1SEPyU94Nqf3gSNpMV4GzFRn0B9fxjWGz-tZ5jzT$f`{ zY!;$2P-Mk4@&K3!jzHPe5R_Hb1X)e%Vk>?`E#Jmny>6m+8w);))r}Bal!SFc7P=KM z)g+WeO%m|Nw8jsgc72DmqOX(mYNj zrZJ+708`3AS=hlk|0iZ5Ge%5`6uX~-oa$}HFuMGB=Hg0sv7x{}EO%D|guC9&WTK{zai}BYAnCe?Q+j%lJ zu+qMF>*=z3_dzf?3~Tz@kps)C`?G7Qt396=kN&qZadKnukG|`v!!Z{g+qc1; gdAasc-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxSU1_g&``n5OwZ87 z)XdCKN5ROz&`93^h|F{iO{`4Ktc=VRpg;*|TTx1yRgjAt)Gi>;Rw<*Tq`*pFzr4I$ zuiRKKzbIYb(9+TpWQLKEE>MMTab;dfVufyAu`kBtHuNWFoz#!AFNG#Ad)HBe}%?0@jth%@)C>7xhtg4GcDhpEegHnt0 zON)|$@sXws(+mtd{1$-}0$pR}Uz7=ql*AmD{N&Qy)VvZ;7h5Huj9yA+ij{$}v6+FR zlbNxZv7@Vtp`oL*i=(5nlcS@liL0}-xjD=XY{da#XE3!?U99@GL3WLv}HTmc6_z#C-Tt{zTpx?2&a-Z&c?shujbJ z$z%Q&cg1%8L0K6A>66(8D}GPgv_|XlhO6ffY~@jTIknb)q4^m*)$80xZP@0Y{2Sf= zOW=N`gtW)W>A|g63@2z=r#slLp0c*(ZpfO6ds^fAJu^-xAKEhE=Zt^9=hU-GF#Mg7 V=ly-c%R*3z<>~6@vd$@?2>`$*%Zva3 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-v24/img_infor_edit.png b/app/src/main/res/drawable-v24/img_infor_edit.png new file mode 100644 index 0000000000000000000000000000000000000000..950a53409aa88a69922af3779d18345f286d576e GIT binary patch literal 1319 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 UyX$Vh|2i_58CgNg4PB%D1y%`{XaE2J literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-v24/img_search.png b/app/src/main/res/drawable-v24/img_search.png new file mode 100644 index 0000000000000000000000000000000000000000..19010f8cec6c4fb0081985746d4e8c2968718a42 GIT binary patch literal 1288 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+nA0*tB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxSU1_g&``n5OwZ87 z)XdCKN5ROz&`93^h|F{iO{`4Ktc=VRpg;*|TTx1yRgjAt)Gi>;Rw<*Tq`*pFzr4I$ zuiRKKzbIYb(9+TpWQLKEE>MMTab;dfVufyAu`kBtHuNWFoz#!AFNG#Ad)HBe}%?0@jth%@)C>7xhtg4GcDhpEegHnt0 zON)|$@sXws(+mtd{1$-}0$pR}Uz7=ql*AmD{N&Qy)VvZ;7h5Huj9yA+ij{$}v6+FR zlbNxZv7@Vtp`oL*i=(5nlcS@liL0}-xjD=XYWqOZ4GmpgEKN+z-HeUF`Z*UGslHL)bWC?r2W2bKZ?GV)9Ei!<^I z6r6+26g0v!^HTE5i#0*f1M#g(YEfocYKmJ?ey##Ie62FE*>7p)X6a~d=4@{43i7w5 ztAUHFtFwi%g`ul~xucO1RBsA7VWtmsj6NuFASD)<5HJOTnDC?zm60 zhF@gFghemJjuyzqMs|FBwdq7!Qqs=ub=9@=e=WWK_-OZXyS?Un&cFY6{{R0yiq}iC z|81Ug^~GOmV@l3jKc=!)|5}% z(8J>8ag*`$i=zUc>_TUCP09#6A@^>Nd&kQ;KjnW-y(FmiR<7islEY#7f^IqM1ziOP zR%005| w^XdNeYtm-N<;)Ox&L96lJMGHiqvnik3|<9};;&uLbb`tzPgg&ebxsLQ062KZ0ssI2 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-v24/img_user_add.png b/app/src/main/res/drawable-v24/img_user_add.png new file mode 100644 index 0000000000000000000000000000000000000000..c71afd3d5509c8d41564bb1c0cc36b2bcfc97df8 GIT binary patch literal 1299 zcmbVMTWs4@7u;YnL6*keZ7uFEFGc*Q6} zkkaIFn1ix1J$V%lW0f<;H++^)wYkXq8O0W~+t{ z97VZkOxaN!dAbvVR!gV%gmr5-Q7C0ZL#`2IFhppY6W2D{vUBiXH}*wa`RN)Ya?moS z%n~|}a!-?ta`$jU4iI_6y<)29P~@s;l%_PO+bJ=Mqc1^4Rk#pMvmrjt(k#tOB1!Us z$n!#+=b1rC5W?Z6#=hJ{n4u(6prr&wl9Ct?^MWA68CHrgJQWd|+>~zFvR;BsyQ*V% zhZ}z=mlI4V+lHApjB2w2vK7NNtcpOS`4LrelWJ1A1L&S zd(8uN)G;P%jnWU(uVR=>NQr#DaijS6*4BvUnc0?ek9BobTRu54x9;t?4=jB4>&k0y zw7u^dO`iX7?q?R9JhXNs+g3E*zSeGE=>~2sBlF*kBr3R|zzp&;-(|sY1{_z{AQ05(q_NNEH%jMO;KtIc}T6L$wDi z+vno%`~J)Mf4?RT9QS!2^CAf1OZN*|IQpHZV;6iszPc{M;eajX?LlM2uE-`pIK?Oc zG_A>_APZz=>eT0;7eU%a)Lh=qXHKw1Lkr3dCRo+Vkc}X{ebusD90xX90HdlN$A13! zI)6M|8k)PQcMg*XPk1Qk_b35sF}F3C^~#fbt* za=gHCe3Iknu*ma~NK0c!F2_*3NRyP9qDWE{Vo{po!xWzqXp!cksTMb_TehqhLCdb{ z*xlq3_vNy@31r(abA~a|ssO2E*oIXy$|yg`pofQ4T`?-wGtTjBMk@eQeGw=r)6me3 z{Ico}_LEUM#q)ev2vMRFcT6M%QRJgkloW{w7s9r<%Kyn34xPcB;`mRow6E9`pgvk+sIn>(Vs|eZIC*J9xHZakb_>-{lR@ z&3eAPT0c0vck!?O#^0x<_%He4T}>n3{oM_DVQA*$jO&Y9-q)yHjD6%g;~JCVW&9_k zdAREnzh}8E^3H?Z;=)||$x9E+KuAhU%TE z)XYUUy6jo}u~zN$zffDb?P~5vnf7LA_|A!iG31tCsxR#>;OMzC-oEzc`-$Gpxj%!Z b-rhkVJ$JR~uih9u=lqY-;(+i$a=88vk?y8) literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-v24/img_user_server.png b/app/src/main/res/drawable-v24/img_user_server.png new file mode 100644 index 0000000000000000000000000000000000000000..1b1fa496b26d4e37db2ef57c8bc13bbd18c1bcf7 GIT binary patch literal 1311 zcmbVMZA{!`950g0jg7GhF>~{!DFMdYwY}bzyUICxZO@%@fX5}f`4X9<$Rr@I1__Yhtat3h0M);8JGpPusMxe#L0)5;Zxwy4`d%~+CDG+ z{eJ(K=l}0ObK`x51=|Y{1St&e=EHE@Vn6HG!S`MBiy|CuvxKPCqP1IT(Etc5Yi$4x zCdD`i15xfyO@ev^$!}L8Q7am1U?eT+5N(Vjlhh#_LF#v9bW!R67TN~lit58IA3cVl zitNMoxI;up=RiW)-D7~3p2mpO(;<0fY}Y+#eTIPoNnnX+CfTW)OvZ;T=`wI`Z{rxc z1hG1N*s@d6P&3MD20+~os#YRM5~XPe>2lLFS%W$W(uouBrfW$T*k zmm$IPXfMr?VeW2h$Ob}hm?lGkhaz_Jn$(p9sukpY82sXp6`3I@iY8b;P0votfI=_uDiqdWH~s;s5WO8a=0qve62>;rPZ(30p< zei>yA`+ko*z;T?5cT$2Kw^tx|LEt=;hZKl9)`_if<^Pj296E#B#qpnF$!)<3w5O}3 z4;QP=160^C25gOw^4?StB(EvRvysf1?5ShbPd&J8BDHWeeCuTFNVMj=m>eS>`u&|v zFLdZ*hZ^pG|LB3fw%C=TXtrV9(+|(6<3H7ue7=72Ie*FVg&)j6txF%g*fMhMwa2IC z>tCJ!`a*WtbT2BYMSp7Gg6FZ~x&1NkT*bl7!?T4~Ge!M7w!XCZae}KnIZ%C`94yX; zu57t8rJZ+I47%TA^R=;O9%zZ(-23UH)V@*g*(b|}e=eWBJMsJ@l_#FvG`L}-C4~xp z6gR#SJzg?5cDOH}QK!kkC$kG>Bl=eGbHv%Q~P znjyY8Q92&JcT}qK{5n8!UbFywETluJfax56#G6 zr2z;8GV=DKFf?P3=CRY$)x5d!MxL5sg^bFQF-1I?oGk%BB(7*H0QMHJqW}iL=Em-5 z2G)Z>+B|*$OU9yaCU8Uo7<&!_QwYQwHVCxdO(AA;wgWQoRv?NmBtnL+*FnI1E)f!p zr6cHKG7!!8+ART?yL|#UySH=jT!`BS@OlM7BOm}|Y_LKQBa{*pM93#yf@VIq4Tpd~ zL1f#Bkk3xB=zd_bNCJSdFtif~fkc9FI2aOx#o>^SU=#w0f+I9H&IySjU~vSLGx*B| z(O8pkc?1T<^NTIbiU^68$;1RWTrQWxigfEuyMMChLB73W7r;G^Ec=|a6ftXJJDlC+KNt7mKa0OcoN5T+rfnYAKPiU!( z0sPmEZ=$6Ev0?zu0HmUw5{~9Pc+h#WCU^gCXb!0HhTtpVYYv4SLlJRy3IL(Zn?i(W zzQDMAE&+i?;}9ed92$ovQ7K3yiA*7p$Q~pT7DFYIot@`3zQsl1(4Nj@vJ0Au!XS}U z3JKwfB~e`vNUV#qGlGhq=XwjJGPaNd%-iK_?0(@o|0|b3mH=#-ND?3t#mrZLU$jUj zl17WfU@{X2whQJ9xgxpLe(rcaM@s=D{9ORoQz8<8KjoLe|Au|MGu9b{$6`=uG<7a+ z7f%YB;^E?fb-|-4I1e1;3zz%<{Q&EjkG076a2NHndX z({cO*2&9|uO(6v+ItN3HHs=Of%)s;k|L`exkzK%9fcoG=RKhj@$mwh|zf^ba7}hx| zi<(DJfgMxvEep+;ZDRjsxFfOMZ0Y5Y4wfC2r`K{qhnf;lrbYA}o9-ML=x&iGxK}@u z$BoAKOvJUtw&92H{lvQuJ39C&_Tx)UgGj9MS%){LXI!i@66)?AvTUm=uh)shd}m^~ zpiqz#XQeh7)Y=95CGkZ?#UoqMQShZzYJochVQ2w5zWDtW)sYLqt=q&@Pm_QobBiD3 zOJje=>Nx6G>04;s-q`g~o!R#j+PE8a8X9D@X$AA;<8?u%A6?YH)qm&aI_L-{)u;I` znxR~~m|RS1cxxWJeBTYN)m?%k83YJKo)})J^Fej_Eeg^8S42h;NVm`b`JPZ{kWN%$ z>))vzJB)`75LSwSOj=(sDEWHaZV&U^iE`PVwhoqFK{tJ4;A_)N4#UU99&22Ba&69e z%koR>&vb!uKp))EQNQM++H|&ZxjyETF-83P5dNSJeUJ9=GC%#xO_v8cXR405hECo& zue$Cr5zpWq+L)jIE_*i?;Me-)|IKs?*t) zmM+tvZlnFxIlt;&sO|X1#=rWb=VqZsSbPB+~~vZJT~>N zU2zTqHH#q*|2BvzW7D+Kb5Vtq44;x3vL4Qd;2W8{u{9E_4keq1tg3@2<`9 zx7d^S&0il`qi3lXmNC?yXm}WEeso=tcr^aPgy^1~?MlbsZu9c9HmW8ph_;9c- zXSUS~{ZQ-{fV2-KtPUq^FnL|s+kerZNuOCdC_?8HtcY4l)gFJ%;-LbD~BlKf5P58AhegLBK}#+;y!MAUS%CqmhujEA*8e2hBxHu zKmIt;W5}f;&>k!H5Hv#`)RQ)S!)&}Y zSS#$H-vd?ZWcUTbLOxFsUb}Qe%FXOes$_6{Y4&w-e!S$;I~2wI{(U~58eEiB;v%G z&0WULLyUXf4!Ew>)^y9F8VR3ueP7bwLEt|35>;?Bkk6xRwa1zH>mEmB;HOMxQA z-3okRpR>=sW85>oA2%b(db8eVK6B1ztu@A+Z=$s{lnC*u@Bsh-p)yQf2R-(pKXtg+ z=zBd_>xU+7;_jCM$*n>a78x3@Qsw*ZeT!j_j`Oib*a0}SRyBe*?$T#yzhZWj-x ze;DN99##l@H>AC*3+SHF!qU|fDaDA6^j|4ByQ!=HhuFpA-$J1!<3(Ax@$&QV@j5%- z=k+(*1E~Z5KVke=w1=LL8=O}M?&0c*utKkg4bwlyXzl)YNB2NjOaT&*7nxod;$W(d=RLxfUp2WL7txIT4Y6IR2Zh z7+8@X0ukmDPyh??^DD@Uf<+Y+MdgJBfLkD45qhq!PXFuxEjw4FtB0Md8%R!97{qR1?_%xh?ZI)sJpam89*(g0f?F#h zT%AFG>nm>mU;Hcbi3x}Z3d->*2q@g=EhaA~uP84jAPN-{Re%VIGXC4v`u|5WUUV?L z_nYJY+ARM}p?Bc@<$tz5`p16`58MTPVi4$~F%mF-1^`giDa%9jP_sKZ1V|bKpPqfm zGlo9iuU>x=^O9G);~(HX&IS||o0GD$MC$Cw!tm|I`0KRBw5qe;VQR=FssyiV<%55Q zrOC>&%I*dMU2(%Op_aj`=W@yLnc9kt-!)vjjy6{dlO{fOxidK#IWsvkH@6%9bVjo| z5*{13d*`pt7c+j6DKM~;sTk8>gg_ZU>|_|=?QYQ_p`N4GQ17WP>#Wu4=2M{+7-bKP zv7ZkIp2u#$+EF*B-ktSUVN~Mz z>!6^3|JLU-qWxmbk3Ine!j0Mn0@*)MUN}~thqjUrxH6F)-fG`YA7IkM-u3!kr1svv z2KYr#JUU|vfWAnhDu@Nw?qYjKnhrx9r+AHlpTv! z=WRG&=A+w4EGo;3Nl_9fOw~DnehxI5I~j4Bl|RK!0AJ_Os|2Ojs%%5a>?C2>khR@P ze7v3SC)2w_+Qh_|%nxwXo7(Xje*8$|BK?K3JxU$L^$vYPj5W$D`jjdc*h~q+V?gK3 zO-R^r(7A3=tvQons}&djJrpP5TS_+Q8IEYwqh(_Mknu?97O$rHPia?w!d9*U_|%IKNVfX%Aya_pYf68P)-WG$*QSDg}h7w zu7E*|?jSLdLXK()KyoWO087kx=V~8}0o#ol=En%c-R*&b^3Ugk9i2zhFXOs`12+U+*uCZ^jH{xzP_Ap@qL1@`uxQ&E| z`|Y052$s*Dj~AE*S*ue;sI?`f29oiM4R0vhX&iZ=mDlbX#m!op&GFFMofDaO`c$(r z>x|+l-@CxvGv@K2&oDu@OM#+j2@IX}AOMZ3xg2#De)IRch5c{wdHXr@9RxHFejeGS z5+onL6o2#sGx3B8B-}G+`nUtqqo0Ssh)-c-)6^9mBOf>pQ>9KPdMnBo@J&?YIblV@ zd+EzAKlzZ-m$I^XK)<2|30nH}Z;xncjQI(1(j&}g-v#HltI9z?(QN!^DmXnNUePXK zpg=vE1>}Bg4$UVG*4%%(6Q}-mle>QFpzlFne+W`9amHL7^T8FYoqy7h|y*TlAN5O4qRiw6@IZ@MZt`hr>Z z5DWKx+eJl!6#1tzNdOBj_c25)qlG@x&i71aGrfqg?3ciH)iG~H=^;1bgUTE*QGz%T zjET8yNSMWAdEC0Dr@2onDezQ%a6X1h7WS*`@f{#>{^kFC>n_hd3%Ib1C~hvFNYd-Qy%<&_om)%EOg9B5 zo}PEoM7e9{*`UW7#J%Me?8%*n%Q5feEGL)WUPNQW_*}CEqBH?Ojz_H-0|Dm|+=T__ zhN3n2;=eysskB(_r{|{5yVa%#jPU?L`>P84(BL<4GP3D+WM&654?L$#?vcL#*!Mz`M@8)26NL;aANS>E}4oA`cWAM3nDLnQ@xe z7u=S~_n4VypVNWPiO|+3*L&epVl_*PA8UXIbgj1zcY&V|TgZ)k$v~n4v@cAEYQS#R z0aF5k=d&9UA(UiB(HYNHC@{NMn{H}wN_#p&yOW{wd#@f5e!FSQ-~X=Z@2fc$w?Sme z+;{1J7oZUJHYw|&+C+K4?Q%BofY}DrNOF|ufZ07)xQ}__`Dik`+OMbPjoK33t4l43P{ zESATqUt*wVek&{3A-uAy3ENPJ6fSQu8`)3#7y4_d9|>G(@{Zaq3j;`q6C8ZjBinla z)E|B>X9gxhA&1wO(w`y?o_aP&lHuSI4TOMN6}it_nTGQWo3zs!+a#OKB7#uHo~2>+ z6o{mvl4AJ}A;kv3E3MDl3#=&Ty(C<5B0&f#%2DjmuMPsJrQRjNF_b9o&nOe;}9YTatrsuT?ZrE|M2*7wklfl54jua9! z`tu|&on-R?tMdBL)*l}_3>_PBYU5gFVHQ;mDpMmImX#8Mf%o(grVe(tZlq1`uL7I@i?uF+Dxu`|wNj}yL4C8&Q@2B$_a za!Kemm`i@?R_QD?1RL~KV6Z4UjSc#2tQ6-D`%qdbAw1(IoYazCw}HjN z;d%_kVy`{QWu~ll9(-NyX6@EeI<9uZ2--^>h0ld$HJdNg^k$N7B~`q3!hAgy2;XlO zX_Rd7<<6erG$L`%`Lwl@_i4fjZNM{;`$%T&L6&Mnd$swYC)>Lpxv*|>7DA|tmMEWh zyP=}C*W*qZ>vNY#*3#!8Y+^TW&!rbbgHUF}SyzIx2(ahi77F7@FX|z!)?@drc;4F! zF9YACth=pORY@$DXRi%Ys`DhE8fKYy#ySj~-m(F3@v0o}$t&GI?_z71>D5c*%D5mT ztGXpsO(!k%;g}{-c*m3yHOHi{2+*a~uY$Z6m&sZtA8RF0R+f@aciw+jwXqo^{RmNJ zDK?h5Ta&o!RA>7W5!iMtU6^PrYWgIBOJ8+fugX+!MrPsWtcNb2VArLZOrtmECGDPc zBO_lm!*Ns634vHArn@fzMMdUnGkk+qhTCWC>KmY}}8y6+vgwz`SQ=VUSpka^{)6XA{*o8);*A|u9?uL>pM}5bK z9{m7z$pnv-W(v=}LFvcIDeSV67pnl)@Sym92Qo5M4F$FuDf=&Xey`Sk;V=k#oc>%* zF?m?(VtS4ubp>1UICPpJx^$B1}vsJ^t)p3@lu0P;N^u{izCUCR#?lNLq7zYaP>TuI#>- zq}?_YP13L=i}Kul$o<4JHLlHNDn9J@Z#YwZ){ks0;nTmE9fnGd$eYOCGJq-Wy5tg; z&MGalCyeP9Z@m_IZ*!UE>odOL(}q4Kr>H`H=)Gekf2VQ?s$P1*|JP7c*(dhADKHBvty1RlBx5DIvHj)&sHo8=Md<{n^0@4CuyqGI9J00JvbE z2LI+5GYxef59%0xOrlBHTlPc3P344^eS0f(6I~Etg$dQQ2M^wnT^p{+g9lg`Uv=s+ zQxN}(1-2t5*bqt&fO`|OSIhMKe&bdgUj8Qm1Wl4T@v_bUKiZ6dtnspp^vpxD$Dxdb zxHmb>98AS~IxmSt54*b_0ci{-s4;W`f<|b9c~aa~O@aj*D38M21sWq}Jx20KnNcXd z#x-o5_-##dbwJc#L9fL?50lZ|rNT-*iDbB1r1ng1=&e~AQ+l$ev@*KyYGe&xu?bp* z56XS9SUeg>AAWRyG}VII**b&W^*N+#zipTTihgK&hokg1s%qqT5zlMPm`Fb3mpVH; zlIievwJ5q#qr6cZ>kLrhrvEbPEq=X=WkK2!X;5!J(k@kFV&;Rs3XxfqsYz<`W&Yq- z7DKz!_w#gwa^(o3`pvKHOS;NY;05*!5oN-jDk={EQR($@XE0syfK*g}${!J@hUTTv z-jD0jitkI~~r6L!Opxt1Q)n%Tla=$;BRn$bq<_Vbb+CMk_s`{A z#f1QOE@o2g+k_3CE7R4EO75=UAU$>vPpCW{9XZkYqv$FxY8o`xgB5Jpa_z&AsVGI( zOCguA2fz|HSrt5G@K;(Xk0FD+BW?tVf;Nu1_MN`Zd`x$NzwJs37xc%xSw5NXHK-GX%qzwg)`4@O*M*P;GkRA zwU99B+ok>@&u>L3e@ay4R%THl#)e@In~dWEYa2P!Vra}J1iD0X?O2WdfSx||PoX19 z@59ps+$oBhCfe`^=*I)kAQ+Qkm_K#tQ8C@9Ff)pr6@%ByC$y3G_Z~tpi0jn9UWnsn ztgC-*Oik{NW|2NE?6}V+qOS7N!{$pxZSXy^1zTDBr>rb7F)u_1DT;3FySWlyV-lhJ z(L)Some701Jdv{U-w+Ww9mL-d9@yqM_3q24>7M1yXQ!9CDBsu zhsxGw4lgPQArx=8I{;kWpu;YfmMcInM^R zztS=ERkqxhpMU^ZSU*jxD>&It)6Yv833M(s28-o)noBW^}~`)wW7X8xXvMOTL`EuQ<5SECFMyQB~QwJDLWj3 z3tQ4c>o(VDkSJtx25pUY8Mk=i1m&BHBCW535WQoXnL@%>&8e?+VCL;}y(ch3VU)xs zv0Din`Oha*ALF?n_DuYg6+4|_c%RBQJ_s-EcN`!Z%#k*Deru!8N!%czJVhPh%u`G< z9t{;ec)p%9Q3{uBpm-Xkrc`aT3bm1zn+C~8J$bV;;L+ItE}P_F6DVnl^<>ZN!3uQr zw90s7qZyngZW&C6U#A|tz#nT~M%z~Nk{MJRH;0bp%Z_)L(_MZ; zJ}V}v*f{$jyRUr!NjAV$PwYXOZ=r8HS~zMbMw!-_`l@QN~=tueyk!& z15pfyR*%SS&wFhV8VeYHsIUDceC`kyZv4|@hM{PY*hhS5IQ5_un}49vfXgAnCuqL1 z9vTvd>s75#=1lc#^lIJ$Nesn_d0w;yaAg90r3&ywe9_u&fhukwr#G68Ar(}8qho3Q zlzCqA=5ue91jY?xU$Amj{a~k=@nPrEOtRHEGfOgWsjW%{ex$n3S4m+S8J<3rY9&v1+UQf?JdWf26?dHD&XF zV$PA5@iSLP;O^kjT7|x>O5=RdCcG>yU9glV!1>31%acNJqj!s?p*O<6a_W)2Q|4Wt z{BtdVSQmdgTr;+O%$RPQAyF5v zWQ#bCIUc!`qNP}{c^AqL^x){9_-&Zw+~P!AiODPgmaU}OsGQ0W`jPDWN^PBiFaxjH z&*Syh>l4;`FqfhC92Q#zeJfGK&^mPno0cbEJrB1)@lSiISoge0YH0b(IM2x7n8ku| zf>C3~IgcHy^sXSg(BFnUyijVY~QbQ&Ak;0qv zu8_%W*R7DDrnlLYQ#;NrHhVaujS2ZP1DW*L0kO|rOLft$!%AHS5zw$IX84E_;_+$?TBze zSRyr>l8R^a*y>!O&gg^8EX0Z7M`UGJ_n)yibQYz$8nH={7~q8RPq}4Xr$N>Du0#Bp ziH#rQpZD4bJ#&f@8Q*TQcxkdtvj^{~^sG9w!B#Y2Xys`hA*8?tLCZa6c7K3pzI42# zwQK&tCvZdiUEx#`;ZZ{s&aLTfK$s-%^C_?7x`lfUByki5%kX@0+Wkk}SaCm81nigR zgMz|Nb8Zwp5_MkNgO(naiGT3-csA&>XY8&|1RmGz2p+{A(a6q{FCKsnwCh!IZvM6!K4z-1I)57RF50-?`jWK|7(L3u-i-fQyFb~*9k+Ad&}=v<&^XJDg8B|1iP(xsjdiOXCkfSitmIvBNP7JDN=CzCs;i;3DCrb#zd^3So3f#ETd(39(+mWqj(!kM&pYQnUKyWwpXX zl6{g}7Ih)DN{(JL2h|6K>1g~;kb>h1&(4~7vCeBFFLc?E%7}>>4wcnn|8K(w#N-_T aAK*#EPwwG&$%y;^g_RXFH3Khh38|4$I!*`|VH80?#d4PtOiR) zTWs7LQzx59Ev?MStZB17ZPA>}j#DqT%=>zQU)DWx){8-!eGGD{35D_R~#eiWTi<6Sj2YP8~ zX><7urj$twCb5MA6l-1vB@>7=Xe})-ADM{7js>NNXfTE!?~Q!j(Tzm#Io`-k1R91W z@&$SPfNf%M!!|mDy)BmQ!9n`0L3qhX8Ug_*Wg%pOxOfRk=8gQ!OVZ5ex6w$%XAx7Oj-!SS11M%1QgDNjlp6OL?Q}{ClHBPXM`&T>x#x`UZM*YPa+UWu5O604^pE| z%;A#40Kc!gG%If;Pbw9W(CFmkWK=Q^B^1Y?u^t{C^Bk_OE*c3JNlLtwC3A_FSbt*x zKnYvS7fJcTc*Hy-D_WQ+^+swe{o;Z^M5Fyp954AAC{4)FGL{I9MPbka!MtCer6tlZ z@V{pKqqKyPA_CE2phTD`W^3}nwf+Xy#O~h}%?oO*A*~nlHA!K`0YY}70F0Lg0^Uf? z35vt#kT5tL5ksaBaYP)M3ShBhUw};ZrI5)4Jk{6N&Fve{uN8|6@x6PP|OetwkO^*h4+7p5hojE> z?d}KQ0E#<>;O>C~h!i67E0**B#0;%520dRK|5GgAwlozuKmEJ(HH*KS2aMNrj9Ake zn2fp*EiK(kfdH8yyEPG^AGd6yNxF-{$*_Jn6uKEe(z1fx%MFp?XGXRsAgk9V9h4y)wFR9uEw9xIZW>ic^}$o=L;5 ztj5+JX$c>7Q%f>=RZn2PdV64g=lAS??C`x_id^~r#NIdX2WgZXd!$0nkiBn(-}9u) z&W)LRlr7c2U^jBv>Y!mkukBeQm%_%~r}u`C-|MH>eD~WSs>#~+Y>fHE$R;l%q(LVS zD53NmFCWic8$r6=o(xx`tM{vQAPLr$nT2%syp3rK>l=!E&O{+osj`(;+gw?T^c;Wf zeBC@Q*S0Hau>L(GfK8OF1+Hc_#9qoL=2 zoU+o5y6gDk>1uQNL(HnJ#Rf12OR%j(q|ee#z5XL*=}~~QIk@Wvxw04}JFahcn;T&C zcv%+JCn9pJ1C!sE8PS8Q-PAvE7MbBkVxql9zJrp&Jdl@rCI#|26Zz{qm|bF?xHR82NX6M(BGQ%49IQeNY5jaW@=c^KGR-qKl#8%a*XMO z!JtiCZt0$u6J(v}ve**Z0cyd(GC~j`wEEUoWH>iLudaDZhF9jpGP|@qX72{Q+7pux zRkv>MTzZ!zF7)6o!*Y&%3Az;AM_=w=@~x{;y==|12&qbxf-S%ritj6fU(EMcjmN> z272n6;zEYe+J9yJ=}>BHn^vjXeijB5S3rk!)Ok-zJ_6Sk*xs*Djj8=bOB1Tc>P8d7 zEAVtVr)t8-vHV`&vAkSQ)?m_7H<+x@p&DSQ5V5og8|l0J*SEFDm#g1hCS)~6zqsz zP~$JkfS9t36HYLjGq9J>Q-8fGn=Dd{s}zT-Qd?J8m2CjiEtChkW*~QM{&?*PozDED zR7MAgQB{Iv65rwjr!(5GIy88Y zZOF!m7K55;pwwP(X=;ul?oMB!``W;Uw@YR_C)V9m9X(@_d5U@UzOkta(&s2H*>pWX z)qp61&pDU7#V@Q^`#YRvlug^pO3M#aXxxTIutY9z7gPq@8ZCbB5yP5E^X&E54TyS+{oQV+*5z?fyXP-1TdW zI^Co!oph(CNe|AeLmb215apiNcT5-J^h>;{cwtK7B@vq2;Zte0_o&yxM(?(3=jM83 zS0QsdQfU=V>gPtvmL-QD?%SC7LV9z>AGrxNiY_e2)*AvHD!w9X0P(#gU>ad=Xu)IB ztG1tZFYFbqlRL|w3^{fLGGu#xzR3>#vqBN~VInj*vl`mH0=sB=oSA!n)G^M;>Jdp+ zo0(+u%M!&d417Ct;0nelY4$I3suO6}_p&pR%07O-n>m=UtwbKcyNK@w4I68|HE^Ywi?T?5Camv=4%b%}H<0y>6DwcG668 zdsYl1qEGBlH{P-YqM(#Z1r6J2DQ_xwZa-s(jNqSj-}jMO(245)MEIaHG4cM+PQv?C z*ftY$(XIdsSZCA>AY9gZsu*;r9`y#k-~B(vtY9@_NPWVctXQAk_-K4r@QsUz5E-Gsw&q0v%98TV-qmaGxuv+3Cp*XAlnpOhZBG6P zsv3d#-^bZKg10?yRVhN(oT#@{9fcU~pH-Ob;h);Pq`OetIOWQ^0hUd4xv1OVckSA@ zYYtzoff?Z}%Bn+|PAI?D(MK`4d0<`cF_kW|JoTN~pKxj!y1R5v_ofZB+-P~-jPl*# usUsHk^~U*%f-MCBK|}sFN=*N~1xvJoAqLq?N<1L**X2Me9XLhVn*AS^)X-`G literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-v24/main_menu02.png b/app/src/main/res/drawable-v24/main_menu02.png new file mode 100644 index 0000000000000000000000000000000000000000..30c992d06835d2c1931c6f0ef123103a3fd8f8cc GIT binary patch literal 2631 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-v24/main_menu04.png b/app/src/main/res/drawable-v24/main_menu04.png new file mode 100644 index 0000000000000000000000000000000000000000..a3afe937757168619ab8bcf608d75d6a5a1e6f8b GIT binary patch literal 2352 zcmbVOc~ld39uEO2poknwz+F0oAn=e}lY>N%9Fss65R2hZTrngA1ags#5Ii|7CK^0g zQNW|niq=&@u;PUh1qz5#tAbtRvbus>QG_C(;%=hg?jOGXvA;Jnzw7(?eDC*0zj8&W zy`8%q3Wc&4ghA1!nPYx!tWDp?Le!9Hazl9W$SP$rk|k2ZD7HkI1Oo!OC)ap6>H*hV$HYU2u_cw@SlA;E?$2ZFRr6M-B?M1WQD3c$=LN>Xk>g0Ut`Ke`}SMMi!iR%m7dWeOQVD^d|icp^bAH~aNLT7yKx z|25;Y(i&m53MNFu8s!GH*p!cCuUW7uc7LqMENHTZ8Kst*k|L5pO7R9ctUv@%FxGT~ zmq;Z{A_&rmYz_^ifovW`BC)v;o6Y60*;ERT%caw2IX;J_ap@q9PiBKWGL=N)L2N!4 z$Y6kckij8ARFFK26(}@_NFj!2^-4{8XRwSv#4@>RScE9mLZwnRTLCLmm55T4s#F2o zRW!giPO6Y7vowC@^nCOdg4NPYSi)B;<-mvdGNqr<&tOyO6b6+-20@|Nkc_Nuz=XE9u$fC@>e?^j~Oldv{P z25ao~#O4y;F2HI3mPi}?es5rXnAErZlnndN&Dn!(Bji1qPy0&yD#pBhCOYb~H7^fO zy|~b;kBNy{y)QnN53!+{F&>>bZoT8c@0tG9yfpe>i*P|=v~Kej#&)mJW%ysC%UzJ8VR^Zxc<=} z5Zp1(r-8&j_iknR-LaTlXmu5{2z&Iqf2CL?d`pW-!Niq&*cN(Ikkv$or-E~2NTL7np%V+Qr;Y+obc4{7dwho zUy(Qn@!9J+QHFYF8)SQ$QmlJ#baDUD&x7JAU3@dQVrVz|z4c|wO>90rt)S;Ep6E9C z=1^GE6{N?4D3`(@f#gT7Ubxf&U|-hSH} z_U*+M>h42OQ(%Y4bvVCrpTVx%T2GlfGSH}c;qqn~Cb2%v$#F^+{_Y~fW9{gk&Y-19 zR~WF&OE=V!S-nTBJ2>fpu{yJ0qW+t~O(hT%T6bdF9knK-fYBcGdo`G}upR73l^Nco*CapyNAOTVFjIMa*D1+B-(*xlGq`Cq1|18=cV|9qVO7!|4r9gJHE@M ztKnhg{abq7_uAiLy>R`ZW7c5c5fAR>%~da2??x?tWjk`*LGyjf*{t&0Er$eFKZx7} zdnuUiw4}SD7mbcsjfCdZ@I3N8{Hj`CuPYs%h=Q}zZn2Z3R5Z@!@m$#nrZYR- z-~X$fu1fWh!7j3o-miy#&+phamKQ5;|IhS)+(^tQ-I1PaWqax2S%Ni!Twc&4mSkUI z7RE<9;YSN)jm`aO9q-eyV}k9eH^PlL|F3%NZ^d6zdcSrZ6+rS`7v(3D zEW+=Aj`SKsoxgkgvxe);0oFDkrig=^d~7Xx!zYnjiCdAkkU ztTfEH2Zl;3^*5{aKjl6rJl;eB*{xq2b;j~<(YLAi!qGDK)Gq&Hr+pHp+X}@~ESaHr zl6k!PV720}&esWDxIcAtO&;(*_pYMA?c`oyPT#(+X->89yyR5FT;P1?gR2qP#{4up z+oCIpF-;BiDGK`^iyfMloC|5>=QZyMIXiNfOd)NWa_Hr%r=Q*VHwru@-=TRRBX($pI}D|cK_j!2Ge ruh}5jnsr~-%7>gB9UUJ56IK|M?WSU-Vg98m^FNG$w*so-tk3%ol+dpV literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-v24/sub_menu01.png b/app/src/main/res/drawable-v24/sub_menu01.png new file mode 100644 index 0000000000000000000000000000000000000000..9143df2ecbb6a9c2ffbb94d224b665609b6381b2 GIT binary patch literal 1801 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 ma`FLQN&6oMK7ISSc!B6- + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/account_edit_focus_background.xml b/app/src/main/res/drawable/account_edit_focus_background.xml new file mode 100644 index 0000000..003f352 --- /dev/null +++ b/app/src/main/res/drawable/account_edit_focus_background.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/button_new_default_disable_background.xml b/app/src/main/res/drawable/button_new_default_disable_background.xml new file mode 100644 index 0000000..09d8cde --- /dev/null +++ b/app/src/main/res/drawable/button_new_default_disable_background.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/dialog_background.xml b/app/src/main/res/drawable/dialog_background.xml index 70f4f7e..2b8dd42 100644 --- a/app/src/main/res/drawable/dialog_background.xml +++ b/app/src/main/res/drawable/dialog_background.xml @@ -3,7 +3,7 @@ android:shape="rectangle"> - + diff --git a/app/src/main/res/drawable/squrebutton_background.xml b/app/src/main/res/drawable/squrebutton_background.xml index 9de458a..6c3ccde 100644 --- a/app/src/main/res/drawable/squrebutton_background.xml +++ b/app/src/main/res/drawable/squrebutton_background.xml @@ -12,9 +12,9 @@ android:topRightRadius="12dp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_account_add.xml b/app/src/main/res/layout/activity_account_add.xml index d163bba..2792953 100644 --- a/app/src/main/res/layout/activity_account_add.xml +++ b/app/src/main/res/layout/activity_account_add.xml @@ -1,24 +1,25 @@ - - + + - + - + - + + + @@ -92,13 +106,13 @@ android:layout_marginTop="100dp" android:layout_marginEnd="16dp" android:text="등록" - android:background="@color/black" - android:textColor="#FFFFFF" + android:background="@drawable/button_new_default_disable_background" + android:textColor="@color/defaultDisableTextColor" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/textView_AccountDapt" /> + - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_layout_test.xml b/app/src/main/res/layout/activity_layout_test.xml index bde0e8b..0b0f0e9 100644 --- a/app/src/main/res/layout/activity_layout_test.xml +++ b/app/src/main/res/layout/activity_layout_test.xml @@ -3,10 +3,10 @@ + app:srcCompat="@drawable/logo_qtagger" /> - - - - - - + app:srcCompat="@drawable/logo_nse" /> diff --git a/app/src/main/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml index ee668e0..fa799dd 100644 --- a/app/src/main/res/layout/activity_search.xml +++ b/app/src/main/res/layout/activity_search.xml @@ -1,91 +1,104 @@ - - - - - - - - - - - - - - - - - - - - - - + android:orientation="vertical"> - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_test2.xml b/app/src/main/res/layout/activity_test2.xml index eb234af..b3482e4 100644 --- a/app/src/main/res/layout/activity_test2.xml +++ b/app/src/main/res/layout/activity_test2.xml @@ -1,144 +1,122 @@ - + tools:context=".Activity.TestActivity"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:orientation="vertical" + tools:context=".Activity.TestActivity"> - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_test_select.xml b/app/src/main/res/layout/activity_test_select.xml index 688c3fb..f8f41c7 100644 --- a/app/src/main/res/layout/activity_test_select.xml +++ b/app/src/main/res/layout/activity_test_select.xml @@ -8,52 +8,52 @@ android:orientation="vertical" tools:context=".Activity.TestSelectActivity"> - + android:orientation="vertical"> - - - + tools:context=".Activity.TestSelectActivity"> + + - + + + + + @@ -74,12 +74,11 @@ android:layout_marginBottom="2dp" android:layout_weight="1" android:background="@drawable/squrebutton_background" - android:foreground="@drawable/originchrct_86" + android:foreground="@drawable/main_menu01" android:foregroundGravity="center" android:gravity="center|bottom" - android:text="발생지특성 규명" - android:textStyle="bold" - android:textSize="20sp" /> + android:text="발생지 특성 규명" + android:textSize="16sp" /> + android:textSize="16sp" /> + android:textSize="16sp" /> + android:textSize="16sp" /> - - + @@ -26,10 +27,9 @@ android:id="@+id/textView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="172dp" android:layout_marginTop="12dp" - android:layout_marginEnd="181dp" android:text="Barcode 인식" + android:textStyle="bold" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/imageView2" /> @@ -38,9 +38,7 @@ android:id="@+id/textView2" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="172dp" android:layout_marginTop="8dp" - android:layout_marginEnd="181dp" android:text="Barcode를 인식해주세요" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/fragment_rfid.xml b/app/src/main/res/layout/fragment_rfid.xml index 2d455b4..056c1db 100644 --- a/app/src/main/res/layout/fragment_rfid.xml +++ b/app/src/main/res/layout/fragment_rfid.xml @@ -4,108 +4,81 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_margin="10dp" android:background="@drawable/default_fragment_background" tools:context=".Activity.Search.RfidFragment"> - - - - + android:layout_height="match_parent" + android:background="@color/defaultBackgroundColor" + > - - - - - - + app:layout_constraintTop_toBottomOf="@+id/textView" /> + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/layout_dialog.xml b/app/src/main/res/layout/layout_dialog.xml index de0e085..542037e 100644 --- a/app/src/main/res/layout/layout_dialog.xml +++ b/app/src/main/res/layout/layout_dialog.xml @@ -2,8 +2,8 @@ + android:text="포장물 ID" + android:textColor="@color/dialogTitleColor" + android:textSize="13sp" /> + android:textColor="@color/dialogIdColor" + android:textSize="20sp" /> @@ -53,6 +58,7 @@ android:layout_height="1dp" android:layout_marginLeft="20dp" android:layout_marginRight="20dp" + android:layout_marginBottom="50dp" android:background="@color/black"/> @@ -60,8 +66,8 @@ @@ -55,48 +61,48 @@ android:id="@+id/button_serverInfo" android:layout_width="match_parent" android:layout_height="wrap_content" - android:drawableLeft="@drawable/database_icon_32" + android:drawableLeft="@drawable/img_user_server" android:background="@android:color/transparent" android:paddingLeft="10dp" - android:text=" 서버 정보" + android:text=" 서버정보" android:gravity="left|center" - android:textSize="20sp" + android:textSize="16sp" android:layout_gravity="left" /> @@ -115,24 +121,24 @@ android:id="@+id/button_AccountAdd" android:layout_width="match_parent" android:layout_height="wrap_content" - android:drawableLeft="@drawable/database_icon_32" + android:drawableLeft="@drawable/img_user_add" android:background="@android:color/transparent" android:paddingLeft="10dp" android:text=" 사용자 등록" android:gravity="left|center" - android:textSize="20sp" + android:textSize="16sp" android:layout_gravity="left" /> @@ -151,12 +157,12 @@ android:id="@+id/button_Close" android:layout_width="match_parent" android:layout_height="wrap_content" - android:drawableLeft="@drawable/database_icon_32" + android:drawableLeft="@drawable/img_user_logout" android:background="@android:color/transparent" android:padding="30dp" android:text=" 나가기" android:gravity="left|center" - android:textSize="20sp" + android:textSize="16sp" android:layout_gravity="left" /> diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index a2ab01b..12f0325 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -11,6 +11,14 @@ #82CAFF #A5A5A5 #408DCF + #f3f3f3 + #f3f3f3 + #c5c5c5 + #959494 + #707070 + #0f8fc4 + #b4b4b4 + #408dcf #EAEAEA #F3F3F3 #D6D6D6 diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 145846b..c9b7e02 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -3,5 +3,6 @@ \ No newline at end of file