From 3e0e9838686e88cabcd83f647b04ed71b147fe2b Mon Sep 17 00:00:00 2001 From: Cody Mingus Date: Thu, 13 Jun 2019 07:48:32 -0700 Subject: [PATCH] Adding dark theme (closes #653) (#1301) --- .../activities/DeviceActivity.java | 8 ++-- .../activities/FolderActivity.java | 10 ++--- .../activities/FolderPickerActivity.java | 4 +- .../activities/FolderTypeDialogActivity.java | 3 +- .../activities/MainActivity.java | 10 ++--- .../activities/PullOrderDialogActivity.java | 3 +- .../activities/SettingsActivity.java | 28 ++++++++---- .../activities/StateDialogActivity.java | 6 +-- .../activities/SyncthingActivity.java | 3 +- .../activities/ThemedAppCompatActivity.java | 27 ++++++++++++ .../activities/VersioningDialogActivity.java | 5 +-- .../fragments/DrawerFragment.java | 4 +- .../syncthingandroid/service/Constants.java | 1 + .../nutomic/syncthingandroid/util/Util.java | 9 ++++ .../ic_add_folder_24dp_white.png | Bin 197 -> 0 bytes .../ic_add_white_24dp_active.png | Bin 124 -> 0 bytes .../drawable-hdpi/ic_autorenew_black_24dp.png | Bin 514 -> 0 bytes .../ic_cellphone_black_24dp_active.png | Bin 137 -> 0 bytes .../ic_cellphone_black_24dp_inactive.png | Bin 136 -> 0 bytes .../res/drawable-hdpi/ic_close_black_24dp.png | Bin 224 -> 0 bytes .../ic_content_copy_black_24dp.png | Bin 299 -> 0 bytes .../ic_delete_white_24dp_active.png | Bin 161 -> 0 bytes .../ic_device_hub_black_24dp_active.png | Bin 263 -> 0 bytes .../res/drawable-hdpi/ic_done_white_24dp.png | Bin 188 -> 0 bytes .../ic_folder_black_24dp_active.png | Bin 143 -> 0 bytes .../ic_folder_black_24dp_inactive.png | Bin 143 -> 0 bytes .../ic_history_black_24dp_active.png | Bin 491 -> 0 bytes .../ic_info_black_24dp_inactive.png | Bin 286 -> 0 bytes .../ic_label_outline_black_24dp.png | Bin 403 -> 0 bytes .../ic_link_black_24dp_active.png | Bin 466 -> 0 bytes .../ic_lock_black_24dp_active.png | Bin 327 -> 0 bytes .../ic_phonelink_black_24dp_active.png | Bin 150 -> 0 bytes .../ic_qrcode_black_24dp_active.png | Bin 367 -> 0 bytes .../drawable-hdpi/ic_settings_black_24dp.png | Bin 437 -> 0 bytes .../res/drawable-hdpi/ic_share_black_24dp.png | Bin 543 -> 0 bytes .../ic_share_white_24dp_active.png | Bin 390 -> 0 bytes .../ic_tag_text_outline_black_24dp_active.png | Bin 308 -> 0 bytes .../ic_vpn_key_black_24dp_active.png | Bin 287 -> 0 bytes .../ic_vpn_key_black_24dp_inactive.png | Bin 255 -> 0 bytes .../res/drawable-hdpi/ic_web_black_24dp.png | Bin 171 -> 0 bytes .../ic_zip_box_black_24dp_active.png | Bin 182 -> 0 bytes .../drawable-mdpi/ic_autorenew_black_24dp.png | Bin 375 -> 0 bytes .../ic_content_copy_black_24dp.png | Bin 228 -> 0 bytes .../res/drawable-mdpi/ic_done_white_24dp.png | Bin 139 -> 0 bytes .../ic_label_outline_black_24dp.png | Bin 292 -> 0 bytes .../res/drawable-mdpi/ic_share_black_24dp.png | Bin 377 -> 0 bytes .../ic_add_folder_24dp_white.png | Bin 227 -> 0 bytes .../ic_add_white_24dp_active.png | Bin 97 -> 0 bytes .../ic_autorenew_black_24dp.png | Bin 675 -> 0 bytes .../ic_cellphone_black_24dp_active.png | Bin 161 -> 0 bytes .../ic_cellphone_black_24dp_inactive.png | Bin 161 -> 0 bytes .../drawable-xhdpi/ic_close_black_24dp.png | Bin 250 -> 0 bytes .../ic_content_copy_black_24dp.png | Bin 308 -> 0 bytes .../ic_delete_white_24dp_active.png | Bin 151 -> 0 bytes .../ic_device_hub_black_24dp_active.png | Bin 314 -> 0 bytes .../res/drawable-xhdpi/ic_done_white_24dp.png | Bin 199 -> 0 bytes .../ic_folder_black_24dp_active.png | Bin 196 -> 0 bytes .../ic_folder_black_24dp_inactive.png | Bin 186 -> 0 bytes .../ic_history_black_24dp_active.png | Bin 627 -> 0 bytes .../ic_info_black_24dp_inactive.png | Bin 358 -> 0 bytes .../ic_label_outline_black_24dp.png | Bin 483 -> 0 bytes .../ic_link_black_24dp_active.png | Bin 545 -> 0 bytes .../ic_lock_black_24dp_active.png | Bin 381 -> 0 bytes .../ic_phonelink_black_24dp_active.png | Bin 164 -> 0 bytes .../ic_qrcode_black_24dp_active.png | Bin 137 -> 0 bytes .../drawable-xhdpi/ic_settings_black_24dp.png | Bin 566 -> 0 bytes .../drawable-xhdpi/ic_share_black_24dp.png | Bin 684 -> 0 bytes .../ic_share_white_24dp_active.png | Bin 484 -> 0 bytes .../ic_tag_text_outline_black_24dp_active.png | Bin 320 -> 0 bytes .../ic_vpn_key_black_24dp_active.png | Bin 346 -> 0 bytes .../ic_vpn_key_black_24dp_inactive.png | Bin 316 -> 0 bytes .../res/drawable-xhdpi/ic_web_black_24dp.png | Bin 196 -> 0 bytes .../ic_zip_box_black_24dp_active.png | Bin 169 -> 0 bytes .../ic_add_folder_24dp_white.png | Bin 281 -> 0 bytes .../ic_add_white_24dp_active.png | Bin 97 -> 0 bytes .../ic_autorenew_black_24dp.png | Bin 929 -> 0 bytes .../ic_cellphone_black_24dp_active.png | Bin 204 -> 0 bytes .../ic_cellphone_black_24dp_inactive.png | Bin 195 -> 0 bytes .../drawable-xxhdpi/ic_close_black_24dp.png | Bin 328 -> 0 bytes .../ic_content_copy_black_24dp.png | Bin 404 -> 0 bytes .../ic_delete_white_24dp_active.png | Bin 193 -> 0 bytes .../ic_device_hub_black_24dp_active.png | Bin 430 -> 0 bytes .../drawable-xxhdpi/ic_done_white_24dp.png | Bin 255 -> 0 bytes .../ic_folder_black_24dp_active.png | Bin 277 -> 0 bytes .../ic_folder_black_24dp_inactive.png | Bin 266 -> 0 bytes .../ic_history_black_24dp_active.png | Bin 897 -> 0 bytes .../ic_info_black_24dp_inactive.png | Bin 508 -> 0 bytes .../ic_label_outline_black_24dp.png | Bin 649 -> 0 bytes .../ic_link_black_24dp_active.png | Bin 784 -> 0 bytes .../ic_lock_black_24dp_active.png | Bin 562 -> 0 bytes .../ic_phonelink_black_24dp_active.png | Bin 213 -> 0 bytes .../ic_qrcode_black_24dp_active.png | Bin 156 -> 0 bytes .../ic_settings_black_24dp.png | Bin 808 -> 0 bytes .../drawable-xxhdpi/ic_share_black_24dp.png | Bin 989 -> 0 bytes .../ic_share_white_24dp_active.png | Bin 666 -> 0 bytes .../ic_tag_text_outline_black_24dp_active.png | Bin 459 -> 0 bytes .../ic_vpn_key_black_24dp_active.png | Bin 503 -> 0 bytes .../ic_vpn_key_black_24dp_inactive.png | Bin 447 -> 0 bytes .../res/drawable-xxhdpi/ic_web_black_24dp.png | Bin 281 -> 0 bytes .../ic_zip_box_black_24dp_active.png | Bin 206 -> 0 bytes .../ic_add_folder_24dp_white.png | Bin 39600 -> 0 bytes .../ic_add_white_24dp_active.png | Bin 102 -> 0 bytes .../ic_autorenew_black_24dp.png | Bin 1194 -> 0 bytes .../ic_cellphone_black_24dp_active.png | Bin 277 -> 0 bytes .../ic_cellphone_black_24dp_inactive.png | Bin 255 -> 0 bytes .../drawable-xxxhdpi/ic_close_black_24dp.png | Bin 375 -> 0 bytes .../ic_content_copy_black_24dp.png | Bin 473 -> 0 bytes .../ic_delete_white_24dp_active.png | Bin 239 -> 0 bytes .../ic_device_hub_black_24dp_active.png | Bin 581 -> 0 bytes .../drawable-xxxhdpi/ic_done_white_24dp.png | Bin 308 -> 0 bytes .../ic_folder_black_24dp_active.png | Bin 347 -> 0 bytes .../ic_folder_black_24dp_inactive.png | Bin 309 -> 0 bytes .../ic_history_black_24dp_active.png | Bin 1235 -> 0 bytes .../ic_info_black_24dp_inactive.png | Bin 670 -> 0 bytes .../ic_label_outline_black_24dp.png | Bin 812 -> 0 bytes .../ic_link_black_24dp_active.png | Bin 990 -> 0 bytes .../ic_lock_black_24dp_active.png | Bin 737 -> 0 bytes .../ic_phonelink_black_24dp_active.png | Bin 263 -> 0 bytes .../ic_qrcode_black_24dp_active.png | Bin 155 -> 0 bytes .../ic_settings_black_24dp.png | Bin 1079 -> 0 bytes .../drawable-xxxhdpi/ic_share_black_24dp.png | Bin 1266 -> 0 bytes .../ic_share_white_24dp_active.png | Bin 887 -> 0 bytes .../ic_tag_text_outline_black_24dp_active.png | Bin 1095 -> 0 bytes .../ic_vpn_key_black_24dp_active.png | Bin 662 -> 0 bytes .../ic_vpn_key_black_24dp_inactive.png | Bin 606 -> 0 bytes .../drawable-xxxhdpi/ic_web_black_24dp.png | Bin 344 -> 0 bytes .../ic_zip_box_black_24dp_active.png | Bin 270 -> 0 bytes .../res/drawable/ic_add_folder_white_24dp.xml | 10 +++++ .../main/res/drawable/ic_add_white_24dp.xml | 9 ++++ .../main/res/drawable/ic_autorenew_24dp.xml | 9 ++++ .../res/drawable/ic_cellphone_black_24dp.xml | 5 --- .../main/res/drawable/ic_check_white_24dp.xml | 10 +++++ app/src/main/res/drawable/ic_close_24dp.xml | 10 +++++ .../res/drawable/ic_content_copy_24dp.xml | 10 +++++ .../res/drawable/ic_delete_white_24dp.xml | 10 +++++ .../res/drawable/ic_developer_board_24dp.xml | 10 +++++ .../main/res/drawable/ic_device_hub_24dp.xml | 10 +++++ app/src/main/res/drawable/ic_folder_24dp.xml | 10 +++++ .../res/drawable/ic_folder_black_24dp.xml | 5 --- app/src/main/res/drawable/ic_history_24dp.xml | 10 +++++ app/src/main/res/drawable/ic_info_24dp.xml | 10 +++++ .../res/drawable/ic_label_outline_24dp.xml | 10 +++++ app/src/main/res/drawable/ic_link_24dp.xml | 10 +++++ app/src/main/res/drawable/ic_lock_24dp.xml | 10 +++++ .../main/res/drawable/ic_phonelink_24dp.xml | 10 +++++ app/src/main/res/drawable/ic_qrcode_24dp.xml | 10 +++++ .../main/res/drawable/ic_settings_24dp.xml | 9 ++++ app/src/main/res/drawable/ic_share_24dp.xml | 10 +++++ .../main/res/drawable/ic_share_white_24dp.xml | 10 +++++ .../main/res/drawable/ic_smartphone_24dp.xml | 9 ++++ .../res/drawable/ic_tag_text_outline_24dp.xml | 10 +++++ ..._active.xml => ic_visibility_off_24dp.xml} | 7 +-- .../drawable/ic_visibility_off_black_24dp.xml | 5 --- .../ic_visibility_off_black_24dp_inactive.xml | 9 ---- app/src/main/res/drawable/ic_vpn_key_24dp.xml | 10 +++++ .../res/drawable/ic_vpn_key_black_24dp.xml | 5 --- app/src/main/res/drawable/ic_web_24dp.xml | 10 +++++ app/src/main/res/drawable/ic_zipbox_24dp.xml | 9 ++++ app/src/main/res/layout/activity_share.xml | 4 +- app/src/main/res/layout/dialog_qrcode.xml | 8 ++-- app/src/main/res/layout/fragment_device.xml | 30 ++++++------- app/src/main/res/layout/fragment_drawer.xml | 20 ++++----- app/src/main/res/layout/fragment_folder.xml | 40 +++++++++--------- .../layout/fragment_staggered_versioning.xml | 4 +- app/src/main/res/layout/item_folder_list.xml | 2 +- app/src/main/res/menu/device_list.xml | 2 +- app/src/main/res/menu/device_settings.xml | 6 +-- app/src/main/res/menu/folder_list.xml | 2 +- app/src/main/res/menu/folder_picker.xml | 2 +- app/src/main/res/menu/folder_settings.xml | 4 +- app/src/main/res/values/arrays.xml | 10 +++++ app/src/main/res/values/strings.xml | 4 ++ app/src/main/res/values/styles.xml | 9 ++++ app/src/main/res/values/themes.xml | 18 ++++++-- app/src/main/res/xml/app_settings.xml | 7 +++ 175 files changed, 437 insertions(+), 137 deletions(-) create mode 100644 app/src/main/java/com/nutomic/syncthingandroid/activities/ThemedAppCompatActivity.java delete mode 100644 app/src/main/res/drawable-hdpi/ic_add_folder_24dp_white.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_add_white_24dp_active.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_autorenew_black_24dp.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_cellphone_black_24dp_active.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_cellphone_black_24dp_inactive.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_close_black_24dp.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_content_copy_black_24dp.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_delete_white_24dp_active.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_device_hub_black_24dp_active.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_done_white_24dp.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_folder_black_24dp_active.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_folder_black_24dp_inactive.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_history_black_24dp_active.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_info_black_24dp_inactive.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_label_outline_black_24dp.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_link_black_24dp_active.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_lock_black_24dp_active.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_phonelink_black_24dp_active.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_qrcode_black_24dp_active.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_settings_black_24dp.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_share_black_24dp.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_share_white_24dp_active.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_tag_text_outline_black_24dp_active.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_vpn_key_black_24dp_active.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_vpn_key_black_24dp_inactive.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_web_black_24dp.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_zip_box_black_24dp_active.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_autorenew_black_24dp.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_content_copy_black_24dp.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_done_white_24dp.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_label_outline_black_24dp.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_share_black_24dp.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_add_folder_24dp_white.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_add_white_24dp_active.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_autorenew_black_24dp.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_cellphone_black_24dp_active.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_cellphone_black_24dp_inactive.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_close_black_24dp.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_content_copy_black_24dp.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_delete_white_24dp_active.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_device_hub_black_24dp_active.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_done_white_24dp.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_folder_black_24dp_active.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_folder_black_24dp_inactive.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_history_black_24dp_active.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_info_black_24dp_inactive.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_label_outline_black_24dp.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_link_black_24dp_active.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_lock_black_24dp_active.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_phonelink_black_24dp_active.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_qrcode_black_24dp_active.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_share_black_24dp.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_share_white_24dp_active.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_tag_text_outline_black_24dp_active.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_vpn_key_black_24dp_active.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_vpn_key_black_24dp_inactive.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_web_black_24dp.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_zip_box_black_24dp_active.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_add_folder_24dp_white.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_add_white_24dp_active.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_autorenew_black_24dp.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_cellphone_black_24dp_active.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_cellphone_black_24dp_inactive.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_close_black_24dp.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_content_copy_black_24dp.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_delete_white_24dp_active.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_device_hub_black_24dp_active.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_done_white_24dp.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_folder_black_24dp_active.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_folder_black_24dp_inactive.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_history_black_24dp_active.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_info_black_24dp_inactive.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_label_outline_black_24dp.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_link_black_24dp_active.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_lock_black_24dp_active.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_phonelink_black_24dp_active.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_qrcode_black_24dp_active.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_share_black_24dp.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_share_white_24dp_active.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_tag_text_outline_black_24dp_active.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_vpn_key_black_24dp_active.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_vpn_key_black_24dp_inactive.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_web_black_24dp.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_zip_box_black_24dp_active.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_add_folder_24dp_white.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_add_white_24dp_active.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_autorenew_black_24dp.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_cellphone_black_24dp_active.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_cellphone_black_24dp_inactive.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_close_black_24dp.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_content_copy_black_24dp.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_delete_white_24dp_active.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_device_hub_black_24dp_active.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_done_white_24dp.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_folder_black_24dp_active.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_folder_black_24dp_inactive.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_history_black_24dp_active.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_info_black_24dp_inactive.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_label_outline_black_24dp.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_link_black_24dp_active.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_lock_black_24dp_active.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_phonelink_black_24dp_active.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_qrcode_black_24dp_active.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_settings_black_24dp.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_share_black_24dp.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_share_white_24dp_active.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_tag_text_outline_black_24dp_active.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_vpn_key_black_24dp_active.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_vpn_key_black_24dp_inactive.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_web_black_24dp.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_zip_box_black_24dp_active.png create mode 100644 app/src/main/res/drawable/ic_add_folder_white_24dp.xml create mode 100644 app/src/main/res/drawable/ic_add_white_24dp.xml create mode 100644 app/src/main/res/drawable/ic_autorenew_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_cellphone_black_24dp.xml create mode 100644 app/src/main/res/drawable/ic_check_white_24dp.xml create mode 100644 app/src/main/res/drawable/ic_close_24dp.xml create mode 100644 app/src/main/res/drawable/ic_content_copy_24dp.xml create mode 100644 app/src/main/res/drawable/ic_delete_white_24dp.xml create mode 100644 app/src/main/res/drawable/ic_developer_board_24dp.xml create mode 100644 app/src/main/res/drawable/ic_device_hub_24dp.xml create mode 100644 app/src/main/res/drawable/ic_folder_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_folder_black_24dp.xml create mode 100644 app/src/main/res/drawable/ic_history_24dp.xml create mode 100644 app/src/main/res/drawable/ic_info_24dp.xml create mode 100644 app/src/main/res/drawable/ic_label_outline_24dp.xml create mode 100644 app/src/main/res/drawable/ic_link_24dp.xml create mode 100644 app/src/main/res/drawable/ic_lock_24dp.xml create mode 100644 app/src/main/res/drawable/ic_phonelink_24dp.xml create mode 100644 app/src/main/res/drawable/ic_qrcode_24dp.xml create mode 100644 app/src/main/res/drawable/ic_settings_24dp.xml create mode 100644 app/src/main/res/drawable/ic_share_24dp.xml create mode 100644 app/src/main/res/drawable/ic_share_white_24dp.xml create mode 100644 app/src/main/res/drawable/ic_smartphone_24dp.xml create mode 100644 app/src/main/res/drawable/ic_tag_text_outline_24dp.xml rename app/src/main/res/drawable/{ic_visibility_off_black_24dp_active.xml => ic_visibility_off_24dp.xml} (83%) delete mode 100644 app/src/main/res/drawable/ic_visibility_off_black_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_visibility_off_black_24dp_inactive.xml create mode 100644 app/src/main/res/drawable/ic_vpn_key_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_vpn_key_black_24dp.xml create mode 100644 app/src/main/res/drawable/ic_web_24dp.xml create mode 100644 app/src/main/res/drawable/ic_zipbox_24dp.xml diff --git a/app/src/main/java/com/nutomic/syncthingandroid/activities/DeviceActivity.java b/app/src/main/java/com/nutomic/syncthingandroid/activities/DeviceActivity.java index b7971ae5..33e8aa74 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/activities/DeviceActivity.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/activities/DeviceActivity.java @@ -378,7 +378,7 @@ public class DeviceActivity extends SyncthingActivity implements View.OnClickLis } private Dialog createDeleteDialog(){ - return new android.app.AlertDialog.Builder(this) + return Util.getAlertDialogBuilder(this) .setMessage(R.string.remove_device_confirm) .setPositiveButton(android.R.string.yes, (dialogInterface, i) -> { getApi().removeDevice(mDevice.deviceID); @@ -413,7 +413,7 @@ public class DeviceActivity extends SyncthingActivity implements View.OnClickLis private void prepareEditMode() { getWindow().setSoftInputMode(SOFT_INPUT_STATE_ALWAYS_HIDDEN); - Drawable dr = ContextCompat.getDrawable(this, R.drawable.ic_content_copy_black_24dp); + Drawable dr = ContextCompat.getDrawable(this, R.drawable.ic_content_copy_24dp); mIdView.setCompoundDrawablesWithIntrinsicBounds(null, null, dr, null); mIdView.setEnabled(false); mQrButton.setVisibility(GONE); @@ -461,7 +461,7 @@ public class DeviceActivity extends SyncthingActivity implements View.OnClickLis } private Dialog createCompressionDialog(){ - return new AlertDialog.Builder(this) + return Util.getAlertDialogBuilder(this) .setTitle(R.string.compression) .setSingleChoiceItems(R.array.compress_entries, Compression.fromValue(this, mDevice.compression).getIndex(), @@ -497,7 +497,7 @@ public class DeviceActivity extends SyncthingActivity implements View.OnClickLis } private Dialog createDiscardDialog() { - return new android.app.AlertDialog.Builder(this) + return Util.getAlertDialogBuilder(this) .setMessage(R.string.dialog_discard_changes) .setPositiveButton(android.R.string.ok, (dialog, which) -> finish()) .setNegativeButton(android.R.string.cancel, null) diff --git a/app/src/main/java/com/nutomic/syncthingandroid/activities/FolderActivity.java b/app/src/main/java/com/nutomic/syncthingandroid/activities/FolderActivity.java index 4834ff88..b3952ecc 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/activities/FolderActivity.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/activities/FolderActivity.java @@ -1,9 +1,7 @@ package com.nutomic.syncthingandroid.activities; import android.annotation.SuppressLint; -import android.annotation.TargetApi; import android.app.Activity; -import android.app.AlertDialog; import android.app.Dialog; import android.content.ActivityNotFoundException; import android.content.Intent; @@ -12,6 +10,7 @@ import android.os.Build; import android.os.Bundle; import android.support.v4.provider.DocumentFile; import android.support.v7.widget.SwitchCompat; +import android.support.v7.app.AlertDialog; import android.text.Editable; import android.text.TextUtils; import android.text.TextWatcher; @@ -27,7 +26,6 @@ import android.widget.LinearLayout; import android.widget.TextView; import android.widget.Toast; -import com.google.common.base.Objects; import com.google.gson.Gson; import com.nutomic.syncthingandroid.R; import com.nutomic.syncthingandroid.model.Device; @@ -116,7 +114,7 @@ public class FolderActivity extends SyncthingActivity @Override public void afterTextChanged(Editable s) { mFolder.label = mLabelView.getText().toString(); - mFolder.id = mIdView.getText().toString();; + mFolder.id = mIdView.getText().toString(); // mPathView must not be handled here as it's handled by {@link onActivityResult} mFolderNeedsToUpdate = true; } @@ -498,7 +496,7 @@ public class FolderActivity extends SyncthingActivity } private Dialog createDeleteDialog(){ - return new AlertDialog.Builder(this) + return Util.getAlertDialogBuilder(this) .setMessage(R.string.remove_folder_confirm) .setPositiveButton(android.R.string.yes, (dialogInterface, i) -> { RestApi restApi = getApi(); @@ -676,7 +674,7 @@ public class FolderActivity extends SyncthingActivity } private Dialog createDiscardDialog() { - return new AlertDialog.Builder(this) + return Util.getAlertDialogBuilder(this) .setMessage(R.string.dialog_discard_changes) .setPositiveButton(android.R.string.ok, (dialog, which) -> finish()) .setNegativeButton(android.R.string.cancel, null) diff --git a/app/src/main/java/com/nutomic/syncthingandroid/activities/FolderPickerActivity.java b/app/src/main/java/com/nutomic/syncthingandroid/activities/FolderPickerActivity.java index 731960b0..46a3ddad 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/activities/FolderPickerActivity.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/activities/FolderPickerActivity.java @@ -2,7 +2,6 @@ package com.nutomic.syncthingandroid.activities; import android.annotation.SuppressLint; import android.app.Activity; -import android.app.AlertDialog; import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -15,6 +14,7 @@ import android.preference.PreferenceManager; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.v4.content.ContextCompat; +import android.support.v7.app.AlertDialog; import android.text.TextUtils; import android.view.Menu; import android.view.MenuItem; @@ -186,7 +186,7 @@ public class FolderPickerActivity extends SyncthingActivity switch (item.getItemId()) { case R.id.create_folder: final EditText et = new EditText(this); - AlertDialog dialog = new AlertDialog.Builder(this) + AlertDialog dialog = Util.getAlertDialogBuilder(this) .setTitle(R.string.create_folder) .setView(et) .setPositiveButton(android.R.string.ok, diff --git a/app/src/main/java/com/nutomic/syncthingandroid/activities/FolderTypeDialogActivity.java b/app/src/main/java/com/nutomic/syncthingandroid/activities/FolderTypeDialogActivity.java index fab9fa90..83900356 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/activities/FolderTypeDialogActivity.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/activities/FolderTypeDialogActivity.java @@ -3,7 +3,6 @@ package com.nutomic.syncthingandroid.activities; import android.app.Activity; import android.content.Intent; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; import android.view.View; import android.widget.AdapterView; import android.widget.Button; @@ -14,7 +13,7 @@ import com.nutomic.syncthingandroid.service.Constants; import java.util.Arrays; import java.util.List; -public class FolderTypeDialogActivity extends AppCompatActivity { +public class FolderTypeDialogActivity extends ThemedAppCompatActivity { public static final String EXTRA_FOLDER_TYPE = "com.nutomic.syncthinandroid.activities.FolderTypeDialogActivity.FOLDER_TYPE"; public static final String EXTRA_RESULT_FOLDER_TYPE = "com.nutomic.syncthinandroid.activities.FolderTypeDialogActivity.EXTRA_RESULT_FOLDER_TYPE"; diff --git a/app/src/main/java/com/nutomic/syncthingandroid/activities/MainActivity.java b/app/src/main/java/com/nutomic/syncthingandroid/activities/MainActivity.java index fe91b459..36b80ac3 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/activities/MainActivity.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/activities/MainActivity.java @@ -2,7 +2,7 @@ package com.nutomic.syncthingandroid.activities; import android.annotation.SuppressLint; import android.app.Activity; -import android.app.AlertDialog; +import android.support.v7.app.AlertDialog; import android.app.Dialog; import android.content.ActivityNotFoundException; import android.content.ComponentName; @@ -140,7 +140,7 @@ public class MainActivity extends StateDialogActivity return; } - mBatteryOptimizationsDialog = new AlertDialog.Builder(this) + mBatteryOptimizationsDialog = Util.getAlertDialogBuilder(this) .setTitle(R.string.dialog_disable_battery_optimization_title) .setMessage(R.string.dialog_disable_battery_optimization_message) .setPositiveButton(R.string.dialog_disable_battery_optimization_turn_off, (d, i) -> { @@ -359,7 +359,7 @@ public class MainActivity extends StateDialogActivity } private Dialog createRestartDialog(){ - return new AlertDialog.Builder(this) + return Util.getAlertDialogBuilder(this) .setMessage(R.string.dialog_confirm_restart) .setPositiveButton(android.R.string.yes, (dialogInterface, i1) -> this.startService(new Intent(this, SyncthingService.class) .setAction(SyncthingService.ACTION_RESTART))) @@ -379,7 +379,7 @@ public class MainActivity extends StateDialogActivity shareDeviceIdTextView.setOnClickListener(v -> shareDeviceId(deviceId)); qrCodeImageView.setImageBitmap(qrCode); - mQrCodeDialog = new AlertDialog.Builder(this) + mQrCodeDialog = Util.getAlertDialogBuilder(this) .setTitle(R.string.device_id) .setView(qrCodeDialogView) .setPositiveButton(R.string.finish, null) @@ -514,7 +514,7 @@ public class MainActivity extends StateDialogActivity .inflate(R.layout.dialog_usage_reporting, null); TextView tv = v.findViewById(R.id.example); tv.setText(report); - new AlertDialog.Builder(MainActivity.this) + Util.getAlertDialogBuilder(MainActivity.this) .setTitle(R.string.usage_reporting_dialog_title) .setView(v) .setPositiveButton(R.string.yes, listener) diff --git a/app/src/main/java/com/nutomic/syncthingandroid/activities/PullOrderDialogActivity.java b/app/src/main/java/com/nutomic/syncthingandroid/activities/PullOrderDialogActivity.java index 880991c5..025f9c3d 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/activities/PullOrderDialogActivity.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/activities/PullOrderDialogActivity.java @@ -3,7 +3,6 @@ package com.nutomic.syncthingandroid.activities; import android.app.Activity; import android.content.Intent; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; import android.view.View; import android.widget.AdapterView; import android.widget.Button; @@ -13,7 +12,7 @@ import com.nutomic.syncthingandroid.R; import java.util.Arrays; import java.util.List; -public class PullOrderDialogActivity extends AppCompatActivity { +public class PullOrderDialogActivity extends ThemedAppCompatActivity { public static final String EXTRA_PULL_ORDER = "com.nutomic.syncthinandroid.activities.PullOrderDialogActivity.PULL_ORDER"; public static final String EXTRA_RESULT_PULL_ORDER = "com.nutomic.syncthinandroid.activities.PullOrderDialogActivity.EXTRA_RESULT_PULL_ORDER"; diff --git a/app/src/main/java/com/nutomic/syncthingandroid/activities/SettingsActivity.java b/app/src/main/java/com/nutomic/syncthingandroid/activities/SettingsActivity.java index 90747317..5ab30eca 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/activities/SettingsActivity.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/activities/SettingsActivity.java @@ -1,7 +1,6 @@ package com.nutomic.syncthingandroid.activities; import android.Manifest; -import android.app.AlertDialog; import android.content.Intent; import android.content.SharedPreferences; import android.content.pm.PackageManager; @@ -17,6 +16,7 @@ import android.preference.PreferenceManager; import android.preference.PreferenceScreen; import android.support.annotation.NonNull; import android.support.annotation.Nullable; +import android.support.v4.app.TaskStackBuilder; import android.text.TextUtils; import android.util.Log; import android.widget.ListAdapter; @@ -74,7 +74,7 @@ public class SettingsActivity extends SyncthingActivity { this.startService(new Intent(this, SyncthingService.class) .setAction(SyncthingService.ACTION_REFRESH_NETWORK_INFO)); } else { - new AlertDialog.Builder(this) + Util.getAlertDialogBuilder(this) .setTitle(R.string.sync_only_wifi_ssids_location_permission_rejected_dialog_title) .setMessage(R.string.sync_only_wifi_ssids_location_permission_rejected_dialog_content) .setPositiveButton(android.R.string.ok, null).show(); @@ -265,6 +265,9 @@ public class SettingsActivity extends SyncthingActivity { handleSocksProxyPreferenceChange(screen.findPreference(Constants.PREF_SOCKS_PROXY_ADDRESS), mPreferences.getString(Constants.PREF_SOCKS_PROXY_ADDRESS, "")); handleHttpProxyPreferenceChange(screen.findPreference(Constants.PREF_HTTP_PROXY_ADDRESS), mPreferences.getString(Constants.PREF_HTTP_PROXY_ADDRESS, "")); + ListPreference themePreference = (ListPreference) findPreference(Constants.PREF_APP_THEME); + themePreference.setOnPreferenceChangeListener(this); + try { appVersion.setSummary(getActivity().getPackageManager() .getPackageInfo(getActivity().getPackageName(), 0).versionName); @@ -311,8 +314,8 @@ public class SettingsActivity extends SyncthingActivity { public void onServiceStateChange(SyncthingService.State currentState) { mApi = mSyncthingService.getApi(); boolean isSyncthingRunning = (mApi != null) && - mApi.isConfigLoaded() && - (currentState == SyncthingService.State.ACTIVE); + mApi.isConfigLoaded() && + (currentState == SyncthingService.State.ACTIVE); mCategorySyncthingOptions.setEnabled(isSyncthingRunning); mCategoryBackup.setEnabled(isSyncthingRunning); @@ -511,6 +514,13 @@ public class SettingsActivity extends SyncthingActivity { return false; } break; + case Constants.PREF_APP_THEME: + // Recreate activities with the correct colors + TaskStackBuilder.create(getActivity()) + .addNextIntent(new Intent(getActivity(), MainActivity.class)) + .addNextIntent(getActivity().getIntent()) + .startActivities(); + break; } return true; @@ -531,7 +541,7 @@ public class SettingsActivity extends SyncthingActivity { } return true; case KEY_EXPORT_CONFIG: - new AlertDialog.Builder(getActivity()) + Util.getAlertDialogBuilder(getActivity()) .setMessage(R.string.dialog_confirm_export) .setPositiveButton(android.R.string.yes, (dialog, which) -> { mSyncthingService.exportConfig(); @@ -543,7 +553,7 @@ public class SettingsActivity extends SyncthingActivity { .show(); return true; case KEY_IMPORT_CONFIG: - new AlertDialog.Builder(getActivity()) + Util.getAlertDialogBuilder(getActivity()) .setMessage(R.string.dialog_confirm_import) .setPositiveButton(android.R.string.yes, (dialog, which) -> { if (mSyncthingService.importConfig()) { @@ -562,7 +572,7 @@ public class SettingsActivity extends SyncthingActivity { .show(); return true; case KEY_UNDO_IGNORED_DEVICES_FOLDERS: - new AlertDialog.Builder(getActivity()) + Util.getAlertDialogBuilder(getActivity()) .setMessage(R.string.undo_ignored_devices_folders_question) .setPositiveButton(android.R.string.yes, (dialog, which) -> { if (mApi == null) { @@ -584,7 +594,7 @@ public class SettingsActivity extends SyncthingActivity { intent = new Intent(getActivity(), SyncthingService.class) .setAction(SyncthingService.ACTION_RESET_DATABASE); - new AlertDialog.Builder(getActivity()) + Util.getAlertDialogBuilder(getActivity()) .setTitle(R.string.st_reset_database_title) .setMessage(R.string.st_reset_database_question) .setPositiveButton(android.R.string.ok, (dialogInterface, i) -> { @@ -599,7 +609,7 @@ public class SettingsActivity extends SyncthingActivity { intent = new Intent(getActivity(), SyncthingService.class) .setAction(SyncthingService.ACTION_RESET_DELTAS); - new AlertDialog.Builder(getActivity()) + Util.getAlertDialogBuilder(getActivity()) .setTitle(R.string.st_reset_deltas_title) .setMessage(R.string.st_reset_deltas_question) .setPositiveButton(android.R.string.ok, (dialogInterface, i) -> { diff --git a/app/src/main/java/com/nutomic/syncthingandroid/activities/StateDialogActivity.java b/app/src/main/java/com/nutomic/syncthingandroid/activities/StateDialogActivity.java index 150aee76..b69a414a 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/activities/StateDialogActivity.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/activities/StateDialogActivity.java @@ -1,6 +1,5 @@ package com.nutomic.syncthingandroid.activities; -import android.app.AlertDialog; import android.content.Intent; import android.databinding.DataBindingUtil; import android.os.Bundle; @@ -8,6 +7,7 @@ import android.os.Handler; import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.v4.app.ActivityCompat; +import android.support.v7.app.AlertDialog; import android.view.View; import com.nutomic.syncthingandroid.R; @@ -108,7 +108,7 @@ public abstract class StateDialogActivity extends SyncthingActivity { return; } - mDisabledDialog = new AlertDialog.Builder(this) + mDisabledDialog = Util.getAlertDialogBuilder(this) .setTitle(R.string.syncthing_disabled_title) .setMessage(getDisabledDialogMessage()) .setPositiveButton(R.string.syncthing_disabled_change_settings, @@ -164,7 +164,7 @@ public abstract class StateDialogActivity extends SyncthingActivity { ? R.string.web_gui_creating_key : R.string.api_loading); - mLoadingDialog = new AlertDialog.Builder(this) + mLoadingDialog = Util.getAlertDialogBuilder(this) .setCancelable(false) .setView(binding.getRoot()) .show(); diff --git a/app/src/main/java/com/nutomic/syncthingandroid/activities/SyncthingActivity.java b/app/src/main/java/com/nutomic/syncthingandroid/activities/SyncthingActivity.java index 827f2cbb..9fda2e5c 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/activities/SyncthingActivity.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/activities/SyncthingActivity.java @@ -6,7 +6,6 @@ import android.content.Intent; import android.content.ServiceConnection; import android.os.Bundle; import android.os.IBinder; -import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; import com.annimon.stream.Stream; @@ -20,7 +19,7 @@ import java.util.LinkedList; /** * Connects to {@link SyncthingService} and provides access to it. */ -public abstract class SyncthingActivity extends AppCompatActivity implements ServiceConnection { +public abstract class SyncthingActivity extends ThemedAppCompatActivity implements ServiceConnection { public static final String EXTRA_KEY_GENERATION_IN_PROGRESS = "com.nutomic.syncthing-android.SyncthingActivity.KEY_GENERATION_IN_PROGRESS"; diff --git a/app/src/main/java/com/nutomic/syncthingandroid/activities/ThemedAppCompatActivity.java b/app/src/main/java/com/nutomic/syncthingandroid/activities/ThemedAppCompatActivity.java new file mode 100644 index 00000000..75e38b79 --- /dev/null +++ b/app/src/main/java/com/nutomic/syncthingandroid/activities/ThemedAppCompatActivity.java @@ -0,0 +1,27 @@ +package com.nutomic.syncthingandroid.activities; + +import android.content.SharedPreferences; +import android.os.Bundle; +import android.preference.PreferenceManager; +import android.support.v7.app.AppCompatActivity; +import android.support.v7.app.AppCompatDelegate; + +import com.nutomic.syncthingandroid.service.Constants; + +/** + * Provides a themed instance of AppCompatActivity. + */ +public class ThemedAppCompatActivity extends AppCompatActivity { + + private static final String LIGHT_THEME = "1"; + + @Override + protected void onCreate(Bundle savedInstanceState) { + // Load theme. + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); + Integer prefAppTheme = Integer.parseInt(prefs.getString(Constants.PREF_APP_THEME, LIGHT_THEME)); + AppCompatDelegate.setDefaultNightMode(prefAppTheme); + super.onCreate(savedInstanceState); + } + +} diff --git a/app/src/main/java/com/nutomic/syncthingandroid/activities/VersioningDialogActivity.java b/app/src/main/java/com/nutomic/syncthingandroid/activities/VersioningDialogActivity.java index 0ffbf4c4..a7801222 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/activities/VersioningDialogActivity.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/activities/VersioningDialogActivity.java @@ -5,7 +5,6 @@ import android.content.Intent; import android.os.Bundle; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentTransaction; -import android.support.v7.app.AppCompatActivity; import android.view.View; import android.widget.AdapterView; import android.widget.Button; @@ -20,7 +19,7 @@ import com.nutomic.syncthingandroid.fragments.dialog.TrashCanVersioningFragment; import java.util.Arrays; import java.util.List; -public class VersioningDialogActivity extends AppCompatActivity { +public class VersioningDialogActivity extends ThemedAppCompatActivity { private Fragment mCurrentFragment; @@ -131,4 +130,4 @@ public class VersioningDialogActivity extends AppCompatActivity { saveConfiguration(); super.onBackPressed(); } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/nutomic/syncthingandroid/fragments/DrawerFragment.java b/app/src/main/java/com/nutomic/syncthingandroid/fragments/DrawerFragment.java index 15fa8dbb..0ace80a7 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/fragments/DrawerFragment.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/fragments/DrawerFragment.java @@ -1,12 +1,12 @@ package com.nutomic.syncthingandroid.fragments; -import android.app.AlertDialog; import android.content.Intent; import android.content.SharedPreferences; import android.os.Bundle; import android.preference.PreferenceManager; import android.support.v4.app.Fragment; import android.support.v4.content.ContextCompat; +import android.support.v7.app.AlertDialog; import android.util.Log; import android.view.LayoutInflater; import android.view.View; @@ -256,7 +256,7 @@ public class DrawerFragment extends Fragment implements View.OnClickListener { * App is running as a service. Show an explanation why exiting syncthing is an * extraordinary request, then ask the user to confirm. */ - AlertDialog mExitConfirmationDialog = new AlertDialog.Builder(mActivity) + AlertDialog mExitConfirmationDialog = Util.getAlertDialogBuilder(mActivity) .setTitle(R.string.dialog_exit_while_running_as_service_title) .setMessage(R.string.dialog_exit_while_running_as_service_message) .setPositiveButton(R.string.yes, (d, i) -> { diff --git a/app/src/main/java/com/nutomic/syncthingandroid/service/Constants.java b/app/src/main/java/com/nutomic/syncthingandroid/service/Constants.java index 3e8a2d63..27aa7b5c 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/service/Constants.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/service/Constants.java @@ -25,6 +25,7 @@ public class Constants { // Preferences - Behaviour public static final String PREF_FIRST_START = "first_start"; public static final String PREF_START_INTO_WEB_GUI = "start_into_web_gui"; + public static final String PREF_APP_THEME = "theme"; public static final String PREF_USE_ROOT = "use_root"; public static final String PREF_ENVIRONMENT_VARIABLES = "environment_variables"; public static final String PREF_DEBUG_FACILITIES_ENABLED = "debug_facilities_enabled"; diff --git a/app/src/main/java/com/nutomic/syncthingandroid/util/Util.java b/app/src/main/java/com/nutomic/syncthingandroid/util/Util.java index 35c2e75e..5a69c0f4 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/util/Util.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/util/Util.java @@ -9,6 +9,7 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager.NameNotFoundException; import android.os.Build; import android.preference.PreferenceManager; +import android.support.v7.app.AlertDialog; import android.util.Log; import android.widget.Toast; @@ -230,4 +231,12 @@ public class Util { public static String formatPath(String path) { return new File(path).toURI().normalize().getPath(); } + + /** + * @return a themed AlertDialog builder. + */ + public static AlertDialog.Builder getAlertDialogBuilder(Context context) + { + return new AlertDialog.Builder(context, R.style.Theme_Syncthing_Dialog); + } } diff --git a/app/src/main/res/drawable-hdpi/ic_add_folder_24dp_white.png b/app/src/main/res/drawable-hdpi/ic_add_folder_24dp_white.png deleted file mode 100644 index 62b353700603cda141cca20e1edc5e47fb3d969f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 197 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbBdOTemLn;{GUO&j$;K1W@Q8&?h z!xY`4K|x(hmxx$Pik2Cg7khG8@IU*>09YU%>l z)vO1lO`6hs&o29e#u?G~ vmkT*w+ut;)^!vp54uAJM-ZVEARNcYgI9onFZ+4P9&|M6ku6{1-oD!M<)$&K& diff --git a/app/src/main/res/drawable-hdpi/ic_add_white_24dp_active.png b/app/src/main/res/drawable-hdpi/ic_add_white_24dp_active.png deleted file mode 100644 index 023e5d21a4021fd2d74f3a33110f73b4487f46b5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 124 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K;v!{z=NCji^0cN*@8b98D*w4rz zt6|2G!NFnDBW02$ka?1ySB^otgu(evwlmD7ek|` Wh{|==W#K^M7(8A5T-G@yGywqSa3Jmg diff --git a/app/src/main/res/drawable-hdpi/ic_autorenew_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_autorenew_black_24dp.png deleted file mode 100644 index 9207cd986641b7f73950dcc7b3ad06d408585e7a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 514 zcmV+d0{#7oP)I!cY{z@xN9PEEsigvxu7@d4aBV6YOdyAEZm)#I1A_H^HZ{=~ThC(xp0>ickcJ zLsB)#{R)-dN#n`Sb8harH}J2cs1HdSK|MWX23dM4ZCIR^N*m9UhDs@JEzzV#h5X^~ zT>7k%K}A|L1i!x17vGQ(UbShH6k1QPWCzTW0iU646igf{ z(gxs-N45$kLynE=@wdnVOD)r-rCLWN8UPGJ46&lR)UheZp(ZI{8k!qGI5#Ppa;OHt zM7zrUh`JoA05I1=A1Bd5C=b9|3w;A{DTn;!=^3`MCx`r%Q83sEj?qHs3xKK?@*@^< zXcjbyZrCT$Lg*P!Fh|kt?20A38D%c8sA3;B(94#tIMmshv zm_?tI>A7~K9{%<{907*qoM6N<$ Ef-y(Y`2YX_ diff --git a/app/src/main/res/drawable-hdpi/ic_cellphone_black_24dp_active.png b/app/src/main/res/drawable-hdpi/ic_cellphone_black_24dp_active.png deleted file mode 100644 index 23f0c445dde1a0861817a234bbb02129926bfe3c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 137 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K8fTxRNNCo5DX&ZSDC|k0wldT1B8K;zo(01NCo5DYa4kFIB>8W%w-Pb z7Fzay(Vc_Ejj{{U_2-NH&{tpam??Nhd)9OdUq?^wSzdQTUfeLrSlB8Sm9en<{jK!v j_dOatd(0;PTg|k1|%Oc%$NbBmV3H5hEy=Vy~fDa>LAkk@LfA^hNHK)Y)3+_mQxJ+hv$-b!tc zv6hz9LcQd!v|#mHug+Qa=1SE$XXcYl1mK;-xy z$tw>|Fr;0q2xJicV4i$jqfX@Dk3bpcKnCV|V_*FYcCXl4c4Nu)8y;WQ|2fk~Z8NjT X?ZEtdH?&!RPG<0Q^>bP0l+XkK0##Zr diff --git a/app/src/main/res/drawable-hdpi/ic_content_copy_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_content_copy_black_24dp.png deleted file mode 100644 index d18e5b3a7020b639e00db0fc25071b4e07cf16d8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 299 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8JTQFVdQ&MBb@0O+r5)Bpeg diff --git a/app/src/main/res/drawable-hdpi/ic_delete_white_24dp_active.png b/app/src/main/res/drawable-hdpi/ic_delete_white_24dp_active.png deleted file mode 100644 index 484ed5656b72d14d9ee11c9dd17f4a231f37b0b9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 161 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K8hNp{TNX4z>1PNA=hW|4Ewf~tb z9PIip^F(s-FKmRW+J}dc&f#K)gg?bl4l$?QfGI+ZB KxvXujP)#nJ<4Bq_A8(JEE6*-p<8MK6(3G-&qJP7xtIFh3C92Hb(KpV0vF`2r+3 zUgKbD`_#bhg$og4J}#>&7s<*X66j_CP-n06k|B+SeZG& zd8RUC{E#2&*bG@^D8p|k0wldT1B8K8v!{z=h{y4_R}8rt40u`}^1XVn zvWkOUU-^j{pVq65HqD1Oi)r3+T*LWdLcQO)Q$gY0SWi# mI0*h{o5b;0Guz~Cq_l|d_dwzLnQwv4VeoYIb6Mw<&;$SqxI>Tt diff --git a/app/src/main/res/drawable-hdpi/ic_folder_black_24dp_active.png b/app/src/main/res/drawable-hdpi/ic_folder_black_24dp_active.png deleted file mode 100644 index 4b15e4b0971ade364219241c9ab1410d026c6cb8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbB!aQ9ZLn>~)y|z&BfB}#5#WRyj zde=QI@Rc>bJYg5p|NEWxD;!&ptH=X=2K>ED?ZH}!fif*fsu)Y rLqNfyfyeRo+XZW5OcI|dEPBQlk>TaWQ^qk9Xaj?%tDnm{r-UW|%jYo@ diff --git a/app/src/main/res/drawable-hdpi/ic_folder_black_24dp_inactive.png b/app/src/main/res/drawable-hdpi/ic_folder_black_24dp_inactive.png deleted file mode 100644 index af555d8a5f83972348ffa2791e64fdca78240978..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbB!aQ9ZLn;{GURx;Gkig^okS~xe zq5q%SZ+_QU-8P|*_hSF33){Q6gs-ov+G)Kn*FaC>tW7|Xb7to9>2eDqcQ&$c2q-u- qFfcNua9HKB>sD`VIjOMdshoV^+&Aah-!B5%z~JfX=d#Wzp$PzC2Q9V$ diff --git a/app/src/main/res/drawable-hdpi/ic_history_black_24dp_active.png b/app/src/main/res/drawable-hdpi/ic_history_black_24dp_active.png deleted file mode 100644 index 37ed9c2b961efefd0e89fa898af900b9c4194bcc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 491 zcmVIbQi-C-#HH=frmCtY6gri5Xct5vSRetj5#n7U48cHnjl=oyJi{5RBNTjX z1B)N&xBn&I_{MLD%F4<-bZ`b4;S9_0@GQN>3Wg8|F*>NCuzZ|Aj4Ol)&_;j|R}iBM zAG!O8J|tluO^oBQ#?it7B%zNF$XpHQ5Os&&aA_U`bG9atscne5!53tyfg6b0f^%~a zb&v1J(+}K3)GVCpLR5fJiTZ|7twPi>Qr9q#YNDV)?{EuIpOLB#M6H9e4>D~)R2!+< zhp1M;gMLEPE>hKpD6il_QxJ85R1G1jQt+S(M8$Zt2$I4nreG5lpi;!3I-)FNv?GY> zq3QO>+(-577}FT$aS2f&eAs5~p>`eBgNHOtU=>3MV%T%F>GreNQLbZ5pRk7>D(1y_ zm*vG+#|}K?sfJ{0_Ud@en&xtyL9To>kfpEY4hxGI6JdZqNZT0xVgOMQCXuTnNWvjn zPyB_Q!678!0@KKyk1oWxMu-552(X1~h;fWM3ag4G#1IED+Ni$vhhl^_YIw1x@eBX4 hfPa|7dz6*Ecn_C!et+#KFeLy0002ovPDHLkV1jM%+x-9l diff --git a/app/src/main/res/drawable-hdpi/ic_info_black_24dp_inactive.png b/app/src/main/res/drawable-hdpi/ic_info_black_24dp_inactive.png deleted file mode 100644 index 6cc170e6219474c52bd91f3ad661a3af2b58363c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 286 zcmV+(0pb3MP)O z=R!sn%mh4@oXE(Ei6cL83`m6$x1M<*mEPA<1JdA7-bUJ7-pUsyeiCM%h1oq{T#!Wr z0HORT8?dZ0kGUssLeUY)t&wtbG&R%tboI8ccv6rb!fdzx@` kL`D*?*~G||4#)rT0j0dGvQ8xPtpET307*qoM6N<$g0=N}b^rhX diff --git a/app/src/main/res/drawable-hdpi/ic_label_outline_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_label_outline_black_24dp.png deleted file mode 100644 index 8b58b07fc68eca577e8f66e657ec6c63dc2e773d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 403 zcmV;E0c`$>P)WItn@n4&oq)I9Lb4?L3Izx6 zllM9(rIud)n$eyqc_F{NCnP7d^^X<%F&mT8(PG83yoctXHRF*sf3=}lTkNRnW;~*c zq*dLu#YAP40!4)um?=GaE!%1Y`s%IVumz}O9TO&<)wdQ^7f!*V{xA^xu91|jUi}x) zo1AwHn+pSR z>@vh!!m2n*j>67p!2n+5e1w29roo=O`metXMys!VgBXFl^F}dp1=7+Hx_Y!zTZ&gk xH&O;8nR~J6wt4tx>V$u+PWV5zf6caj=o809HnfGJK(+t?002ovPDHLkV1jRHr5peN diff --git a/app/src/main/res/drawable-hdpi/ic_link_black_24dp_active.png b/app/src/main/res/drawable-hdpi/ic_link_black_24dp_active.png deleted file mode 100644 index be3dcdc46289bb31cb8a1845c064e790de53bd2f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 466 zcmV;@0WJQCP)$#dKf_;vnEeXa{0zRisjU1N#B^x) z%`hwz5h;7^ahq_}K1!C`_!AYiyX8Qz^~T!{nPlXxTZ_BVOY`8Dug-#N{{}V3fyl5K z6PR=1L)4?3chac%6wN)++ZR^R@ZJfeZ#G_;#1~s#r}k4;(SW8OVQSN0CpfsAAW&_6 z?RbW%s7E6>ch-~8sXwyv(W<5C%9})FT3t~vWXO5UpOcW2<*(IuLVF5Q7H#w(v~&|0 zNo`jH&n?6ZO?>&6%%WkpebyGOfVyu^gOIv9#*GKuh#6y`;$wSfZyPk%5kgfR<=85I zzLkj%?WO~(M!PK2v5N1>&q&G>69)hBj9fZ$bia1#qmTas*BwnwwQ9-7H2?qr07*qo IM6N<$g1+CzjQ{`u diff --git a/app/src/main/res/drawable-hdpi/ic_lock_black_24dp_active.png b/app/src/main/res/drawable-hdpi/ic_lock_black_24dp_active.png deleted file mode 100644 index a0142e55fb76e1d186b300b93fff2477f9860be3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 327 zcmV-N0l5B&P)qC8f_Gb?ub6q!0t=sr`o2<)VZ@PHqkP;J5!1 za>KnCTGv=$g*BcLqxWKDs3D#jJKUg`?vO(oeBmCZ#om|-TP*R03>8Ebh+$R+Q3oXO zOK^awt>p(?Lr@{XU)|yxg4*gWEm}VH4x*mWc`JxoqN#U?TBGwe5cPtlULk7J$Dnc0 z6b>b%BS$zyXq|%?acEr$F;b#+V(ix@IIE`kH;FN`K{-;DhaU8SOPrcvA9BzG{N^DC zP2d-W95jdDW5_{!%y8-opP^4#0jCPnQ)cYE{?y|ji;ltWLji7#DOwj9+^I{Xh%k)C ZegLk0;t4c?Ue^Es002ovPDHLkV1f;viq`-D diff --git a/app/src/main/res/drawable-hdpi/ic_phonelink_black_24dp_active.png b/app/src/main/res/drawable-hdpi/ic_phonelink_black_24dp_active.png deleted file mode 100644 index 935686e806db8be21a12c08f7e5883069e827981..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 150 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K8tfz}(NCjiE#GwR{4F*39O^iw= zvIaKDyG$r*mRgx25YnMzP{Z>n@r47w>VgjQlWdMX2Ti(CnhTD~?qpMJOw7Ho!f`R% x#3-SpF8(==Ke`1k@qRiMwV~38$I*a`;br^@E~oyNi-8s~c)I$ztaD0e0szMjFH-;j diff --git a/app/src/main/res/drawable-hdpi/ic_qrcode_black_24dp_active.png b/app/src/main/res/drawable-hdpi/ic_qrcode_black_24dp_active.png deleted file mode 100644 index 49eb0bbebaaed333acf7c9be8334abb048b07252..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 367 zcmV-#0g(QQP)J<_4D(}V(cmY?P=<$Jy(o)LQMnz1{UEuxKJ1|e{&7n1h*3f@!ZD@#K}MHY5Itkm z!5u96c8rn7ipw&i3CFH7+Ect&MlLHRWk$1HY#20 zV}b_^*(jtqWTPPtDOCnWDYgK9d_-RYDKM)ZU}aU=T5Yt&cg=(S~z9q}=(FGd?%nVLW* z=tx%i9CctJpl`>VqcsBJt!OHrYFiXw5gG6W|@m?Sio{?xCJ|PhTxJax#M6rxmD`FpMjOU;ZQPkjIybKOd zfK@J@AQ<8rE8lt$Lyst96*m|{(6`;vDkMyq8(2Ma2&1xihfLWkmY~*vB;>+mkOPQ? zA-ZT|2(b_#kI2p-h6bp>!%rT33?PP15m_27!^IR4Rnc%!_eeplu54WeTE4PXHCVMh zVP-sNc@t)86V`1&!qA0j9Y`3~VBI<-4DG*K(9RUMYzxLYI8m+%A6gYulTvu`Z;7;G#-Fu%ReT z+pMgyir55dTsWOflNM$suKKOc`998X&gDJt84he@5|1dkuZV`%8tFk-JPyZnRejtk zWD{YIn2mfoW7cRoP}$*K{SoDKpc4a`lj%Um1~T7w8u{3ef=ABv<=X1WKx1ZH10DHr z6JEnt8e(#kD51bElv>IPWWe-h&H8sun$}T9%YFNc-6&Jxza~9)Ykx@@v z3fjvy+>*t%x8`+{+_k46rWZ?IXvH~?d}LAmn6GL+$5ls9ki~)8LVQdVlpW5Ga*_6p zzS_8!Z^=PF6rI{tJL;+_O}~@QsP1fts#`K8W716{)@>)X+Cm`zHB71mC;7{q55sx( zWtCu-O*L!7n19Y~_kv5i=%quZm2@@CN2MCi{EwS)J+Kj>-L^fmzSm~&A03}8J7Y{P zG9vGScgaBi9AH6Ksqa~v~W2px*{sPgtTppxwm`eZv002ovPDHLkV1mV6?@<5% diff --git a/app/src/main/res/drawable-hdpi/ic_share_white_24dp_active.png b/app/src/main/res/drawable-hdpi/ic_share_white_24dp_active.png deleted file mode 100644 index fda42d71c8e653808ab3049efb5af85b8700b957..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 390 zcmV;10eSw3P) zLR{GxwAGy@p>|I$e~{PZ-q*37i2o{Pyt8iIThmd_b$?X0T#GV}7}%-raFo!Jx)~+h zm%11E)I65D5xF#dkout>Ih^p)5DaXpY`GevbHH6|VCb2nn!0}ZX~|TK&K0YG_s+%W zG_`e1#WrVj0bk9k#i-ORsw{eB6a4nj!N_6JZVSdEkEYZ|7bBmxR69!ONZpDO&P(-N ziW0hZdu<|esasNcWzGiJFy~O@(sbJ$ld;W&H-K+iYOxnC`vh1v8GB*BjsX~Y;ka@0 zKI@rxI&wMYxgl6HQ0Z$#J`KxKtHvUqng>!dQ9?^meVcpDd(Pyhe`07*qoM6N<$g1fe=YXATM diff --git a/app/src/main/res/drawable-hdpi/ic_tag_text_outline_black_24dp_active.png b/app/src/main/res/drawable-hdpi/ic_tag_text_outline_black_24dp_active.png deleted file mode 100644 index 3da65a17639c7a232f9341209e5794e8107a5f0f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 308 zcmV-40n7f0P)DtPTxxU-vPEof&(Wozp$||r1vWG^87+Yk-KTCaUb5cdZ(}{TsNDTHJ>>U` zSa2pd zz<^VW(J6!OY*;#sPC4gP7%DuOO5EYPlaW!v%#KEkB#23vwfF)onrOoNsXdc)a2nOVEbo*2wln;bb8>#H z*Rw3k`o{=6#JC|wga9>sBo6@+NQMMMcu=c?4J3y(e5ka9ykU;g>p%)pDsLNoZ(@mZmNTtEd)jD$=^||Dk$@Lmaxa^p&9Zfgdgh{UJ+7nx<)5`(mt- zqrk&ob6CU}Bm;{(+#4nA5MxeoA2`B5q&?ghw&=YDTnBUX+PUMP481jN_@Eia{+h!H zNKmy59J(Mvy$Dz7K{jwG#j7^IHYok0udMw|ZHBz5rGNHG^9cDr#%_arJE2EMc#y!u z^#CI@sA`3>`SpWyKG8wG7#10BwHLGu788)@AWhRW?FsKyTKfAwPc{Gm002ovPDHLk FV1jo?YeWD5 diff --git a/app/src/main/res/drawable-hdpi/ic_web_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_web_black_24dp.png deleted file mode 100644 index a73506c90535d92f1cc4b64f06bfa4f6b0646a33..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 171 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbBiacE$Ln>~)oo>i=z<|S*wR&sM zSDC$SlD4I?M%+h3GJo>l%eptAL6O11uw8rIu5X))=N=VNSSPA2vVhmoi}9LbQ=PQQ zq_~T7o;y~$nXo%@oMJ28yQ$`aUtzmI%L09tv;Rc5)t|K2Y~bGSxGM>0W9uEJ8!sz& T1{g#DZD;Uw^>bP0l+XkK1#mnW diff --git a/app/src/main/res/drawable-hdpi/ic_zip_box_black_24dp_active.png b/app/src/main/res/drawable-hdpi/ic_zip_box_black_24dp_active.png deleted file mode 100644 index 77961be89b42c0847cf7bc4eb6e4eb6b64f2ac37..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 182 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K8t*47)NCo5DsoiV`40v4M%d_6T zzxB<+voFH=S+CA;YhG8yR3JOC+u>+ZyL(U%`^j1Co|ZklqL0jYqeDG5GE4poFzu8v zy682f$~C6Nf3FAMZbp~sS9|XiEDC6OKQoFuc$-?wV}rG>+Jd+5zL>A{yWAyVYn!9M fg1+f@4?JS6U)Zc9_)c^k&>;+-u6{1-oD!M!s2 diff --git a/app/src/main/res/drawable-mdpi/ic_autorenew_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_autorenew_black_24dp.png deleted file mode 100644 index 3211b64d5dad664f8a58328b713ce36f795c925a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 375 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1rX+877l!}s{b%+Ad7K3vkw8&y zVGw3ym^BBap1s7=*OmP~k1(H^sM~(eeGCkY9G)(YAr`0CPTAOX$UvfD|E;Fv(ttTE zvawxTcAqQqSGe;m`OXXH9Xs!M@3^|tinH(NRjUww8Ie}$b!xejxt0D!Pk!(H>Hp8* zifEp%ho{!JHpZ=#_;x|7&*+lUg67$p0<&1!1#645!WjQAIosR8%Nc)Q)1JD*cEQ}b zAI~P#dha>)l=0@y&GiMzdIjDOO4W|cIUUN?;PK#RN^K0&)-|#Ti_aEwmxLZ<6_-0R;lS!lD~{a&q>o7OYz{<}C&%m2-~M_~Ut7IRCD To>8FDok@VL(3YO!T`!DoZ2 zWsjy-N%LO}OlKF=%xtmJ{4ssPhso!g9hOQlu(|DdG~@F%hC4S}br|B}E~R8i=3INJ zBR$bo?S)R?$|(yrw|ovUJ-q)zA8YilpZ-QM@$Wghifz4S^9tL}P3l*fm%$!#mbd!W Tlk~4Z2QYZL`njxgN@xNAuK`bQ diff --git a/app/src/main/res/drawable-mdpi/ic_done_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_done_white_24dp.png deleted file mode 100644 index 6d84e1431bafe464f26cb2f63061c4c9b57edb10..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 139 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+iAWs*^5R2aA1PRt12kLb%O=-GeF>qN`e$ mOkm7ZjI#{k);#6T#=sC9S)hEq`Oa^k=?tE(elF{r5}E+GHZxWL diff --git a/app/src/main/res/drawable-mdpi/ic_label_outline_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_label_outline_black_24dp.png deleted file mode 100644 index 7ca623c5864cda27cd290425ed4edb7ed9e03337..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 292 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1rX+877l!}s{b%+Ad7K3vkw8&y zVGw3ym^BBap1s7=*OmPN3#X`>%65%7HlWZ}PZ!4!i_=dp*>*7n3b;O8UmB3Xoan@? zZd%CB_DpIk_oT=U?+@&3#i?n6$C}cbnmD9hsOT;#JAK;rsM6mQ4E~L8$0z( zU$cC7bfkyz`neI0K8MvUi9A@oY(mB>NsIgYC!D|H=li>GNll-dUev3FOy2cMokc4S zoQVomkNL3Y+Vw40b9|j!cTMZwm^>q3TF0NLw!SNYTaD`Xd~sYefAJii_2tWEJUcc$ i=-Bd<{G_LQf3inwD9n>Q@mmP!0R~T3KbLh*2~7a$;c!m? diff --git a/app/src/main/res/drawable-mdpi/ic_share_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_share_black_24dp.png deleted file mode 100644 index 1a2b2abf3f38eaf21a47b40ed7de5cd0aadb0864..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 377 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1rX+877l!}s{b%+Ad7K3vkw8&y zVGw3ym^BBap1s7=*OmPN6Njj&z=8hCCkzaXT%InDAr`0iUbgi<6ez;>A%5S4=9ia* z>Z7EjnraxYt94JXi<4J#lBtqiWDpy*NKt9Y#y7q~(r4^dUzV=ie5d%`Q_DNgEzdt( zpRD&`-lnw)3v%P-Cowwsx(0cvJeCq-bWl9kbvW57Ax`TY`(k^)wD7RM*EX2W{jzD6 z>U+K?Q+c*rXi-?Fyno}2idE`EBlZHsmFyX9vS-BtI!UX|@HcVLIhrJ zazF&0kq{#S?_diNDUn#374qcBFm(?BC0o-8tN0?X31d4_wjolMU*EDef*UO(SYU^2 zV(aoKF3Rzq8U5Cx&IwJf_~0TR@1li1`Ew3A;?}+Q@qkC{X!#mnX!|%PX&w}`?<*XL z<)29bi>&G1e-($ez%H5L&y$9#TRc&||4i4A7H0W%0#bapk6?;WJsldHW1hRuSqI=1 zX**z91-`|RcsBjyk4lbZJ0P#h`cPuV+bwnV^ui9vsq(~WMffq$Isp)6LemKl)qX4q za?h@u0GFzqwgaNosq3|9cI|*`Rn9m8W(Qg)0M1ppkzc}-X_`&F`nDy@b%icPz8U2=3}3gI z1E51iwxj*#V@&T&^6ywxPu1ZZirX@!@@clU{Hb{pO$oy|EI&cWrg9EkuusPy&@Vs9 zELrk8b9(Zh^aOQ2I>!0Fe`@Z>$x8sq@*S#_%+7I(fyvs`sF*TmG#7Qaro|b@G>nG= zj}esAU7%-sg5RJO=VEOv+gZ}g2F5Y zMkW>x0R@K!2F8OWwf_|#ESGN#W9ljBooQEh$>Yk#KjDYw)~;(u_ msFT08R3v>m26PbP4+a~aiE6E0SJweO!{F)a=d#Wzp$Py-fNjYD diff --git a/app/src/main/res/drawable-xhdpi/ic_content_copy_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_content_copy_black_24dp.png deleted file mode 100644 index 248a9d344c155bb728507337aad518c4d3aa15a7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 308 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}a}trX+877l!}s{b%+Ad7K3vk;M!Q z+`=Ht$S`Y;1W=H@#M9T6{Q(oFsG8JI&TYIvp`)HIjv*0;lM^IfH3)X<9(r(S!HENI zi#U6KERCGd{Xe2RhKYuz++@YYP9)D%=3z@U*i^Y1P z46+WcUH0f~Dl{m{DaqHI_kGH--2lOA+6wJ?Yzps3*=`N4`Nuz)4hvicA yjQv{gOXL}RF#hl`uu-=l&v;E@#c6{z3=Go}Bsx1jubB$;5QC?ypUXO@geCxOw{tT9 diff --git a/app/src/main/res/drawable-xhdpi/ic_delete_white_24dp_active.png b/app/src/main/res/drawable-xhdpi/ic_delete_white_24dp_active.png deleted file mode 100644 index 388b5b060af924493b057a63216fe7db75d4435a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 151 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0DI8PVHkch)?FC64-Fko=L=%?Iw zv$u;+&1tXu2b~*Nwk`N$?;xkbvPe<$)w&zy|9BUkVz|Zlf5mTGpk6SDXXMMa|9v2f u@g#fN+oPXnt4Z(ZaQ*pHX6dTRMUVWXo;a(XeY#{ZNU5i*pUXO@geCyi%r-Ls diff --git a/app/src/main/res/drawable-xhdpi/ic_device_hub_black_24dp_active.png b/app/src/main/res/drawable-xhdpi/ic_device_hub_black_24dp_active.png deleted file mode 100644 index 9ef9fb0867e80ebd063b46807fa88c1298a0d2a4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 314 zcmV-A0mc4_P)K1*Da!OaB$GU#mU7%1ao>nPF|rVDGIS`-A~;!*b+xxZ;}14oCkjU`NO&J z&MwdM+E^eU?giYTf^@fdL^|LBH;}At9&eARAlCxvNOQ;)G6pOmSIijjR{DTg`U~Ad zu6f3Q8RV+4LTV7uf@IeS4X<+r=~|c?$4_yIGBO67E+60ne1H$AjRAFW#~bQ`kJlez z9lr+jM_9){p|kg_Ji-Y_N_+Aeir4iQgTl8_L0k)?akupUL(bNzT zDaT(A*kOcY8)2t1;2mS+HpYj-fC+xuL}0-0@&P`;2l#-0%=0|&6TejE@s70|!2kdN M07*qoM6N<$f(RCfl>h($ diff --git a/app/src/main/res/drawable-xhdpi/ic_done_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_done_white_24dp.png deleted file mode 100644 index 3b2b65d26291575f2741d223cdf80facb436dc20..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 199 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0DK2I0Nkcif|mv{3vD2TKsT6rJ; zxO0YV_Rhw~KO`R95NK`?{Vrkn{YygTe~DWM4fc7H=b diff --git a/app/src/main/res/drawable-xhdpi/ic_folder_black_24dp_inactive.png b/app/src/main/res/drawable-xhdpi/ic_folder_black_24dp_inactive.png deleted file mode 100644 index 57df8a595c764a46d9004392ad661cf01d7a469f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 186 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpUtMo$;VkP61PH#YJfG2n5&xO%TE z+XlA{0&nd@ZmcYv7?RF3|G@jdUayavCHEMbg{%nqy76_(asAM_;z{3}Z3Mli8b1mv z4Or>K>+i7r$_JK`hkPF84weiIQ?!AGBY{hQgXP(opS^y(?qy@hrc YgPHY){!zvzopr0GH=N`Tzg` diff --git a/app/src/main/res/drawable-xhdpi/ic_history_black_24dp_active.png b/app/src/main/res/drawable-xhdpi/ic_history_black_24dp_active.png deleted file mode 100644 index b32ab0c7c0309399a1d3e80dd7471a97b42920f7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 627 zcmV-(0*w8MP)AS)W< z9a1ZYbBJSSSclh&7(xtUbkRf&1%z`2)X+p1F~neiyuZzxkIW2bmN#Y@tp$UOeGHLX z@X3$x21$F12Z+*leVp15JGB83zOD5~opVckqE5~esnsIGs)!XijQ z(UJpHoe$t(h{)m_h|xmc=MjpWZJy|(;Wgwp4iQ-1!~>9+08QK?giim%poherAcBw9 zpxZLM$nCoRBfi=+Jhkq9?jeAyLi~a#b$ICnKe6fPlQ(Vt)aT}9?g3RKZ3`2K(nkpA z9YT~CZB(#q6`Ui6C?n+Ir2+;JgBVx%f*J}45Tb}}9H9qU;0AekZ5=I$W2Xp_TJJH2 ztmqzfJWByS;Ra$MMi0AK!;7el20FOI6f->G5d&P{03~E)Wo7-t{RQ%g<3-Tq@Sy+z N002ovPDHLkV1hTp7dHR^ diff --git a/app/src/main/res/drawable-xhdpi/ic_info_black_24dp_inactive.png b/app/src/main/res/drawable-xhdpi/ic_info_black_24dp_inactive.png deleted file mode 100644 index 138e36b087d595a62f4ecd53f50a2799e3f37ccd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 358 zcmV-s0h#`ZP)VAtkrKP*9a4;;;i%3NZ1XFOe|hS|T1> zDe(Tn7M-I1@KU zuMPmL^CIQP{;Xyy0k5oyixAfVaIL&50d35QdnBy`FiQsj6;c$`1BU4rm*G-GQu002ovPDHLkV1o03#lZjo diff --git a/app/src/main/res/drawable-xhdpi/ic_link_black_24dp_active.png b/app/src/main/res/drawable-xhdpi/ic_link_black_24dp_active.png deleted file mode 100644 index 0a47c006f9409937c83b52b41949a10b31a8afae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 545 zcmV++0^a?JP)viX0kTO%K~z}7 z?UlVw0zni;4{cj2H$>oO9DpAix?61Dr>c4Q46QaTBnIZ_!W_7EH%DM4XWHvp}J@ z2N~9-_s9h`+MW){AV)$*$CRxHRxUe?0&vFx5B4 zIi!dx;C{0Q!V+i#5Le2BH$ub#cu_qti2)%D$7RoZ5}1<>nra4BX>*MD-hY@yM>Ly2 zS<*_d?NcJm7UKXsQ&Dg7C$Dln5@dLz!KbIQ&#=jqj83Tc{%Tgq+G_lhQtbAn-BpUd z{o^Qc>Q+sQQVqMgO}OrNvQI80&fNb89SYpDLe!_p&zxHJy8Y40+>*v1N#x&mqRk5? jRVoA40gXnZ(YWvhi(y;*Dsr0Z00000NkvXXu0mjf3Loct diff --git a/app/src/main/res/drawable-xhdpi/ic_lock_black_24dp_active.png b/app/src/main/res/drawable-xhdpi/ic_lock_black_24dp_active.png deleted file mode 100644 index 8e65175f307aebe517c2a8259d1187cf8ad66ab3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 381 zcmV-@0fPRCP)Ds>ZrBB6*Wkp|ypia8I)lCj=|*J%Bpbqe)jhz1abW0}owHN#1HbR*KXw?q z(EeC`EU?55htdv9+@g<8Hp3_6h!0HBnR>W~G<1g^99Mt%0vl{m)Q)i63}VPIL4cnE zOz{da+_=23<~#q05Oqa(f_WzbSZ@LI$%i;rgf~dV9M)SxDkeC!Ii%tN*4r5uHo&Qc zI6zA8u$ys!4VsogN(Wd^DxT4_7YKlE56}TR;2LWbkYAP~!SI}i-$N|hpKHV#;z)wl z6%a>qv`!q;0Xjej=z!+77$HQ27^yD;#-A(nmN3TJ7E#M0}OV|Ci$ bHBI{lAb|xgW{mXB00000NkvXXu0mjfE}5V= diff --git a/app/src/main/res/drawable-xhdpi/ic_phonelink_black_24dp_active.png b/app/src/main/res/drawable-xhdpi/ic_phonelink_black_24dp_active.png deleted file mode 100644 index 5575e46de6902a38493e5b3893b66c0b70223a80..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 164 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0DY)==*kP61P*S0bqFc5GK^qnZn zWL-I_pxnECrsUVF_qB5kjzwh#a3~(nc~P_B{~M773eTAy-fR%D)@54GC>C?#M9hre zjN(Ry>Glejs|7FgGB7f+)Um$#H|@k1jye2i?0;1=3ZFYt$=qXjY9p1}VrVb}WnO-;Xg7`Pl>hI6|! l>PfJgIzD;2Nb^C5jM0k34fEeE+72|E!PC{xWt~$(69DopFRB0l diff --git a/app/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png deleted file mode 100644 index fd7c37007d72ab29422bfcbb0761993dbb56dc1a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 566 zcmV-60?GY}P)K|wTuC*Z+=QOMeR3nh9#J)pl`T90orCUgeZK%eT>yK z4j>ttu(qoh_Z_C;OR-&;hqYS9m@%#=#WNv-wJ2lEf0KR#7w~16LJK!Ag@$l9gZGdO zEm+%AjC2bini59E&h_UuNRkP-eu%_-3q0zFAYK~z}7 z?U&DM6G0TmKiQ4gR;e^LYcy6Qspz3et(tn!i}-`~fAHkNKTPy4B2*DUp$LYSZGy!{ zLZND!-2|!>v^8zIUY2!d-Nj^QqzZkfeeVtLJHwm#zVE_;?YAYQDW5Jm+hCx(>2q3)@EsZJx0zGY^v7k9hv@gIAP;E$oGG{Z@)7?_lzh@9`Ktk_SE8 z<^fGLT$GM@xy}6{yBGki&^2AM@d5NeN5(_@bcqo@(~$?TIM310bs4U($GU%<#{qDt zkrN;+>MmRAl*4A7;?JWpAn&IyJA7^Fa!b+*(iyGd?&C+qT-*S&V6 zSK(!|h(;C-&=_NiEiCogG{p?(Jg>nV4Isxw44}o*?^M{oHXUb%VlNE S6cW<_0000%viOmqF*u6a>NIXW*tg< z{hW>7D?}>#Ww{xtD9bV(srW0)a;pdaL>kUmkYytBbI^!p`XV0%cP(kAtRwPp(PuSl z9(k)#+5Xr(C%jVUwUZG#^%=Kh(HqxtTyM9BR@HoUDe}=4b#}Pwhni*g?8?)ZfqETp zDMUDJTAk;P#^yO}PNR29s%mDPi#!y~YUZaK+9MygWn1&up4QcI-l^8c>vzPK8JL!3 zUU#J7x@=WX?Th>r%xGrOfX>Lv0TqqPo~Ww%V@qi*BsymUNL)8?{o zYF0eZ6{+cR--?>=u4s$Y9P>h*iS_r@t7Jw+NpIxmypN6V>zPKQijkKN{T4Jc5-Heg zNL9A8k%n$xWEqN7RAiZI^}uALq9n^;q@q`ro=C^2jfNv7MI#ywD@1C}8Zu?lpq}^- aZTkn2+sNF&xu`7w0000Xg)&h$rnnGZ~_|i6P>&~xtB2Sexim5BOfR1r;QT!(*}uVKW&Uy z5czo_^7BIE=Y`163z3qSU4%%@3z3}{A}=pQdR~aS<$0v!Wg|BljT<9Bvj5&7nO<7t SzWF2o0000IP4z@|Hr*I^!+694wJwrudE2{@+S}6gQICGx54{()Chw5<82c5lAv+AP9~$rk*IL*gy?CB^D`eww%@43bKCr}O9btv- zr#$=i55iRMLI+ED#~M{s;{tPV(>deCFYvvE(}C*0>J3)dD`fWr@(XOP2y z*cQVtFPja>aX@T^148E0W{)MvVL)O?ixaN+jIOzVtCSz0lu}A5rM>{bhoRJM+AF32 O0000gQ4z8+#;gJk42X@Y;T&E~pUwQJ5G(Q7F0kiXr`C2pYADIPo7K5j&pUXO@geCw*twqQH diff --git a/app/src/main/res/drawable-xhdpi/ic_zip_box_black_24dp_active.png b/app/src/main/res/drawable-xhdpi/ic_zip_box_black_24dp_active.png deleted file mode 100644 index 240f40a69855072007402dbf0f616ed03cf49263..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 169 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0D0#6smkP61P(>L-SP~c(7Zw@e& zO%iK37rfjvTcq*jzjfbDx3RP+yDT%>=&RnkMehDaXKTsnU91s>GZh;fyLJEknA*Xw z@u2-3yU2xEulOLujdJ@12X_4Zp{v-~blTZk?tVqY1dWC98j4I6jHlFzsbGA2&5-M`fq+Y(d(fk)&+q@=!+6})Vd{|t zp&RiltEMKT@7}I++N)#ZjIvb>%^@seng^6QC$p$^ZWTGo+_;L<=_re!o`+tC;G>(* z9`0?C|D+kG-tY`gaAecZ&BYgIMQMZ9YZ ueD^C|mbkl$=kt#>E!Wt7uT72o#%A=)@ydg{EBS#AWbkzLb6Mw<&;$U>FoeSZ diff --git a/app/src/main/res/drawable-xxhdpi/ic_add_white_24dp_active.png b/app/src/main/res/drawable-xxhdpi/ic_add_white_24dp_active.png deleted file mode 100644 index 0fdced8fce76a0f9a527388935adecebf63d0dae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 97 zcmeAS@N?(olHy`uVBq!ia0vp^9w5vJBp7O^^}Pa8OeH~n!3+##lh0ZJc~YJ(jv*C{ s$r5`OFVdQ&MBb@07vc`*Z=?k diff --git a/app/src/main/res/drawable-xxhdpi/ic_autorenew_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_autorenew_black_24dp.png deleted file mode 100644 index 69644e28c4409e20ce1bbdf5416cfa9933ebece8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 929 zcmV;S177@zP)Lj+A1 zks^sElxc=d&R9;1B<@w`-Fx3Xw@seadGm(*e(#+Bz31F_;oAON8<80%5(65RL5c)p zB!U!)rcD4T5>}EoQY0>JPoyZoeDgwzf-C_ZNMV3HkZL_1+DI2!GPF=n`U)f{xDQ&B z2&I7@dbwx(-@H4LJ5UpY^jSyN8ObeWDFztgM#z%r5}^ze+;ti~Xv%VoQx_V?9_S&D zulVmF8*H=B5oMlA;Mi*D0b>__sj$u>JF?NS1w>15dgWf<3z^^-iy^4hTl zN-?2HxyUqo;c(2gY(SgnMV@=&+@Z%OLQM>5$(oK;jt$Nf^=wj18lgdLRnB`yXNqRh z3?@xk1AW@eS{A_hvxuaV0re;et&lgUtzgjVlXD!Xi_=jYP_N>z8`NX6Gd@-s*&3)( z>vtBt%lI3`&vMHhs7tF^JKjJaII1$bB~VuJH$+;U_ln={4wO;+Z4n@Kls0#u7RBEe z0s5r)x7~s275_*C=$qmv5Vg8^l|_I~6u-_LDAHCD=}$jr?m%Um_i-{c<|TKa?~30n z0@Pe3eU?C96~9#kNFC+C9q6;-cZdLW+AJj1fz)DgUj(ST%IKCrTUsyE?v2x-X=uwG z=$KvQs^1$(9bvb66C2kLt!l-v#tWy7oN~32tU+7l^l$s|l1l6YM+`t?$_t&cmJH~G zrE{DYhH5s#aP0j@+6-IbN77x#Yf1t*Sw^)Au#kLTR^%1io;a;clF~K<$39!>w}$)X z=uC1`x!yB%=e1sQ$E=-EEjlG;Or1k*Fq}5VG$})cSq>$>54q!X&`<8t$~DJ3iSI+U zI4ROJ(@H1ZSF|e?<_uf$bE^rWor_jt)+Rbhfn0I+m@#W7IglGpnF5P0J-OeskGE5n zScqQ+|6R&!Qr{b$lP!$=#KB>wJ`ZjRRCfmMb^r>PGo+Y4|E=br>mdKI;Vst07ukG=>Px# diff --git a/app/src/main/res/drawable-xxhdpi/ic_cellphone_black_24dp_inactive.png b/app/src/main/res/drawable-xxhdpi/ic_cellphone_black_24dp_inactive.png deleted file mode 100644 index 2dc0ef752d097c59394213da7172572687d253a5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 195 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhawx;$MRLn;{G-rC4}#DIt8V5^Y1 zW4WS*=z@RUMgI=CA9p$S&eXuNvv#ASVdR^HZcoFE7mpIn-#%2zc``@-lESMr^YtCG z-Y)RGlEtpOsO&!r=PzqV&n6a5Ar+4a3XUiY5s*;6Y!i#B^-rI=1ImtDn_oRhpTc~v f^q2gsebe_g&Zs?V>}<^nbQOcAtDnm{r-UW|w4_H; diff --git a/app/src/main/res/drawable-xxhdpi/ic_close_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_close_black_24dp.png deleted file mode 100644 index a6420a44b1d4edf0c6731f0e1550aeb380429051..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 328 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@Zgyv2VC467aSW+oe0$50>yUv6TcTo| z+TLLAy**BTxee?o!b|d=wVpe$U&x?lLDI>?X)~c9x3)UIvcUFt-@aLb&o5v9<;SF1 z5Lc^vF39-N7D3KKnZhb^=}j&VdOV~#xA3Q{>tI6<5l-FX8O-5SE#E zMDRrajQC6c&ZHl)Ox`*10sEU)_fy@%A3bIQwdPn{Fn;$GVun!vVdb?z{L#YZQk8{` zP=7J=66QlYn@T1)nEn*qQ$9y4nJ za0`PlBg3pY5H=O_6JOyqH3!C`Lhie7#LMOT^vI)?!CRaan&IMkz*hCn?EWk zHGcFe&+*Fgi{*m%U27x@FPt@>u&#V(v#a{SZCa+j9j)(kco+UGESluN)Yay?`byG_ zNf(ws&TRRbe)o3kdp&M8L*p;OC;U?U1WkI+YBo*!;X0T7>*MB6u6GOLWfP5#Z1^?mg@$z;Q=$Ip0JZc<*&{A%NuZQhb?JTo^uJYRb1mYn7H4Lb8ucS~i+rSQue z6tng+hZa2I+SKT9ZR?8O>&AIs^Gb4im^f7?IG_^OPu#a(GgYyXMaV;;QL1j*-mW(f z_3ED%e(BC`yX5fFBi8Y_!-8h*3~?3r^lwj(W$CX7_v`ub^~}vr@p*Zn{~8nBn*Khx m`J+^Gxy%jwdX_K~y}WhT6ubTFyV*!GXc$qU}Xy zabB)cz0QC}ts}W53MuUe{)_JMQDae3Dq7;T`P-~e+s08{ z(7?dR!~)_XG4^tAiL&YDzY^_mkv&Uy!7cVvrmDqksRyTf^>)rtst8`^Hh0?R@UW2F e*!GSW@wvS7#rZGUt|L@rB zz#6z_W9kxCJ%OuQJ6zKw9`amVH&b{yr>=UykzfVZAQ-wdX^sP@$ngmpeY$}%(Tgm) zQjSS77P@VE)Kl0a+>_j$a&+c`j`^a7ovM>WpK~t%u{YSJx*sUGsAYfHp)=Vk+UK}W zZ3sKIdb>y19P^NkFIQFAKk=}0*5fKp)HP1G&I6Iqc zjKz5rgEVtukiIy2Qo_-K;J|?c2M!!K@i?}(lWik$uJ;4aeo|e|;mI*SsV?U@bDX5g zSJ{Te;g>S0!OODIPipkgGo)TTcRZxVWAGnIFqKOr(UM3=(~BhBSvit;g=R?Vjh>M7 zAB+M?!6}eboF615Cqq(m7NiKA4^kA)n-qydL_|cirW>R3em?os7vTT^002ovPDHLk FV1hF8Y9jyu diff --git a/app/src/main/res/drawable-xxhdpi/ic_folder_black_24dp_active.png b/app/src/main/res/drawable-xxhdpi/ic_folder_black_24dp_active.png deleted file mode 100644 index 4a4395d6e31e5990b81f2aba633fd6a852c51fa6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 277 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!cRXDjLn;{G-g3-36d=)h@lf%a z-oCRLL5IYc&m9%Qt?!My~)lx_3`9wxs2&E z-{#44tW3H8y}$WOq&?52@V^=!$A39asN1yhVC*Kv+bP}u8DckY{3yFgbiuE0k&Get zr2=Z17yLTcAjc!1;LyOpSk=$S#KHk$yE)X~PhkZ!85o&VK$1Y233_$)E6vYvteDTV zWu{<&`PZK%GZ@e5Y2REDc5`3hoTtY3N?zxjIM-`4;rE);USJ1SZLDMbbh>}5tn7@* QKz}lLy85}Sb4q9e07BDlkN^Mx diff --git a/app/src/main/res/drawable-xxhdpi/ic_folder_black_24dp_inactive.png b/app/src/main/res/drawable-xxhdpi/ic_folder_black_24dp_inactive.png deleted file mode 100644 index 47c613e86d692580df98f200acc98b36ea409f07..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 266 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY3?!3`olAj~Zh%jSE088099*Db2UN{p666=m zz{D;it7vRuYG!Be;OO)(b<<;@RIR6rV@L(#+iQkGhYWaJ0#BPoFm3#9pLeNh#iGbd z8~!t_|L1#mc97XM>3CZ`YugQ>Q_nDVnK1NyVezbLRH+Tntd(N5>h^0AaBDJ%oUnO8 zisKJ)4*M1sP9YVK2?~xUZ%MiD-0CR&^cY*@gtRSR7rgm6)7L*n=lX`SY_FBf7AX@Z TC3i2^2KmU-)z4*}Q$iB}04z$t diff --git a/app/src/main/res/drawable-xxhdpi/ic_history_black_24dp_active.png b/app/src/main/res/drawable-xxhdpi/ic_history_black_24dp_active.png deleted file mode 100644 index a4a255d3aada4f14fa25df663ed8a7305cadc8b2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 897 zcmV-{1AhF8P)Nkl99B3voj=PK4=&NDvoQ)ND>bWR1pn1AvJp-k2?_K#ZHH5|qvN!~0xtMb^_Y zPft(rJjw41{FAPyU3$jnVm_bG=kxh|K7}e4v5pRU*vH_=K6+?l4U4Eko#s(yv59@i zh<;)dH%`k~As(RzF|3OQLKLzG_y)4dB;4I9uvRBw zoN?H0JYl4^y%VzjvMM33$_ba-0x~Vccg+v-6!LCb^TWM|5SjG|5~GPxlVc+MOG}U# z4P=r+Pjk*u4h5rsna192S_K#=f()@{6 zlObN?f=icJl+!q*eW$&G(87S1 zrsL?lh&PZJhlns{?NP(PNKaw9S$u}X=%EH(Weju=t2RbjK~@D=#)0ON8})UEu_7zu z=sS-s{5f{1T^jL)**YlOk)FVI*RcaZ%e7aok5DLh1oxB~3jeQ8hh9LsRMB}j}q zGE2ers+!lVdkFB~Hj!{5zXvB8gYCxg5fbAaoah<0aSpbcNEqh;6<5ZQBVTb9Syx3D zqH)KuaRBtOf&iuqu!KHDO$2Zv zg%^;N252Kf4OdV?fDjXy!fiz8U;s%;b6NRM5$?e0D(FBgdxr`Nk-~jTpF{289tznQ zn&?6d>!OYTg->D5z$ckMu#TD2{{8ATJjMn(=-~hZ^zrl9N4-rYnCn00000NkvXXu0mjfP?wW> diff --git a/app/src/main/res/drawable-xxhdpi/ic_info_black_24dp_inactive.png b/app/src/main/res/drawable-xxhdpi/ic_info_black_24dp_inactive.png deleted file mode 100644 index 3fd178db8046ceb404d8c1b8296a3346c98ac0d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 508 zcmVeM>_CD>_h=EtwcJ6AfOm+d zy(K_VM1g4Bg%AZX9}&&_NX$ynaE@Y9$O-`kVrT^ci@ie(?kx-5Lk#Z@3#7EhgIW@1 zJ0KRepMT7fMf;sBTE;AuwV+b*{ZR-~c#m$Z2A!FZ&|3}ai5c}2u^J>iW>kq-Udf1% z-g;0+z@Qv)u$)29odi8&(B4VV2L{znf+_}mL#+Sog|7^1oCGxt>YW62-Ua#lk@^3n zuAKx`4B9&h`k?#J@f+QTj@(I5uKV=kH@Z(hptK%TFzSi>Q&`VW^5N{)We{XmgLceN zS_>+eC9@W^^XqoZ2WCrXjpsDPEO5to&}|laYc%H#iv?Vav!4uOGR_MhlkYGt<}oGR#HoA1 yV`3}{$a%&GD!$Ut(b4dgiVr;FngCC2Hk+TNU9!cwuiQBR0000LO#i?J8c zph5)8CicT3HQmng< z8or_yC5q(9QreGDj5{Pe{o_UMvDwJPu;bWWk9DApljJD76FN`74~wIXR^Hd27IGNt z^J%?a;FLR|xNjvi%Heub4mga-${OFdM2cSV*lzKl`8(t-)BF(WH0QL1c6dldgwBSla;#!Bakol;EniP?-$7B446MR|vi`YvkKRb%o#!?~K!OL|X`^_$ks^ z=L0H8p)DqjJVb}C5Pam7aU!Iue?M3unB$8`#~IWXDv@DN;MgeNl&42wUiC5h*Pvw3w<)-~8`gXS_`Rzt1 z?~~2~AKW!)S>w&XE7pu&`ak_iH5Cf$=00000NkvXXu0mjfS}iA5 diff --git a/app/src/main/res/drawable-xxhdpi/ic_link_black_24dp_active.png b/app/src/main/res/drawable-xxhdpi/ic_link_black_24dp_active.png deleted file mode 100644 index 35c8a84d26bb22aa53c373a75b51d640c8307c88..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 784 zcmV+r1MmEaP)oiIq$8x>YevvL?w;cIfAEj+pXjQxD@!jIEolf+ zAj`VgAiK~Ela&)*T;ygK#_M^1oNaHuha%4B>ipRDeD|E^dCqe{qtR$I8jVJy(fn7m zHQ6^9Vvs(%h+s%QGbN0tC7-ELrOY}diqskz3^mwm=L#u00{P={whbB4eSgEr~rExI+ z=7ThbV)Qx$Br%z7o@JwCZ1YVPSm8$iK8Y|wnr_?LBWElbuFQHs*qZH=e8TGkhrzrRV4zV#w%f#kf(j0@Rb$Gk4^hDKIOUkj@woo^~*if zWsSZDlIU`F+48XJ5)`pU73Gz>B9xjYSI1w)F6gi+h$*)m6OKn&=R02%$hpWZVV1LBuFhlG;DXhDv~h+Ip8~z_L)^5<*fxli& z^5o^sO{2Gcl^5g~Btbu2v>&N**Vv`Z8YM~!J5h~BqtR$I8jVKt@9_(1t&O5ZM!wAe O0000y;Edu{n4kEbvM0bg88q0-Ye_a`V>?p z7X&UZtaI`zi}S*UYiA`g#aDeQh(Fl>lhIS~Q1dJ+N%Q4~Pd}JX5P2PNnPJkR z?#$n8o)_C^wM}S|_&j6VwU+1-Hq+J#Eexq&%Mac5@ikO=$dX!W^^h}k@{%8|n||?n zZfeX?kUqf%q!t|ddE+3f(g|zf#FpG2GcxBFum(O7;-2BTZ(Sh+%ZGqUYk{TP0xHD? zmb$Ij!?EZJvzEWfX1HzzTd+A@8`?vEBhr=hPSc3trrB z_UzcTf`%LWj=o90$`*7G`i8$4tHpUJCzt6@c=LOe`D| zWPz+x`bn950tyalC+v@hG|&3_G>)IkbnfK(^l+Omw*>_S?Hhyz#0GRHgQu&X J%Q~loCIBgUPK5vf diff --git a/app/src/main/res/drawable-xxhdpi/ic_qrcode_black_24dp_active.png b/app/src/main/res/drawable-xxhdpi/ic_qrcode_black_24dp_active.png deleted file mode 100644 index 5b2884d34da5f89c7fc3da9c23de7de01d9fa63b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 156 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xf3?%cF6G}PZ!6Kiny&8PV+Jta4-er_dQ&;WwBA`x9yC*M_P`DW}nfR74FsadCro+ x=&4Qrn7T`xE=dPp{4J%(c`k5K-cgY&(^*-wRy@6bHn@mvv4FO#p2mGZg>; diff --git a/app/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png deleted file mode 100644 index eaa08d30d56c520425ebe7a2a082d56c25799b13..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 808 zcmV+@1K0eCP)w<)I9nSU`64E0$TN)D52r9Y=X0eS4bf8q#7(xybQWk@#Myamh4Yo0j z2&~r+De?{ds6}x-$U>B5@c_luVgSpKBE7KMCH#V%Vh`hJM?F44ESp0D9hksA

?- z!djz{Gx`nDrtn>9Sg9FDkaO-3SD@Y;#1S8$+8u~vZfRbxZ9p8ergbek3~|&DLKVj@ z#8Eql!MF*CWd$r_66q6@SU~||*=rcpfMbXy2S_1_(@G+Z1BfNZh$CV?+RR&^U5BFfT7K52}0ZC}pXfOp>M>EROLr4J2&~6nHKsU>oZmm)e(yjP@4o~wNXo1ywLQE9X6);geKsVHj z;+4XsMiOCbRJhA9s(Gn#8A}ia3y8wBsPb<~AXHuW2~jj-I7m^LMlnCY%%`<814jU@&qWBD=m5#lgv3}RUUtC&Li#1z(0fLQht#?@g5;;3!J z5UM8-M-6J-Ze52sW)%^rbQ|KBn^5f|#1XSlugSkaRk{}e=Q*NH;k#0>*2NMpaqi+3 zS`jbPZuuT{Xu}xx6kg&~e_Q?wdQpSoy0HaOwu!qat_FSh`oG@NkKi407(*LM6~zFu zkdS_$4^=2tJI0a6TSWX)gmYe>U(E9FZusR;enDO6_92FL;ryD_Kl-0l%MXwrAO~u} m7LEhjL=${IpU>y>ovFX30SeH{w66;Q0000@Z3N>d$}!P)47q z*(f!X?OFRBH0lfF&c{P0kWJ`)r=pH>( z=iukn1IR`%cXRR#@=Z37nQk8C7?&}IMa^0Qb?}_)ihbQixe#ZNZJF}J!Ar$PvCkM@ zs_9cKfI)`EINAW+;00}IZ70k!MeO{lfi_%NNf0K8R}?#10hxGA7iDR!D~z&R2nlAbm zacLkmaeijM7|FK4X$hn*&SQ)-f4S*>5g>JO9^sRo5>{QDSLv&%6IV^-M^x|Hkq0Cy zHrTnPa#ty*tjQTk5l~#AZj^U5(#npEkunKCNK+1heT_EiSmRJW5Cmw?sd8lF0cJv+ z$ObwfM2oQRh@UA5pb;k>9I_!72=?${S9~}>gG>{~ks?~lXr_rx_GQYCGi$_+3kwFq z1n}@ZiO@}_V#)9@#&5Ym7tK&(O!Dz^5tV<@^N=OhsiPw0*BWSLFH_DX7YJaR1!6c- zex(98PJZO8u4N^Pr_3=y^!%!vmh(h0LV#tCJ{v4EO1HSg zG3GGM&?ausL4n=mX?HW70;S~Dr$mG~%1MhZda&sdO^jjVi6&OC$%-a?Y>J|Z%}NWj zgiS`YP|Ix!*d#>(8@Tb zb#4;XDCe83F#5N>5N8;loqjXIe(iFeqJB=eRIc^ZGq;kIapO^EEN(;1%&4OrR6q`J^h=~@u3E~T9MGG?o^M)4D zKpT02+2Aqt8j;#dMEb!zrd9fhXiO=M={*OD(9bHSSx!j!=)xmQ5uYqcI%FI5Ji%wD zEj*gVLi<9^F+i=jLoXRj8P172)G|OG(>SeSp?xU&3=@}aG?Kt$ib*`K(OP zi6)ZRybw)HVKX6`n8aqh(w=NYG?BpOvS^}-0_FUoUUYGva_+h)CuvIgKveY6M5;ub zMsb4}L*$Iz86+w$5vPymOfbO+S7?x`sw#*60ISkTgVrY$LjV8(07*qoM6N<$fNrD7YAE9(wUkkj%<3~6mL!&JI6s7B zI4k~Jb&|dmBn!%1malR$kOd?IT5#E-gM)%(L5a&!2gf0ao{+;)ketIDjzbc>We&$7 z3I2yXj(}ABu^cI>H|JGEig3)~SwiZ~DI!u|j*JxM)FE)36y!j~K}rg8^rRq1PYV2$ z^LH%m`~0OwAmHn3Dc^6q7y*q+UyLy#&uTDuFY!AW~&TrIJC0O_~7c={H2m*q&U@feJuD%5>y#1SBaZPI^*v;v_xC zC+RsVlFt#41RTG)PttRIlAaSMX*oXW=#zYoo)qWkNpX&z6z9lEagLM}=ZHx@M^BP) z1SFrMC&f8B(zm%uyzt->?`&yl+44qWv`tM-{Q(0d6a&b|!`=V@002ovPDHLkV1h$v B&fNe2 diff --git a/app/src/main/res/drawable-xxhdpi/ic_vpn_key_black_24dp_active.png b/app/src/main/res/drawable-xxhdpi/ic_vpn_key_black_24dp_active.png deleted file mode 100644 index bc6c3d3c2b74289f41d463965ac3dd3426c0878c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 503 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@Zgyv2VBF{F;uuoF`1Z!eAmKoXwnSlb z-jxTOCS0(X;g;UeSHbJxqG=$W;ONBTBvr_kvFTU**8IY#v|^7GKohy1{bieXegSM$DEj)R<8m7MCj=9nr`au3(wZ(IvMA4m& z%v;|Igl+U+k?S0BwC>8!yi|RI!<=OkS!L%Wu@yhNS+&7q|3|U&TYGw*UJqq zlt;8kZVS9({p593z@FoN2QBJ@EH(0U3$9u?v#(9yuYF<=&b6zkCUUDsUVVAZn$Hfr zcMfV9IWFGD+-hg>_i0w3*cA%9S2$Yd>jd82lZ58ZIDYfs zx*X}p9*o%$&R#4omwB#j&|H+kv3p|rol?oN4bnFstdl;R_lC9nHdk4){EpMR4D>@P zocjV!8#=OfpZ>@- zjahzct=}0eza~3lX7KC2n6od}+*7vMl3%i*LFn29Q704TtEC%yUmRb!GiC+fDUUka z*{4~#!*{9gRc=U~)z2(T&Y#`!#(Lv^Q z-KupfW~}no2)(stSN@H_MtQExe|tYXE8?h6QBVSbMOxjrR_NYxK3%^r*!$L+(xn!A zw`J|T`1V%7r=q;5yqei!x(?#H);CiacUduci7nWzyx=g?mn)lQOI9(m2ski6h%Xzp zHr4aPcp&k=G8)V*0g?f0nK>40Dr~m61XT&qGa-J#S)cp-!F)t0-A z=T;p}$holXSmCdLh~>Ufm-^iJJ}v5v;&B0kkl6eO$CgQ!X}KN(`jx@c)z4*}Q$iB} D0n=tr diff --git a/app/src/main/res/drawable-xxhdpi/ic_zip_box_black_24dp_active.png b/app/src/main/res/drawable-xxhdpi/ic_zip_box_black_24dp_active.png deleted file mode 100644 index 43dc2405581191bda8c82633a17c342999b0cf2f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 206 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhawrh2+KhEy=Vy}6P1h=Ks?#fd(C zj>}Y-igj-YhQ_}tc(1a)$7D0_9*(B|nKO^x$|%u$#$0|eGv`l0s)78zX0Hv0+GiFt zJFPh8vukdEE$*d{oSwPF<}9FK@$t-Cs`qt6Z?H8DE!}~>e$5cb2_Jx zibfq!!fTG0m~8yF?Pr5qKdxis*K$90WalG}oV2uft=M^|+hPRf0v*WU>FVdQ&MBb@ E0QWghQvd(} diff --git a/app/src/main/res/drawable-xxxhdpi/ic_add_folder_24dp_white.png b/app/src/main/res/drawable-xxxhdpi/ic_add_folder_24dp_white.png deleted file mode 100644 index b84d0ef3bca19892d89248a590b92c1c47ee9c2b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 39600 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 Md-+WMsq6Rt4-`U+PXGV_ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_add_white_24dp_active.png b/app/src/main/res/drawable-xxxhdpi/ic_add_white_24dp_active.png deleted file mode 100644 index d64c22e9edfdcf9babea9681c44e2dee53a6d2f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 102 zcmeAS@N?(olHy`uVBq!ia0vp^2_Vb}Bp6OT_L>T$m`Z~Df*BafCZDwc^5i{T978G? xlN*`>5BzUTIj7P7-(I3-fns}2dtZ?oBSS_(`pg9u0+k>GJYD@<);T3K0RZru9Krwq diff --git a/app/src/main/res/drawable-xxxhdpi/ic_autorenew_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_autorenew_black_24dp.png deleted file mode 100644 index f5732bbd2fd590f447cc5b939fed5e325ed52897..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1194 zcmV;b1XcTqP)*UEnO zP+~hAW_J3tE;>86nI+s+7iNBnNe z6w_R8xb#4Ye)c+fPc?*2an-T^QcU6umpSX`c{IIYG{+!^H~GBEYu>WRXI80kLsEW{ zB+hZ2gLOVzW`<|H3-$Dq0Av`fBmWzZm}Wg(@FWAc92q=68E1?iA!9!o!0E`;U1W$4 zVN*95K#406t#b@hOG~~DK!*N^yPt5Ejr8Q(tOvRyX5C5dh{*5bgzp|`iCBWnaYtm@ z>Z6zM%$W@eraf>`E7=wq7JB-b0UCNEr6bhEpVS}LA2E!V86Cpc_#+&mZcc)2>|ve*RMr4 z8Ps2Ia|bACPf5}iV!S5+*shfjlBTXJcDMtmY4lkX;A@Qc1ORFgw<-#-6yrSsKu#O2 zCGCf8xgQUZ(dtl1%liL>s$bg~lhg?S)PZfc zD1bU~eQ^i)Xj`2)S-W!m$sORma@`>c&=KQ30l>U+z0L8h%x1Pv8zSc20lsV9ctQ-| zq!zwa9}~w*%}qf>eu3jk%PT)K->f!PcZmRW(Guf1A;5wbL>U43Oj zq+%?qY;mVrIveeMm;pTftDtyjv8h$&lHr|g^e8QBO#1_n2Vg3{i84KrLr8@eHV*SC$S-h~^L2K7X1QnQG9Os} zK2CC6t9kwuZ?|ln=EddbXr{6XAOx9m4jPS{Myz#fUEo(x9w8b zFMzB3Hw@bhoW23v&bRFMQ%X^YI%c>Eyr&)Iqo@n@IjnaEvgT#z^4v2udmle$UXPfZ+QOP;dnQrpSX*+GEqA>(Cd zpTMqV?27Nhn;0LN<|!L{%E-|3q_v!tjuup76Uo9-}gomm~sU>?Sob(l}A z&5eOA?n;YUn^}Xp>B_B)4HK1lKP2|BpSg16S%rfq>y(NE^SEw2W;8WtWMbhED9AnF znFC@dI5aSTMF=q%85rgEae>q~+-ooJ6I>p0K!ji7XNm1`+eBaHHEY#gMqi)&MLzN6 n56uJi@4~B2KS<|iWZJi+K>%QLv3>2$ zwp(6O-i6=xuUMmK@Y(d?o$KA~LC~^SPFrQqEmimb3E`+q+Y+NHIzO6SpFxB#I^kuH?ORC*9A9#E}7j$6eyRDBHfp#(2NEiJ73}%6N zgutJVq97#??(;pIqolXLj>qbLP2Xz;tC^d`=P%(`SaVdKRpP>*CFhMieldJZU$*k} RohLdV4W6!kF6*2UngBALUH$+7 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_close_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_close_black_24dp.png deleted file mode 100644 index 842af2cfab6d4d0b2ee574177fe6400ed03c9697..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 375 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD3?#3*wSy!S1AIbUfi!-Qd(q<{Pz85MkY6wZ zJBOTnN_I|DbJyX0e}jR-zdT(WLn;{G-Z;qBY#_oKXzKR(_kaF($F8msn$dJ%@9QGA zH5Wc@(>c9K=k&h4i?`=irQe_acemT@Z}WHcrS89XXi9vk{AxQci9a)$YD5fvtZt1n z4Qzi?w?6QKOYeQ_6RZKkmA zi(l|w{Kaq9Uv-W9;y={dKd@K&?;REw4AOku;o!Gu=Y!vVTEG3R@xzXL-}$EZn;-nv zfiV~S)|s>K{D1GJe6bg|S$~x^?hE?RulUdM`K|vI6BfOnf91t*cgJ7mdKI;Vst04~6zCIA2c diff --git a/app/src/main/res/drawable-xxxhdpi/ic_content_copy_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_content_copy_black_24dp.png deleted file mode 100644 index 351ffbb7095b1c537832fbeadee9a8994c8c16b1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 473 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%xcgn3BBRT^Rni_n+Ah4nJ za0`PlBg3pY5H=O_6JOyqH2brTm5|*7#OoWT^vIyZoR!@n0LrP&OOo^pg1wR_E3IES@R>Ds-8DX)3flr%D%A=U0wcG z?9^7CiX`2ym&#|iGdO+cF1C$kO8UY*by-=1#b2jP_KwT?A|U3W8|!-7UWte8oqsBj z31lc9(6;oi?Z;W7NGcv={ciNmtg}75lgsG*u{_pufq7p}@@?p6x^a_nTOh+$*#|G` zjPolmx4#ZD%dmXDi{IjJv)Qk0EHy7<%d0rbzMH?3y7GNH&vc{El}^e1_J^%9m*3i3 d$)Pyu3vgNBkb{8h#iR3Y z^el0$4!D?gL`$hmsQy!qDsnZ<&{RM)UibpW7^h`R3o*r{Xy&&SY*%*R$43B_Mk|UHx3v IIVCg!0IXP9ApigX diff --git a/app/src/main/res/drawable-xxxhdpi/ic_device_hub_black_24dp_active.png b/app/src/main/res/drawable-xxxhdpi/ic_device_hub_black_24dp_active.png deleted file mode 100644 index 729afe2201da1237adbc3b56d5be4aeaa9d3bff5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 581 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>VB+y~aSW+oe0#$_J2+6Ly)ZaR zW9>x~S*sTp91mVw=_+F?X0=13t5rypYt~X{c2?KkFZ`V^ZP(vQ-_X2h-t0TYc}^8_ zKh8AX7ccTyHxmZVX5_wE*ly>x|I5Y0!fO*%qDTRTwNwT+Q$%|WHNiYb>GU0vBo$fxV?xYryKDz~+3Xg?p@vEir0 z0ht4gXBcIWs2q94BzeovKa6dfj-R)0IzIoepiSLBL7RVX`X7A!48-%9E=wGIY=1cP z{A<~RkM}z z!u{2?k9QgWy%&)_ah2_y%!BuO1>8G#_j0rUxXUnm#cE$3S%x2t)+=`Jey~|KLHcsm pZN_EunJpTyqZ!ahySeA9u(`?Xf0rjF*#VOWgQu&X%Q~loCIH=;^_~C# diff --git a/app/src/main/res/drawable-xxxhdpi/ic_done_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_done_white_24dp.png deleted file mode 100644 index d670618c7e96225f7756cb4c2743e7ebbf688cf8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 308 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%xcgetWt&hE&{od;P3vlYxj!B3Hnh z1714EonD+``t$ZU)3IJ|2aboi6~%ilJM7!-={Kv*@R&q$518Ox)_m^XpXp1^&DOu% zB6r^~@kqJ%j0e`LXFkL-JviL|Ir_(khlktwLa#r83bn@|VwIw^gKjzH(>hUq>tlAsh9~)aj{(R+p z`Qx=v&?j!r?}<)Pb+Jxa|B9Td>MRd7#ru4CATBh=u6rtHhv5hn7S>A;H=hE`q|CFU154;*3Bl5S`aX3A$|V&Sl06abO}1xySe zYQxL_&NXTKg}7!-Gk4%J(Xo0wZ$j?u{)}r6wy95Xn5?w>?et$OA0?EYnya~VO3-S% XPyADaoC>-Zfr7}>)z4*}Q$iB}D?Vgk diff --git a/app/src/main/res/drawable-xxxhdpi/ic_folder_black_24dp_inactive.png b/app/src/main/res/drawable-xxxhdpi/ic_folder_black_24dp_inactive.png deleted file mode 100644 index b0c38691067877565fd3b143dea11acb3c3a2ed3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 309 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD3?#3*wSy##1AIbUfi$ULF{|52pdP`JAirP+ zCT<=@HFXU`BQtXgI|oOnvMEXKK*PMR~6rl x?$FCoi}nZyP0sq5d+-0oja#ESIy(6FGE`4e{dDKullve;JYD@<);T3K0RWMWTl@e3 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_history_black_24dp_active.png b/app/src/main/res/drawable-xxxhdpi/ic_history_black_24dp_active.png deleted file mode 100644 index 1fda9904c9ce298a260f2137912c7470b60076bc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1235 zcmV;^1T6cBP)nXIA9?~Kn)8Q07KiEUT7t>#THtCL8m4qnvZ?|_&yh0 zIn45I%L4a&kJi|VEkk8b`Z&*edmt@Of0f&$fdH54gkj1sHh;_6f5&I9TDB#+a zMI9d?F>B))GPo8^;~m5>XP884%j0K=;dYQks`>_Jkc2qFS4c$<(SZ!8j{|IA9up{| zh|Gl|%9y|cHgSkPWI!MA0Ew;!4-!xhukZ*33|av*_!YeYhd+lzwlv_@u#O^zT@iJh zLjv$nL!zod0_fm5atON|>gWUUYtLVRo^^!6Y==2JX?8pKBf zp?3oDF_Gc{Oe&t1gGASNFMzIACoC}GG zYX=bD5Zobu0vf0$`A?8*{Nj`15O5v2q+WzwvlpNAFMiD=bsOp$yZA&8@fM=+2fmK* zMr;>k<`7&At4x45ocq{BA%dfbEs%Lba1lmjyo4w;@dP(QJd9fanKc9#VfQUgAqszC zG^FF`F_1Y!SVL4fSW&(x=HW*aq3v;;4`f^e7GK+K{G$Fe=-Z9^B-Axx@%2sM2;yUU zh!5qTg5n>-8cfN-BHEBoydL8J+ryWjc!#hC6D#2-co1|^fu=m#5Fh)9G*_|sCN_>k zxX`w0>Z^&aV)0Gv1{`RrpljyKxkMXSLt1O-U%`wg2Wf3d`2~$UhMa9&`4y#Q3^`jB zP31Q}9VD&-OzoEPsN2JRB(8P5MFpl+RV_ZSoz%sb3oYD*DUG3-^q(qFECPO-Na+;4*2irV-|^S3hg2MY~?1t#{|mA!$AfmR4|DeHt`QU z$bj0ILMp1_7?Kc2s3KKmu?-JmC=Xl6BDGE83}Tp5+{d-Z!3xeHF+0aH99+8!sG|jm zSQ9V6#oU&~9NvU{jqtFKIb?82wh=604;{#7`iKS=aT@`$IT%L`+i2hzO?1$|(7}5g xVHaCiz$hFn*=#nO&1SRNY&M(C_CGE7j*sVDPaXgO002ovPDHLkV1htgCcgjx diff --git a/app/src/main/res/drawable-xxxhdpi/ic_info_black_24dp_inactive.png b/app/src/main/res/drawable-xxxhdpi/ic_info_black_24dp_inactive.png deleted file mode 100644 index 35f85460033d85c800ebcf155f678cc7609c3c4b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 670 zcmV;P0%84$P)7YF`dhkSzbkvazo$`1?IxfbeBR>C-9y;LDfqQbK zr!oQ@d!R&mtmMJ%r(YsHR}$cePmT;whK~at|B!(?;L+L}GGIGedO`+nLkj^lGH^8k zS4$8D?YYthQPP?#7z(6CKS_%U3>SMv)C>?JE_BCH)qo1aMM6Z?0O19DOvu#@$eCbm zfv6iG%(3>Va=<&53@4QXY7ACZh|-o=i4mo3v63N5OR?Z1ikn*9LKU~5QG_Tiq|pvh zTuh?`QCvc!6mil|;-oJcRjLP+G&-psP}AtFdcgVj577S=`t=v_&EG~7)dTi4+NmB8 z((GH^#`w6M|to`mkx>X_C% z4#+_L#lr!g3>lz|DUJk`NY51nxBTL3!99)z+Fw0x=5y%j(w))~uZNrJ7LQJCI{gF0 znjQq~JNnHtqc>{`#9=urdS-~I5C>I+cnreu((>k-@r+?m6Xv{MabefIGe-@>k}WA> zQOcGjp5DLXhQuU%QBrgMuBPORJuxA3ri@0T(P-q%e>uy}GK1Ffr~m)}07*qoM6N<$ Ef;X8er2qf` diff --git a/app/src/main/res/drawable-xxxhdpi/ic_label_outline_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_label_outline_black_24dp.png deleted file mode 100644 index 2446c9a17bc8c9a0c73123da68f07b5b807afe94..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 812 zcmV+{1JnG8P)9oZ%(;fGE>o=YBtm(`-d(R9gilQirq9}@@D9Zmypx`%J=_5jz z>VkU(4)hEAWJr@_^)Ljgxyd-wt0x->{u}Y1*mYWqOu+5Z_9pjoD0a)UdkzIDL z$|_3$=2$bbF>2)qWJwr}Wh29K1YnIhBkQ48jsU!7$;fWeEJpyQ`0Yq)h}*|nnF5 z4erZX2d>j*WRq-55$NQSktiS*#Esgz_6oC%If{-*_aaBa0DsB(~d& zdCC7cGwY~H?s}&5n6KsNi8DU^Bg?!jPg9@vW%#y-90wFg`XVsRMyd68KDKDE%+7~P ziuuwT2)DEG6h}N9e%kWV!9NM)SRh1u5pOn@gCvuMDo-1Q2iHQB2u;R>8z}md`_?Q! qNt3iZ8&ecTQ4~c{6h%=K#f86@e}DUKK1QHFpa;h_H$Etfkm6yH&B<4D(aWGsQPXdCw?|Zk;M|IWI&bwQMNh zt1PCJQo>XL6TBeCM7{)+ahy8i8_y>}4sn11dYLs%U1j`dHOx@&srySS(m*TG+*Y8N zX6iZTTZWc$o^5oKUY>x}Tx7TJ+suAK+$WiR2o-Z_1-K7T$pvRWomZflT@FvaGsY|n zS-SDu7|f-Fsc?{Riq7onK#ex?e-I<#ZhKqy{u8B%a?O(mB=muz-#9;UL>Wuc!$UqY zU(j%wXM{L&Y_)l|odI1Y=mnglMH%_YO@`dp$DCMXgf~+#!P;tPGsNUeR-u?yIu zEYuJBeX9V^l$8$=F$>tC*s)B7yuhT08NAaJGF4;3@FQ(GI@y}>=}S&z^iHz^o0O_M zfuHf0PTvJ*KzbUg=b7lcoEmqif z0ag#D%mThytO|m@y1$W72Jf_WV3aD09pzaL`*^NIZQdDI;Jsou`EVoQe0&==3m8>O zS2<0-2{@<(@Hn5%0v36pj2vULFYZS;tc(oWTPj^0h>=pRS6Y-*@`7?MD;c^#++9mK zPf$5D1*m42X;0t&6C)&azG!o#vkIDn~CMNt9|^ zupbrJb6jJOCbS>f6FAeo5S*sLv0EKu#(1&Sq1b1P@4bw$W3Khn?eu3( zbP=Rd`y}Klr8{hQ3d?7R$LEr{=%8}MPrs?FhDRoRFc*jxpx&E4#FBW)CAHU3du9;c7cuEsBp4H=V28lE2u4uSp zk|*>M`TLnQkoPlcin%|ZS%>-T(KWIl2!bF8f*=TjAP9mW2*N+gZ!hq+?RCFvX8-^I M07*qoM6N<$f>$2KO#lD@ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_lock_black_24dp_active.png b/app/src/main/res/drawable-xxxhdpi/ic_lock_black_24dp_active.png deleted file mode 100644 index a7e5af73d952d0d0c3a42f709de30d3c16031d7c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 737 zcmV<70v`Q|P)=pL#3pS-kd_e{8S7yk|4G$w0L$4v=Aiznj_)o=!TVyDn=Lds+3 z7AH6wJHc(b<47O4me3tq6D}(oXyG1~&^o+qA>q|dAKOzN7d5odhfVMs^E!I|?H(&g zTN4kk3EDp1;SLkL_>GKy)+5YefS2&5y#&Y33bN`g1~7-u@S-5Wvz={Z-44v*0RbxC zYJ#hsIb>Ze!BO-cm2Vg3(1N2}e+za{`Ho=@4dm5pn8P`raYN4Ti91 zZis8dXri>$aR{rh5n_a8eDQz6JaJyO5e{LViOY26n}oS^PC3I0DjW|8o+NFKm+(q184xhX#fr2Ee%ir4RC=7i>Qq)Awow3BE!z<^zy_u*(g4}GK$-${G{Ed4q-|3J%x)2BTh;)xt08USvmZbMXn-Xh zLC^O?cuND!u7d#67NDyEvJn;g?$-bVtRZP1^(Z2r5h4T=j-4$%jLTOCn^;CTwu~)w z^*Gu)8bAa1O#^5Ezi9vs;5QAR0sN)`G=RS}fCkV%Y8T(NzN$c9)=`u;3a^O~%rhgr zK`Dy$?k~0w=P*zFK!{QmBF3oV$4(m|N?Q~AxWb?!mzq~-XL05$rIb=iDW%jOVXhQW T2ieay00000NkvXXu0mjfR(eJ~ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_phonelink_black_24dp_active.png b/app/src/main/res/drawable-xxxhdpi/ic_phonelink_black_24dp_active.png deleted file mode 100644 index 10f29d4702afc8e7a8db2b74f0e7de8d971e3f0d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 263 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%xcg&Uv~xhEy=Vy|t0IIe^FY;`I%T z7dD7`@$Ns%^u@*A>C=^$o`Ox>kDuH#KR7Wa$^{Jad8M{yOpeWI&nlT5Tf&}IGCh^; zPRdNiW*zf{Gkg)7n76%QxUCxtG@XG#L2^O(#o%vGS9R^uW~j1FQQy9*n_XmPaW zmrPeG8h(B&2CA}SJs=NOj!uaDTa$Q>5hU7hr$MWD%`xV#GaEJKE@YP4RBv%?kWCD; iEwq^&^|ui0urEyS<@bF0rm=PdNQbAZpUXO@geCyNWm{PQ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_qrcode_black_24dp_active.png b/app/src/main/res/drawable-xxxhdpi/ic_qrcode_black_24dp_active.png deleted file mode 100644 index a5f05770341b37fc22f2e69b9dfb16bb42df7f10..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 155 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeK3?y%aJ*@^(YymzYu0R?HmZtAK52Tn%g8YIR zx~l&zX9Mz_JY5_^D&o#gJjlynz`?ZJ@%#Nryc)bOIj*m0snB1v?&8+mtBDt~CEhs5 xw8h`@%A4-IFfv@{OAW8+l46EMFcNl z1&FfqNSIfGC>ub+yqgeZw~#Pz5~A#TB+PpRQ8tT&c`FcQFX1KZEkxNqB2>xCLjq|> zmApPkASG1Ey8#L0CQfC&c!l3Fi4L5kAuK}zS;i1f(gjRn3v1{_L)3yz$a`WeU>F%x zYY-JkN-7vYwK5pSQ^b(>Y~c*dy9YVOHYSc(0Ne2xVq_MDBOcec*oGWq9Htd&*fJjA z35F116nhY3f8r`44B-h5YS`Mg!>penC-4ShPvtSqz@*EFAujy|Il>Fbe_RC-QtLY8 z5O)Kql*4PtA?^>HwVl-(4L71AynOg7UsA30;zTp8xTbg5xVIByPbyUsRAd4Us@GB$* z^U6O+77LIRl#z#OJqCBR%p<4t%3m<}QoabaeuEfTLwB7ooOOtS7f@>zVkE{ix{$Ok zOe2OEc?q>{L5#&%#9j0wkCu1xC}9j`#Ha0!nW(0>Ay+|UH^6eeb|+c683gNs-=buH z=lp$$vpYK?hi!8Cn|RboQ_F-_=0C9Bts{$us0S<9zy!|YBn@CG@Ql7x#}wc`Hc+uyc$@#=)=_wd zM;Bj)XLxw`CrFU@SCI2TJ=2Q-mf#tF@iPO@@L<3RB+UB~qU;(x!wUd<;Tirb!*lRz xXh(U}?A6$?(gne9a0Q;{d7kHap67WD(ZA}mei#Z$_XYp}002ovPDHLkV1gbq-3R~x diff --git a/app/src/main/res/drawable-xxxhdpi/ic_share_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_share_black_24dp.png deleted file mode 100644 index 0d2410c14a7b2a7ed039825a58baf850091a1b7a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1266 zcmVzv=m?7KVrBwj5iPi^Dp&URTz(b|zjClYnO3}i#xJJ_pJi-B`9tm>*_Hvpx6o2_0 z;${E@c#SiP{sS=0x(NU;F+zJ8{jyvYH+luoz_3#C@T9(wIhGdy)tqEdka=bZN&6P~ znpwSD%5H{7?x5ww95k5`HoEk zbHXR=a)@3*+h1H}(a@x}XqRs@$R5kKHO86InUzP1waa<}Y>**^r6+c&4iM(3;#hfp<|nu8QXQaIaglS` zF4X}JDpn0X)l;1jR|i^^#%Tf50Mu#+4dwwnBN78-l*U;%4g zJ4v!80jx2gv=Z#+b!thnZ3;k+7TOda#{--o<6Ryk2Y@8~$|w1C9HEOv?_O%z1aqt? z=R*LE^wY#$Z?Yo!H=HI*m(2(pmN{!X{cLm3{SA%XBa$RdmoQ_>@)=jC;spykuA!4- ztgx&X0MbkmqP4`4c9`N5?z2sTI1$TisGdHa=boE;Gp9z`Ko1>62@xPeiUc#eUeqqm z2~xUke&I(R=>>3RqXV3x&a&+x-`d^1a_bRtt^#+NBxqR|-9xuK_FCy1TU*RAPaBN_ zdkt6GUfsBIw$3E0yl7b^eU5&1NSa+<|L>uBm$w98&=O#aFq#ZV8I=|7w{J zi${STzQk(w8kF`8a)@d2dI9Y0RjzuPxv3w(&R%7Taz}i-$m^@ei(D6EuQD}>(-80P zPRp`ak-|)pGX(%(lQ>l+&M*Jv7FFv)ZcFV=F!0`}S~WFf9zccCIeh?`%0%k}NL40U zA3&lq(fR;Zx$QW1LA({!dB8DIiAbFQx8(N`A1f}qZ=v^yY1Bd8?g3xw-VcbCXO2VC zd@P^7DgS1TF<5f2zQBZ&yGEw`9Tytupp_65%PQ;m^5x5y cFJHF$2R{-Ko`X>XzW@LL07*qoM6N<$f~RLj2mk;8 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_share_white_24dp_active.png b/app/src/main/res/drawable-xxxhdpi/ic_share_white_24dp_active.png deleted file mode 100644 index 8f59555938cd096bfe5b66cfb16ad8d7452c570d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 887 zcmV--1Bm>IP)#wJ2nZkn>Q$p?1k?a2pgbec2q>ggm`acWRE>}Y5I{>7 zH5VJhG9z;gJU{}}tH7Emq39}QtCO2^JD&S13;}m|&dqZV;kh1pKL5dWbKPIyQYMqh zWNstWQ?E4Q0rpa48h~kvyvHV`1sxp1QOz;N2HD5UT%ndZ3bKt|fZtBpMGtYjD4W>8 z9C6IDUKTM*T*Efs-w{`Zc3Hz7LcAku7$?M0S;G_|&dVAW39%q+xJHPpvWD}7I45f; z65@MV!o!RcrdL+5ntsZJDU*{0)bk3L2zNjh@HoG)692MJNh8M)E92-^vbd8y%o6Qy z96l9ZRkG;j4AJJ<%PP8=p_Un*Q<8XyAE{-O^;$v;1C*(@$Y(SwIW)1KGSPnJ2`xhl zJNT9}T&Bby9O8A>C7a7_TqN2IuW^Sg<1v0FT7^%!N0xCPUsB6)9#QhB^W<_Dmx*?c z7nCG6@-7qnLj}i0CfH58mf=}W`*Nw|kY^M}wF*PDY6%bWgD02mN)lU{qm~j|xSNkz zteMMBC5yN5b4(k~B`*=cTrO#677ydOl=vDC1G)4gPlYh^>|>RzU^gBna_Pr0LL5u` z?ec8eZogE_8+}8D0yt53h}z1$z(E_%ys5SdMmFSw%q^# N002ovPDHLkV1h9Hk)Qwo diff --git a/app/src/main/res/drawable-xxxhdpi/ic_tag_text_outline_black_24dp_active.png b/app/src/main/res/drawable-xxxhdpi/ic_tag_text_outline_black_24dp_active.png deleted file mode 100644 index 7c4050d321097b2e6fef8a1c111e345da73aff68..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1095 zcmV-N1i1T&P)eq%oheFb0v>Qh^c)2`nA9Rf z0WCZhy88QdQjd^}wA>Pp570&*4e0_A9^ssiFKy=#3k~F<#x_lkJzH0r2{QX^gAt0gAD2qBzq4GGa5N& zgGMeo#9si4y1iiUfiaKP=+#&61v}u2N2_V@C=+tXS7l^Xf*sK8(Ha+5kzfa0_h^la zsz|WULTCBNM&!%RLnA#dKA<%t*#S8&GtZ9$q$eEnjITy;S&8#>bDT{!spTAZdBo9x z_)3K6qw_P7nJ2z_4VMTOL!XgcdO$M1crQo*;^OyGWI>yd91tJBm*Q?*MM6?QwfOAD zR3#(>*y5)^NCI$)uTBUD#KphK{YaZ4Aruflajw!zQ+k9jK(%?l%w(E`5P)sjN|oRb za9MRzB=`bcSKZVIegL0UHzk4(z<1S6h2RbdS#?t&L;-gU?@Pm1U3EefaDztCRaco1 z1)Mg#G+Z#A%5~M1BD6BjwjJ=D9>b~Xn2VY3yEtJz-u1YBLOpGf)+P#kumd*8(;8`Q zkGWc9#*A0DJ<mih&93PKu8zF?aF)kJ#uYD)}gk|mccy65WC8)>8d*_c9Auv7x zTbDEl!SM;&d$qH)$q^F7CvfvvNsy2zKEb=+qzDP)hXZy9N$-Wk@sj|O69nQX10*Ae z#7_zcCkVw)4hSQN#g_p169nVS0Q?A|@udJegbu^T@k)Yld^rG=n6MJW<4XeU1cmsr zfa-*zMtl_h-K2p&!;cf@N*rIh2ddr9D)BV{t^|?zIsg}fP<$V2bs0aSW+oe0%3(woszX@sC#o zmzXVHxqmx{*qR$*J)du_FjQ!IdhLDy?+UZvj;r~%7y9k5FU>!okg@UcyDQJ<{oeEN zEB}v+#~+`2+t)QS$V+qS6m%j>^tQz@^*={c*BLstaL-xPoqNZ;Cg-HuJKIPN%Oj!84TAZa64rC36&?5xw@HRFo&7?^l=6p0@(ecGykeox zpL?L_k?fvTZH7APN_Se#-ySYX6TkOGcG^TaCX>LKnTihbVH$>62aF85KCaVIJRl*J zaLvz6|DW=aT-oFdhF=?&e70y{TX6YGdfg_k2iA_vf0~vGC}hft)HQHSa}xH<&Tja! zeXh30EiRqwCJlWH!s_}JYB}3Cl$1!`a@TyA`oe)ZrC8eP!tVN=+m((*xZjaWuh(`m ze|(H1&$7>pqty7_{i+Q;UoJXIYa8dbn9uzw<-nh!v(#r*V#o#eNz;PTWDgfT(mk=B zQOfeCNX)`l_ZeK+4UX?+`f2HK^kch9e88u2hDFm3+n=lD_*BWT$d|o--anQnw;A5q z>&;1G4_U(4Va4~S^AdM}AiKh?BL$x6|JYWXU>4XaR#RHiW;%iGM=)#tvp<;~AEZ(z zuLS&;~JW|#x=zKks!~TP$`wb^q k%}Wf}qTOrf#9zFBA9_}pY?yT)nBEvXUHx3vIVCg!06YXFy#N3J diff --git a/app/src/main/res/drawable-xxxhdpi/ic_vpn_key_black_24dp_inactive.png b/app/src/main/res/drawable-xxxhdpi/ic_vpn_key_black_24dp_inactive.png deleted file mode 100644 index 78b3735d363f89ff4b154c3d185b9202ccfbe1a6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 606 zcmV-k0-^nhP)v9ES1#P(aJgbWYh?WYK|_ZgCJbv8Ctxe<1^Vbx7RF!gPu2df^afPat>#17ZrhMnS zNV-Y!X{U~8fLdKyA{MGrF0xAXHifsEd*veS$JpPZ-YFM(D;udd>M(!-%CR0@Y?T{G zU&nZ`b{NnArFvx}vQlnf-P(xkJ3hzBRi-AsOyx({Nv8(p9bM?q@KKrj+cJQ+?C8$F zwB|088KHr1Jv|@i3?T9t`kWv3+QR_9122$UdpQG`m4O$?ti6l@!jGLN*4~5xk{*Dk zpalc;`yyO0K=|9xJ#Ryw?JUR8IgkEf9Ywt3DB@)f<8u4Ig2T9f?K-^R{={+gLKPfG z^MTAME-*fl>~nxrKa~GsGPVKcs!H%{DRB(otp_kbVKSZp_-bN219(|tU(Std0Pi}& zucyB^Nnn5|KQ3IFBsGASNAMG+8I3xgGu5Y~7hDGLF4S68FZ`(g z?5`yZaLQb5Iv%1@_iAb$12j9pE7ViqQ%#{>o5uj{%+x2fQQwdLyPAWlRjGce2X*gn sJF{>M0000000000000000HAk&0lxi*PpZN9L;wH)07*qoM6N<$f~}enLjV8( diff --git a/app/src/main/res/drawable-xxxhdpi/ic_web_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_web_black_24dp.png deleted file mode 100644 index e82a24df9bc0fe54ae03950af05599637048c183..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 344 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD3?#3*wSy#_0(?STfi#7n@8P#kKqJITg8YIR zSi~hHrThW{gM!mDib_hG+S)rhyHs7Tr~y^1_jGX#sbGA2!;!DaK*aT8*y;es4O{E~ zN0+`^&)MSs=)pY0hs%83^&dzxJeYPpi~XwU@(befXH}y5?*8{zGycxCnDgm_m|2`# zpD>kAmWq9l8Pv_a$7j_J2SZ))6)YS%?hOt%7JmPG{=jd3CKe6>g$vu*INoeDc4$cV zI=~@Nz+u7i>Sptms&7lC`DPU~E}3h({@}?+%oc@aGgsQjrC+tMJ91(Av86X0Qzh^G cWoG!m_}>2aZS9>xS3u$8>FVdQ&MBb@0OfIQy#N3J diff --git a/app/src/main/res/drawable-xxxhdpi/ic_zip_box_black_24dp_active.png b/app/src/main/res/drawable-xxxhdpi/ic_zip_box_black_24dp_active.png deleted file mode 100644 index c3359f74c4819a6006c45ce6ed858391841e6147..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 270 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%xcgu6nvShEy=Vy}gn5kb!{1Mg3M; z4(Fp@Hxz~Tx^u98yz)il1Ruw_OaILeu3oqE@EIVuSE4v^XK5FE1&di`eARg9#c9ONE_L%TgItfvbd5%}i!pqxCrq}tGUb?r^PS7SuXKc+LqNfy zp`j|^KLaBZ3x~i1H8CKcfiW)$8#loIBUo5r!SBP@-}(114`}Fo<|bD=|Nh}i- t)*Orv(Bde*qQ2nQxxo7yKrVd4DfapAX}dRzKLb6;;OXk;vd$@?2>^qCWR?H` diff --git a/app/src/main/res/drawable/ic_add_folder_white_24dp.xml b/app/src/main/res/drawable/ic_add_folder_white_24dp.xml new file mode 100644 index 00000000..d2f2e42b --- /dev/null +++ b/app/src/main/res/drawable/ic_add_folder_white_24dp.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_add_white_24dp.xml b/app/src/main/res/drawable/ic_add_white_24dp.xml new file mode 100644 index 00000000..6b6146ec --- /dev/null +++ b/app/src/main/res/drawable/ic_add_white_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_autorenew_24dp.xml b/app/src/main/res/drawable/ic_autorenew_24dp.xml new file mode 100644 index 00000000..5f864075 --- /dev/null +++ b/app/src/main/res/drawable/ic_autorenew_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_cellphone_black_24dp.xml b/app/src/main/res/drawable/ic_cellphone_black_24dp.xml deleted file mode 100644 index 52c7da3c..00000000 --- a/app/src/main/res/drawable/ic_cellphone_black_24dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_check_white_24dp.xml b/app/src/main/res/drawable/ic_check_white_24dp.xml new file mode 100644 index 00000000..e69d6e1a --- /dev/null +++ b/app/src/main/res/drawable/ic_check_white_24dp.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_close_24dp.xml b/app/src/main/res/drawable/ic_close_24dp.xml new file mode 100644 index 00000000..9ff3a931 --- /dev/null +++ b/app/src/main/res/drawable/ic_close_24dp.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_content_copy_24dp.xml b/app/src/main/res/drawable/ic_content_copy_24dp.xml new file mode 100644 index 00000000..46062c57 --- /dev/null +++ b/app/src/main/res/drawable/ic_content_copy_24dp.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_delete_white_24dp.xml b/app/src/main/res/drawable/ic_delete_white_24dp.xml new file mode 100644 index 00000000..95f2ef56 --- /dev/null +++ b/app/src/main/res/drawable/ic_delete_white_24dp.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_developer_board_24dp.xml b/app/src/main/res/drawable/ic_developer_board_24dp.xml new file mode 100644 index 00000000..ff4b4db7 --- /dev/null +++ b/app/src/main/res/drawable/ic_developer_board_24dp.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_device_hub_24dp.xml b/app/src/main/res/drawable/ic_device_hub_24dp.xml new file mode 100644 index 00000000..6fb1f2f6 --- /dev/null +++ b/app/src/main/res/drawable/ic_device_hub_24dp.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_folder_24dp.xml b/app/src/main/res/drawable/ic_folder_24dp.xml new file mode 100644 index 00000000..e3eda102 --- /dev/null +++ b/app/src/main/res/drawable/ic_folder_24dp.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_folder_black_24dp.xml b/app/src/main/res/drawable/ic_folder_black_24dp.xml deleted file mode 100644 index 44582fde..00000000 --- a/app/src/main/res/drawable/ic_folder_black_24dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_history_24dp.xml b/app/src/main/res/drawable/ic_history_24dp.xml new file mode 100644 index 00000000..8411cfee --- /dev/null +++ b/app/src/main/res/drawable/ic_history_24dp.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_info_24dp.xml b/app/src/main/res/drawable/ic_info_24dp.xml new file mode 100644 index 00000000..32b2fd3e --- /dev/null +++ b/app/src/main/res/drawable/ic_info_24dp.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_label_outline_24dp.xml b/app/src/main/res/drawable/ic_label_outline_24dp.xml new file mode 100644 index 00000000..74c57389 --- /dev/null +++ b/app/src/main/res/drawable/ic_label_outline_24dp.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_link_24dp.xml b/app/src/main/res/drawable/ic_link_24dp.xml new file mode 100644 index 00000000..b39c110e --- /dev/null +++ b/app/src/main/res/drawable/ic_link_24dp.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_lock_24dp.xml b/app/src/main/res/drawable/ic_lock_24dp.xml new file mode 100644 index 00000000..3e315272 --- /dev/null +++ b/app/src/main/res/drawable/ic_lock_24dp.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_phonelink_24dp.xml b/app/src/main/res/drawable/ic_phonelink_24dp.xml new file mode 100644 index 00000000..0e125c08 --- /dev/null +++ b/app/src/main/res/drawable/ic_phonelink_24dp.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_qrcode_24dp.xml b/app/src/main/res/drawable/ic_qrcode_24dp.xml new file mode 100644 index 00000000..11b023cc --- /dev/null +++ b/app/src/main/res/drawable/ic_qrcode_24dp.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_settings_24dp.xml b/app/src/main/res/drawable/ic_settings_24dp.xml new file mode 100644 index 00000000..2e85225a --- /dev/null +++ b/app/src/main/res/drawable/ic_settings_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_share_24dp.xml b/app/src/main/res/drawable/ic_share_24dp.xml new file mode 100644 index 00000000..a813d1b3 --- /dev/null +++ b/app/src/main/res/drawable/ic_share_24dp.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_share_white_24dp.xml b/app/src/main/res/drawable/ic_share_white_24dp.xml new file mode 100644 index 00000000..51ea4a28 --- /dev/null +++ b/app/src/main/res/drawable/ic_share_white_24dp.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_smartphone_24dp.xml b/app/src/main/res/drawable/ic_smartphone_24dp.xml new file mode 100644 index 00000000..83cede80 --- /dev/null +++ b/app/src/main/res/drawable/ic_smartphone_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_tag_text_outline_24dp.xml b/app/src/main/res/drawable/ic_tag_text_outline_24dp.xml new file mode 100644 index 00000000..c3e78a37 --- /dev/null +++ b/app/src/main/res/drawable/ic_tag_text_outline_24dp.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_visibility_off_black_24dp_active.xml b/app/src/main/res/drawable/ic_visibility_off_24dp.xml similarity index 83% rename from app/src/main/res/drawable/ic_visibility_off_black_24dp_active.xml rename to app/src/main/res/drawable/ic_visibility_off_24dp.xml index 5a7f8dff..004e08ec 100644 --- a/app/src/main/res/drawable/ic_visibility_off_black_24dp_active.xml +++ b/app/src/main/res/drawable/ic_visibility_off_24dp.xml @@ -1,9 +1,10 @@ + android:width="24dp"> diff --git a/app/src/main/res/drawable/ic_visibility_off_black_24dp.xml b/app/src/main/res/drawable/ic_visibility_off_black_24dp.xml deleted file mode 100644 index d1276fc1..00000000 --- a/app/src/main/res/drawable/ic_visibility_off_black_24dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_visibility_off_black_24dp_inactive.xml b/app/src/main/res/drawable/ic_visibility_off_black_24dp_inactive.xml deleted file mode 100644 index 89f3df49..00000000 --- a/app/src/main/res/drawable/ic_visibility_off_black_24dp_inactive.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_vpn_key_24dp.xml b/app/src/main/res/drawable/ic_vpn_key_24dp.xml new file mode 100644 index 00000000..574e7516 --- /dev/null +++ b/app/src/main/res/drawable/ic_vpn_key_24dp.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_vpn_key_black_24dp.xml b/app/src/main/res/drawable/ic_vpn_key_black_24dp.xml deleted file mode 100644 index 6c405c92..00000000 --- a/app/src/main/res/drawable/ic_vpn_key_black_24dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_web_24dp.xml b/app/src/main/res/drawable/ic_web_24dp.xml new file mode 100644 index 00000000..a27fb576 --- /dev/null +++ b/app/src/main/res/drawable/ic_web_24dp.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_zipbox_24dp.xml b/app/src/main/res/drawable/ic_zipbox_24dp.xml new file mode 100644 index 00000000..115d7363 --- /dev/null +++ b/app/src/main/res/drawable/ic_zipbox_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout/activity_share.xml b/app/src/main/res/layout/activity_share.xml index ff218c55..29f5762c 100644 --- a/app/src/main/res/layout/activity_share.xml +++ b/app/src/main/res/layout/activity_share.xml @@ -137,8 +137,8 @@ android:layout_marginLeft="8dp" android:layout_marginStart="8dp" android:layout_marginTop="6dp" - android:drawableLeft="@drawable/ic_folder_black_24dp" - android:drawableStart="@drawable/ic_folder_black_24dp" + android:drawableLeft="@drawable/ic_folder_24dp" + android:drawableStart="@drawable/ic_folder_24dp" android:focusable="true" android:hint="@string/no_sub_folder_is_selected" app:layout_constraintHorizontal_bias="0.0" diff --git a/app/src/main/res/layout/dialog_qrcode.xml b/app/src/main/res/layout/dialog_qrcode.xml index 56ff52cc..4e9773bd 100644 --- a/app/src/main/res/layout/dialog_qrcode.xml +++ b/app/src/main/res/layout/dialog_qrcode.xml @@ -24,8 +24,8 @@ android:layout_weight="1" android:padding="8dp" android:clickable="true" - android:drawableEnd="@drawable/ic_content_copy_black_24dp" - android:drawableRight="@drawable/ic_content_copy_black_24dp" + android:drawableEnd="@drawable/ic_content_copy_24dp" + android:drawableRight="@drawable/ic_content_copy_24dp" android:focusable="true" android:fontFamily="monospace" android:textAppearance="@style/TextAppearance.AppCompat.Caption" @@ -37,8 +37,8 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:padding="8dp" - android:drawableRight="@drawable/ic_share_black_24dp" - android:drawableEnd="@drawable/ic_share_black_24dp" + android:drawableRight="@drawable/ic_share_24dp" + android:drawableEnd="@drawable/ic_share_24dp" android:clickable="true" android:focusable="true" /> diff --git a/app/src/main/res/layout/fragment_device.xml b/app/src/main/res/layout/fragment_device.xml index fe168280..5066c7fa 100644 --- a/app/src/main/res/layout/fragment_device.xml +++ b/app/src/main/res/layout/fragment_device.xml @@ -34,8 +34,8 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" - android:drawableLeft="@drawable/ic_cellphone_black_24dp" - android:drawableStart="@drawable/ic_cellphone_black_24dp" + android:drawableLeft="@drawable/ic_smartphone_24dp" + android:drawableStart="@drawable/ic_smartphone_24dp" android:hint="@string/device_id" android:imeOptions="actionNext" android:inputType="textNoSuggestions|textMultiLine" @@ -50,7 +50,7 @@ android:layout_marginEnd="@dimen/abc_action_bar_content_inset_material" android:layout_marginRight="@dimen/abc_action_bar_content_inset_material" android:contentDescription="@string/scan_qr_code_description" - android:src="@drawable/ic_qrcode_black_24dp_active" /> + android:src="@drawable/ic_qrcode_24dp" /> @@ -69,8 +69,8 @@ style="@style/Widget.Syncthing.TextView.Label.Details.Field" android:layout_width="match_parent" android:layout_height="wrap_content" - android:drawableLeft="@drawable/ic_link_black_24dp_active" - android:drawableStart="@drawable/ic_link_black_24dp_active" + android:drawableLeft="@drawable/ic_link_24dp" + android:drawableStart="@drawable/ic_link_24dp" android:hint="@string/addresses" android:imeOptions="actionDone" android:inputType="textNoSuggestions"/> @@ -89,8 +89,8 @@ android:layout_weight="1" android:background="@null" android:checked="false" - android:drawableLeft="@drawable/ic_zip_box_black_24dp_active" - android:drawableStart="@drawable/ic_zip_box_black_24dp_active" + android:drawableLeft="@drawable/ic_zipbox_24dp" + android:drawableStart="@drawable/ic_zipbox_24dp" android:text="@string/compression" /> @@ -31,8 +31,8 @@ style="@style/Widget.Syncthing.TextView.Label" android:layout_width="match_parent" android:layout_height="48dp" - android:drawableLeft="@drawable/ic_close_black_24dp" - android:drawableStart="@drawable/ic_close_black_24dp" + android:drawableLeft="@drawable/ic_close_24dp" + android:drawableStart="@drawable/ic_close_24dp" android:text="@string/exit" android:visibility="gone" android:clickable="true" @@ -215,8 +215,8 @@ android:layout_width="match_parent" android:layout_height="48dp" android:clickable="true" - android:drawableLeft="@drawable/ic_qrcode_black_24dp_active" - android:drawableStart="@drawable/ic_qrcode_black_24dp_active" + android:drawableLeft="@drawable/ic_qrcode_24dp" + android:drawableStart="@drawable/ic_qrcode_24dp" android:focusable="true" android:text="@string/show_device_id" /> @@ -225,8 +225,8 @@ style="@style/Widget.Syncthing.TextView.Label" android:layout_width="match_parent" android:layout_height="48dp" - android:drawableLeft="@drawable/ic_web_black_24dp" - android:drawableStart="@drawable/ic_web_black_24dp" + android:drawableLeft="@drawable/ic_web_24dp" + android:drawableStart="@drawable/ic_web_24dp" android:text="@string/web_gui_title" android:clickable="true" android:focusable="true" /> @@ -236,8 +236,8 @@ style="@style/Widget.Syncthing.TextView.Label" android:layout_width="match_parent" android:layout_height="48dp" - android:drawableLeft="@drawable/ic_autorenew_black_24dp" - android:drawableStart="@drawable/ic_autorenew_black_24dp" + android:drawableLeft="@drawable/ic_autorenew_24dp" + android:drawableStart="@drawable/ic_autorenew_24dp" android:text="@string/restart" android:clickable="true" android:focusable="true" /> diff --git a/app/src/main/res/layout/fragment_folder.xml b/app/src/main/res/layout/fragment_folder.xml index 9a77d284..0c4a77d8 100644 --- a/app/src/main/res/layout/fragment_folder.xml +++ b/app/src/main/res/layout/fragment_folder.xml @@ -27,8 +27,8 @@ style="@style/Widget.Syncthing.TextView.Label.Details.Field" android:layout_width="match_parent" android:layout_height="wrap_content" - android:drawableLeft="@drawable/ic_label_outline_black_24dp" - android:drawableStart="@drawable/ic_label_outline_black_24dp" + android:drawableLeft="@drawable/ic_label_outline_24dp" + android:drawableStart="@drawable/ic_label_outline_24dp" android:hint="@string/folder_label" android:imeOptions="actionDone" android:inputType="textCapWords|textNoSuggestions" /> @@ -38,8 +38,8 @@ style="@style/Widget.Syncthing.TextView.Label.Details.Field" android:layout_width="match_parent" android:layout_height="wrap_content" - android:drawableLeft="@drawable/ic_vpn_key_black_24dp" - android:drawableStart="@drawable/ic_vpn_key_black_24dp" + android:drawableLeft="@drawable/ic_vpn_key_24dp" + android:drawableStart="@drawable/ic_vpn_key_24dp" android:hint="@string/folder_id" android:imeOptions="actionDone" android:inputType="textCapWords" /> @@ -49,8 +49,8 @@ style="@style/Widget.Syncthing.TextView.Label.Details" android:layout_width="match_parent" android:layout_height="wrap_content" - android:drawableLeft="@drawable/ic_folder_black_24dp" - android:drawableStart="@drawable/ic_folder_black_24dp" + android:drawableLeft="@drawable/ic_folder_24dp" + android:drawableStart="@drawable/ic_folder_24dp" android:focusable="true" android:hint="@string/directory"/> @@ -64,8 +64,8 @@ style="@style/Widget.Syncthing.TextView.Label.Details" android:layout_width="match_parent" android:layout_height="wrap_content" - android:drawableLeft="@drawable/ic_device_hub_black_24dp_active" - android:drawableStart="@drawable/ic_device_hub_black_24dp_active" + android:drawableLeft="@drawable/ic_device_hub_24dp" + android:drawableStart="@drawable/ic_device_hub_24dp" android:text="@string/devices" /> @@ -85,8 +85,8 @@ android:layout_weight="1" android:background="@null" android:checked="false" - android:drawableLeft="@drawable/ic_lock_black_24dp_active" - android:drawableStart="@drawable/ic_lock_black_24dp_active" + android:drawableLeft="@drawable/ic_lock_24dp" + android:drawableStart="@drawable/ic_lock_24dp" android:text="@string/folder_type" /> diff --git a/app/src/main/res/layout/fragment_staggered_versioning.xml b/app/src/main/res/layout/fragment_staggered_versioning.xml index 60434246..0500735c 100644 --- a/app/src/main/res/layout/fragment_staggered_versioning.xml +++ b/app/src/main/res/layout/fragment_staggered_versioning.xml @@ -52,8 +52,8 @@ style="@style/Widget.Syncthing.TextView.Label.Details" android:layout_width="match_parent" android:layout_height="wrap_content" - android:drawableLeft="@drawable/ic_folder_black_24dp" - android:drawableStart="@drawable/ic_folder_black_24dp" + android:drawableLeft="@drawable/ic_folder_24dp" + android:drawableStart="@drawable/ic_folder_24dp" android:focusable="true" android:hint="@string/directory"/> diff --git a/app/src/main/res/layout/item_folder_list.xml b/app/src/main/res/layout/item_folder_list.xml index 0856e370..2c30b5b6 100644 --- a/app/src/main/res/layout/item_folder_list.xml +++ b/app/src/main/res/layout/item_folder_list.xml @@ -100,7 +100,7 @@ android:paddingRight="20dp" android:paddingStart="30dp" android:paddingTop="5dp" - android:src="@drawable/ic_folder_black_24dp" /> + android:src="@drawable/ic_folder_24dp" /> diff --git a/app/src/main/res/menu/device_list.xml b/app/src/main/res/menu/device_list.xml index fa1d81ab..182d2d84 100644 --- a/app/src/main/res/menu/device_list.xml +++ b/app/src/main/res/menu/device_list.xml @@ -5,7 +5,7 @@ diff --git a/app/src/main/res/menu/device_settings.xml b/app/src/main/res/menu/device_settings.xml index 7f6a1705..277c1a5a 100644 --- a/app/src/main/res/menu/device_settings.xml +++ b/app/src/main/res/menu/device_settings.xml @@ -6,18 +6,18 @@ diff --git a/app/src/main/res/menu/folder_list.xml b/app/src/main/res/menu/folder_list.xml index b03d348d..3e2bae32 100644 --- a/app/src/main/res/menu/folder_list.xml +++ b/app/src/main/res/menu/folder_list.xml @@ -5,7 +5,7 @@ diff --git a/app/src/main/res/menu/folder_picker.xml b/app/src/main/res/menu/folder_picker.xml index e0331849..b0a7bf54 100644 --- a/app/src/main/res/menu/folder_picker.xml +++ b/app/src/main/res/menu/folder_picker.xml @@ -11,7 +11,7 @@ diff --git a/app/src/main/res/menu/folder_settings.xml b/app/src/main/res/menu/folder_settings.xml index f590cab7..4baaa177 100644 --- a/app/src/main/res/menu/folder_settings.xml +++ b/app/src/main/res/menu/folder_settings.xml @@ -5,13 +5,13 @@ diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index a61c2a44..b244e309 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -15,4 +15,14 @@ battery_power + + @string/preference_theme_option_light + @string/preference_theme_option_dark + + + + 1 + 2 + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b7c9a37a..741a0e52 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -379,6 +379,10 @@ Please report any problems you encounter via Github. When starting the app, open web GUI instead of the main screen + Theme + Light + Dark + Default Language diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index d88d22f0..1a983fdf 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -64,4 +64,13 @@ 5dp 5dp + + + + + + + + + - diff --git a/app/src/main/res/xml/app_settings.xml b/app/src/main/res/xml/app_settings.xml index 852cb214..67d26f0b 100644 --- a/app/src/main/res/xml/app_settings.xml +++ b/app/src/main/res/xml/app_settings.xml @@ -1,6 +1,13 @@ + +