From 2fa76e53430c94d591bba773a58841ad5a206088 Mon Sep 17 00:00:00 2001 From: Roshan Rajaratnam Date: Tue, 12 May 2020 11:17:49 +0200 Subject: [PATCH 1/9] WIP: Dark theme support --- Example/nrf-mesh/app/build.gradle | 8 + .../nrfmeshprovisioner/GroupsFragment.java | 3 +- .../nrfmeshprovisioner/NetworkFragment.java | 6 +- .../ProvisioningActivity.java | 9 +- .../nrfmeshprovisioner/SettingsFragment.java | 25 +- .../adapter/FilterAddressAdapter.java | 3 +- .../adapter/GroupAdapter.java | 9 +- .../adapter/GroupAddressAdapter.java | 15 +- .../adapter/GroupModelAdapter.java | 18 +- .../adapter/SubGroupAdapter.java | 8 +- .../dialog/DialogFragmenPermissionDenied.java | 4 +- .../DialogFragmentAuthenticationInput.java | 13 +- .../dialog/DialogFragmentConfigStatus.java | 4 +- .../DialogFragmentConfigurationComplete.java | 2 +- .../dialog/DialogFragmentCreateGroup.java | 2 +- .../dialog/DialogFragmentDeleteNode.java | 2 +- .../dialog/DialogFragmentDisconnected.java | 4 +- .../dialog/DialogFragmentError.java | 4 +- .../DialogFragmentFilterAddAddress.java | 2 +- .../DialogFragmentGroupSubscription.java | 2 +- .../dialog/DialogFragmentMeshExportMsg.java | 6 +- .../dialog/DialogFragmentMeshImport.java | 4 +- .../dialog/DialogFragmentMeshImportMsg.java | 6 +- .../dialog/DialogFragmentNetworkName.java | 16 +- .../DialogFragmentPermissionRationale.java | 4 +- ...DialogFragmentProvisioningFailedError.java | 4 +- .../dialog/DialogFragmentProxySet.java | 6 +- .../dialog/DialogFragmentResetNetwork.java | 4 +- .../DialogFragmentTransactionStatus.java | 4 +- .../dialog/DialogFragmentUnicastAddress.java | 2 +- .../keys/AddAppKeyActivity.java | 15 +- .../keys/AddNetKeyActivity.java | 7 +- .../keys/AppKeysActivity.java | 3 +- .../keys/EditAppKeyActivity.java | 5 +- .../keys/EditNetKeyActivity.java | 5 +- .../keys/NetKeysActivity.java | 5 +- .../keys/adapter/BoundAppKeysAdapter.java | 7 +- .../keys/adapter/ManageAppKeyAdapter.java | 6 +- .../adapter/ManageBoundNetKeyAdapter.java | 11 +- .../keys/adapter/ManageNetKeyAdapter.java | 11 +- .../keys/dialogs/DialogFragmentAddKey.java | 4 +- .../dialogs/DialogFragmentEditAppKey.java | 2 +- .../dialogs/DialogFragmentEditNetKey.java | 2 +- .../keys/dialogs/DialogFragmentKeyName.java | 2 +- .../node/NodeConfigurationActivity.java | 7 +- .../node/PublicationSettingsActivity.java | 3 +- .../node/adapter/ElementAdapter.java | 7 +- .../node/adapter/NodeAdapter.java | 10 +- .../dialog/DialogFragmentElementName.java | 2 +- ...DialogFragmentNetworkTransmitSettings.java | 10 +- .../node/dialog/DialogFragmentNodeName.java | 2 +- .../DialogFragmentPublicationResolution.java | 6 +- .../dialog/DialogFragmentPublishAddress.java | 2 +- .../node/dialog/DialogFragmentResetNode.java | 4 +- .../dialog/DialogRelayRetransmitSettings.java | 10 +- .../provisioners/AddProvisionerActivity.java | 11 +- .../provisioners/EditProvisionerActivity.java | 9 +- .../provisioners/ProvisionersActivity.java | 5 +- .../provisioners/RangesActivity.java | 3 +- .../adapter/ProvisionerAdapter.java | 29 +- .../provisioners/adapter/RangeAdapter.java | 2 +- .../dialogs/DialogFragmentGroupRange.java | 4 +- .../DialogFragmentProvisionerAddress.java | 2 +- .../DialogFragmentProvisionerName.java | 2 +- .../dialogs/DialogFragmentSceneRange.java | 2 +- .../dialogs/DialogFragmentUnassign.java | 2 +- .../dialogs/DialogFragmentUnicastRange.java | 2 +- .../viewmodels/BaseViewModel.java | 4 +- .../ProvisioningStatusLiveData.java | 52 +-- .../widgets/DividerItemDecorator.java | 34 ++ .../RemovableItemTouchHelperCallback.java | 1 - .../widgets/RemovableViewHolder.java | 6 +- .../src/main/res/color/bottom_nav_color.xml | 5 + .../res/color/proxy_filter_button_states.xml | 2 +- .../list_divider_holo_light.9.png | Bin 76 -> 0 bytes .../main/res/drawable-xhdpi/ic_rssi_0_bar.png | Bin 1038 -> 0 bytes .../main/res/drawable-xhdpi/ic_rssi_1_bar.png | Bin 1125 -> 0 bytes .../res/drawable-xhdpi/ic_rssi_2_bars.png | Bin 1318 -> 0 bytes .../res/drawable-xhdpi/ic_rssi_3_bars.png | Bin 1356 -> 0 bytes .../list_divider_holo_light.9.png | Bin 83 -> 0 bytes .../main/res/drawable/blue_button_states.xml | 2 +- .../app/src/main/res/drawable/divider.xml | 26 -- .../main/res/drawable/ic_account_check.xml | 14 +- .../src/main/res/drawable/ic_account_key.xml | 12 + .../ic_account_key_black_alpha_24dp.xml | 9 - .../src/main/res/drawable/ic_arrow_back.xml | 33 ++ .../res/drawable/ic_arrow_collapse_black.xml | 11 + .../ic_arrow_collapse_black_alpha_24dp.xml | 5 - .../main/res/drawable/ic_arrow_downward.xml | 11 + .../ic_arrow_downward_black_alpha_24dp.xml | 5 - .../main/res/drawable/ic_arrow_forward.xml | 33 ++ .../drawable/ic_arrow_forward_black_alpha.xml | 27 -- .../src/main/res/drawable/ic_arrow_upward.xml | 11 + .../ic_arrow_upward_black_alpha_24dp.xml | 5 - ...ic_lan_black.xml => ic_auto_fix_black.xml} | 12 +- .../drawable/ic_auto_fix_black_24dp_alpha.xml | 27 -- .../main/res/drawable/ic_barcode_black.xml | 33 ++ .../res/drawable/ic_bluetooth_disabled.xml | 13 +- ...k_alpha.xml => ic_bluetooth_searching.xml} | 13 +- .../src/main/res/drawable/ic_capabilities.xml | 14 +- .../src/main/res/drawable/ic_certificate.xml | 13 +- .../{ic_check_white_24dp.xml => ic_check.xml} | 0 .../{ic_close_white_24dp.xml => ic_close.xml} | 0 .../src/main/res/drawable/ic_content_copy.xml | 11 + .../ic_content_copy_black_24dp_alpha.xml | 5 - ...ete_black_alpha_24dp.xml => ic_delete.xml} | 15 +- ...edium_gray_48dp.xml => ic_domain_48dp.xml} | 0 .../src/main/res/drawable/ic_domain_black.xml | 33 ++ .../drawable/ic_domain_black_24dp_alpha.xml | 27 -- ...p.xml => ic_domain_nordic_medium_gray.xml} | 0 .../main/res/drawable/ic_done_all_black.xml | 11 + .../drawable/ic_done_all_black_alpha_24dp.xml | 5 - ...e_24dp.xml => ic_done_all_nordic_lake.xml} | 0 ...l_white_24dp.xml => ic_done_all_white.xml} | 0 .../app/src/main/res/drawable/ic_drawing.xml | 11 + .../drawable/ic_drawing_black_24dp_alpha.xml | 5 - ...black_alpha_24dp.xml => ic_edit_black.xml} | 13 +- ..._edit_white_24dp.xml => ic_edit_white.xml} | 0 .../res/drawable/ic_error_outline_black.xml | 33 ++ .../drawable/ic_error_outline_black_alpha.xml | 27 -- .../main/res/drawable/ic_filter_list_24dp.xml | 11 + .../drawable/ic_filter_list_black_24dp.xml | 9 - .../ic_filter_list_black_alpha_24dp.xml | 5 - .../main/res/drawable/ic_folder_key_24dp.xml | 11 + .../ic_folder_key_black_24dp_alpha.xml | 5 - ...4dp.xml => ic_folder_provisioner_24dp.xml} | 13 +- ...grey_24dp.xml => ic_help_outline_24dp.xml} | 0 ...grey_48dp.xml => ic_help_outline_48dp.xml} | 0 .../app/src/main/res/drawable/ic_index.xml | 13 +- .../src/main/res/drawable/ic_info_24dp.xml | 11 + .../res/drawable/ic_info_black_24dp_alpha.xml | 5 - .../src/main/res/drawable/ic_info_outline.xml | 33 ++ .../drawable/ic_info_outline_black_alpha.xml | 27 -- .../app/src/main/res/drawable/ic_label.xml | 11 + .../drawable/ic_label_black_alpha_24dp.xml | 5 - .../main/res/drawable/ic_label_outline.xml | 11 + .../ic_label_outline_black_alpha_24dp.xml | 5 - ...n_black_alpha_24dp.xml => ic_lan_24dp.xml} | 13 +- ...n_black_alpha_48dp.xml => ic_lan_48dp.xml} | 13 +- ...grey_24dp.xml => ic_light_switch_24dp.xml} | 0 ...grey_48dp.xml => ic_light_switch_48dp.xml} | 0 ...e_24dp.xml => ic_lightbulb_level_24dp.xml} | 0 ...e_48dp.xml => ic_lightbulb_level_48dp.xml} | 0 .../ic_lightbulb_level_black_24dp.xml | 37 ++ ...24dp.xml => ic_lightbulb_outline_24dp.xml} | 0 ...48dp.xml => ic_lightbulb_outline_48dp.xml} | 0 .../ic_lightbulb_outline_black_24dp.xml | 11 + .../src/main/res/drawable/ic_linear_scale.xml | 11 + .../ic_linear_scale_black_alpha_24dp.xml | 5 - .../src/main/res/drawable/ic_location_off.xml | 13 +- .../main/res/drawable/ic_lock_open_24dp.xml | 20 + .../ic_lock_open_black_alpha_24dp.xml | 8 - .../src/main/res/drawable/ic_mesh_48dp.xml | 111 ------ .../src/main/res/drawable/ic_mesh_black.xml | 11 +- .../main/res/drawable/ic_mesh_black_48dp.xml | 11 + .../src/main/res/drawable/ic_mesh_white.xml | 11 +- .../app/src/main/res/drawable/ic_numeric.xml | 13 +- .../main/res/drawable/ic_oob_lock_outline.xml | 13 +- .../main/res/drawable/ic_outline_group.xml | 19 + .../res/drawable/ic_outline_group_24dp.xml | 20 + .../res/drawable/ic_outline_group_48dp.xml | 20 + .../drawable/ic_outline_group_white_48dp.xml | 18 + .../ic_outline_group_work_black_24dp.xml | 8 - ...ic_outline_group_work_black_alpha_24dp.xml | 8 - ...ic_outline_group_work_black_alpha_48dp.xml | 8 - .../ic_outline_group_work_white_48dp.xml | 8 - .../main/res/drawable/ic_perm_identity.xml | 33 ++ .../ic_perm_identity_black_24dp_alpha.xml | 27 -- ...roxy_24dp_black_alpha.xml => ic_proxy.xml} | 13 +- .../app/src/main/res/drawable/ic_publish.xml | 33 ++ .../drawable/ic_publish_black_alpha_24dp.xml | 27 -- .../app/src/main/res/drawable/ic_puzzle.xml | 14 +- .../src/main/res/drawable/ic_range_48dp.xml | 11 + .../drawable/ic_range_black_alpha_48dp.xml | 10 - .../app/src/main/res/drawable/ic_repeat.xml | 11 + .../res/drawable/ic_repeat_black_24dp.xml | 5 - .../app/src/main/res/drawable/ic_reset.xml | 11 + .../drawable/ic_reset_black_24dp_alpha.xml | 5 - .../res/drawable/ic_round_expand_less.xml | 33 ++ .../ic_round_expand_less_black_alpha_24dp.xml | 27 -- ...lpha_24dp.xml => ic_round_expand_more.xml} | 13 +- .../main/res/drawable/ic_rounded_corner.xml | 2 +- ...cene_black_alpha_24dp.xml => ic_scene.xml} | 13 +- .../app/src/main/res/drawable/ic_security.xml | 33 ++ .../drawable/ic_security_black_24dp_alpha.xml | 27 -- ...s_nordic_gray_24dp.xml => ic_settings.xml} | 12 +- .../main/res/drawable/ic_settings_black.xml | 27 -- .../src/main/res/drawable/ic_shield_key.xml | 11 + .../ic_shield_key_black_alpha_24dp.xml | 5 - .../res/drawable/ic_shield_provisioner.xml | 11 + ...ic_shield_provisioner_black_alpha_24dp.xml | 5 - .../src/main/res/drawable/ic_signal_0_bar.xml | 33 ++ .../src/main/res/drawable/ic_signal_1_bar.xml | 36 ++ .../src/main/res/drawable/ic_signal_2_bar.xml | 36 ++ .../src/main/res/drawable/ic_signal_3_bar.xml | 36 ++ ...ck_black_alpha.xml => ic_signal_4_bar.xml} | 13 +- .../{ic_rssi_bar.xml => ic_signal_bar.xml} | 27 +- .../src/main/res/drawable/ic_space_bar.xml | 11 + .../ic_space_bar_black_alpha_24dp.xml | 5 - ..._black_24dp_alpha.xml => ic_subscribe.xml} | 14 +- .../ic_subscribe_black_alpha_24dp.xml | 27 -- .../app/src/main/res/drawable/ic_timer.xml | 14 +- .../src/main/res/drawable/ic_vpn_key_24dp.xml | 11 + ...ack_alpha_48dp.xml => ic_vpn_key_48dp.xml} | 13 +- .../drawable/ic_vpn_key_black_alpha_24dp.xml | 5 - .../app/src/main/res/drawable/ic_widgets.xml | 11 + .../drawable/ic_widgets_black_24dp_alpha.xml | 5 - .../main/res/drawable/red_button_states.xml | 4 +- .../main/res/layout-land/activity_ranges.xml | 5 +- .../res/layout-land/info_range_legend.xml | 41 +- .../main/res/layout-sw600dp/network_item.xml | 82 ++-- .../src/main/res/layout/activity_add_keys.xml | 3 +- .../src/main/res/layout/activity_app_keys.xml | 3 +- .../res/layout/activity_config_groups.xml | 3 +- .../src/main/res/layout/activity_edit_key.xml | 21 +- .../res/layout/activity_edit_provisioner.xml | 25 +- .../app/src/main/res/layout/activity_main.xml | 51 ++- .../res/layout/activity_mesh_provisioner.xml | 68 ++-- .../layout/activity_model_configuration.xml | 104 +++-- .../src/main/res/layout/activity_net_keys.xml | 23 +- .../layout/activity_node_configuration.xml | 132 ++++--- .../main/res/layout/activity_node_details.xml | 14 +- .../main/res/layout/activity_provisioners.xml | 46 ++- .../layout/activity_publication_settings.xml | 94 +++-- .../src/main/res/layout/activity_ranges.xml | 5 +- .../main/res/layout/activity_reconnect.xml | 5 +- .../src/main/res/layout/activity_scanner.xml | 48 ++- .../app/src/main/res/layout/address_item.xml | 38 +- .../src/main/res/layout/address_type_item.xml | 5 +- .../app/src/main/res/layout/custom_chip.xml | 4 +- .../app/src/main/res/layout/device_item.xml | 36 +- .../layout/dialog_fragment_address_input.xml | 4 +- .../res/layout/dialog_fragment_auth_input.xml | 4 +- .../layout/dialog_fragment_create_group.xml | 2 +- .../layout/dialog_fragment_filter_address.xml | 4 +- .../dialog_fragment_group_subscription.xml | 12 +- .../res/layout/dialog_fragment_key_input.xml | 4 +- .../main/res/layout/dialog_fragment_name.xml | 2 +- ...log_fragment_network_transmit_settings.xml | 14 +- ...dialog_fragment_publication_parameters.xml | 4 +- .../dialog_fragment_publish_address.xml | 12 +- .../dialog_fragment_publish_ttl_input.xml | 2 +- .../main/res/layout/dialog_fragment_range.xml | 6 +- .../layout/dialog_fragment_relay_settings.xml | 18 +- .../dialog_fragment_select_oob_type.xml | 8 +- .../main/res/layout/dialog_fragment_ttl.xml | 2 +- .../app/src/main/res/layout/element_item.xml | 91 +++-- .../layout/fragment_bottom_sheet_dialog.xml | 27 +- .../src/main/res/layout/fragment_network.xml | 7 +- .../main/res/layout/fragment_proxy_filter.xml | 63 ++-- .../src/main/res/layout/fragment_settings.xml | 19 +- .../main/res/layout/group_element_item.xml | 4 +- .../app/src/main/res/layout/group_item.xml | 43 +-- .../src/main/res/layout/group_model_item.xml | 6 +- .../res/layout/group_subscription_item.xml | 27 +- .../main/res/layout/grouped_app_key_item.xml | 15 +- .../app/src/main/res/layout/grouped_item.xml | 77 ++-- .../main/res/layout/info_element_count.xml | 23 +- .../res/layout/info_input_oob_actions.xml | 17 +- .../main/res/layout/info_input_oob_size.xml | 24 +- .../main/res/layout/info_no_app_key_bound.xml | 23 +- .../src/main/res/layout/info_no_app_keys.xml | 9 +- .../src/main/res/layout/info_no_bluetooth.xml | 25 +- .../src/main/res/layout/info_no_devices.xml | 28 +- .../res/layout/info_no_groups_configured.xml | 9 +- .../res/layout/info_no_models_configured.xml | 9 +- .../res/layout/info_no_nodes_provisioned.xml | 23 +- .../main/res/layout/info_no_permission.xml | 7 +- .../src/main/res/layout/info_no_ranges.xml | 9 +- .../layout/info_node_company_identifier.xml | 28 +- .../src/main/res/layout/info_node_crpl.xml | 27 +- .../main/res/layout/info_node_device_key.xml | 27 +- .../main/res/layout/info_node_features.xml | 23 +- .../main/res/layout/info_node_identifier.xml | 11 +- .../src/main/res/layout/info_node_name.xml | 25 +- .../layout/info_node_product_identifier.xml | 17 +- .../res/layout/info_node_product_version.xml | 27 +- .../res/layout/info_node_prov_timestamp.xml | 23 +- .../res/layout/info_node_unicast_address.xml | 25 +- .../res/layout/info_output_oob_actions.xml | 25 +- .../main/res/layout/info_output_oob_size.xml | 25 +- .../main/res/layout/info_public_key_type.xml | 25 +- .../src/main/res/layout/info_range_legend.xml | 13 +- .../main/res/layout/info_static_oob_type.xml | 8 +- .../res/layout/info_supported_algorithms.xml | 25 +- .../main/res/layout/layout_capabilities.xml | 7 +- .../res/layout/layout_config_server_model.xml | 117 +++--- .../src/main/res/layout/layout_container.xml | 15 +- .../src/main/res/layout/layout_divider.xml | 11 +- .../main/res/layout/layout_generic_level.xml | 56 ++- .../layout_generic_level_bottom_sheet.xml | 357 +++++++++--------- .../main/res/layout/layout_generic_on_off.xml | 62 ++- .../layout_generic_on_off_bottom_sheet.xml | 47 ++- .../res/layout/layout_group_subscription.xml | 2 +- .../res/layout/layout_range_container.xml | 4 +- .../layout_vendor_model_bottom_sheet.xml | 19 +- .../layout/layout_vendor_model_controls.xml | 19 +- .../app/src/main/res/layout/model_item.xml | 32 +- .../main/res/layout/model_item_details.xml | 58 --- .../app/src/main/res/layout/network_item.xml | 79 ++-- .../src/main/res/layout/no_groups_layout.xml | 2 +- .../app/src/main/res/layout/oob_type_item.xml | 5 +- .../app/src/main/res/layout/progress_item.xml | 18 +- .../app/src/main/res/layout/range_item.xml | 33 +- .../main/res/layout/removable_row_item.xml | 43 ++- .../main/res/layout/removable_row_item1.xml | 100 ----- .../main/res/layout/removable_row_item2.xml | 125 +++--- .../main/res/layout/removable_row_item3.xml | 39 +- .../layout/removable_row_item_provisioner.xml | 90 +++++ .../app/src/main/res/layout/row_item_key.xml | 33 +- .../main/res/menu/menu_bottom_navigation.xml | 4 +- .../res/menu/menu_group_controls_connect.xml | 2 +- .../menu/menu_group_controls_disconnect.xml | 2 +- .../styles.xml} | 12 +- .../app/src/main/res/values-night/colors.xml | 78 ++++ .../app/src/main/res/values-night/styles.xml | 8 + .../app/src/main/res/values/colors.xml | 24 +- .../app/src/main/res/values/styles.xml | 47 +-- Example/nrf-mesh/build.gradle | 6 +- .../meshprovisioner/build.gradle | 7 + 320 files changed, 3039 insertions(+), 2771 deletions(-) create mode 100644 Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/widgets/DividerItemDecorator.java create mode 100644 Example/nrf-mesh/app/src/main/res/color/bottom_nav_color.xml delete mode 100644 Example/nrf-mesh/app/src/main/res/drawable-hdpi/list_divider_holo_light.9.png delete mode 100644 Example/nrf-mesh/app/src/main/res/drawable-xhdpi/ic_rssi_0_bar.png delete mode 100644 Example/nrf-mesh/app/src/main/res/drawable-xhdpi/ic_rssi_1_bar.png delete mode 100644 Example/nrf-mesh/app/src/main/res/drawable-xhdpi/ic_rssi_2_bars.png delete mode 100644 Example/nrf-mesh/app/src/main/res/drawable-xhdpi/ic_rssi_3_bars.png delete mode 100644 Example/nrf-mesh/app/src/main/res/drawable-xhdpi/list_divider_holo_light.9.png delete mode 100644 Example/nrf-mesh/app/src/main/res/drawable/divider.xml create mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_account_key.xml delete mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_account_key_black_alpha_24dp.xml create mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_arrow_back.xml create mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_arrow_collapse_black.xml delete mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_arrow_collapse_black_alpha_24dp.xml create mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_arrow_downward.xml delete mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_arrow_downward_black_alpha_24dp.xml create mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_arrow_forward.xml delete mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_arrow_forward_black_alpha.xml create mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_arrow_upward.xml delete mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_arrow_upward_black_alpha_24dp.xml rename Example/nrf-mesh/app/src/main/res/drawable/{ic_lan_black.xml => ic_auto_fix_black.xml} (72%) delete mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_auto_fix_black_24dp_alpha.xml create mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_barcode_black.xml rename Example/nrf-mesh/app/src/main/res/drawable/{ic_bluetooth_searching_black_alpha.xml => ic_bluetooth_searching.xml} (91%) rename Example/nrf-mesh/app/src/main/res/drawable/{ic_check_white_24dp.xml => ic_check.xml} (100%) rename Example/nrf-mesh/app/src/main/res/drawable/{ic_close_white_24dp.xml => ic_close.xml} (100%) create mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_content_copy.xml delete mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_content_copy_black_24dp_alpha.xml rename Example/nrf-mesh/app/src/main/res/drawable/{ic_delete_black_alpha_24dp.xml => ic_delete.xml} (86%) rename Example/nrf-mesh/app/src/main/res/drawable/{ic_domain_nordic_medium_gray_48dp.xml => ic_domain_48dp.xml} (100%) create mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_domain_black.xml delete mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_domain_black_24dp_alpha.xml rename Example/nrf-mesh/app/src/main/res/drawable/{ic_domain_nordic_medium_gray_24dp.xml => ic_domain_nordic_medium_gray.xml} (100%) create mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_done_all_black.xml delete mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_done_all_black_alpha_24dp.xml rename Example/nrf-mesh/app/src/main/res/drawable/{ic_done_all_nordic_lake_24dp.xml => ic_done_all_nordic_lake.xml} (100%) rename Example/nrf-mesh/app/src/main/res/drawable/{ic_done_all_white_24dp.xml => ic_done_all_white.xml} (100%) create mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_drawing.xml delete mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_drawing_black_24dp_alpha.xml rename Example/nrf-mesh/app/src/main/res/drawable/{ic_edit_black_alpha_24dp.xml => ic_edit_black.xml} (90%) rename Example/nrf-mesh/app/src/main/res/drawable/{ic_edit_white_24dp.xml => ic_edit_white.xml} (100%) create mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_error_outline_black.xml delete mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_error_outline_black_alpha.xml create mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_filter_list_24dp.xml delete mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_filter_list_black_24dp.xml delete mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_filter_list_black_alpha_24dp.xml create mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_folder_key_24dp.xml delete mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_folder_key_black_24dp_alpha.xml rename Example/nrf-mesh/app/src/main/res/drawable/{ic_folder_provisioner_black_alpha_24dp.xml => ic_folder_provisioner_24dp.xml} (73%) rename Example/nrf-mesh/app/src/main/res/drawable/{ic_help_outline_nordic_medium_grey_24dp.xml => ic_help_outline_24dp.xml} (100%) rename Example/nrf-mesh/app/src/main/res/drawable/{ic_help_outline_nordic_medium_grey_48dp.xml => ic_help_outline_48dp.xml} (100%) create mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_info_24dp.xml delete mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_info_black_24dp_alpha.xml create mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_info_outline.xml delete mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_info_outline_black_alpha.xml create mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_label.xml delete mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_label_black_alpha_24dp.xml create mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_label_outline.xml delete mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_label_outline_black_alpha_24dp.xml rename Example/nrf-mesh/app/src/main/res/drawable/{ic_lan_black_alpha_24dp.xml => ic_lan_24dp.xml} (90%) rename Example/nrf-mesh/app/src/main/res/drawable/{ic_lan_black_alpha_48dp.xml => ic_lan_48dp.xml} (90%) rename Example/nrf-mesh/app/src/main/res/drawable/{ic_light_switch_nordic_medium_grey_24dp.xml => ic_light_switch_24dp.xml} (100%) rename Example/nrf-mesh/app/src/main/res/drawable/{ic_light_switch_nordic_medium_grey_48dp.xml => ic_light_switch_48dp.xml} (100%) rename Example/nrf-mesh/app/src/main/res/drawable/{ic_lightbulb_level_nordic_medium_gray_outline_24dp.xml => ic_lightbulb_level_24dp.xml} (100%) rename Example/nrf-mesh/app/src/main/res/drawable/{ic_lightbulb_level_nordic_sun_outline_48dp.xml => ic_lightbulb_level_48dp.xml} (100%) create mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_lightbulb_level_black_24dp.xml rename Example/nrf-mesh/app/src/main/res/drawable/{ic_lightbulb_outline_nordic_medium_grey_24dp.xml => ic_lightbulb_outline_24dp.xml} (100%) rename Example/nrf-mesh/app/src/main/res/drawable/{ic_lightbulb_outline_nordic_grass_48dp.xml => ic_lightbulb_outline_48dp.xml} (100%) create mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_lightbulb_outline_black_24dp.xml create mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_linear_scale.xml delete mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_linear_scale_black_alpha_24dp.xml create mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_lock_open_24dp.xml delete mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_lock_open_black_alpha_24dp.xml delete mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_mesh_48dp.xml create mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_mesh_black_48dp.xml create mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_outline_group.xml create mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_outline_group_24dp.xml create mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_outline_group_48dp.xml create mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_outline_group_white_48dp.xml delete mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_outline_group_work_black_24dp.xml delete mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_outline_group_work_black_alpha_24dp.xml delete mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_outline_group_work_black_alpha_48dp.xml delete mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_outline_group_work_white_48dp.xml create mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_perm_identity.xml delete mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_perm_identity_black_24dp_alpha.xml rename Example/nrf-mesh/app/src/main/res/drawable/{ic_proxy_24dp_black_alpha.xml => ic_proxy.xml} (78%) create mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_publish.xml delete mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_publish_black_alpha_24dp.xml create mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_range_48dp.xml delete mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_range_black_alpha_48dp.xml create mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_repeat.xml delete mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_repeat_black_24dp.xml create mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_reset.xml delete mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_reset_black_24dp_alpha.xml create mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_round_expand_less.xml delete mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_round_expand_less_black_alpha_24dp.xml rename Example/nrf-mesh/app/src/main/res/drawable/{ic_round_expand_more_black_alpha_24dp.xml => ic_round_expand_more.xml} (89%) rename Example/nrf-mesh/app/src/main/res/drawable/{ic_scene_black_alpha_24dp.xml => ic_scene.xml} (67%) create mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_security.xml delete mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_security_black_24dp_alpha.xml rename Example/nrf-mesh/app/src/main/res/drawable/{ic_settings_nordic_gray_24dp.xml => ic_settings.xml} (93%) delete mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_settings_black.xml create mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_shield_key.xml delete mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_shield_key_black_alpha_24dp.xml create mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_shield_provisioner.xml delete mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_shield_provisioner_black_alpha_24dp.xml create mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_signal_0_bar.xml create mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_signal_1_bar.xml create mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_signal_2_bar.xml create mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_signal_3_bar.xml rename Example/nrf-mesh/app/src/main/res/drawable/{ic_arrow_back_black_alpha.xml => ic_signal_4_bar.xml} (80%) rename Example/nrf-mesh/app/src/main/res/drawable/{ic_rssi_bar.xml => ic_signal_bar.xml} (80%) create mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_space_bar.xml delete mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_space_bar_black_alpha_24dp.xml rename Example/nrf-mesh/app/src/main/res/drawable/{ic_barcode_black_24dp_alpha.xml => ic_subscribe.xml} (80%) delete mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_subscribe_black_alpha_24dp.xml create mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_vpn_key_24dp.xml rename Example/nrf-mesh/app/src/main/res/drawable/{ic_vpn_key_black_alpha_48dp.xml => ic_vpn_key_48dp.xml} (90%) delete mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_vpn_key_black_alpha_24dp.xml create mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_widgets.xml delete mode 100644 Example/nrf-mesh/app/src/main/res/drawable/ic_widgets_black_24dp_alpha.xml delete mode 100644 Example/nrf-mesh/app/src/main/res/layout/model_item_details.xml delete mode 100644 Example/nrf-mesh/app/src/main/res/layout/removable_row_item1.xml create mode 100644 Example/nrf-mesh/app/src/main/res/layout/removable_row_item_provisioner.xml rename Example/nrf-mesh/app/src/main/res/{drawable/nav_item_color_state.xml => values-night-v23/styles.xml} (81%) create mode 100644 Example/nrf-mesh/app/src/main/res/values-night/colors.xml create mode 100644 Example/nrf-mesh/app/src/main/res/values-night/styles.xml diff --git a/Example/nrf-mesh/app/build.gradle b/Example/nrf-mesh/app/build.gradle index 34df2a805..e7f4295ea 100644 --- a/Example/nrf-mesh/app/build.gradle +++ b/Example/nrf-mesh/app/build.gradle @@ -21,6 +21,8 @@ */ apply plugin: 'com.android.application' +apply plugin: 'kotlin-android-extensions' +apply plugin: 'kotlin-android' android { compileSdkVersion 29 @@ -86,4 +88,10 @@ dependencies { annotationProcessor 'com.google.dagger:dagger-compiler:2.27' annotationProcessor 'com.google.dagger:dagger-android-processor:2.27' implementation project(':meshprovisioner') + implementation "androidx.core:core-ktx:+" + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" +} +repositories { + mavenCentral() } diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/GroupsFragment.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/GroupsFragment.java index e4debc331..ac9bf11d6 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/GroupsFragment.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/GroupsFragment.java @@ -41,7 +41,6 @@ import androidx.coordinatorlayout.widget.CoordinatorLayout; import androidx.fragment.app.Fragment; import androidx.lifecycle.ViewModelProvider; -import androidx.lifecycle.ViewModelProviders; import androidx.recyclerview.widget.DividerItemDecoration; import androidx.recyclerview.widget.ItemTouchHelper; import androidx.recyclerview.widget.LinearLayoutManager; @@ -198,7 +197,7 @@ public boolean onGroupAdded(@NonNull final Group group) { private void displaySnackBar(final Group group) { final String message = getString(R.string.group_deleted, group.getName()); Snackbar.make(container, message, Snackbar.LENGTH_LONG) - .setActionTextColor(getResources().getColor(R.color.colorPrimaryDark)) + .setActionTextColor(getResources().getColor(R.color.colorSecondary)) .setAction(R.string.undo, v -> { mEmptyView.setVisibility(View.INVISIBLE); final MeshNetwork network = mViewModel.getNetworkLiveData().getMeshNetwork(); diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/NetworkFragment.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/NetworkFragment.java index a22046466..69103bbdc 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/NetworkFragment.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/NetworkFragment.java @@ -39,7 +39,6 @@ import androidx.coordinatorlayout.widget.CoordinatorLayout; import androidx.fragment.app.Fragment; import androidx.lifecycle.ViewModelProvider; -import androidx.lifecycle.ViewModelProviders; import androidx.recyclerview.widget.DividerItemDecoration; import androidx.recyclerview.widget.ItemTouchHelper; import androidx.recyclerview.widget.LinearLayoutManager; @@ -49,8 +48,8 @@ import no.nordicsemi.android.meshprovisioner.transport.ProvisionedMeshNode; import no.nordicsemi.android.nrfmeshprovisioner.ble.ScannerActivity; import no.nordicsemi.android.nrfmeshprovisioner.di.Injectable; -import no.nordicsemi.android.nrfmeshprovisioner.dialog.DialogFragmentError; import no.nordicsemi.android.nrfmeshprovisioner.dialog.DialogFragmentDeleteNode; +import no.nordicsemi.android.nrfmeshprovisioner.dialog.DialogFragmentError; import no.nordicsemi.android.nrfmeshprovisioner.node.NodeConfigurationActivity; import no.nordicsemi.android.nrfmeshprovisioner.node.adapter.NodeAdapter; import no.nordicsemi.android.nrfmeshprovisioner.utils.Utils; @@ -91,8 +90,7 @@ public View onCreateView(@NonNull final LayoutInflater inflater, @Nullable final mNodeAdapter = new NodeAdapter(requireContext(), mViewModel.getNodes()); mNodeAdapter.setOnItemClickListener(this); mRecyclerViewNodes.setLayoutManager(new LinearLayoutManager(getContext())); - final DividerItemDecoration decoration = new DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL); - mRecyclerViewNodes.addItemDecoration(decoration); + mRecyclerViewNodes.addItemDecoration(new DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)); final ItemTouchHelper.Callback itemTouchHelperCallback = new RemovableItemTouchHelperCallback(this); final ItemTouchHelper itemTouchHelper = new ItemTouchHelper(itemTouchHelperCallback); itemTouchHelper.attachToRecyclerView(mRecyclerViewNodes); diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/ProvisioningActivity.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/ProvisioningActivity.java index 3e2466461..5deb7567c 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/ProvisioningActivity.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/ProvisioningActivity.java @@ -45,7 +45,6 @@ import androidx.coordinatorlayout.widget.CoordinatorLayout; import androidx.core.content.ContextCompat; import androidx.lifecycle.ViewModelProvider; -import androidx.lifecycle.ViewModelProviders; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import butterknife.BindView; @@ -134,7 +133,7 @@ protected void onCreate(final Bundle savedInstanceState) { final View containerName = findViewById(R.id.container_name); containerName.findViewById(R.id.image) - .setBackground(ContextCompat.getDrawable(this, R.drawable.ic_label_outline_black_alpha_24dp)); + .setBackground(ContextCompat.getDrawable(this, R.drawable.ic_label_outline)); final TextView nameTitle = containerName.findViewById(R.id.title); nameTitle.setText(R.string.summary_name); final TextView nameView = containerName.findViewById(R.id.text); @@ -146,7 +145,7 @@ protected void onCreate(final Bundle savedInstanceState) { final View containerUnicastAddress = findViewById(R.id.container_unicast); containerUnicastAddress.findViewById(R.id.image) - .setBackground(ContextCompat.getDrawable(this, R.drawable.ic_lan_black_alpha_24dp)); + .setBackground(ContextCompat.getDrawable(this, R.drawable.ic_lan_24dp)); final TextView unicastAddressTitle = containerUnicastAddress.findViewById(R.id.title); unicastAddressTitle.setText(R.string.title_unicast_address); final TextView unicastAddressView = containerUnicastAddress.findViewById(R.id.text); @@ -164,7 +163,7 @@ protected void onCreate(final Bundle savedInstanceState) { final View containerAppKey = findViewById(R.id.container_app_keys); containerAppKey.findViewById(R.id.image) - .setBackground(ContextCompat.getDrawable(this, R.drawable.ic_vpn_key_black_alpha_24dp)); + .setBackground(ContextCompat.getDrawable(this, R.drawable.ic_vpn_key_24dp)); final TextView appKeyTitle = containerAppKey.findViewById(R.id.title); appKeyTitle.setText(R.string.title_app_keys); final TextView appKeyView = containerAppKey.findViewById(R.id.text); @@ -365,7 +364,7 @@ public void setupProvisionerStateObservers(final View provisioningStatusContaine switch (state) { case PROVISIONING_FAILED: if (getSupportFragmentManager().findFragmentByTag(DIALOG_FRAGMENT_PROVISIONING_FAILED) == null) { - final String statusMessage = ProvisioningFailedState.parseProvisioningFailure(getApplicationContext(), provisionerProgress.getStatusReceived()); + final String statusMessage = ProvisioningFailedState.parseProvisioningFailure(this, provisionerProgress.getStatusReceived()); DialogFragmentProvisioningFailedError message = DialogFragmentProvisioningFailedError.newInstance(getString(R.string.title_error_provisioning_failed), statusMessage); message.show(getSupportFragmentManager(), DIALOG_FRAGMENT_PROVISIONING_FAILED); } diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/SettingsFragment.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/SettingsFragment.java index 12b59a838..dd2d75500 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/SettingsFragment.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/SettingsFragment.java @@ -39,17 +39,16 @@ import android.widget.TextView; import android.widget.Toast; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; -import androidx.fragment.app.Fragment; -import androidx.lifecycle.ViewModelProvider; - import java.io.FileNotFoundException; import java.io.OutputStream; import javax.inject.Inject; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; +import androidx.fragment.app.Fragment; +import androidx.lifecycle.ViewModelProvider; import no.nordicsemi.android.nrfmeshprovisioner.di.Injectable; import no.nordicsemi.android.nrfmeshprovisioner.dialog.DialogFragmentMeshExportMsg; import no.nordicsemi.android.nrfmeshprovisioner.dialog.DialogFragmentMeshImport; @@ -97,7 +96,7 @@ public View onCreateView(@NonNull final LayoutInflater inflater, // Set up views final View containerNetworkName = rootView.findViewById(R.id.container_network_name); containerNetworkName.findViewById(R.id.image) - .setBackground(ContextCompat.getDrawable(requireContext(), R.drawable.ic_label_black_alpha_24dp)); + .setBackground(ContextCompat.getDrawable(requireContext(), R.drawable.ic_label)); final TextView networkNameTitle = containerNetworkName.findViewById(R.id.title); networkNameTitle.setText(R.string.title_network_name); final TextView networkNameView = containerNetworkName.findViewById(R.id.text); @@ -110,7 +109,7 @@ public View onCreateView(@NonNull final LayoutInflater inflater, final View containerProvisioner = rootView.findViewById(R.id.container_provisioners); containerProvisioner.findViewById(R.id.image) - .setBackground(ContextCompat.getDrawable(requireContext(), R.drawable.ic_folder_provisioner_black_alpha_24dp)); + .setBackground(ContextCompat.getDrawable(requireContext(), R.drawable.ic_folder_provisioner_24dp)); final TextView provisionerTitle = containerProvisioner.findViewById(R.id.title); final TextView provisionerSummary = containerProvisioner.findViewById(R.id.text); provisionerSummary.setVisibility(View.VISIBLE); @@ -122,7 +121,7 @@ public View onCreateView(@NonNull final LayoutInflater inflater, final View containerNetKey = rootView.findViewById(R.id.container_net_keys); containerNetKey.findViewById(R.id.image) - .setBackground(ContextCompat.getDrawable(requireContext(), R.drawable.ic_folder_key_black_24dp_alpha)); + .setBackground(ContextCompat.getDrawable(requireContext(), R.drawable.ic_folder_key_24dp)); final TextView keyTitle = containerNetKey.findViewById(R.id.title); keyTitle.setText(R.string.title_net_keys); final TextView netKeySummary = containerNetKey.findViewById(R.id.text); @@ -135,7 +134,7 @@ public View onCreateView(@NonNull final LayoutInflater inflater, final View containerAppKey = rootView.findViewById(R.id.container_app_keys); containerAppKey.findViewById(R.id.image). - setBackground(ContextCompat.getDrawable(requireContext(), R.drawable.ic_folder_key_black_24dp_alpha)); + setBackground(ContextCompat.getDrawable(requireContext(), R.drawable.ic_folder_key_24dp)); ((TextView) containerAppKey.findViewById(R.id.title)).setText(R.string.title_app_keys); final TextView appKeySummary = containerAppKey.findViewById(R.id.text); appKeySummary.setVisibility(View.VISIBLE); @@ -147,7 +146,7 @@ public View onCreateView(@NonNull final LayoutInflater inflater, final View containerIvTestMode = rootView.findViewById(R.id.container_iv_test_mode); containerIvTestMode.findViewById(R.id.image). - setBackground(ContextCompat.getDrawable(requireContext(), R.drawable.ic_folder_key_black_24dp_alpha)); + setBackground(ContextCompat.getDrawable(requireContext(), R.drawable.ic_folder_key_24dp)); ((TextView) containerIvTestMode.findViewById(R.id.title)).setText(R.string.title_iv_test_mode); final TextView ivTestModeSummary = containerIvTestMode.findViewById(R.id.text); ivTestModeSummary.setText(R.string.iv_test_mode_summary); @@ -189,7 +188,7 @@ public View onCreateView(@NonNull final LayoutInflater inflater, mViewModel.getNetworkLoadState().observe(getViewLifecycleOwner(), networkImportState -> { final String title = getString(R.string.title_network_import); final DialogFragmentMeshImportMsg fragment = - DialogFragmentMeshImportMsg.newInstance(R.drawable.ic_info_outline_black_alpha, + DialogFragmentMeshImportMsg.newInstance(R.drawable.ic_info_outline, title, networkImportState); fragment.show(getChildFragmentManager(), null); }); @@ -197,7 +196,7 @@ public View onCreateView(@NonNull final LayoutInflater inflater, mViewModel.getNetworkExportState().observe(getViewLifecycleOwner(), networkExportState -> { final String title = getString(R.string.title_network_export); final DialogFragmentMeshExportMsg fragment = - DialogFragmentMeshExportMsg.newInstance(R.drawable.ic_info_outline_black_alpha, + DialogFragmentMeshExportMsg.newInstance(R.drawable.ic_info_outline, title, networkExportState); fragment.show(getChildFragmentManager(), null); }); diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/adapter/FilterAddressAdapter.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/adapter/FilterAddressAdapter.java index 1c7ff8563..723bf35d0 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/adapter/FilterAddressAdapter.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/adapter/FilterAddressAdapter.java @@ -23,7 +23,6 @@ package no.nordicsemi.android.nrfmeshprovisioner.adapter; import android.content.Context; -import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -121,7 +120,7 @@ public final class ViewHolder extends RemovableViewHolder { private ViewHolder(final View view) { super(view); ButterKnife.bind(this, view); - view.findViewById(R.id.removable).setOnClickListener(v -> { + view.findViewById(R.id.container).setOnClickListener(v -> { if (mOnItemClickListener != null) { mOnItemClickListener.onItemClick(getAdapterPosition(), mAddresses.get(getAdapterPosition()).getAddress()); } diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/adapter/GroupAdapter.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/adapter/GroupAdapter.java index 8d35bce5e..69a713513 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/adapter/GroupAdapter.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/adapter/GroupAdapter.java @@ -23,16 +23,17 @@ package no.nordicsemi.android.nrfmeshprovisioner.adapter; import android.content.Context; -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.FrameLayout; import android.widget.TextView; import java.util.ArrayList; import java.util.List; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import butterknife.BindView; import butterknife.ButterKnife; import no.nordicsemi.android.meshprovisioner.Group; @@ -119,6 +120,8 @@ public interface OnItemClickListener { } public final class ViewHolder extends RemovableViewHolder { + @BindView(R.id.container) + FrameLayout container; @BindView(R.id.group_name) TextView groupName; @BindView(R.id.group_address) @@ -129,7 +132,7 @@ public final class ViewHolder extends RemovableViewHolder { private ViewHolder(final View view) { super(view); ButterKnife.bind(this, view); - view.findViewById(R.id.container).setOnClickListener(v -> { + container.setOnClickListener(v -> { if (mOnItemClickListener != null) { mOnItemClickListener.onItemClick(mGroups.get(getAdapterPosition()).getAddress()); } diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/adapter/GroupAddressAdapter.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/adapter/GroupAddressAdapter.java index fccd508a7..f3f8a22ea 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/adapter/GroupAddressAdapter.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/adapter/GroupAddressAdapter.java @@ -29,6 +29,8 @@ import android.widget.ImageView; import android.widget.TextView; +import com.google.android.material.elevation.ElevationOverlayProvider; + import java.util.ArrayList; import java.util.List; @@ -80,16 +82,10 @@ public void onBindViewHolder(@NonNull final GroupAddressAdapter.ViewHolder holde final int address = mAddresses.get(position); final Group group = network.getGroup(address); if (group != null) { - holder.icon.setImageDrawable(ContextCompat.getDrawable(mContext, R.drawable.ic_outline_group_work_black_alpha_24dp)); + holder.icon.setImageDrawable(ContextCompat.getDrawable(mContext, R.drawable.ic_outline_group_24dp)); holder.name.setText(group.getName()); holder.address.setText(MeshAddress.formatAddress(address, true)); - }/* else { - if(MeshAddress.isValidVirtualAddress(address)) { - holder.icon.setImageDrawable(ContextCompat.getDrawable(mContext, R.drawable.ic_label_outline_black_alpha_24dp)); - holder.name.setText(group.getName()); - holder.address.setText(model.getLabelUUID(address).toString().toUpperCase(Locale.US)); - } - }*/ + } } } @@ -119,6 +115,9 @@ public final class ViewHolder extends RemovableViewHolder { private ViewHolder(final View view) { super(view); ButterKnife.bind(this, view); + final ElevationOverlayProvider provider = new ElevationOverlayProvider(itemView.getContext()); + final int color = provider.compositeOverlayIfNeeded(provider.getThemeSurfaceColor(), 3.5f); + getSwipeableView().setBackgroundColor(color); } } } diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/adapter/GroupModelAdapter.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/adapter/GroupModelAdapter.java index 90e7c5809..0aebc427d 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/adapter/GroupModelAdapter.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/adapter/GroupModelAdapter.java @@ -23,10 +23,6 @@ package no.nordicsemi.android.nrfmeshprovisioner.adapter; import android.content.Context; -import androidx.annotation.NonNull; -import androidx.constraintlayout.widget.ConstraintLayout; -import androidx.core.content.ContextCompat; -import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -38,6 +34,10 @@ import java.util.List; import java.util.Map; +import androidx.annotation.NonNull; +import androidx.constraintlayout.widget.ConstraintLayout; +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.RecyclerView; import butterknife.BindView; import butterknife.ButterKnife; import no.nordicsemi.android.meshprovisioner.Group; @@ -113,20 +113,20 @@ private void updateGroupItemViewHolder(final ViewHolder holder, final Element el final TextView modelTitle = view.findViewById(R.id.model_title); modelTitle.setText(model.getModelName()); if(MeshParserUtils.isVendorModel(model.getModelId())){ - modelIcon.setImageDrawable(ContextCompat.getDrawable(mContext, R.drawable.ic_domain_nordic_medium_gray_24dp)); + modelIcon.setImageDrawable(ContextCompat.getDrawable(mContext, R.drawable.ic_domain_nordic_medium_gray)); } else { switch (model.getModelId()) { case SigModelParser.GENERIC_ON_OFF_SERVER: - modelIcon.setImageDrawable(ContextCompat.getDrawable(mContext, R.drawable.ic_lightbulb_outline_nordic_medium_grey_24dp)); + modelIcon.setImageDrawable(ContextCompat.getDrawable(mContext, R.drawable.ic_lightbulb_outline_24dp)); break; case SigModelParser.GENERIC_ON_OFF_CLIENT: - modelIcon.setImageDrawable(ContextCompat.getDrawable(mContext, R.drawable.ic_light_switch_nordic_medium_grey_24dp)); + modelIcon.setImageDrawable(ContextCompat.getDrawable(mContext, R.drawable.ic_light_switch_24dp)); break; case SigModelParser.GENERIC_LEVEL_SERVER: - modelIcon.setImageDrawable(ContextCompat.getDrawable(mContext, R.drawable.ic_lightbulb_level_nordic_medium_gray_outline_24dp)); + modelIcon.setImageDrawable(ContextCompat.getDrawable(mContext, R.drawable.ic_lightbulb_level_24dp)); break; default: - modelIcon.setImageDrawable(ContextCompat.getDrawable(mContext, R.drawable.ic_help_outline_nordic_medium_grey_24dp)); + modelIcon.setImageDrawable(ContextCompat.getDrawable(mContext, R.drawable.ic_help_outline_24dp)); break; } } diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/adapter/SubGroupAdapter.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/adapter/SubGroupAdapter.java index 3a5203030..627ebd12a 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/adapter/SubGroupAdapter.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/adapter/SubGroupAdapter.java @@ -120,7 +120,7 @@ private void inflateView(@NonNull final ViewHolder holder, final int keyIndex, f final Button on = view.findViewById(R.id.action_on); final Button off = view.findViewById(R.id.action_off); if (MeshParserUtils.isVendorModel(modelId)) { - icon.setImageDrawable(ContextCompat.getDrawable(mContext, R.drawable.ic_domain_nordic_medium_gray_48dp)); + icon.setImageDrawable(ContextCompat.getDrawable(mContext, R.drawable.ic_domain_48dp)); view.findViewById(R.id.container_buttons).setVisibility(View.INVISIBLE); view.findViewById(R.id.container_vendor).setVisibility(View.VISIBLE); final TextView modelIdView = view.findViewById(R.id.subtitle); @@ -135,16 +135,16 @@ private void inflateView(@NonNull final ViewHolder holder, final int keyIndex, f groupSummary.setText(mContext.getResources().getQuantityString(R.plurals.light_count, modelCount, modelCount)); break; case SigModelParser.GENERIC_ON_OFF_CLIENT: - icon.setImageDrawable(ContextCompat.getDrawable(mContext, R.drawable.ic_light_switch_nordic_medium_grey_48dp)); + icon.setImageDrawable(ContextCompat.getDrawable(mContext, R.drawable.ic_light_switch_48dp)); view.findViewById(R.id.container_buttons).setVisibility(View.INVISIBLE); groupSummary.setText(mContext.getResources().getQuantityString(R.plurals.switch_count, modelCount, modelCount)); break; case SigModelParser.GENERIC_LEVEL_SERVER: - icon.setImageDrawable(ContextCompat.getDrawable(mContext, R.drawable.ic_lightbulb_level_nordic_sun_outline_48dp)); + icon.setImageDrawable(ContextCompat.getDrawable(mContext, R.drawable.ic_lightbulb_level_48dp)); groupSummary.setText(mContext.getResources().getQuantityString(R.plurals.dimmer_count, modelCount, modelCount)); break; default: - icon.setImageDrawable(ContextCompat.getDrawable(mContext, R.drawable.ic_help_outline_nordic_medium_grey_48dp)); + icon.setImageDrawable(ContextCompat.getDrawable(mContext, R.drawable.ic_help_outline_48dp)); view.findViewById(R.id.container_buttons).setVisibility(View.INVISIBLE); groupSummary.setText(mContext.getResources().getQuantityString(R.plurals.device_count, modelCount, modelCount)); break; diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmenPermissionDenied.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmenPermissionDenied.java index 637d92d8d..101271189 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmenPermissionDenied.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmenPermissionDenied.java @@ -24,9 +24,9 @@ import android.app.Dialog; import android.os.Bundle; + import androidx.annotation.NonNull; import androidx.appcompat.app.AlertDialog; - import no.nordicsemi.android.nrfmeshprovisioner.R; public class DialogFragmenPermissionDenied extends DialogFragmentMessage { @@ -53,7 +53,7 @@ public void onCreate(Bundle savedInstanceState) { @Override public Dialog onCreateDialog(final Bundle savedInstanceState) { alertDialogBuilder = new AlertDialog.Builder(requireActivity()); - alertDialogBuilder.setIcon(R.drawable.ic_error_outline_black_alpha); + alertDialogBuilder.setIcon(R.drawable.ic_error_outline_black); alertDialogBuilder.setPositiveButton(getString(R.string.ok), (dialog, which) -> ( (DialogFragmentNetworkImportListener)requireParentFragment()).onNetworkImportFailed()); diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentAuthenticationInput.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentAuthenticationInput.java index 67160d18e..eb4b4ba71 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentAuthenticationInput.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentAuthenticationInput.java @@ -27,11 +27,6 @@ import android.app.Dialog; import android.content.DialogInterface; import android.os.Bundle; -import androidx.annotation.NonNull; -import com.google.android.material.textfield.TextInputEditText; -import com.google.android.material.textfield.TextInputLayout; -import androidx.fragment.app.DialogFragment; -import androidx.appcompat.app.AlertDialog; import android.text.Editable; import android.text.InputFilter; import android.text.InputType; @@ -45,8 +40,14 @@ import android.widget.Button; import android.widget.TextView; +import com.google.android.material.textfield.TextInputEditText; +import com.google.android.material.textfield.TextInputLayout; + import java.nio.ByteBuffer; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.DialogFragment; import butterknife.BindView; import butterknife.ButterKnife; import no.nordicsemi.android.meshprovisioner.provisionerstates.ProvisioningConfirmationState; @@ -105,7 +106,7 @@ public Dialog onCreateDialog(final Bundle savedInstanceState) { ButterKnife.bind(this, rootView); AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(requireContext()). - setIcon(R.drawable.ic_lock_open_black_alpha_24dp). + setIcon(R.drawable.ic_lock_open_24dp). setTitle(getString(R.string.provisioner_authentication_title)). setView(rootView); diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentConfigStatus.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentConfigStatus.java index d1e7f2e24..b4f74c3a4 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentConfigStatus.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentConfigStatus.java @@ -24,9 +24,9 @@ import android.app.Dialog; import android.os.Bundle; + import androidx.annotation.NonNull; import androidx.appcompat.app.AlertDialog; - import no.nordicsemi.android.nrfmeshprovisioner.R; public class DialogFragmentConfigStatus extends DialogFragmentMessage { @@ -49,7 +49,7 @@ public void onCreate(Bundle savedInstanceState) { @Override public Dialog onCreateDialog(final Bundle savedInstanceState) { alertDialogBuilder = new AlertDialog.Builder(requireContext()); - alertDialogBuilder.setIcon(R.drawable.ic_vpn_key_black_alpha_24dp); + alertDialogBuilder.setIcon(R.drawable.ic_vpn_key_24dp); alertDialogBuilder.setPositiveButton(getString(R.string.ok), null); return super.onCreateDialog(savedInstanceState); diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentConfigurationComplete.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentConfigurationComplete.java index 5bce6ba5a..5d2febee4 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentConfigurationComplete.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentConfigurationComplete.java @@ -53,7 +53,7 @@ public void onCreate(Bundle savedInstanceState) { @Override public Dialog onCreateDialog(final Bundle savedInstanceState) { alertDialogBuilder = new AlertDialog.Builder(requireContext()); - alertDialogBuilder.setIcon(R.drawable.ic_done_all_black_alpha_24dp); + alertDialogBuilder.setIcon(R.drawable.ic_done_all_black); alertDialogBuilder.setPositiveButton(getString(R.string.ok), (dialog, which) -> ( (ConfigurationCompleteListener)requireActivity()).onConfigurationCompleted()); diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentCreateGroup.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentCreateGroup.java index 0c8fe6988..3fbb90eaa 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentCreateGroup.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentCreateGroup.java @@ -165,7 +165,7 @@ public void onNothingSelected(final AdapterView parent) { final AlertDialog alertDialog = new AlertDialog.Builder(requireContext()) .setView(rootView) - .setIcon(R.drawable.ic_outline_group_work_black_alpha_24dp) + .setIcon(R.drawable.ic_outline_group_24dp) .setTitle(R.string.title_create_group) .setPositiveButton(R.string.ok, null) .setNegativeButton(R.string.cancel, null) diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentDeleteNode.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentDeleteNode.java index 660776df0..d94fde23c 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentDeleteNode.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentDeleteNode.java @@ -66,7 +66,7 @@ public void onCreate(Bundle savedInstanceState) { @Override public Dialog onCreateDialog(final Bundle savedInstanceState) { alertDialogBuilder = new AlertDialog.Builder(requireActivity()); - alertDialogBuilder.setIcon(R.drawable.ic_delete_black_alpha_24dp); + alertDialogBuilder.setIcon(R.drawable.ic_delete); alertDialogBuilder.setNegativeButton(getString(R.string.no), (dialog, which) -> ((DialogFragmentDeleteNodeListener) requireParentFragment()).onNodeDeleteCancelled(position)); alertDialogBuilder.setPositiveButton(getString(R.string.yes), (dialog, which) -> diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentDisconnected.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentDisconnected.java index 95abe6644..5fd4c6f34 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentDisconnected.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentDisconnected.java @@ -24,9 +24,9 @@ import android.app.Dialog; import android.os.Bundle; + import androidx.annotation.NonNull; import androidx.appcompat.app.AlertDialog; - import no.nordicsemi.android.nrfmeshprovisioner.R; public class DialogFragmentDisconnected extends DialogFragmentMessage { @@ -49,7 +49,7 @@ public void onCreate(Bundle savedInstanceState) { @Override public Dialog onCreateDialog(final Bundle savedInstanceState) { alertDialogBuilder = new AlertDialog.Builder(requireActivity()); - alertDialogBuilder.setIcon(R.drawable.ic_error_outline_black_alpha); + alertDialogBuilder.setIcon(R.drawable.ic_error_outline_black); alertDialogBuilder.setPositiveButton(getString(R.string.ok), (dialog, which) -> ((DialogFragmentDisconnectedListener)requireContext()).onDisconnected()); return super.onCreateDialog(savedInstanceState); diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentError.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentError.java index 64db668ba..5e203dda6 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentError.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentError.java @@ -24,9 +24,9 @@ import android.app.Dialog; import android.os.Bundle; + import androidx.annotation.NonNull; import androidx.appcompat.app.AlertDialog; - import no.nordicsemi.android.nrfmeshprovisioner.R; public class DialogFragmentError extends DialogFragmentMessage { @@ -49,7 +49,7 @@ public void onCreate(Bundle savedInstanceState) { @Override public Dialog onCreateDialog(final Bundle savedInstanceState) { alertDialogBuilder = new AlertDialog.Builder(requireContext()); - alertDialogBuilder.setIcon(R.drawable.ic_error_outline_black_alpha); + alertDialogBuilder.setIcon(R.drawable.ic_error_outline_black); alertDialogBuilder.setPositiveButton(getString(R.string.ok), null); return super.onCreateDialog(savedInstanceState); diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentFilterAddAddress.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentFilterAddAddress.java index e421c615b..5056c2cc9 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentFilterAddAddress.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentFilterAddAddress.java @@ -153,7 +153,7 @@ public void afterTextChanged(final Editable s) { } }) .setNegativeButton(R.string.cancel, null) - .setIcon(R.drawable.ic_lan_black_alpha_24dp) + .setIcon(R.drawable.ic_lan_24dp) .setTitle(R.string.title_add_address).create(); } diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentGroupSubscription.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentGroupSubscription.java index e936c2d38..301fba212 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentGroupSubscription.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentGroupSubscription.java @@ -212,7 +212,7 @@ public void afterTextChanged(final Editable s) { }); final AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(requireContext()) - .setIcon(R.drawable.ic_subscribe_black_alpha_24dp) + .setIcon(R.drawable.ic_subscribe) .setTitle(R.string.title_subscribe_group) .setView(rootView) .setPositiveButton(R.string.ok, null) diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentMeshExportMsg.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentMeshExportMsg.java index 8d77597d3..7bf8936f2 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentMeshExportMsg.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentMeshExportMsg.java @@ -24,13 +24,13 @@ import android.app.Dialog; import android.os.Bundle; + import androidx.annotation.NonNull; import androidx.appcompat.app.AlertDialog; - import no.nordicsemi.android.nrfmeshprovisioner.R; public class DialogFragmentMeshExportMsg extends DialogFragmentMessage { - private int resId = R.drawable.ic_info_outline_black_alpha; + private int resId = R.drawable.ic_info_outline; public static DialogFragmentMeshExportMsg newInstance(final int resId, final String title, final String message) { final Bundle args = new Bundle(); @@ -55,7 +55,7 @@ public void onCreate(Bundle savedInstanceState) { @Override public Dialog onCreateDialog(final Bundle savedInstanceState) { alertDialogBuilder = new AlertDialog.Builder(requireActivity()); - alertDialogBuilder.setIcon(R.drawable.ic_info_outline_black_alpha); + alertDialogBuilder.setIcon(R.drawable.ic_info_outline); alertDialogBuilder.setPositiveButton(getString(R.string.ok), null); return super.onCreateDialog(savedInstanceState); } diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentMeshImport.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentMeshImport.java index f5cc8a215..04d12a921 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentMeshImport.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentMeshImport.java @@ -24,14 +24,14 @@ import android.app.Dialog; import android.os.Bundle; + import androidx.annotation.NonNull; import androidx.appcompat.app.AlertDialog; - import no.nordicsemi.android.nrfmeshprovisioner.R; @SuppressWarnings("ConstantConditions") public class DialogFragmentMeshImport extends DialogFragmentMessage { - private int resId = R.drawable.ic_info_outline_black_alpha; + private int resId = R.drawable.ic_info_outline; public interface DialogFragmentNetworkImportListener { void onNetworkImportConfirmed(); diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentMeshImportMsg.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentMeshImportMsg.java index 890b25903..5ac9aa929 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentMeshImportMsg.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentMeshImportMsg.java @@ -24,13 +24,13 @@ import android.app.Dialog; import android.os.Bundle; + import androidx.annotation.NonNull; import androidx.appcompat.app.AlertDialog; - import no.nordicsemi.android.nrfmeshprovisioner.R; public class DialogFragmentMeshImportMsg extends DialogFragmentMessage { - private int resId = R.drawable.ic_info_outline_black_alpha; + private int resId = R.drawable.ic_info_outline; public static DialogFragmentMeshImportMsg newInstance(final int resId, final String title, final String message) { final Bundle args = new Bundle(); @@ -55,7 +55,7 @@ public void onCreate(Bundle savedInstanceState) { @Override public Dialog onCreateDialog(final Bundle savedInstanceState) { alertDialogBuilder = new AlertDialog.Builder(requireActivity()); - alertDialogBuilder.setIcon(R.drawable.ic_error_outline_black_alpha); + alertDialogBuilder.setIcon(R.drawable.ic_error_outline_black); alertDialogBuilder.setPositiveButton(getString(R.string.ok), null); return super.onCreateDialog(savedInstanceState); diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentNetworkName.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentNetworkName.java index ad36ee939..72e0e9658 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentNetworkName.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentNetworkName.java @@ -22,17 +22,10 @@ package no.nordicsemi.android.nrfmeshprovisioner.dialog; -import androidx.appcompat.app.AlertDialog; - import android.annotation.SuppressLint; import android.app.Dialog; import android.content.DialogInterface; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import com.google.android.material.textfield.TextInputEditText; -import com.google.android.material.textfield.TextInputLayout; -import androidx.fragment.app.DialogFragment; import android.text.Editable; import android.text.TextUtils; import android.text.TextWatcher; @@ -40,6 +33,13 @@ import android.view.View; import android.widget.TextView; +import com.google.android.material.textfield.TextInputEditText; +import com.google.android.material.textfield.TextInputLayout; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.DialogFragment; import butterknife.BindView; import butterknife.ButterKnife; import no.nordicsemi.android.nrfmeshprovisioner.R; @@ -107,7 +107,7 @@ public void afterTextChanged(final Editable s) { final AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(requireContext()).setView(rootView) .setPositiveButton(R.string.ok, null).setNegativeButton(R.string.cancel, null); - alertDialogBuilder.setIcon(R.drawable.ic_label_black_alpha_24dp); + alertDialogBuilder.setIcon(R.drawable.ic_label); alertDialogBuilder.setTitle(R.string.title_network_name); summary.setText(R.string.summary_network_name); diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentPermissionRationale.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentPermissionRationale.java index dac329049..beed72e13 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentPermissionRationale.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentPermissionRationale.java @@ -27,9 +27,9 @@ import android.net.Uri; import android.os.Bundle; import android.provider.Settings; + import androidx.annotation.NonNull; import androidx.appcompat.app.AlertDialog; - import no.nordicsemi.android.nrfmeshprovisioner.R; public class DialogFragmentPermissionRationale extends DialogFragmentMessage { @@ -64,7 +64,7 @@ public void onCreate(Bundle savedInstanceState) { @Override public Dialog onCreateDialog(final Bundle savedInstanceState) { alertDialogBuilder = new AlertDialog.Builder(requireActivity()); - alertDialogBuilder.setIcon(R.drawable.ic_info_outline_black_alpha); + alertDialogBuilder.setIcon(R.drawable.ic_info_outline); alertDialogBuilder.setPositiveButton(getString(R.string.ok), (dialog, which) -> ((StoragePermissionListener)getParentFragment()).requestPermission()); if(isDeniedForever){ message = message + getString(R.string.permission_rationale_settings); diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentProvisioningFailedError.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentProvisioningFailedError.java index 1a263649d..97eda3a39 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentProvisioningFailedError.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentProvisioningFailedError.java @@ -24,9 +24,9 @@ import android.app.Dialog; import android.os.Bundle; + import androidx.annotation.NonNull; import androidx.appcompat.app.AlertDialog; - import no.nordicsemi.android.nrfmeshprovisioner.R; public class DialogFragmentProvisioningFailedError extends DialogFragmentMessage { @@ -48,7 +48,7 @@ public static DialogFragmentProvisioningFailedError newInstance(final String tit @Override public Dialog onCreateDialog(final Bundle savedInstanceState) { alertDialogBuilder = new AlertDialog.Builder(requireActivity()); - alertDialogBuilder.setIcon(R.drawable.ic_error_outline_black_alpha); + alertDialogBuilder.setIcon(R.drawable.ic_error_outline_black); alertDialogBuilder.setPositiveButton(getString(R.string.ok), (dialog, which) -> ((DialogFragmentProvisioningFailedErrorListener)requireActivity()).onProvisioningFailed()); return super.onCreateDialog(savedInstanceState); diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentProxySet.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentProxySet.java index 8a5ccc4bc..fb018c836 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentProxySet.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentProxySet.java @@ -24,15 +24,15 @@ import android.app.Dialog; import android.os.Bundle; + import androidx.annotation.NonNull; import androidx.appcompat.app.AlertDialog; - import no.nordicsemi.android.meshprovisioner.transport.ConfigProxySet; import no.nordicsemi.android.nrfmeshprovisioner.R; public class DialogFragmentProxySet extends DialogFragmentMessage { - protected static final String SET_PROXY_STATE = "SET_PROXY_STATE"; + private static final String SET_PROXY_STATE = "SET_PROXY_STATE"; private boolean mState = true; //Let's set true by default so that we don't break anyone's node public interface DialogFragmentProxySetListener { @@ -61,7 +61,7 @@ public void onCreate(Bundle savedInstanceState) { @Override public Dialog onCreateDialog(final Bundle savedInstanceState) { alertDialogBuilder = new AlertDialog.Builder(requireActivity()); - alertDialogBuilder.setIcon(R.drawable.ic_reset_black_24dp_alpha); + alertDialogBuilder.setIcon(R.drawable.ic_reset); alertDialogBuilder.setCancelable(true); alertDialogBuilder.setNegativeButton(getString(R.string.no), null); alertDialogBuilder.setPositiveButton(getString(R.string.yes), (dialog, which) -> ( diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentResetNetwork.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentResetNetwork.java index c51942636..3311bcebc 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentResetNetwork.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentResetNetwork.java @@ -24,9 +24,9 @@ import android.app.Dialog; import android.os.Bundle; + import androidx.annotation.NonNull; import androidx.appcompat.app.AlertDialog; - import no.nordicsemi.android.nrfmeshprovisioner.R; public class DialogFragmentResetNetwork extends DialogFragmentMessage { @@ -53,7 +53,7 @@ public void onCreate(Bundle savedInstanceState) { @Override public Dialog onCreateDialog(final Bundle savedInstanceState) { alertDialogBuilder = new AlertDialog.Builder(requireActivity()); - alertDialogBuilder.setIcon(R.drawable.ic_lan_black_alpha_24dp); + alertDialogBuilder.setIcon(R.drawable.ic_lan_24dp); alertDialogBuilder.setNegativeButton(getString(R.string.no), null); alertDialogBuilder.setPositiveButton(getString(R.string.yes), (dialog, which) -> { if(getParentFragment() != null) diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentTransactionStatus.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentTransactionStatus.java index 3f55231a3..7eaec38aa 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentTransactionStatus.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentTransactionStatus.java @@ -24,9 +24,9 @@ import android.app.Dialog; import android.os.Bundle; + import androidx.annotation.NonNull; import androidx.appcompat.app.AlertDialog; - import no.nordicsemi.android.nrfmeshprovisioner.R; public class DialogFragmentTransactionStatus extends DialogFragmentMessage { @@ -49,7 +49,7 @@ public void onCreate(Bundle savedInstanceState) { @Override public Dialog onCreateDialog(final Bundle savedInstanceState) { alertDialogBuilder = new AlertDialog.Builder(requireActivity()); - alertDialogBuilder.setIcon(R.drawable.ic_error_outline_black_alpha); + alertDialogBuilder.setIcon(R.drawable.ic_error_outline_black); alertDialogBuilder.setPositiveButton(getString(R.string.ok), null); return super.onCreateDialog(savedInstanceState); diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentUnicastAddress.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentUnicastAddress.java index fbc2787de..b5826ed48 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentUnicastAddress.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/dialog/DialogFragmentUnicastAddress.java @@ -117,7 +117,7 @@ public void afterTextChanged(final Editable s) { }); final AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(requireContext()) - .setIcon(R.drawable.ic_lan_black_alpha_24dp) + .setIcon(R.drawable.ic_lan_24dp) .setTitle(R.string.title_unicast_address) .setView(rootView) .setPositiveButton(R.string.ok, null) diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/keys/AddAppKeyActivity.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/keys/AddAppKeyActivity.java index 0cce157f3..b6fb571f4 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/keys/AddAppKeyActivity.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/keys/AddAppKeyActivity.java @@ -28,6 +28,10 @@ import android.view.View; import android.widget.TextView; +import com.google.android.material.snackbar.Snackbar; + +import javax.inject.Inject; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; @@ -38,11 +42,6 @@ import androidx.recyclerview.widget.DefaultItemAnimator; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; - -import com.google.android.material.snackbar.Snackbar; - -import javax.inject.Inject; - import butterknife.BindView; import butterknife.ButterKnife; import no.nordicsemi.android.meshprovisioner.ApplicationKey; @@ -96,18 +95,18 @@ protected void onCreate(@Nullable final Bundle savedInstanceState) { //noinspection ConstantConditions getSupportActionBar().setTitle(R.string.title_add_app_key); getSupportActionBar().setDisplayHomeAsUpEnabled(true); - getSupportActionBar().setHomeAsUpIndicator(R.drawable.ic_close_white_24dp); + getSupportActionBar().setHomeAsUpIndicator(R.drawable.ic_close); final View containerKey = findViewById(R.id.container_key); containerKey.findViewById(R.id.image). - setBackground(ContextCompat.getDrawable(this, R.drawable.ic_vpn_key_black_alpha_24dp)); + setBackground(ContextCompat.getDrawable(this, R.drawable.ic_vpn_key_24dp)); ((TextView) containerKey.findViewById(R.id.title)).setText(R.string.title_app_key); keyView = containerKey.findViewById(R.id.text); keyView.setVisibility(View.VISIBLE); final View containerKeyName = findViewById(R.id.container_key_name); containerKeyName.findViewById(R.id.image). - setBackground(ContextCompat.getDrawable(this, R.drawable.ic_label_black_alpha_24dp)); + setBackground(ContextCompat.getDrawable(this, R.drawable.ic_label)); ((TextView) containerKeyName.findViewById(R.id.title)).setText(R.string.name); nameView = containerKeyName.findViewById(R.id.text); nameView.setVisibility(View.VISIBLE); diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/keys/AddNetKeyActivity.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/keys/AddNetKeyActivity.java index b222bef08..dceb5d804 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/keys/AddNetKeyActivity.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/keys/AddNetKeyActivity.java @@ -36,7 +36,6 @@ import androidx.appcompat.widget.Toolbar; import androidx.core.content.ContextCompat; import androidx.lifecycle.ViewModelProvider; -import androidx.lifecycle.ViewModelProviders; import no.nordicsemi.android.meshprovisioner.MeshNetwork; import no.nordicsemi.android.meshprovisioner.NetworkKey; import no.nordicsemi.android.meshprovisioner.utils.MeshParserUtils; @@ -70,18 +69,18 @@ protected void onCreate(@Nullable final Bundle savedInstanceState) { //noinspection ConstantConditions getSupportActionBar().setTitle(R.string.title_add_net_key); getSupportActionBar().setDisplayHomeAsUpEnabled(true); - getSupportActionBar().setHomeAsUpIndicator(R.drawable.ic_close_white_24dp); + getSupportActionBar().setHomeAsUpIndicator(R.drawable.ic_close); final View containerKey = findViewById(R.id.container_key); containerKey.findViewById(R.id.image). - setBackground(ContextCompat.getDrawable(this, R.drawable.ic_vpn_key_black_alpha_24dp)); + setBackground(ContextCompat.getDrawable(this, R.drawable.ic_vpn_key_24dp)); ((TextView) containerKey.findViewById(R.id.title)).setText(R.string.title_net_key); keyView = containerKey.findViewById(R.id.text); keyView.setVisibility(View.VISIBLE); final View containerKeyName = findViewById(R.id.container_key_name); containerKeyName.findViewById(R.id.image). - setBackground(ContextCompat.getDrawable(this, R.drawable.ic_label_black_alpha_24dp)); + setBackground(ContextCompat.getDrawable(this, R.drawable.ic_label)); ((TextView) containerKeyName.findViewById(R.id.title)).setText(R.string.name); nameView = containerKeyName.findViewById(R.id.text); nameView.setVisibility(View.VISIBLE); diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/keys/AppKeysActivity.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/keys/AppKeysActivity.java index 6b391da77..cd55f64bb 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/keys/AppKeysActivity.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/keys/AppKeysActivity.java @@ -42,7 +42,6 @@ import androidx.appcompat.widget.Toolbar; import androidx.coordinatorlayout.widget.CoordinatorLayout; import androidx.lifecycle.ViewModelProvider; -import androidx.lifecycle.ViewModelProviders; import androidx.recyclerview.widget.DefaultItemAnimator; import androidx.recyclerview.widget.DividerItemDecoration; import androidx.recyclerview.widget.ItemTouchHelper; @@ -258,7 +257,7 @@ private void displaySnackBar(@NonNull final ApplicationKey appKey) { mEmptyView.setVisibility(View.INVISIBLE); mViewModel.getNetworkLiveData().getMeshNetwork().addAppKey(appKey); }) - .setActionTextColor(getResources().getColor(R.color.colorPrimaryDark)) + .setActionTextColor(getResources().getColor(R.color.colorSecondary)) .show(); } } diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/keys/EditAppKeyActivity.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/keys/EditAppKeyActivity.java index 0d2cb0405..ebe83946a 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/keys/EditAppKeyActivity.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/keys/EditAppKeyActivity.java @@ -37,7 +37,6 @@ import androidx.appcompat.widget.Toolbar; import androidx.core.content.ContextCompat; import androidx.lifecycle.ViewModelProvider; -import androidx.lifecycle.ViewModelProviders; import androidx.recyclerview.widget.DefaultItemAnimator; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -85,14 +84,14 @@ protected void onCreate(@Nullable final Bundle savedInstanceState) { final View containerKey = findViewById(R.id.container_key); containerKey.findViewById(R.id.image). - setBackground(ContextCompat.getDrawable(this, R.drawable.ic_lock_open_black_alpha_24dp)); + setBackground(ContextCompat.getDrawable(this, R.drawable.ic_lock_open_24dp)); ((TextView) containerKey.findViewById(R.id.title)).setText(R.string.title_app_key); final TextView keyView = containerKey.findViewById(R.id.text); keyView.setVisibility(View.VISIBLE); final View containerKeyName = findViewById(R.id.container_key_name); containerKeyName.findViewById(R.id.image). - setBackground(ContextCompat.getDrawable(this, R.drawable.ic_label_black_alpha_24dp)); + setBackground(ContextCompat.getDrawable(this, R.drawable.ic_label)); ((TextView) containerKeyName.findViewById(R.id.title)).setText(R.string.name); final TextView name = containerKeyName.findViewById(R.id.text); name.setVisibility(View.VISIBLE); diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/keys/EditNetKeyActivity.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/keys/EditNetKeyActivity.java index 3db4a62ef..0b6c3f236 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/keys/EditNetKeyActivity.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/keys/EditNetKeyActivity.java @@ -35,7 +35,6 @@ import androidx.appcompat.widget.Toolbar; import androidx.core.content.ContextCompat; import androidx.lifecycle.ViewModelProvider; -import androidx.lifecycle.ViewModelProviders; import no.nordicsemi.android.meshprovisioner.MeshNetwork; import no.nordicsemi.android.meshprovisioner.NetworkKey; import no.nordicsemi.android.meshprovisioner.utils.MeshParserUtils; @@ -72,14 +71,14 @@ protected void onCreate(@Nullable final Bundle savedInstanceState) { final View containerKey = findViewById(R.id.container_key); containerKey.findViewById(R.id.image). - setBackground(ContextCompat.getDrawable(this, R.drawable.ic_lock_open_black_alpha_24dp)); + setBackground(ContextCompat.getDrawable(this, R.drawable.ic_lock_open_24dp)); ((TextView) containerKey.findViewById(R.id.title)).setText(R.string.title_net_key); final TextView keyView = containerKey.findViewById(R.id.text); keyView.setVisibility(View.VISIBLE); final View containerKeyName = findViewById(R.id.container_key_name); containerKeyName.findViewById(R.id.image). - setBackground(ContextCompat.getDrawable(this, R.drawable.ic_label_black_alpha_24dp)); + setBackground(ContextCompat.getDrawable(this, R.drawable.ic_label)); ((TextView) containerKeyName.findViewById(R.id.title)).setText(R.string.name); final TextView name = containerKeyName.findViewById(R.id.text); name.setVisibility(View.VISIBLE); diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/keys/NetKeysActivity.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/keys/NetKeysActivity.java index dc0215ddd..8f71aba4d 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/keys/NetKeysActivity.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/keys/NetKeysActivity.java @@ -42,7 +42,6 @@ import androidx.coordinatorlayout.widget.CoordinatorLayout; import androidx.core.content.ContextCompat; import androidx.lifecycle.ViewModelProvider; -import androidx.lifecycle.ViewModelProviders; import androidx.recyclerview.widget.DefaultItemAnimator; import androidx.recyclerview.widget.ItemTouchHelper; import androidx.recyclerview.widget.LinearLayoutManager; @@ -107,7 +106,7 @@ protected void onCreate(@Nullable final Bundle savedInstanceState) { getSupportActionBar().setDisplayHomeAsUpEnabled(true); containerKey.findViewById(R.id.image). - setBackground(ContextCompat.getDrawable(this, R.drawable.ic_vpn_key_black_alpha_24dp)); + setBackground(ContextCompat.getDrawable(this, R.drawable.ic_vpn_key_24dp)); final TextView keyTitle = containerKey.findViewById(R.id.title); final TextView keyView = containerKey.findViewById(R.id.text); keyView.setVisibility(View.VISIBLE); @@ -196,7 +195,7 @@ public void onItemDismissFailed(final RemovableViewHolder viewHolder) { private void displaySnackBar(@NonNull final NetworkKey networkKey) { Snackbar.make(container, getString(R.string.net_key_deleted), Snackbar.LENGTH_LONG) .setAction(getString(R.string.undo), view -> addNetKey(networkKey)) - .setActionTextColor(getResources().getColor(R.color.colorPrimaryDark)) + .setActionTextColor(getResources().getColor(R.color.colorSecondary)) .show(); } diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/keys/adapter/BoundAppKeysAdapter.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/keys/adapter/BoundAppKeysAdapter.java index 42840ffb7..6064e3492 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/keys/adapter/BoundAppKeysAdapter.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/keys/adapter/BoundAppKeysAdapter.java @@ -28,6 +28,8 @@ import android.view.ViewGroup; import android.widget.TextView; +import com.google.android.material.elevation.ElevationOverlayProvider; + import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -73,7 +75,7 @@ public BoundAppKeysAdapter(@NonNull final Context context, @NonNull @Override public BoundAppKeysAdapter.ViewHolder onCreateViewHolder(@NonNull final ViewGroup parent, final int viewType) { - final View layoutView = LayoutInflater.from(mContext).inflate(R.layout.removable_row_item, parent, false); + final View layoutView = LayoutInflater.from(mContext).inflate(R.layout.removable_row_item2, parent, false); return new BoundAppKeysAdapter.ViewHolder(layoutView); } @@ -123,6 +125,9 @@ public final class ViewHolder extends RemovableViewHolder { private ViewHolder(final View view) { super(view); ButterKnife.bind(this, view); + final ElevationOverlayProvider provider = new ElevationOverlayProvider(itemView.getContext()); + final int color = provider.compositeOverlayIfNeeded(provider.getThemeSurfaceColor(), 3.5f); + getSwipeableView().setBackgroundColor(color); } } } diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/keys/adapter/ManageAppKeyAdapter.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/keys/adapter/ManageAppKeyAdapter.java index 6f6022fc9..9d6db866d 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/keys/adapter/ManageAppKeyAdapter.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/keys/adapter/ManageAppKeyAdapter.java @@ -26,6 +26,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.FrameLayout; import android.widget.TextView; import java.util.ArrayList; @@ -121,7 +122,8 @@ public interface OnItemClickListener { } final class ViewHolder extends RemovableViewHolder { - + @BindView(R.id.container) + FrameLayout container; @BindView(R.id.title) TextView appKeyName; @BindView(R.id.subtitle) @@ -130,7 +132,7 @@ final class ViewHolder extends RemovableViewHolder { private ViewHolder(final View view) { super(view); ButterKnife.bind(this, view); - view.findViewById(R.id.removable).setOnClickListener(v -> { + container.setOnClickListener(v -> { if (mOnItemClickListener != null) { final ApplicationKey key = appKeys.get(getAdapterPosition()); mOnItemClickListener.onItemClick(getAdapterPosition(), key); diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/keys/adapter/ManageBoundNetKeyAdapter.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/keys/adapter/ManageBoundNetKeyAdapter.java index f9860d80b..c294d6163 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/keys/adapter/ManageBoundNetKeyAdapter.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/keys/adapter/ManageBoundNetKeyAdapter.java @@ -26,9 +26,12 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.FrameLayout; import android.widget.RadioButton; import android.widget.TextView; +import com.google.android.material.elevation.ElevationOverlayProvider; + import java.util.List; import androidx.annotation.NonNull; @@ -108,7 +111,8 @@ public interface OnItemClickListener { } final class ViewHolder extends RemovableViewHolder { - + @BindView(R.id.container) + FrameLayout container; @BindView(R.id.title) TextView netKeyName; @BindView(R.id.subtitle) @@ -119,7 +123,10 @@ final class ViewHolder extends RemovableViewHolder { private ViewHolder(final View view) { super(view); ButterKnife.bind(this, view); - view.findViewById(R.id.removable).setOnClickListener(v -> { + final ElevationOverlayProvider provider = new ElevationOverlayProvider(itemView.getContext()); + final int color = provider.compositeOverlayIfNeeded(provider.getThemeSurfaceColor(), 3.5f); + getSwipeableView().setBackgroundColor(color); + view.findViewById(R.id.container).setOnClickListener(v -> { if (mOnItemClickListener != null) { final NetworkKey netKey = mNetworkKeys.get(getAdapterPosition()); final ApplicationKey appKey = mOnItemClickListener.updateBoundNetKeyIndex(getAdapterPosition(), netKey); diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/keys/adapter/ManageNetKeyAdapter.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/keys/adapter/ManageNetKeyAdapter.java index 496854ac3..7c4124734 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/keys/adapter/ManageNetKeyAdapter.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/keys/adapter/ManageNetKeyAdapter.java @@ -26,8 +26,11 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.FrameLayout; import android.widget.TextView; +import com.google.android.material.elevation.ElevationOverlayProvider; + import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -106,7 +109,8 @@ public interface OnItemClickListener { } final class ViewHolder extends RemovableViewHolder { - + @BindView(R.id.container) + FrameLayout container; @BindView(R.id.title) TextView netKeyName; @BindView(R.id.subtitle) @@ -115,7 +119,10 @@ final class ViewHolder extends RemovableViewHolder { private ViewHolder(final View view) { super(view); ButterKnife.bind(this, view); - view.findViewById(R.id.removable).setOnClickListener(v -> { + final ElevationOverlayProvider provider = new ElevationOverlayProvider(itemView.getContext()); + final int color = provider.compositeOverlayIfNeeded(provider.getThemeSurfaceColor(), 3.5f); + getSwipeableView().setBackgroundColor(color); + container.setOnClickListener(v -> { if (mOnItemClickListener != null) { final NetworkKey key = networkKeys.get(getAdapterPosition()); mOnItemClickListener.onItemClick(getAdapterPosition(), key); diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/keys/dialogs/DialogFragmentAddKey.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/keys/dialogs/DialogFragmentAddKey.java index defacf881..49de91c80 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/keys/dialogs/DialogFragmentAddKey.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/keys/dialogs/DialogFragmentAddKey.java @@ -23,7 +23,6 @@ package no.nordicsemi.android.nrfmeshprovisioner.keys.dialogs; import android.annotation.SuppressLint; -import androidx.appcompat.app.AlertDialog; import android.app.Dialog; import android.content.DialogInterface; import android.os.Bundle; @@ -39,6 +38,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.DialogFragment; import butterknife.BindView; import butterknife.ButterKnife; @@ -108,7 +108,7 @@ public void afterTextChanged(final Editable s) { .setPositiveButton(R.string.ok, null).setNegativeButton(R.string.cancel, null) .setNeutralButton(R.string.generate_new_key, null); - alertDialogBuilder.setIcon(R.drawable.ic_vpn_key_black_alpha_24dp); + alertDialogBuilder.setIcon(R.drawable.ic_vpn_key_24dp); alertDialogBuilder.setTitle(R.string.title_manage_app_keys); summary.setText(R.string.title_app_keys); diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/keys/dialogs/DialogFragmentEditAppKey.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/keys/dialogs/DialogFragmentEditAppKey.java index fe663359d..09a807bcf 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/keys/dialogs/DialogFragmentEditAppKey.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/keys/dialogs/DialogFragmentEditAppKey.java @@ -118,7 +118,7 @@ public void afterTextChanged(final Editable s) { final AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(requireContext()) .setView(rootView) - .setIcon(R.drawable.ic_vpn_key_black_alpha_24dp) + .setIcon(R.drawable.ic_vpn_key_24dp) .setTitle(R.string.title_edit_key) .setPositiveButton(R.string.ok, null) .setNegativeButton(R.string.cancel, null) diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/keys/dialogs/DialogFragmentEditNetKey.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/keys/dialogs/DialogFragmentEditNetKey.java index 41743d79c..eaa89fb27 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/keys/dialogs/DialogFragmentEditNetKey.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/keys/dialogs/DialogFragmentEditNetKey.java @@ -121,7 +121,7 @@ public void afterTextChanged(final Editable s) { final AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(requireContext()).setView(rootView) .setPositiveButton(R.string.ok, null).setNegativeButton(R.string.cancel, null) .setNeutralButton(R.string.generate_network_key, null) - .setIcon(R.drawable.ic_vpn_key_black_alpha_24dp) + .setIcon(R.drawable.ic_vpn_key_24dp) .setTitle(R.string.title_edit_key); final AlertDialog alertDialog = alertDialogBuilder.show(); diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/keys/dialogs/DialogFragmentKeyName.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/keys/dialogs/DialogFragmentKeyName.java index 2b4bec4ea..201e0dd5d 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/keys/dialogs/DialogFragmentKeyName.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/keys/dialogs/DialogFragmentKeyName.java @@ -107,7 +107,7 @@ public void afterTextChanged(final Editable s) { final AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(requireContext()).setView(rootView) .setPositiveButton(R.string.ok, null).setNegativeButton(R.string.cancel, null); - alertDialogBuilder.setIcon(R.drawable.ic_vpn_key_black_alpha_24dp); + alertDialogBuilder.setIcon(R.drawable.ic_vpn_key_24dp); alertDialogBuilder.setTitle(R.string.title_edit_key_name); summary.setText(R.string.key_name_rationale); diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/node/NodeConfigurationActivity.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/node/NodeConfigurationActivity.java index f90c3581e..5e4e42bc4 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/node/NodeConfigurationActivity.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/node/NodeConfigurationActivity.java @@ -40,7 +40,6 @@ import androidx.coordinatorlayout.widget.CoordinatorLayout; import androidx.core.content.ContextCompat; import androidx.lifecycle.ViewModelProvider; -import androidx.lifecycle.ViewModelProviders; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import butterknife.BindView; @@ -164,7 +163,7 @@ protected void onCreate(final Bundle savedInstanceState) { final View containerNodeName = findViewById(R.id.container_node_name); containerNodeName.findViewById(R.id.image) - .setBackground(ContextCompat.getDrawable(this, R.drawable.ic_label_black_alpha_24dp)); + .setBackground(ContextCompat.getDrawable(this, R.drawable.ic_label)); final TextView nodeNameTitle = containerNodeName.findViewById(R.id.title); nodeNameTitle.setText(R.string.title_node_name); final TextView nodeNameView = containerNodeName.findViewById(R.id.text); @@ -190,7 +189,7 @@ protected void onCreate(final Bundle savedInstanceState) { final View containerNetKey = findViewById(R.id.container_net_keys); containerNetKey.findViewById(R.id.image) - .setBackground(ContextCompat.getDrawable(this, R.drawable.ic_vpn_key_black_alpha_24dp)); + .setBackground(ContextCompat.getDrawable(this, R.drawable.ic_vpn_key_24dp)); final TextView keyTitle = containerNetKey.findViewById(R.id.title); keyTitle.setText(R.string.title_net_keys); final TextView netKeySummary = containerNetKey.findViewById(R.id.text); @@ -202,7 +201,7 @@ protected void onCreate(final Bundle savedInstanceState) { final View containerAppKey = findViewById(R.id.container_app_keys); containerAppKey.findViewById(R.id.image). - setBackground(ContextCompat.getDrawable(this, R.drawable.ic_vpn_key_black_alpha_24dp)); + setBackground(ContextCompat.getDrawable(this, R.drawable.ic_vpn_key_24dp)); ((TextView) containerAppKey.findViewById(R.id.title)).setText(R.string.title_app_keys); final TextView appKeySummary = containerAppKey.findViewById(R.id.text); appKeySummary.setVisibility(View.VISIBLE); diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/node/PublicationSettingsActivity.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/node/PublicationSettingsActivity.java index e5e4d2711..5a25c8bab 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/node/PublicationSettingsActivity.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/node/PublicationSettingsActivity.java @@ -26,7 +26,6 @@ import androidx.appcompat.widget.Toolbar; import androidx.coordinatorlayout.widget.CoordinatorLayout; import androidx.lifecycle.ViewModelProvider; -import androidx.lifecycle.ViewModelProviders; import butterknife.BindView; import butterknife.ButterKnife; import no.nordicsemi.android.meshprovisioner.ApplicationKey; @@ -133,7 +132,7 @@ protected void onCreate(@Nullable final Bundle savedInstanceState) { setSupportActionBar(toolbar); //noinspection ConstantConditions getSupportActionBar().setDisplayHomeAsUpEnabled(true); - getSupportActionBar().setHomeAsUpIndicator(R.drawable.ic_close_white_24dp); + getSupportActionBar().setHomeAsUpIndicator(R.drawable.ic_close); getSupportActionBar().setTitle(R.string.title_publication_settings); final ScrollView scrollView = findViewById(R.id.scroll_view); diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/node/adapter/ElementAdapter.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/node/adapter/ElementAdapter.java index 77eb2c35f..8f4b7b100 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/node/adapter/ElementAdapter.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/node/adapter/ElementAdapter.java @@ -56,7 +56,7 @@ public class ElementAdapter extends RecyclerView.Adapter meshNodeLiveData) { - this.mContext = context.getApplicationContext(); + this.mContext = context; meshNodeLiveData.observe((LifecycleOwner) context, meshNode -> { if (meshNode != null) { mProvisionedMeshNode = meshNode; @@ -105,7 +105,6 @@ private void inflateModelViews(final ViewHolder holder, final List mo } else { modelIdView.setText(mContext.getString(R.string.format_sig_model_id, CompositionDataParser.formatModelIdentifier((short) model.getModelId(), true))); } - modelView.setOnClickListener(v -> { final int position = holder.getAdapterPosition(); final Element element = mElements.get(position); @@ -162,10 +161,10 @@ private ViewHolder(final View view) { public void onClick(final View v) { if (v.getId() == R.id.element_expand) { if (mModelContainer.getVisibility() == View.VISIBLE) { - mElementExpand.setImageResource(R.drawable.ic_round_expand_more_black_alpha_24dp); + mElementExpand.setImageResource(R.drawable.ic_round_expand_more); mModelContainer.setVisibility(View.GONE); } else { - mElementExpand.setImageResource(R.drawable.ic_round_expand_less_black_alpha_24dp); + mElementExpand.setImageResource(R.drawable.ic_round_expand_less); mModelContainer.setVisibility(View.VISIBLE); } } else if (v.getId() == R.id.edit) { diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/node/adapter/NodeAdapter.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/node/adapter/NodeAdapter.java index 7723f9eea..de59202dd 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/node/adapter/NodeAdapter.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/node/adapter/NodeAdapter.java @@ -29,15 +29,14 @@ import android.widget.FrameLayout; import android.widget.TextView; -import androidx.annotation.NonNull; -import androidx.lifecycle.LifecycleOwner; -import androidx.lifecycle.LiveData; -import androidx.recyclerview.widget.RecyclerView; - import java.util.ArrayList; import java.util.List; import java.util.Map; +import androidx.annotation.NonNull; +import androidx.lifecycle.LifecycleOwner; +import androidx.lifecycle.LiveData; +import androidx.recyclerview.widget.RecyclerView; import butterknife.BindView; import butterknife.ButterKnife; import no.nordicsemi.android.meshprovisioner.transport.Element; @@ -130,7 +129,6 @@ public interface OnItemClickListener { } final class ViewHolder extends RemovableViewHolder { - @BindView(R.id.container) FrameLayout container; @BindView(R.id.node_name) diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/node/dialog/DialogFragmentElementName.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/node/dialog/DialogFragmentElementName.java index e6753ddc8..b61c9c9a4 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/node/dialog/DialogFragmentElementName.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/node/dialog/DialogFragmentElementName.java @@ -107,7 +107,7 @@ public void afterTextChanged(final Editable s) { final AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(requireContext()).setView(rootView) .setPositiveButton(R.string.ok, null).setNegativeButton(R.string.cancel, null); - alertDialogBuilder.setIcon(R.drawable.ic_label_black_alpha_24dp); + alertDialogBuilder.setIcon(R.drawable.ic_label); alertDialogBuilder.setTitle(R.string.title_element_name); summary.setText(R.string.element_name_rationale); diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/node/dialog/DialogFragmentNetworkTransmitSettings.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/node/dialog/DialogFragmentNetworkTransmitSettings.java index 64cd16436..74acea7e6 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/node/dialog/DialogFragmentNetworkTransmitSettings.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/node/dialog/DialogFragmentNetworkTransmitSettings.java @@ -1,18 +1,18 @@ package no.nordicsemi.android.nrfmeshprovisioner.node.dialog; import android.annotation.SuppressLint; -import androidx.appcompat.app.AlertDialog; import android.app.Dialog; import android.content.DialogInterface; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.fragment.app.DialogFragment; import android.view.LayoutInflater; import android.view.View; import android.widget.SeekBar; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.DialogFragment; import butterknife.BindView; import butterknife.ButterKnife; import no.nordicsemi.android.nrfmeshprovisioner.R; @@ -113,7 +113,7 @@ public void onStopTrackingTouch(SeekBar seekBar) { final AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(requireContext()).setView(rootView) .setPositiveButton(R.string.ok, null).setNegativeButton(R.string.cancel, null); - alertDialogBuilder.setIcon(R.drawable.ic_repeat_black_24dp); + alertDialogBuilder.setIcon(R.drawable.ic_repeat); alertDialogBuilder.setTitle(R.string.title_network_transmit); final AlertDialog alertDialog = alertDialogBuilder.show(); diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/node/dialog/DialogFragmentNodeName.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/node/dialog/DialogFragmentNodeName.java index a6c5db201..11058b6d8 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/node/dialog/DialogFragmentNodeName.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/node/dialog/DialogFragmentNodeName.java @@ -106,7 +106,7 @@ public void afterTextChanged(final Editable s) { final AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(requireContext()).setView(rootView) .setPositiveButton(R.string.ok, null).setNegativeButton(R.string.cancel, null); - alertDialogBuilder.setIcon(R.drawable.ic_label_black_alpha_24dp); + alertDialogBuilder.setIcon(R.drawable.ic_label); alertDialogBuilder.setTitle(R.string.title_node_name); summary.setText(R.string.node_name_rationale); diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/node/dialog/DialogFragmentPublicationResolution.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/node/dialog/DialogFragmentPublicationResolution.java index e6b437766..28f7ff8e5 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/node/dialog/DialogFragmentPublicationResolution.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/node/dialog/DialogFragmentPublicationResolution.java @@ -1,13 +1,13 @@ package no.nordicsemi.android.nrfmeshprovisioner.node.dialog; -import androidx.appcompat.app.AlertDialog; import android.app.Dialog; import android.os.Bundle; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.DialogFragment; - import no.nordicsemi.android.meshprovisioner.utils.MeshParserUtils; import no.nordicsemi.android.nrfmeshprovisioner.R; @@ -37,7 +37,7 @@ public void onCreate(@Nullable final Bundle savedInstanceState) { public Dialog onCreateDialog(final Bundle savedInstanceState) { final AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(requireContext()) - .setIcon(R.drawable.ic_linear_scale_black_alpha_24dp) + .setIcon(R.drawable.ic_linear_scale) .setTitle(R.string.title_publication_resolution) .setSingleChoiceItems(R.array.arr_publication_resolution, mPublicationResolution, null) .setPositiveButton(R.string.ok, (dialog, which) -> { diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/node/dialog/DialogFragmentPublishAddress.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/node/dialog/DialogFragmentPublishAddress.java index 980707350..a7a41b244 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/node/dialog/DialogFragmentPublishAddress.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/node/dialog/DialogFragmentPublishAddress.java @@ -224,7 +224,7 @@ public void afterTextChanged(final Editable s) { }); final AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(requireContext()). - setIcon(R.drawable.ic_lan_black_alpha_24dp). + setIcon(R.drawable.ic_lan_24dp). setTitle(R.string.title_publish_address). setView(rootView). setPositiveButton(R.string.ok, null). diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/node/dialog/DialogFragmentResetNode.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/node/dialog/DialogFragmentResetNode.java index e6204bda2..e206404bb 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/node/dialog/DialogFragmentResetNode.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/node/dialog/DialogFragmentResetNode.java @@ -24,9 +24,9 @@ import android.app.Dialog; import android.os.Bundle; + import androidx.annotation.NonNull; import androidx.appcompat.app.AlertDialog; - import no.nordicsemi.android.nrfmeshprovisioner.R; import no.nordicsemi.android.nrfmeshprovisioner.dialog.DialogFragmentMessage; @@ -54,7 +54,7 @@ public void onCreate(Bundle savedInstanceState) { @Override public Dialog onCreateDialog(final Bundle savedInstanceState) { alertDialogBuilder = new AlertDialog.Builder(requireActivity()); - alertDialogBuilder.setIcon(R.drawable.ic_reset_black_24dp_alpha); + alertDialogBuilder.setIcon(R.drawable.ic_reset); alertDialogBuilder.setNegativeButton(getString(R.string.no), null); alertDialogBuilder.setPositiveButton(getString(R.string.yes), (dialog, which) -> ( (DialogFragmentNodeResetListener)requireActivity()).onNodeReset()); diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/node/dialog/DialogRelayRetransmitSettings.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/node/dialog/DialogRelayRetransmitSettings.java index 880e9a977..aa28a27a1 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/node/dialog/DialogRelayRetransmitSettings.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/node/dialog/DialogRelayRetransmitSettings.java @@ -1,18 +1,18 @@ package no.nordicsemi.android.nrfmeshprovisioner.node.dialog; import android.annotation.SuppressLint; -import androidx.appcompat.app.AlertDialog; import android.app.Dialog; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.fragment.app.DialogFragment; import android.view.LayoutInflater; import android.view.View; import android.widget.SeekBar; import android.widget.Switch; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.DialogFragment; import butterknife.BindView; import butterknife.ButterKnife; import no.nordicsemi.android.meshprovisioner.utils.RelaySettings; @@ -131,7 +131,7 @@ public void onStopTrackingTouch(SeekBar seekBar) { .onRelayRetransmitSet(mRelay, mTransmitCount, mTransmitIntervalSteps); } }).setNegativeButton(R.string.cancel, null) - .setIcon(R.drawable.ic_repeat_black_24dp) + .setIcon(R.drawable.ic_repeat) .setTitle(R.string.title_relay_retransmit).create(); } diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/provisioners/AddProvisionerActivity.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/provisioners/AddProvisionerActivity.java index c2f86c3b8..88c9171e3 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/provisioners/AddProvisionerActivity.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/provisioners/AddProvisionerActivity.java @@ -39,7 +39,6 @@ import androidx.appcompat.widget.Toolbar; import androidx.core.content.ContextCompat; import androidx.lifecycle.ViewModelProvider; -import androidx.lifecycle.ViewModelProviders; import no.nordicsemi.android.meshprovisioner.AllocatedGroupRange; import no.nordicsemi.android.meshprovisioner.AllocatedSceneRange; import no.nordicsemi.android.meshprovisioner.AllocatedUnicastRange; @@ -89,11 +88,11 @@ protected void onCreate(@Nullable final Bundle savedInstanceState) { //noinspection ConstantConditions getSupportActionBar().setTitle(R.string.title_add_provisioner); getSupportActionBar().setDisplayHomeAsUpEnabled(true); - getSupportActionBar().setHomeAsUpIndicator(R.drawable.ic_close_white_24dp); + getSupportActionBar().setHomeAsUpIndicator(R.drawable.ic_close); final View containerProvisionerName = findViewById(R.id.container_name); containerProvisionerName.findViewById(R.id.image). - setBackground(ContextCompat.getDrawable(this, R.drawable.ic_label_outline_black_alpha_24dp)); + setBackground(ContextCompat.getDrawable(this, R.drawable.ic_label_outline)); ((TextView) containerProvisionerName.findViewById(R.id.title)).setText(R.string.name); provisionerName = containerProvisionerName.findViewById(R.id.text); provisionerName.setVisibility(View.VISIBLE); @@ -124,21 +123,21 @@ protected void onCreate(@Nullable final Bundle savedInstanceState) { final View containerUnicastRange = findViewById(R.id.container_unicast_range); containerUnicastRange.setClickable(false); containerUnicastRange.findViewById(R.id.image). - setBackground(ContextCompat.getDrawable(this, R.drawable.ic_lan_black_alpha_24dp)); + setBackground(ContextCompat.getDrawable(this, R.drawable.ic_lan_24dp)); ((TextView) containerUnicastRange.findViewById(R.id.title)).setText(R.string.title_unicast_addresses); unicastRangeView = containerUnicastRange.findViewById(R.id.range_view); final View containerGroupRange = findViewById(R.id.container_group_range); containerGroupRange.setClickable(false); containerGroupRange.findViewById(R.id.image). - setBackground(ContextCompat.getDrawable(this, R.drawable.ic_outline_group_work_black_alpha_24dp)); + setBackground(ContextCompat.getDrawable(this, R.drawable.ic_outline_group_24dp)); ((TextView) containerGroupRange.findViewById(R.id.title)).setText(R.string.title_group_addresses); groupRangeView = containerGroupRange.findViewById(R.id.range_view); final View containerSceneRange = findViewById(R.id.container_scene_range); containerSceneRange.setClickable(false); containerSceneRange.findViewById(R.id.image). - setBackground(ContextCompat.getDrawable(this, R.drawable.ic_arrow_collapse_black_alpha_24dp)); + setBackground(ContextCompat.getDrawable(this, R.drawable.ic_arrow_collapse_black)); ((TextView) containerSceneRange.findViewById(R.id.title)).setText(R.string.title_scenes); sceneRangeView = containerSceneRange.findViewById(R.id.range_view); diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/provisioners/EditProvisionerActivity.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/provisioners/EditProvisionerActivity.java index 62ffd58d8..5804cb68e 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/provisioners/EditProvisionerActivity.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/provisioners/EditProvisionerActivity.java @@ -37,7 +37,6 @@ import androidx.appcompat.widget.Toolbar; import androidx.core.content.ContextCompat; import androidx.lifecycle.ViewModelProvider; -import androidx.lifecycle.ViewModelProviders; import no.nordicsemi.android.meshprovisioner.MeshNetwork; import no.nordicsemi.android.meshprovisioner.Provisioner; import no.nordicsemi.android.meshprovisioner.utils.MeshAddress; @@ -89,7 +88,7 @@ protected void onCreate(@Nullable final Bundle savedInstanceState) { final View containerProvisionerName = findViewById(R.id.container_name); containerProvisionerName.findViewById(R.id.image). - setBackground(ContextCompat.getDrawable(this, R.drawable.ic_label_black_alpha_24dp)); + setBackground(ContextCompat.getDrawable(this, R.drawable.ic_label)); ((TextView) containerProvisionerName.findViewById(R.id.title)).setText(R.string.name); provisionerName = containerProvisionerName.findViewById(R.id.text); provisionerName.setVisibility(View.VISIBLE); @@ -121,21 +120,21 @@ protected void onCreate(@Nullable final Bundle savedInstanceState) { final View containerUnicastRange = findViewById(R.id.container_unicast_range); containerUnicastRange.setClickable(false); containerUnicastRange.findViewById(R.id.image). - setBackground(ContextCompat.getDrawable(this, R.drawable.ic_lan_black_alpha_24dp)); + setBackground(ContextCompat.getDrawable(this, R.drawable.ic_lan_24dp)); ((TextView) containerUnicastRange.findViewById(R.id.title)).setText(R.string.title_unicast_addresses); unicastRangeView = containerUnicastRange.findViewById(R.id.range_view); final View containerGroupRange = findViewById(R.id.container_group_range); containerGroupRange.setClickable(false); containerGroupRange.findViewById(R.id.image). - setBackground(ContextCompat.getDrawable(this, R.drawable.ic_outline_group_work_black_alpha_24dp)); + setBackground(ContextCompat.getDrawable(this, R.drawable.ic_outline_group_24dp)); ((TextView) containerGroupRange.findViewById(R.id.title)).setText(R.string.title_group_addresses); groupRangeView = containerGroupRange.findViewById(R.id.range_view); final View containerSceneRange = findViewById(R.id.container_scene_range); containerSceneRange.setClickable(false); containerSceneRange.findViewById(R.id.image). - setBackground(ContextCompat.getDrawable(this, R.drawable.ic_scene_black_alpha_24dp)); + setBackground(ContextCompat.getDrawable(this, R.drawable.ic_scene)); ((TextView) containerSceneRange.findViewById(R.id.title)).setText(R.string.title_scenes); sceneRangeView = containerSceneRange.findViewById(R.id.range_view); diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/provisioners/ProvisionersActivity.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/provisioners/ProvisionersActivity.java index 2ec19a5f5..9e484c3b7 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/provisioners/ProvisionersActivity.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/provisioners/ProvisionersActivity.java @@ -43,7 +43,6 @@ import androidx.coordinatorlayout.widget.CoordinatorLayout; import androidx.core.content.ContextCompat; import androidx.lifecycle.ViewModelProvider; -import androidx.lifecycle.ViewModelProviders; import androidx.recyclerview.widget.ItemTouchHelper; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -98,7 +97,7 @@ protected void onCreate(@Nullable final Bundle savedInstanceState) { final View containerProvisioner = findViewById(R.id.container_current_provisioner); containerProvisioner.findViewById(R.id.image). - setBackground(ContextCompat.getDrawable(this, R.drawable.ic_account_key_black_alpha_24dp)); + setBackground(ContextCompat.getDrawable(this, R.drawable.ic_account_key)); final TextView provisionerTitle = containerProvisioner.findViewById(R.id.title); final TextView provisionerView = containerProvisioner.findViewById(R.id.text); provisionerView.setVisibility(View.VISIBLE); @@ -214,7 +213,7 @@ private void displaySnackBar(@NonNull final Provisioner provisioner) { network.addProvisioner(provisioner); } }) - .setActionTextColor(getResources().getColor(R.color.colorPrimaryDark)) + .setActionTextColor(getResources().getColor(R.color.colorSecondary)) .show(); } } diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/provisioners/RangesActivity.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/provisioners/RangesActivity.java index ea4437e71..ae5acbe64 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/provisioners/RangesActivity.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/provisioners/RangesActivity.java @@ -43,7 +43,6 @@ import androidx.appcompat.widget.Toolbar; import androidx.coordinatorlayout.widget.CoordinatorLayout; import androidx.lifecycle.ViewModelProvider; -import androidx.lifecycle.ViewModelProviders; import androidx.recyclerview.widget.DefaultItemAnimator; import androidx.recyclerview.widget.DividerItemDecoration; import androidx.recyclerview.widget.ItemTouchHelper; @@ -365,7 +364,7 @@ private void displaySnackBar(final int position, final Range range) { updateEmptyView(); updateResolveFab(); }) - .setActionTextColor(getResources().getColor(R.color.colorPrimaryDark)) + .setActionTextColor(getResources().getColor(R.color.colorSecondary)) .show(); } diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/provisioners/adapter/ProvisionerAdapter.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/provisioners/adapter/ProvisionerAdapter.java index bce5980bb..f8513ee42 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/provisioners/adapter/ProvisionerAdapter.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/provisioners/adapter/ProvisionerAdapter.java @@ -26,9 +26,12 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.TextView; +import com.google.android.material.elevation.ElevationOverlayProvider; + import java.util.ArrayList; import java.util.List; @@ -48,12 +51,10 @@ public class ProvisionerAdapter extends RecyclerView.Adapter { private final List mProvisioners = new ArrayList<>(); - private final Context mContext; private OnItemClickListener mOnItemClickListener; - public ProvisionerAdapter(@NonNull final Context context, @NonNull final MeshNetworkLiveData meshNetworkLiveData) { - this.mContext = context; - meshNetworkLiveData.observe((LifecycleOwner) context, networkData -> { + public ProvisionerAdapter(@NonNull final LifecycleOwner owner, @NonNull final MeshNetworkLiveData meshNetworkLiveData) { + meshNetworkLiveData.observe(owner, networkData -> { final MeshNetwork network = meshNetworkLiveData.getMeshNetwork(); final List provisioners = network.getProvisioners(); mProvisioners.clear(); @@ -71,7 +72,7 @@ public void setOnItemClickListener(final ProvisionerAdapter.OnItemClickListener @NonNull @Override public ProvisionerAdapter.ViewHolder onCreateViewHolder(@NonNull final ViewGroup parent, final int viewType) { - final View layoutView = LayoutInflater.from(mContext).inflate(R.layout.removable_row_item1, parent, false); + final View layoutView = LayoutInflater.from(parent.getContext()).inflate(R.layout.removable_row_item_provisioner, parent, false); return new ProvisionerAdapter.ViewHolder(layoutView); } @@ -79,11 +80,12 @@ public ProvisionerAdapter.ViewHolder onCreateViewHolder(@NonNull final ViewGroup public void onBindViewHolder(@NonNull final ProvisionerAdapter.ViewHolder holder, final int position) { final Provisioner provisioner = mProvisioners.get(position); holder.provisionerName.setText(provisioner.getProvisionerName()); + final Context context = holder.provisionerName.getContext(); if (provisioner.getProvisionerAddress() == null) { - holder.provisionerSummary.setText(mContext.getString(R.string.unicast_address, - mContext.getString(R.string.address_unassigned))); + holder.provisionerSummary.setText(context.getString(R.string.unicast_address, + holder.provisionerName.getContext().getString(R.string.address_unassigned))); } else { - holder.provisionerSummary.setText(mContext.getString(R.string.unicast_address, + holder.provisionerSummary.setText(context.getString(R.string.unicast_address, MeshAddress.formatAddress(provisioner.getProvisionerAddress(), true))); } } @@ -112,7 +114,8 @@ public interface OnItemClickListener { } final class ViewHolder extends RemovableViewHolder { - + @BindView(R.id.container) + FrameLayout container; @BindView(R.id.icon) ImageView icon; @BindView(R.id.title) @@ -123,9 +126,11 @@ final class ViewHolder extends RemovableViewHolder { private ViewHolder(final View view) { super(view); ButterKnife.bind(this, view); - icon.setImageDrawable(ContextCompat.getDrawable(mContext, R.drawable.ic_account_key_black_alpha_24dp)); - - view.findViewById(R.id.removable).setOnClickListener(v -> { + final ElevationOverlayProvider provider = new ElevationOverlayProvider(itemView.getContext()); + final int color = provider.compositeOverlayIfNeeded(provider.getThemeSurfaceColor(), 3.5f); + getSwipeableView().setBackgroundColor(color); + icon.setImageDrawable(ContextCompat.getDrawable(view.getContext(), R.drawable.ic_account_key)); + container.setOnClickListener(v -> { if (mOnItemClickListener != null) { final Provisioner provisioner = mProvisioners.get(getAdapterPosition()); mOnItemClickListener.onItemClick(getAdapterPosition(), provisioner); diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/provisioners/adapter/RangeAdapter.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/provisioners/adapter/RangeAdapter.java index 81f485dd7..d60a48ab3 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/provisioners/adapter/RangeAdapter.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/provisioners/adapter/RangeAdapter.java @@ -169,7 +169,7 @@ final class ViewHolder extends RemovableViewHolder { private ViewHolder(final View view) { super(view); ButterKnife.bind(this, view); - view.findViewById(R.id.removable).setOnClickListener(v -> { + view.findViewById(R.id.container).setOnClickListener(v -> { if (mOnItemClickListener != null) { mOnItemClickListener.onItemClick(getAdapterPosition(), mRanges.get(getAdapterPosition())); } diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/provisioners/dialogs/DialogFragmentGroupRange.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/provisioners/dialogs/DialogFragmentGroupRange.java index 45640cc81..048d4d439 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/provisioners/dialogs/DialogFragmentGroupRange.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/provisioners/dialogs/DialogFragmentGroupRange.java @@ -37,8 +37,6 @@ import com.google.android.material.textfield.TextInputEditText; import com.google.android.material.textfield.TextInputLayout; -import org.w3c.dom.Text; - import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AlertDialog; @@ -146,7 +144,7 @@ public void afterTextChanged(final Editable s) { final AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(requireContext()) .setView(rootView) - .setIcon(R.drawable.ic_arrow_collapse_black_alpha_24dp) + .setIcon(R.drawable.ic_arrow_collapse_black) .setTitle(R.string.title_range) .setPositiveButton(R.string.ok, null) .setNegativeButton(R.string.cancel, null); diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/provisioners/dialogs/DialogFragmentProvisionerAddress.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/provisioners/dialogs/DialogFragmentProvisionerAddress.java index 39cbe6e56..1d93ba43f 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/provisioners/dialogs/DialogFragmentProvisionerAddress.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/provisioners/dialogs/DialogFragmentProvisionerAddress.java @@ -120,7 +120,7 @@ public void afterTextChanged(final Editable s) { final AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(requireContext()) .setView(rootView) - .setIcon(R.drawable.ic_lan_black_alpha_24dp) + .setIcon(R.drawable.ic_lan_24dp) .setTitle(R.string.title_provisioner_address) .setPositiveButton(R.string.ok, null) .setNeutralButton(R.string.action_unassign, null) diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/provisioners/dialogs/DialogFragmentProvisionerName.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/provisioners/dialogs/DialogFragmentProvisionerName.java index 7780aac92..4b073c455 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/provisioners/dialogs/DialogFragmentProvisionerName.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/provisioners/dialogs/DialogFragmentProvisionerName.java @@ -105,7 +105,7 @@ public void afterTextChanged(final Editable s) { final AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(requireContext()) .setView(rootView) - .setIcon(R.drawable.ic_lan_black_alpha_24dp) + .setIcon(R.drawable.ic_lan_24dp) .setTitle(R.string.title_provisioner_name) .setPositiveButton(R.string.ok, null) .setNegativeButton(R.string.cancel, null); diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/provisioners/dialogs/DialogFragmentSceneRange.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/provisioners/dialogs/DialogFragmentSceneRange.java index 8b4c07230..407a250d1 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/provisioners/dialogs/DialogFragmentSceneRange.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/provisioners/dialogs/DialogFragmentSceneRange.java @@ -147,7 +147,7 @@ public void afterTextChanged(final Editable s) { final AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(requireContext()) .setView(rootView) - .setIcon(R.drawable.ic_arrow_collapse_black_alpha_24dp) + .setIcon(R.drawable.ic_arrow_collapse_black) .setTitle(R.string.title_range) .setPositiveButton(R.string.ok, null) .setNegativeButton(R.string.cancel, null); diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/provisioners/dialogs/DialogFragmentUnassign.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/provisioners/dialogs/DialogFragmentUnassign.java index 4551059c9..b110396f6 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/provisioners/dialogs/DialogFragmentUnassign.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/provisioners/dialogs/DialogFragmentUnassign.java @@ -64,7 +64,7 @@ public Dialog onCreateDialog(final Bundle savedInstanceState) { super.onCreateDialog(savedInstanceState); final AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(requireActivity()); - alertDialogBuilder.setIcon(R.drawable.ic_reset_black_24dp_alpha); + alertDialogBuilder.setIcon(R.drawable.ic_reset); alertDialogBuilder.setTitle(requireContext().getString(R.string.title_unassign_provisioner)); alertDialogBuilder.setMessage(requireContext().getString(R.string.summary_unassign_provisioner)); alertDialogBuilder.setNegativeButton(getString(R.string.no), null); diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/provisioners/dialogs/DialogFragmentUnicastRange.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/provisioners/dialogs/DialogFragmentUnicastRange.java index 300c4c65b..62137f8b6 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/provisioners/dialogs/DialogFragmentUnicastRange.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/provisioners/dialogs/DialogFragmentUnicastRange.java @@ -144,7 +144,7 @@ public void afterTextChanged(final Editable s) { final AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(requireContext()) .setView(rootView) - .setIcon(R.drawable.ic_arrow_collapse_black_alpha_24dp) + .setIcon(R.drawable.ic_arrow_collapse_black) .setTitle(R.string.title_range) .setPositiveButton(R.string.ok, null) .setNegativeButton(R.string.cancel, null); diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/viewmodels/BaseViewModel.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/viewmodels/BaseViewModel.java index 515d3c028..4dc007045 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/viewmodels/BaseViewModel.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/viewmodels/BaseViewModel.java @@ -281,7 +281,7 @@ public boolean isModelExists(final int modelId) { */ public void displayDisconnectedSnackBar(@NonNull final Activity context, @NonNull final CoordinatorLayout container) { Snackbar.make(container, context.getString(R.string.disconnected_network_rationale), Snackbar.LENGTH_LONG) - .setActionTextColor(context.getResources().getColor(R.color.colorPrimaryDark)) + .setActionTextColor(context.getResources().getColor(R.color.colorSecondary)) .setAction(context.getString(R.string.action_connect), v -> navigateToScannerActivity(context, false, Utils.CONNECT_TO_NETWORK, false)) .show(); @@ -297,7 +297,7 @@ public void displayDisconnectedSnackBar(@NonNull final Activity context, @NonNul */ public void displaySnackBar(@NonNull final Activity context, @NonNull final CoordinatorLayout container, @NonNull final String message, final int duration) { Snackbar.make(container, message, duration) - .setActionTextColor(context.getResources().getColor(R.color.colorPrimaryDark)) + .setActionTextColor(context.getResources().getColor(R.color.colorSecondary)) .show(); } } diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/viewmodels/ProvisioningStatusLiveData.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/viewmodels/ProvisioningStatusLiveData.java index b9f0d3d3f..0cace5133 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/viewmodels/ProvisioningStatusLiveData.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/viewmodels/ProvisioningStatusLiveData.java @@ -52,110 +52,110 @@ void onMeshNodeStateUpdated(final ProvisionerStates state) { final ProvisionerProgress provisioningProgress; switch (state) { case PROVISIONING_INVITE: - provisioningProgress = new ProvisionerProgress(state, "Sending provisioning invite...", R.drawable.ic_arrow_forward_black_alpha); + provisioningProgress = new ProvisionerProgress(state, "Sending provisioning invite...", R.drawable.ic_arrow_forward); mProvisioningProgress.add(provisioningProgress); break; case PROVISIONING_CAPABILITIES: - provisioningProgress = new ProvisionerProgress(state, "Provisioning capabilities received...", R.drawable.ic_arrow_back_black_alpha); + provisioningProgress = new ProvisionerProgress(state, "Provisioning capabilities received...", R.drawable.ic_arrow_back); mProvisioningProgress.add(provisioningProgress); break; case PROVISIONING_START: - provisioningProgress = new ProvisionerProgress(state, "Sending provisioning start...", R.drawable.ic_arrow_forward_black_alpha); + provisioningProgress = new ProvisionerProgress(state, "Sending provisioning start...", R.drawable.ic_arrow_forward); mProvisioningProgress.add(provisioningProgress); break; case PROVISIONING_PUBLIC_KEY_SENT: - provisioningProgress = new ProvisionerProgress(state, "Sending provisioning public key...", R.drawable.ic_arrow_forward_black_alpha); + provisioningProgress = new ProvisionerProgress(state, "Sending provisioning public key...", R.drawable.ic_arrow_forward); mProvisioningProgress.add(provisioningProgress); break; case PROVISIONING_PUBLIC_KEY_RECEIVED: - provisioningProgress = new ProvisionerProgress(state, "Provisioning public key received...", R.drawable.ic_arrow_back_black_alpha); + provisioningProgress = new ProvisionerProgress(state, "Provisioning public key received...", R.drawable.ic_arrow_back); mProvisioningProgress.add(provisioningProgress); break; case PROVISIONING_AUTHENTICATION_STATIC_OOB_WAITING: case PROVISIONING_AUTHENTICATION_OUTPUT_OOB_WAITING: case PROVISIONING_AUTHENTICATION_INPUT_OOB_WAITING: - provisioningProgress = new ProvisionerProgress(state, "Waiting for user authentication input...", R.drawable.ic_arrow_forward_black_alpha); + provisioningProgress = new ProvisionerProgress(state, "Waiting for user authentication input...", R.drawable.ic_arrow_forward); mProvisioningProgress.add(provisioningProgress); break; case PROVISIONING_AUTHENTICATION_INPUT_ENTERED: - provisioningProgress = new ProvisionerProgress(state, "OOB authentication entered...", R.drawable.ic_arrow_forward_black_alpha); + provisioningProgress = new ProvisionerProgress(state, "OOB authentication entered...", R.drawable.ic_arrow_forward); mProvisioningProgress.add(provisioningProgress); break; case PROVISIONING_INPUT_COMPLETE: - provisioningProgress = new ProvisionerProgress(state, "Provisioning input complete received...", R.drawable.ic_arrow_back_black_alpha); + provisioningProgress = new ProvisionerProgress(state, "Provisioning input complete received...", R.drawable.ic_arrow_back); mProvisioningProgress.add(provisioningProgress); break; case PROVISIONING_CONFIRMATION_SENT: - provisioningProgress = new ProvisionerProgress(state, "Sending provisioning confirmation...", R.drawable.ic_arrow_forward_black_alpha); + provisioningProgress = new ProvisionerProgress(state, "Sending provisioning confirmation...", R.drawable.ic_arrow_forward); mProvisioningProgress.add(provisioningProgress); break; case PROVISIONING_CONFIRMATION_RECEIVED: - provisioningProgress = new ProvisionerProgress(state, "Provisioning confirmation received...", R.drawable.ic_arrow_back_black_alpha); + provisioningProgress = new ProvisionerProgress(state, "Provisioning confirmation received...", R.drawable.ic_arrow_back); mProvisioningProgress.add(provisioningProgress); break; case PROVISIONING_RANDOM_SENT: - provisioningProgress = new ProvisionerProgress(state, "Sending provisioning random...", R.drawable.ic_arrow_forward_black_alpha); + provisioningProgress = new ProvisionerProgress(state, "Sending provisioning random...", R.drawable.ic_arrow_forward); mProvisioningProgress.add(provisioningProgress); break; case PROVISIONING_RANDOM_RECEIVED: - provisioningProgress = new ProvisionerProgress(state, "Provisioning random received...", R.drawable.ic_arrow_back_black_alpha); + provisioningProgress = new ProvisionerProgress(state, "Provisioning random received...", R.drawable.ic_arrow_back); mProvisioningProgress.add(provisioningProgress); break; case PROVISIONING_DATA_SENT: - provisioningProgress = new ProvisionerProgress(state, "Sending provisioning data...", R.drawable.ic_arrow_forward_black_alpha); + provisioningProgress = new ProvisionerProgress(state, "Sending provisioning data...", R.drawable.ic_arrow_forward); mProvisioningProgress.add(provisioningProgress); break; case PROVISIONING_COMPLETE: - provisioningProgress = new ProvisionerProgress(state, "Provisioning complete received...", R.drawable.ic_arrow_back_black_alpha); + provisioningProgress = new ProvisionerProgress(state, "Provisioning complete received...", R.drawable.ic_arrow_back); mProvisioningProgress.add(provisioningProgress); break; case PROVISIONING_FAILED: - provisioningProgress = new ProvisionerProgress(state, "Provisioning failed received...", R.drawable.ic_arrow_forward_black_alpha); + provisioningProgress = new ProvisionerProgress(state, "Provisioning failed received...", R.drawable.ic_arrow_forward); mProvisioningProgress.add(provisioningProgress); default: break; case COMPOSITION_DATA_GET_SENT: - provisioningProgress = new ProvisionerProgress(state, "Sending composition data get...", R.drawable.ic_arrow_forward_black_alpha); + provisioningProgress = new ProvisionerProgress(state, "Sending composition data get...", R.drawable.ic_arrow_forward); mProvisioningProgress.add(provisioningProgress); break; case COMPOSITION_DATA_STATUS_RECEIVED: - provisioningProgress = new ProvisionerProgress(state, "Composition data status received...", R.drawable.ic_arrow_back_black_alpha); + provisioningProgress = new ProvisionerProgress(state, "Composition data status received...", R.drawable.ic_arrow_back); mProvisioningProgress.add(provisioningProgress); break; case SENDING_DEFAULT_TTL_GET: - provisioningProgress = new ProvisionerProgress(state, "Sending default TLL get...", R.drawable.ic_arrow_forward_black_alpha); + provisioningProgress = new ProvisionerProgress(state, "Sending default TLL get...", R.drawable.ic_arrow_forward); mProvisioningProgress.add(provisioningProgress); break; case DEFAULT_TTL_STATUS_RECEIVED: - provisioningProgress = new ProvisionerProgress(state, "Default TTL status received...", R.drawable.ic_arrow_forward_black_alpha); + provisioningProgress = new ProvisionerProgress(state, "Default TTL status received...", R.drawable.ic_arrow_forward); mProvisioningProgress.add(provisioningProgress); break; case SENDING_APP_KEY_ADD: - provisioningProgress = new ProvisionerProgress(state, "Sending app key add...", R.drawable.ic_arrow_forward_black_alpha); + provisioningProgress = new ProvisionerProgress(state, "Sending app key add...", R.drawable.ic_arrow_forward); mProvisioningProgress.add(provisioningProgress); break; case APP_KEY_STATUS_RECEIVED: - provisioningProgress = new ProvisionerProgress(state, "App key status received...", R.drawable.ic_arrow_forward_black_alpha); + provisioningProgress = new ProvisionerProgress(state, "App key status received...", R.drawable.ic_arrow_forward); mProvisioningProgress.add(provisioningProgress); break; case SENDING_NETWORK_TRANSMIT_SET: - provisioningProgress = new ProvisionerProgress(state, "Sending network transmit set...", R.drawable.ic_arrow_forward_black_alpha); + provisioningProgress = new ProvisionerProgress(state, "Sending network transmit set...", R.drawable.ic_arrow_forward); mProvisioningProgress.add(provisioningProgress); break; case NETWORK_TRANSMIT_STATUS_RECEIVED: - provisioningProgress = new ProvisionerProgress(state, "Network transmit status received...", R.drawable.ic_arrow_forward_black_alpha); + provisioningProgress = new ProvisionerProgress(state, "Network transmit status received...", R.drawable.ic_arrow_forward); mProvisioningProgress.add(provisioningProgress); break; case SENDING_BLOCK_ACKNOWLEDGEMENT: - provisioningProgress = new ProvisionerProgress(state, "Sending block acknowledgements", R.drawable.ic_arrow_forward_black_alpha); + provisioningProgress = new ProvisionerProgress(state, "Sending block acknowledgements", R.drawable.ic_arrow_forward); mProvisioningProgress.add(provisioningProgress); break; case BLOCK_ACKNOWLEDGEMENT_RECEIVED: - provisioningProgress = new ProvisionerProgress(state, "Receiving block acknowledgements", R.drawable.ic_arrow_back_black_alpha); + provisioningProgress = new ProvisionerProgress(state, "Receiving block acknowledgements", R.drawable.ic_arrow_back); mProvisioningProgress.add(provisioningProgress); break; case PROVISIONER_UNASSIGNED: - provisioningProgress = new ProvisionerProgress(state, "Provisioner unassigned...", R.drawable.ic_arrow_forward_black_alpha); + provisioningProgress = new ProvisionerProgress(state, "Provisioner unassigned...", R.drawable.ic_arrow_forward); mProvisioningProgress.add(provisioningProgress); break; } diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/widgets/DividerItemDecorator.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/widgets/DividerItemDecorator.java new file mode 100644 index 000000000..4177a7c5f --- /dev/null +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/widgets/DividerItemDecorator.java @@ -0,0 +1,34 @@ +package no.nordicsemi.android.nrfmeshprovisioner.widgets; + +import android.graphics.Canvas; +import android.graphics.drawable.Drawable; +import android.view.View; + +import androidx.recyclerview.widget.RecyclerView; + +public class DividerItemDecorator extends RecyclerView.ItemDecoration { + private Drawable mDivider; + + public DividerItemDecorator(Drawable divider) { + mDivider = divider; + } + + @Override + public void onDraw(Canvas canvas, RecyclerView parent, RecyclerView.State state) { + int dividerLeft = parent.getPaddingLeft(); + int dividerRight = parent.getWidth() - parent.getPaddingRight(); + + int childCount = parent.getChildCount(); + for (int i = 0; i <= childCount - 2; i++) { + View child = parent.getChildAt(i); + + RecyclerView.LayoutParams params = (RecyclerView.LayoutParams) child.getLayoutParams(); + + int dividerTop = child.getBottom() + params.bottomMargin; + int dividerBottom = dividerTop + mDivider.getIntrinsicHeight(); + + mDivider.setBounds(dividerLeft, dividerTop, dividerRight, dividerBottom); + mDivider.draw(canvas); + } + } +} diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/widgets/RemovableItemTouchHelperCallback.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/widgets/RemovableItemTouchHelperCallback.java index 0c97b300c..9d3a6f3b7 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/widgets/RemovableItemTouchHelperCallback.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/widgets/RemovableItemTouchHelperCallback.java @@ -23,7 +23,6 @@ package no.nordicsemi.android.nrfmeshprovisioner.widgets; import android.graphics.Canvas; -import android.util.Log; import android.view.Gravity; import android.widget.FrameLayout; import android.widget.ImageView; diff --git a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/widgets/RemovableViewHolder.java b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/widgets/RemovableViewHolder.java index 9f8edc4ad..82ff2a7a9 100644 --- a/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/widgets/RemovableViewHolder.java +++ b/Example/nrf-mesh/app/src/main/java/no/nordicsemi/android/nrfmeshprovisioner/widgets/RemovableViewHolder.java @@ -22,10 +22,10 @@ package no.nordicsemi.android.nrfmeshprovisioner.widgets; -import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.ImageView; +import androidx.recyclerview.widget.RecyclerView; import no.nordicsemi.android.nrfmeshprovisioner.R; public class RemovableViewHolder extends RecyclerView.ViewHolder { @@ -43,11 +43,11 @@ public View getSwipeableView() { return mRemovableView; } - protected boolean isRemovable() { + boolean isRemovable() { return true; } - public ImageView getDeleteView() { + ImageView getDeleteView() { return mDeleteView; } diff --git a/Example/nrf-mesh/app/src/main/res/color/bottom_nav_color.xml b/Example/nrf-mesh/app/src/main/res/color/bottom_nav_color.xml new file mode 100644 index 000000000..6af52613b --- /dev/null +++ b/Example/nrf-mesh/app/src/main/res/color/bottom_nav_color.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/color/proxy_filter_button_states.xml b/Example/nrf-mesh/app/src/main/res/color/proxy_filter_button_states.xml index 941101eba..ba9153b0e 100644 --- a/Example/nrf-mesh/app/src/main/res/color/proxy_filter_button_states.xml +++ b/Example/nrf-mesh/app/src/main/res/color/proxy_filter_button_states.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/drawable-hdpi/list_divider_holo_light.9.png b/Example/nrf-mesh/app/src/main/res/drawable-hdpi/list_divider_holo_light.9.png deleted file mode 100644 index 0279e17a123f8cbb3c7e3a9ce5c5af8e693b6977..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 76 zcmeAS@N?(olHy`uVBq!ia0vp^%plCc1|-8Yw(bW~!k#XUAsp9}6B-)+^LX%RmN2q0 Ycy4A9FVZ~13zTN?boFyt=akR{01+Y(GXMYp diff --git a/Example/nrf-mesh/app/src/main/res/drawable-xhdpi/ic_rssi_0_bar.png b/Example/nrf-mesh/app/src/main/res/drawable-xhdpi/ic_rssi_0_bar.png deleted file mode 100644 index 40d094f34d86743e7da290d35d1e6293a7b0562a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1038 zcmV+p1o8WcP)T zv{KuQ8ChXr?FJJP{23Jze?|vZ21dld##WGEKrD2q)ckbPBu(O^YJNF(oS1tk6>hNO z`{BE~Px8__@80L`z3;uV?Kcd=C&IG1Ldx&=C9M93VkoBf_xd8@@VgBRV4+a(bvPV8 zh(sdkwFk*0?r&91^IctaWkpfGO{deJx;}ZI-rucx3OJj~2Lpk?%jIbFZ9EZA--|?C zoj{m`R!jb&s_Hv52_H}uDCj(Ns-W zMx)E=WHKD4y*vY;v`V8syu6y^{Uotzj4wWy2DvY=TmmjgTY|prBz+f7#%{aP6B2U zt^c8C%IJC;!cG8}+Y<@3ZI$9?wVvyh|3S0Dn)gziI)i%}%~lhB!zzg8Eo^>kvN#~* zQ}v5Rm3D?9;6UbE7#Wq)0S3-obd_}Q5!ND@{n!b+&Cl%t>KGCv%3CpEyd`ghJ0+^i5l+p z`j6o?3(G4S@NuVV7^e+&t6lU&4bwpLhUE@S0xbeo2rv$`C|F^@PNytUutI^YpclQz zy;J+J(|26k+gnxCfhp~FXO;Ogq}%>54Hp{aRzox_*dGA~0BKCb=A{7k0000007*qo IM6N<$f~#!pfB*mh diff --git a/Example/nrf-mesh/app/src/main/res/drawable-xhdpi/ic_rssi_1_bar.png b/Example/nrf-mesh/app/src/main/res/drawable-xhdpi/ic_rssi_1_bar.png deleted file mode 100644 index 72b6996ad4d5af7bc00ddb9b96eb14a242ff0131..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1125 zcmV-r1e*JaP)N-}bIxzh+#+XLRwjjcyndTpE;Dg`hGJNAItH>* z#32_O7{F92<)m7z9@S_x&LbAHneW(QsU+LkNhk98{D*3_y2vnApqk%2=qcY9C5P}+s0<-BbwWV z8@He@yFFf|e=Tq?lgTpde>RB0>+?@g0|wASvB-9s2?ghqx~@*x(RP+hrFQwGdQ;H? zG1BXFD^_c-lSFVz#S)V*6t=6C%5Irqf=GFn>c4{&-KAEk`V>lKx3;V6uvXipLWZqL z!S#)|rBZ3Eskk-URh;xKm&$Ufr4G7S)-&+C>;LAC(WTdtfjQi z)(kqA%T+pQS6ehjcOlkx0#+wl|3cT4QS>x~lK>vE7ZPflE5+;8x}jJ83rz}Jf0pv8 zGx$z47LUOgQbDXg!Wxezjthd%7TJo1a90=tZk1Ym4FnQ=;X=dWah=1WyZ}IsU8oIx zXEvMqNZLX!V;Dx3NF;;VTyE4c(7#0NkhE@uHUhW?bCB#f)_qurD$+8jb;(`;>^-p3 zQtWE0-LCcgf@2q4!>Bi%KX%l9UPuk*^92TFLkL|LzgDYkgzI{!)9LI6gI*;tmIV~c z2(=onsW)$x722KcsXX6y5e(gb-&1_2)x0CCZ&t);C?I9qfkQ0K?!BVba5HH58*W{- zy9;ya1r98>Xf;AZ`qI2Eg75kh0T-6&SlWZ8(QmhE8A)J?fNL)fj8flfmO3zB zXsKW&0d5B^B`o#EqtWJGy|yiW`5ek-|NKi1=;$EP)w4SPmi0E;ZtKqJ&HqP+X-hBX{Lf|eOHR_H{r|u3_y4~CcR3Z8N+ppH;+gkZ#A1=Q z)_2GTzsu=Z6~YcN*T4WKlSv2L+S>NZ<#LxnuhY?8OH!05l}g96+3cUiVsSj5FO0gJ z_Hau9d*;1Ti9~XwL!mgO(P~`VicYQD6^0yfNheFMA!1Ly`xmRe1ig3}3IcPn_b znIw|QbvmJ5H)%mKQYn?QX0yq~CgD&dmCtT$tP~4{^;|w5M49(?`EO80celx8Hi=Z) zp=fV^M4@PxA;Hc`!G*Dd0TwQOtAf_La$o~pXy_M!@jfsU*yPH}2AjLdhsV?DOpb0A2UY-9HA_(7RX*=1 z+b0wb-=Y)d&>e1uwAWG(dTnj3&`Mry&={QnTbm`Y|LQPIIacfTPQGiE7xI;~_w!6B;)e z4P8tXjs5VWJC#bE2?hdBCzA;Y8*f>yHd3q8U43)pjc0JyM`Q6QI`HG=u$;XB0MJ-8 z`m4v|u~8Js={zi#Zxgv(uAtsv*w4o6oB@CO*%tvmKx=__@7Z$&*W;{#zaJetF*`GJ znr-MZ6}anuoIHvtNF5d3tJUAKzYWBjF2ShrbyC;BBiTYCa;#gJ-v)WoDuLxpL`zrXLiOyH_IALrr(BN zA9|5#mcJVbKSdY5_wl~pM~06+PgjSG;r;1bT3iUNuGW8rY_~fy+js03!f7Zr@8x}u zeRpmYl{f!zBXE^UB~q)^uksqw7cTx}8NYV*A!vdiP!@G#-K$3O^|$9PO-@X_P@OLT zw(p52yN(=sDa?D)s)mN}wL2VrT-3>Wp?+&}a^gWnz=dU1mL5PG493iRC*M_z1d!A3 zf0&L&mkC^0Rxje=LC_kZry{mGIsb2|)kP+R63DpG<>i4`EJ~n;zT!JnpNl%ZKB3p^ zKYnen|AYVCzlYVJb9e5H&}~1VZL~X_r}zZt4H$-s>FFsO&RU!fYDNP$QvM;y|-$Dz*$57n*NaUV)iH3jxbJFkNV& zUtJP&4PA75rm4gK#^>4}W0MKHwcv)yz ckbeaj0F#H1@EcOqi2wiq07*qoM6N<$f}kjL?EnA( diff --git a/Example/nrf-mesh/app/src/main/res/drawable-xhdpi/ic_rssi_3_bars.png b/Example/nrf-mesh/app/src/main/res/drawable-xhdpi/ic_rssi_3_bars.png deleted file mode 100644 index ae512dbcda218d9d2d4ae63db585a3920a87fdc9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1356 zcmV-S1+)5zP)^U%h&Dosv8XENDQ5&L3Vr{`agbEZ^AJ*&hN+Ula!cvxx4mpFib) z|M|o9`O`%6mnym+x@}am2H>@58#p;>Ur!JA2eA(F88DwN+KJyC* zoCkV#a$HR08gd-HXvy-B&!0c%e*Eyk@X3=Wyrc#ID4A<%Ys+D)(l9(cXWqgoCypP> zCdC3JCFRe;A|kufQVia?%m}jMW3ymeLQ;JhI<&4gx|e;clg5j zbC$%$rmCvyLs2m?UvjGma$+9n@t)haZ_5)K>!4~ZCoA0w#ls-a-o10@^TUS^I0vIg zv1Pf}uU>7wdi9DtG3s@6^=^xaiD`oJH6ySoNVI3=T3@kv| za~5Jsab*=1UXVi0w{PEY5{gxQ1A}$6%A@20Xuz+TG-djw8`rPv;!EbB2n9x#BRENe z8vLhEoqUR|R2C8v{->j>8$MWK6;H#c9N1oHd-v`w6TSirUT9(SG^q5gsx0H9b}|I^ zrW_zChwT700}_H3*w)_l308%nS4|l8Fv!zD$DJ-I%9kc5gg<`#IOXAk2R68p7O?gj(aE-qezvmT~KH9<=KNJ{ICn$;l19`2to`2j6Fip}HNIy#5Qjd6-SOsG_( z6#(URbq!4;x(oooz|`rp4qm--#g5joiZ8Z}jE$$JB*o{@+`}NxoAfWR>XSV*u->qW_pSnv39VKn14*4Jbv^PUq2aCf6K_qCXv&ifaXhkSU2_IgZt_D zJPsPs1a|flXqu#PHA6w88`?U$WaTSDec_82E(D>M7a-4?nwd+JI&Mu?p@r^gQ1Vq$ zRyL(ocM+7-FI~KN0ahcB>sgAbC77qh#KfuI-p1EteD&%jFS(ut1CWQw#XwIBQKEk! z>|~_ZWZGZ>EcCDhRN}sR`7-YH>sP$M9u!7@TSQd!t*EGIZ(@8*C#~H=(-;PM^w!Or znZ!0fLCr=bWtAFQdYon+26ZZk9b}_M3u-_;OiGIk7tqkudPYv4oDiT%PY2W@1J#w} z0+3#i8MJU4O*{;$BSCc~Ii9AZQ88d1CfC!n_AE_3Osc2p;aQq{m{?EK%d>RxFdhco6Dk;hV=D79K|Sw6L%Ucyf! - + \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/drawable/divider.xml b/Example/nrf-mesh/app/src/main/res/drawable/divider.xml deleted file mode 100644 index 5d55df131..000000000 --- a/Example/nrf-mesh/app/src/main/res/drawable/divider.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_account_check.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_account_check.xml index 99d1be5d5..877eb1234 100644 --- a/Example/nrf-mesh/app/src/main/res/drawable/ic_account_check.xml +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_account_check.xml @@ -1,5 +1,11 @@ - - + + diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_account_key.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_account_key.xml new file mode 100644 index 000000000..3e5770ef6 --- /dev/null +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_account_key.xml @@ -0,0 +1,12 @@ + + + + \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_account_key_black_alpha_24dp.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_account_key_black_alpha_24dp.xml deleted file mode 100644 index 32cd84ed1..000000000 --- a/Example/nrf-mesh/app/src/main/res/drawable/ic_account_key_black_alpha_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_arrow_back.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_arrow_back.xml new file mode 100644 index 000000000..cb2966ef8 --- /dev/null +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_arrow_back.xml @@ -0,0 +1,33 @@ + + + + + diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_arrow_collapse_black.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_arrow_collapse_black.xml new file mode 100644 index 000000000..9e4155088 --- /dev/null +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_arrow_collapse_black.xml @@ -0,0 +1,11 @@ + + + diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_arrow_collapse_black_alpha_24dp.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_arrow_collapse_black_alpha_24dp.xml deleted file mode 100644 index 58e5a41a0..000000000 --- a/Example/nrf-mesh/app/src/main/res/drawable/ic_arrow_collapse_black_alpha_24dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_arrow_downward.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_arrow_downward.xml new file mode 100644 index 000000000..6cdb55783 --- /dev/null +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_arrow_downward.xml @@ -0,0 +1,11 @@ + + + diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_arrow_downward_black_alpha_24dp.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_arrow_downward_black_alpha_24dp.xml deleted file mode 100644 index 8e5daf55f..000000000 --- a/Example/nrf-mesh/app/src/main/res/drawable/ic_arrow_downward_black_alpha_24dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_arrow_forward.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_arrow_forward.xml new file mode 100644 index 000000000..7fa3f6652 --- /dev/null +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_arrow_forward.xml @@ -0,0 +1,33 @@ + + + + + diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_arrow_forward_black_alpha.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_arrow_forward_black_alpha.xml deleted file mode 100644 index 08d660880..000000000 --- a/Example/nrf-mesh/app/src/main/res/drawable/ic_arrow_forward_black_alpha.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_arrow_upward.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_arrow_upward.xml new file mode 100644 index 000000000..403774ae8 --- /dev/null +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_arrow_upward.xml @@ -0,0 +1,11 @@ + + + diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_arrow_upward_black_alpha_24dp.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_arrow_upward_black_alpha_24dp.xml deleted file mode 100644 index 25d69582a..000000000 --- a/Example/nrf-mesh/app/src/main/res/drawable/ic_arrow_upward_black_alpha_24dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_lan_black.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_auto_fix_black.xml similarity index 72% rename from Example/nrf-mesh/app/src/main/res/drawable/ic_lan_black.xml rename to Example/nrf-mesh/app/src/main/res/drawable/ic_auto_fix_black.xml index dc1d31b8d..6e5bea6a0 100644 --- a/Example/nrf-mesh/app/src/main/res/drawable/ic_lan_black.xml +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_auto_fix_black.xml @@ -21,11 +21,13 @@ --> + android:width="24dp" + android:height="24dp" + android:alpha="0.6" + android:tint="@color/colorForeground" + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M7.5,5.6L5,7L6.4,4.5L5,2L7.5,3.4L10,2L8.6,4.5L10,7L7.5,5.6M19.5,15.4L22,14L20.6,16.5L22,19L19.5,17.6L17,19L18.4,16.5L17,14L19.5,15.4M22,2L20.6,4.5L22,7L19.5,5.6L17,7L18.4,4.5L17,2L19.5,3.4L22,2M13.34,12.78L15.78,10.34L13.66,8.22L11.22,10.66L13.34,12.78M14.37,7.29L16.71,9.63C17.1,10 17.1,10.65 16.71,11.04L5.04,22.71C4.65,23.1 4,23.1 3.63,22.71L1.29,20.37C0.9,20 0.9,19.35 1.29,18.96L12.96,7.29C13.35,6.9 14,6.9 14.37,7.29Z" /> diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_auto_fix_black_24dp_alpha.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_auto_fix_black_24dp_alpha.xml deleted file mode 100644 index 919508569..000000000 --- a/Example/nrf-mesh/app/src/main/res/drawable/ic_auto_fix_black_24dp_alpha.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_barcode_black.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_barcode_black.xml new file mode 100644 index 000000000..f27659e4e --- /dev/null +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_barcode_black.xml @@ -0,0 +1,33 @@ + + + + + diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_bluetooth_disabled.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_bluetooth_disabled.xml index 091e75a4c..b40c563ab 100644 --- a/Example/nrf-mesh/app/src/main/res/drawable/ic_bluetooth_disabled.xml +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_bluetooth_disabled.xml @@ -21,12 +21,13 @@ --> + android:width="48dp" + android:height="48dp" + android:alpha="0.6" + android:tint="@color/colorForeground" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:pathData="M13,5.83l1.88,1.88 -1.6,1.6 1.41,1.41 3.02,-3.02L12,2h-1v5.03l2,2v-3.2zM5.41,4L4,5.41 10.59,12 5,17.59 6.41,19 11,14.41V22h1l4.29,-4.29 2.3,2.29L20,18.59 5.41,4zM13,18.17v-3.76l1.88,1.88L13,18.17z" /> diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_bluetooth_searching_black_alpha.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_bluetooth_searching.xml similarity index 91% rename from Example/nrf-mesh/app/src/main/res/drawable/ic_bluetooth_searching_black_alpha.xml rename to Example/nrf-mesh/app/src/main/res/drawable/ic_bluetooth_searching.xml index 4d1750ebb..b4a6f3179 100644 --- a/Example/nrf-mesh/app/src/main/res/drawable/ic_bluetooth_searching_black_alpha.xml +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_bluetooth_searching.xml @@ -21,12 +21,13 @@ --> + android:width="48dp" + android:height="48dp" + android:alpha="0.6" + android:tint="@color/colorForeground" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:pathData="M14.24,12.01l2.32,2.32c0.28,-0.72 0.44,-1.51 0.44,-2.33 0,-0.82 -0.16,-1.59 -0.43,-2.31l-2.33,2.32zM19.53,6.71l-1.26,1.26c0.63,1.21 0.98,2.57 0.98,4.02s-0.36,2.82 -0.98,4.02l1.2,1.2c0.97,-1.54 1.54,-3.36 1.54,-5.31 -0.01,-1.89 -0.55,-3.67 -1.48,-5.19zM15.71,7.71L10,2L9,2v7.59L4.41,5 3,6.41 8.59,12 3,17.59 4.41,19 9,14.41L9,22h1l5.71,-5.71 -4.3,-4.29 4.3,-4.29zM11,5.83l1.88,1.88L11,9.59L11,5.83zM12.88,16.29L11,18.17v-3.76l1.88,1.88z" /> diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_capabilities.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_capabilities.xml index 8b3f7ef44..d3db7bb3f 100644 --- a/Example/nrf-mesh/app/src/main/res/drawable/ic_capabilities.xml +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_capabilities.xml @@ -1,5 +1,11 @@ - - + + diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_certificate.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_certificate.xml index 4a4379c18..0cceab7bc 100644 --- a/Example/nrf-mesh/app/src/main/res/drawable/ic_certificate.xml +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_certificate.xml @@ -21,12 +21,13 @@ --> + android:width="24dp" + android:height="24dp" + android:alpha="0.60" + android:tint="@color/colorForeground" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:pathData="M4,3C2.89,3 2,3.89 2,5V15A2,2 0,0 0,4 17H12V22L15,19L18,22V17H20A2,2 0,0 0,22 15V8L22,6V5A2,2 0,0 0,20 3H16V3H4M12,5L15,7L18,5V8.5L21,10L18,11.5V15L15,13L12,15V11.5L9,10L12,8.5V5M4,5H9V7H4V5M4,9H7V11H4V9M4,13H9V15H4V13Z" /> diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_check_white_24dp.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_check.xml similarity index 100% rename from Example/nrf-mesh/app/src/main/res/drawable/ic_check_white_24dp.xml rename to Example/nrf-mesh/app/src/main/res/drawable/ic_check.xml diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_close_white_24dp.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_close.xml similarity index 100% rename from Example/nrf-mesh/app/src/main/res/drawable/ic_close_white_24dp.xml rename to Example/nrf-mesh/app/src/main/res/drawable/ic_close.xml diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_content_copy.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_content_copy.xml new file mode 100644 index 000000000..ccdaa2533 --- /dev/null +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_content_copy.xml @@ -0,0 +1,11 @@ + + + diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_content_copy_black_24dp_alpha.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_content_copy_black_24dp_alpha.xml deleted file mode 100644 index 507d2cc02..000000000 --- a/Example/nrf-mesh/app/src/main/res/drawable/ic_content_copy_black_24dp_alpha.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_delete_black_alpha_24dp.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_delete.xml similarity index 86% rename from Example/nrf-mesh/app/src/main/res/drawable/ic_delete_black_alpha_24dp.xml rename to Example/nrf-mesh/app/src/main/res/drawable/ic_delete.xml index 2467ec501..fc202eb84 100644 --- a/Example/nrf-mesh/app/src/main/res/drawable/ic_delete_black_alpha_24dp.xml +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_delete.xml @@ -21,12 +21,13 @@ --> + android:width="24dp" + android:height="24dp" + android:alpha="0.60" + android:tint="@color/colorForeground" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="#FF000000" + android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z" /> diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_domain_nordic_medium_gray_48dp.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_domain_48dp.xml similarity index 100% rename from Example/nrf-mesh/app/src/main/res/drawable/ic_domain_nordic_medium_gray_48dp.xml rename to Example/nrf-mesh/app/src/main/res/drawable/ic_domain_48dp.xml diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_domain_black.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_domain_black.xml new file mode 100644 index 000000000..333be2e72 --- /dev/null +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_domain_black.xml @@ -0,0 +1,33 @@ + + + + + diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_domain_black_24dp_alpha.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_domain_black_24dp_alpha.xml deleted file mode 100644 index 344824806..000000000 --- a/Example/nrf-mesh/app/src/main/res/drawable/ic_domain_black_24dp_alpha.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_domain_nordic_medium_gray_24dp.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_domain_nordic_medium_gray.xml similarity index 100% rename from Example/nrf-mesh/app/src/main/res/drawable/ic_domain_nordic_medium_gray_24dp.xml rename to Example/nrf-mesh/app/src/main/res/drawable/ic_domain_nordic_medium_gray.xml diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_done_all_black.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_done_all_black.xml new file mode 100644 index 000000000..a37364382 --- /dev/null +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_done_all_black.xml @@ -0,0 +1,11 @@ + + + diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_done_all_black_alpha_24dp.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_done_all_black_alpha_24dp.xml deleted file mode 100644 index 427787b46..000000000 --- a/Example/nrf-mesh/app/src/main/res/drawable/ic_done_all_black_alpha_24dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_done_all_nordic_lake_24dp.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_done_all_nordic_lake.xml similarity index 100% rename from Example/nrf-mesh/app/src/main/res/drawable/ic_done_all_nordic_lake_24dp.xml rename to Example/nrf-mesh/app/src/main/res/drawable/ic_done_all_nordic_lake.xml diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_done_all_white_24dp.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_done_all_white.xml similarity index 100% rename from Example/nrf-mesh/app/src/main/res/drawable/ic_done_all_white_24dp.xml rename to Example/nrf-mesh/app/src/main/res/drawable/ic_done_all_white.xml diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_drawing.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_drawing.xml new file mode 100644 index 000000000..2ef5ef69c --- /dev/null +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_drawing.xml @@ -0,0 +1,11 @@ + + + diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_drawing_black_24dp_alpha.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_drawing_black_24dp_alpha.xml deleted file mode 100644 index 2d4f819d6..000000000 --- a/Example/nrf-mesh/app/src/main/res/drawable/ic_drawing_black_24dp_alpha.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_edit_black_alpha_24dp.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_edit_black.xml similarity index 90% rename from Example/nrf-mesh/app/src/main/res/drawable/ic_edit_black_alpha_24dp.xml rename to Example/nrf-mesh/app/src/main/res/drawable/ic_edit_black.xml index ccf580ea0..aa505e5c8 100644 --- a/Example/nrf-mesh/app/src/main/res/drawable/ic_edit_black_alpha_24dp.xml +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_edit_black.xml @@ -21,12 +21,13 @@ --> + android:width="24dp" + android:height="24dp" + android:alpha="0.6" + android:tint="@color/colorForeground" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z" /> diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_edit_white_24dp.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_edit_white.xml similarity index 100% rename from Example/nrf-mesh/app/src/main/res/drawable/ic_edit_white_24dp.xml rename to Example/nrf-mesh/app/src/main/res/drawable/ic_edit_white.xml diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_error_outline_black.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_error_outline_black.xml new file mode 100644 index 000000000..eb0565acf --- /dev/null +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_error_outline_black.xml @@ -0,0 +1,33 @@ + + + + + diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_error_outline_black_alpha.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_error_outline_black_alpha.xml deleted file mode 100644 index 86c794e72..000000000 --- a/Example/nrf-mesh/app/src/main/res/drawable/ic_error_outline_black_alpha.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_filter_list_24dp.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_filter_list_24dp.xml new file mode 100644 index 000000000..563bbc4d8 --- /dev/null +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_filter_list_24dp.xml @@ -0,0 +1,11 @@ + + + diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_filter_list_black_24dp.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_filter_list_black_24dp.xml deleted file mode 100644 index b99b672f4..000000000 --- a/Example/nrf-mesh/app/src/main/res/drawable/ic_filter_list_black_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_filter_list_black_alpha_24dp.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_filter_list_black_alpha_24dp.xml deleted file mode 100644 index 67c3f2a90..000000000 --- a/Example/nrf-mesh/app/src/main/res/drawable/ic_filter_list_black_alpha_24dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_folder_key_24dp.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_folder_key_24dp.xml new file mode 100644 index 000000000..5ba3baebd --- /dev/null +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_folder_key_24dp.xml @@ -0,0 +1,11 @@ + + + diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_folder_key_black_24dp_alpha.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_folder_key_black_24dp_alpha.xml deleted file mode 100644 index e915fe93b..000000000 --- a/Example/nrf-mesh/app/src/main/res/drawable/ic_folder_key_black_24dp_alpha.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_folder_provisioner_black_alpha_24dp.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_folder_provisioner_24dp.xml similarity index 73% rename from Example/nrf-mesh/app/src/main/res/drawable/ic_folder_provisioner_black_alpha_24dp.xml rename to Example/nrf-mesh/app/src/main/res/drawable/ic_folder_provisioner_24dp.xml index d0aa09e29..b05d19ce7 100644 --- a/Example/nrf-mesh/app/src/main/res/drawable/ic_folder_provisioner_black_alpha_24dp.xml +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_folder_provisioner_24dp.xml @@ -1,10 +1,11 @@ + android:width="24dp" + android:height="24dp" + android:alpha="0.6" + android:tint="@color/colorForeground" + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M4,4C2.9,4 2,4.9 2,6v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V8c0,-1.1 -0.9,-2 -2,-2h-8l-2,-2M11.5,12v1h-0.5v1h-0.9v-1h-1c-0.2,0.6 -0.7,1 -1.3,1c-0.8,0 -1.4,-0.6 -1.4,-1.4s0.6,-1.4 1.4,-1.4c0.6,0 1.1,0.4 1.3,1H11.5M7.7,12c-0.3,0 -0.5,0.2 -0.5,0.5S7.5,13 7.7,13c0.3,0 0.5,-0.2 0.5,-0.5S8,12 7.7,12M13.9,14c1.3,0 3.8,0.6 3.8,1.9v1h-7.6v-1C10.1,14.6 12.6,14 13.9,14M13.9,13c-1,0 -1.9,-0.9 -1.9,-1.9s0.8,-1.9 1.9,-1.9s1.9,0.9 1.9,1.9S14.9,13 13.9,13z" /> diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_help_outline_nordic_medium_grey_24dp.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_help_outline_24dp.xml similarity index 100% rename from Example/nrf-mesh/app/src/main/res/drawable/ic_help_outline_nordic_medium_grey_24dp.xml rename to Example/nrf-mesh/app/src/main/res/drawable/ic_help_outline_24dp.xml diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_help_outline_nordic_medium_grey_48dp.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_help_outline_48dp.xml similarity index 100% rename from Example/nrf-mesh/app/src/main/res/drawable/ic_help_outline_nordic_medium_grey_48dp.xml rename to Example/nrf-mesh/app/src/main/res/drawable/ic_help_outline_48dp.xml diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_index.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_index.xml index 9f30884a4..8f4712bae 100644 --- a/Example/nrf-mesh/app/src/main/res/drawable/ic_index.xml +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_index.xml @@ -21,12 +21,13 @@ --> + android:width="24dp" + android:height="24dp" + android:alpha="0.60" + android:tint="@color/colorForeground" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:pathData="M2,17h2v0.5L3,17.5v1h1v0.5L2,19v1h3v-4L2,16v1zM3,8h1L4,4L2,4v1h1v3zM2,11h1.8L2,13.1v0.9h3v-1L3.2,13L5,10.9L5,10L2,10v1zM7,5v2h14L21,5L7,5zM7,19h14v-2L7,17v2zM7,13h14v-2L7,11v2z" /> diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_info_24dp.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_info_24dp.xml new file mode 100644 index 000000000..a66d7a9f5 --- /dev/null +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_info_24dp.xml @@ -0,0 +1,11 @@ + + + diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_info_black_24dp_alpha.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_info_black_24dp_alpha.xml deleted file mode 100644 index 1018167a0..000000000 --- a/Example/nrf-mesh/app/src/main/res/drawable/ic_info_black_24dp_alpha.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_info_outline.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_info_outline.xml new file mode 100644 index 000000000..eb568b0f8 --- /dev/null +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_info_outline.xml @@ -0,0 +1,33 @@ + + + + + diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_info_outline_black_alpha.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_info_outline_black_alpha.xml deleted file mode 100644 index da7f0afcf..000000000 --- a/Example/nrf-mesh/app/src/main/res/drawable/ic_info_outline_black_alpha.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_label.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_label.xml new file mode 100644 index 000000000..689ea54ce --- /dev/null +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_label.xml @@ -0,0 +1,11 @@ + + + diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_label_black_alpha_24dp.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_label_black_alpha_24dp.xml deleted file mode 100644 index 222f042ab..000000000 --- a/Example/nrf-mesh/app/src/main/res/drawable/ic_label_black_alpha_24dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_label_outline.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_label_outline.xml new file mode 100644 index 000000000..8b3b163f1 --- /dev/null +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_label_outline.xml @@ -0,0 +1,11 @@ + + + diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_label_outline_black_alpha_24dp.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_label_outline_black_alpha_24dp.xml deleted file mode 100644 index eab6e0479..000000000 --- a/Example/nrf-mesh/app/src/main/res/drawable/ic_label_outline_black_alpha_24dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_lan_black_alpha_24dp.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_lan_24dp.xml similarity index 90% rename from Example/nrf-mesh/app/src/main/res/drawable/ic_lan_black_alpha_24dp.xml rename to Example/nrf-mesh/app/src/main/res/drawable/ic_lan_24dp.xml index 35deee214..c1b6539a3 100644 --- a/Example/nrf-mesh/app/src/main/res/drawable/ic_lan_black_alpha_24dp.xml +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_lan_24dp.xml @@ -21,12 +21,13 @@ --> + android:width="24dp" + android:height="24dp" + android:alpha="0.60" + android:tint="@color/colorForeground" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:pathData="M10,2C8.89,2 8,2.89 8,4V7C8,8.11 8.89,9 10,9H11V11H2V13H6V15H5C3.89,15 3,15.89 3,17V20C3,21.11 3.89,22 5,22H9C10.11,22 11,21.11 11,20V17C11,15.89 10.11,15 9,15H8V13H16V15H15C13.89,15 13,15.89 13,17V20C13,21.11 13.89,22 15,22H19C20.11,22 21,21.11 21,20V17C21,15.89 20.11,15 19,15H18V13H22V11H13V9H14C15.11,9 16,8.11 16,7V4C16,2.89 15.11,2 14,2H10M10,4H14V7H10V4M5,17H9V20H5V17M15,17H19V20H15V17Z" /> diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_lan_black_alpha_48dp.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_lan_48dp.xml similarity index 90% rename from Example/nrf-mesh/app/src/main/res/drawable/ic_lan_black_alpha_48dp.xml rename to Example/nrf-mesh/app/src/main/res/drawable/ic_lan_48dp.xml index f393871ed..b85e704e8 100644 --- a/Example/nrf-mesh/app/src/main/res/drawable/ic_lan_black_alpha_48dp.xml +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_lan_48dp.xml @@ -21,12 +21,13 @@ --> + android:width="48dp" + android:height="48dp" + android:alpha="0.60" + android:tint="@color/colorForeground" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:pathData="M10,2C8.89,2 8,2.89 8,4V7C8,8.11 8.89,9 10,9H11V11H2V13H6V15H5C3.89,15 3,15.89 3,17V20C3,21.11 3.89,22 5,22H9C10.11,22 11,21.11 11,20V17C11,15.89 10.11,15 9,15H8V13H16V15H15C13.89,15 13,15.89 13,17V20C13,21.11 13.89,22 15,22H19C20.11,22 21,21.11 21,20V17C21,15.89 20.11,15 19,15H18V13H22V11H13V9H14C15.11,9 16,8.11 16,7V4C16,2.89 15.11,2 14,2H10M10,4H14V7H10V4M5,17H9V20H5V17M15,17H19V20H15V17Z" /> diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_light_switch_nordic_medium_grey_24dp.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_light_switch_24dp.xml similarity index 100% rename from Example/nrf-mesh/app/src/main/res/drawable/ic_light_switch_nordic_medium_grey_24dp.xml rename to Example/nrf-mesh/app/src/main/res/drawable/ic_light_switch_24dp.xml diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_light_switch_nordic_medium_grey_48dp.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_light_switch_48dp.xml similarity index 100% rename from Example/nrf-mesh/app/src/main/res/drawable/ic_light_switch_nordic_medium_grey_48dp.xml rename to Example/nrf-mesh/app/src/main/res/drawable/ic_light_switch_48dp.xml diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_lightbulb_level_nordic_medium_gray_outline_24dp.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_lightbulb_level_24dp.xml similarity index 100% rename from Example/nrf-mesh/app/src/main/res/drawable/ic_lightbulb_level_nordic_medium_gray_outline_24dp.xml rename to Example/nrf-mesh/app/src/main/res/drawable/ic_lightbulb_level_24dp.xml diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_lightbulb_level_nordic_sun_outline_48dp.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_lightbulb_level_48dp.xml similarity index 100% rename from Example/nrf-mesh/app/src/main/res/drawable/ic_lightbulb_level_nordic_sun_outline_48dp.xml rename to Example/nrf-mesh/app/src/main/res/drawable/ic_lightbulb_level_48dp.xml diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_lightbulb_level_black_24dp.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_lightbulb_level_black_24dp.xml new file mode 100644 index 000000000..51ea920ac --- /dev/null +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_lightbulb_level_black_24dp.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_lightbulb_outline_nordic_medium_grey_24dp.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_lightbulb_outline_24dp.xml similarity index 100% rename from Example/nrf-mesh/app/src/main/res/drawable/ic_lightbulb_outline_nordic_medium_grey_24dp.xml rename to Example/nrf-mesh/app/src/main/res/drawable/ic_lightbulb_outline_24dp.xml diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_lightbulb_outline_nordic_grass_48dp.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_lightbulb_outline_48dp.xml similarity index 100% rename from Example/nrf-mesh/app/src/main/res/drawable/ic_lightbulb_outline_nordic_grass_48dp.xml rename to Example/nrf-mesh/app/src/main/res/drawable/ic_lightbulb_outline_48dp.xml diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_lightbulb_outline_black_24dp.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_lightbulb_outline_black_24dp.xml new file mode 100644 index 000000000..8bc9abbf8 --- /dev/null +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_lightbulb_outline_black_24dp.xml @@ -0,0 +1,11 @@ + + + diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_linear_scale.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_linear_scale.xml new file mode 100644 index 000000000..e6d1269ea --- /dev/null +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_linear_scale.xml @@ -0,0 +1,11 @@ + + + diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_linear_scale_black_alpha_24dp.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_linear_scale_black_alpha_24dp.xml deleted file mode 100644 index 1d77d8516..000000000 --- a/Example/nrf-mesh/app/src/main/res/drawable/ic_linear_scale_black_alpha_24dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_location_off.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_location_off.xml index 2cb26ee30..f6e923b35 100644 --- a/Example/nrf-mesh/app/src/main/res/drawable/ic_location_off.xml +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_location_off.xml @@ -21,12 +21,13 @@ --> + android:width="48dp" + android:height="48dp" + android:alpha="0.6" + android:tint="@color/colorForeground" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:pathData="M12,6.5c1.38,0 2.5,1.12 2.5,2.5 0,0.74 -0.33,1.39 -0.83,1.85l3.63,3.63c0.98,-1.86 1.7,-3.8 1.7,-5.48 0,-3.87 -3.13,-7 -7,-7 -1.98,0 -3.76,0.83 -5.04,2.15l3.19,3.19c0.46,-0.52 1.11,-0.84 1.85,-0.84zM16.37,16.1l-4.63,-4.63 -0.11,-0.11L3.27,3 2,4.27l3.18,3.18C5.07,7.95 5,8.47 5,9c0,5.25 7,13 7,13s1.67,-1.85 3.38,-4.35L18.73,21 20,19.73l-3.63,-3.63z" /> diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_lock_open_24dp.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_lock_open_24dp.xml new file mode 100644 index 000000000..e66c8115a --- /dev/null +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_lock_open_24dp.xml @@ -0,0 +1,20 @@ + + + + + + diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_lock_open_black_alpha_24dp.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_lock_open_black_alpha_24dp.xml deleted file mode 100644 index 0c623121c..000000000 --- a/Example/nrf-mesh/app/src/main/res/drawable/ic_lock_open_black_alpha_24dp.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_mesh_48dp.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_mesh_48dp.xml deleted file mode 100644 index 88a987e7b..000000000 --- a/Example/nrf-mesh/app/src/main/res/drawable/ic_mesh_48dp.xml +++ /dev/null @@ -1,111 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_mesh_black.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_mesh_black.xml index 24f804c6b..ec895c498 100644 --- a/Example/nrf-mesh/app/src/main/res/drawable/ic_mesh_black.xml +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_mesh_black.xml @@ -1,4 +1,9 @@ - - + + diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_mesh_black_48dp.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_mesh_black_48dp.xml new file mode 100644 index 000000000..61bcbfaa1 --- /dev/null +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_mesh_black_48dp.xml @@ -0,0 +1,11 @@ + + + diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_mesh_white.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_mesh_white.xml index d3322b94a..2e3718d7a 100644 --- a/Example/nrf-mesh/app/src/main/res/drawable/ic_mesh_white.xml +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_mesh_white.xml @@ -1,4 +1,9 @@ - - + + diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_numeric.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_numeric.xml index 9321c7846..e3e1fe733 100644 --- a/Example/nrf-mesh/app/src/main/res/drawable/ic_numeric.xml +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_numeric.xml @@ -21,12 +21,13 @@ --> + android:width="24dp" + android:height="24dp" + android:alpha="0.60" + android:tint="@color/colorForeground" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:pathData="M4,17V9H2V7H6V17H4M22,15C22,16.11 21.1,17 20,17H16V15H20V13H18V11H20V9H16V7H20A2,2 0,0 1,22 9V10.5A1.5,1.5 0,0 1,20.5 12A1.5,1.5 0,0 1,22 13.5V15M14,15V17H8V13C8,11.89 8.9,11 10,11H12V9H8V7H12A2,2 0,0 1,14 9V11C14,12.11 13.1,13 12,13H10V15H14Z" /> diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_oob_lock_outline.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_oob_lock_outline.xml index 9d092e31e..9613c55ed 100644 --- a/Example/nrf-mesh/app/src/main/res/drawable/ic_oob_lock_outline.xml +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_oob_lock_outline.xml @@ -1,11 +1,12 @@ + android:width="24dp" + android:height="24dp" + android:alpha="0.6" + android:tint="@color/colorForeground" + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M21,11C21,16.55 17.16,21.74 12,23C6.84,21.74 3,16.55 3,11V5L12,1L21,5V11M12,21C15.75,20 19,15.54 19,11.22V6.3L12,3.18L5,6.3V11.22C5,15.54 8.25,20 12,21M14.8,11V9.5C14.8,8.1 13.4,7 12,7C10.6,7 9.2,8.1 9.2,9.5V11C8.6,11 8,11.6 8,12.2V15.7C8,16.4 8.6,17 9.2,17H14.7C15.4,17 16,16.4 16,15.8V12.3C16,11.6 15.4,11 14.8,11M13.5,11H10.5V9.5C10.5,8.7 11.2,8.2 12,8.2C12.8,8.2 13.5,8.7 13.5,9.5V11Z" /> \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_outline_group.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_outline_group.xml new file mode 100644 index 000000000..7d7a4bbec --- /dev/null +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_outline_group.xml @@ -0,0 +1,19 @@ + + + + + + diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_outline_group_24dp.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_outline_group_24dp.xml new file mode 100644 index 000000000..a703fc357 --- /dev/null +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_outline_group_24dp.xml @@ -0,0 +1,20 @@ + + + + + + diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_outline_group_48dp.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_outline_group_48dp.xml new file mode 100644 index 000000000..db92c4db2 --- /dev/null +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_outline_group_48dp.xml @@ -0,0 +1,20 @@ + + + + + + diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_outline_group_white_48dp.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_outline_group_white_48dp.xml new file mode 100644 index 000000000..7b66bacb5 --- /dev/null +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_outline_group_white_48dp.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_outline_group_work_black_24dp.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_outline_group_work_black_24dp.xml deleted file mode 100644 index 218456087..000000000 --- a/Example/nrf-mesh/app/src/main/res/drawable/ic_outline_group_work_black_24dp.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_outline_group_work_black_alpha_24dp.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_outline_group_work_black_alpha_24dp.xml deleted file mode 100644 index dd14f5dc3..000000000 --- a/Example/nrf-mesh/app/src/main/res/drawable/ic_outline_group_work_black_alpha_24dp.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_outline_group_work_black_alpha_48dp.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_outline_group_work_black_alpha_48dp.xml deleted file mode 100644 index f1df32aa4..000000000 --- a/Example/nrf-mesh/app/src/main/res/drawable/ic_outline_group_work_black_alpha_48dp.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_outline_group_work_white_48dp.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_outline_group_work_white_48dp.xml deleted file mode 100644 index 8f7bb9f7d..000000000 --- a/Example/nrf-mesh/app/src/main/res/drawable/ic_outline_group_work_white_48dp.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_perm_identity.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_perm_identity.xml new file mode 100644 index 000000000..588ab95ba --- /dev/null +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_perm_identity.xml @@ -0,0 +1,33 @@ + + + + + diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_perm_identity_black_24dp_alpha.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_perm_identity_black_24dp_alpha.xml deleted file mode 100644 index f6e017248..000000000 --- a/Example/nrf-mesh/app/src/main/res/drawable/ic_perm_identity_black_24dp_alpha.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_proxy_24dp_black_alpha.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_proxy.xml similarity index 78% rename from Example/nrf-mesh/app/src/main/res/drawable/ic_proxy_24dp_black_alpha.xml rename to Example/nrf-mesh/app/src/main/res/drawable/ic_proxy.xml index 921c3ffb3..22241af63 100644 --- a/Example/nrf-mesh/app/src/main/res/drawable/ic_proxy_24dp_black_alpha.xml +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_proxy.xml @@ -1,11 +1,12 @@ + android:width="24dp" + android:height="24dp" + android:alpha="0.60" + android:tint="@color/colorForeground" + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M4.93,4.93C3.12,6.74 2,9.24 2,12C2,14.76 3.12,17.26 4.93,19.07L6.34,17.66C4.89,16.22 4,14.22 4,12C4,9.79 4.89,7.78 6.34,6.34L4.93,4.93M19.07,4.93L17.66,6.34C19.11,7.78 20,9.79 20,12C20,14.22 19.11,16.22 17.66,17.66L19.07,19.07C20.88,17.26 22,14.76 22,12C22,9.24 20.88,6.74 19.07,4.93M7.76,7.76C6.67,8.85 6,10.35 6,12C6,13.65 6.67,15.15 7.76,16.24L9.17,14.83C8.45,14.11 8,13.11 8,12C8,10.89 8.45,9.89 9.17,9.17L7.76,7.76M16.24,7.76L14.83,9.17C15.55,9.89 16,10.89 16,12C16,13.11 15.55,14.11 14.83,14.83L16.24,16.24C17.33,15.15 18,13.65 18,12C18,10.35 17.33,8.85 16.24,7.76M12,10A2,2 0 0,0 10,12A2,2 0 0,0 12,14A2,2 0 0,0 14,12A2,2 0 0,0 12,10Z" /> \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_publish.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_publish.xml new file mode 100644 index 000000000..97243552a --- /dev/null +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_publish.xml @@ -0,0 +1,33 @@ + + + + + diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_publish_black_alpha_24dp.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_publish_black_alpha_24dp.xml deleted file mode 100644 index fff2de429..000000000 --- a/Example/nrf-mesh/app/src/main/res/drawable/ic_publish_black_alpha_24dp.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_puzzle.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_puzzle.xml index a575cb0d0..da4ba464c 100644 --- a/Example/nrf-mesh/app/src/main/res/drawable/ic_puzzle.xml +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_puzzle.xml @@ -1,5 +1,11 @@ - - + + diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_range_48dp.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_range_48dp.xml new file mode 100644 index 000000000..a7dceed22 --- /dev/null +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_range_48dp.xml @@ -0,0 +1,11 @@ + + + diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_range_black_alpha_48dp.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_range_black_alpha_48dp.xml deleted file mode 100644 index 29b0238b9..000000000 --- a/Example/nrf-mesh/app/src/main/res/drawable/ic_range_black_alpha_48dp.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_repeat.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_repeat.xml new file mode 100644 index 000000000..e16ee7864 --- /dev/null +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_repeat.xml @@ -0,0 +1,11 @@ + + + diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_repeat_black_24dp.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_repeat_black_24dp.xml deleted file mode 100644 index b8604b088..000000000 --- a/Example/nrf-mesh/app/src/main/res/drawable/ic_repeat_black_24dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_reset.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_reset.xml new file mode 100644 index 000000000..b28e3140e --- /dev/null +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_reset.xml @@ -0,0 +1,11 @@ + + + diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_reset_black_24dp_alpha.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_reset_black_24dp_alpha.xml deleted file mode 100644 index 6c9377539..000000000 --- a/Example/nrf-mesh/app/src/main/res/drawable/ic_reset_black_24dp_alpha.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_round_expand_less.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_round_expand_less.xml new file mode 100644 index 000000000..24781fc9b --- /dev/null +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_round_expand_less.xml @@ -0,0 +1,33 @@ + + + + + diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_round_expand_less_black_alpha_24dp.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_round_expand_less_black_alpha_24dp.xml deleted file mode 100644 index b0d954c6b..000000000 --- a/Example/nrf-mesh/app/src/main/res/drawable/ic_round_expand_less_black_alpha_24dp.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_round_expand_more_black_alpha_24dp.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_round_expand_more.xml similarity index 89% rename from Example/nrf-mesh/app/src/main/res/drawable/ic_round_expand_more_black_alpha_24dp.xml rename to Example/nrf-mesh/app/src/main/res/drawable/ic_round_expand_more.xml index 2ab479f42..f4c1cffcc 100644 --- a/Example/nrf-mesh/app/src/main/res/drawable/ic_round_expand_more_black_alpha_24dp.xml +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_round_expand_more.xml @@ -21,12 +21,13 @@ --> + android:width="24dp" + android:height="24dp" + android:alpha="0.6" + android:tint="@color/colorForeground" + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M15.88,9.29L12,13.17L8.12,9.29c-0.39,-0.39 -1.02,-0.39 -1.41,0l0,0c-0.39,0.39 -0.39,1.02 0,1.41l4.59,4.59c0.39,0.39 1.02,0.39 1.41,0l4.59,-4.59c0.39,-0.39 0.39,-1.02 0,-1.41l0,0C16.91,8.91 16.27,8.9 15.88,9.29z" /> diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_rounded_corner.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_rounded_corner.xml index 49c30c5cd..442392530 100644 --- a/Example/nrf-mesh/app/src/main/res/drawable/ic_rounded_corner.xml +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_rounded_corner.xml @@ -24,7 +24,7 @@ - + + android:width="24dp" + android:height="24dp" + android:alpha="0.6" + android:tint="@color/colorForeground" + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M10,11l-0.94,2.06L7,14l2.06,0.94L10,17l0.94,-2.06L13,14l-2.06,-0.94zM18.01,4l2,4h-3l-2,-4h-2l2,4h-3l-2,-4h-2l2,4h-3l-2,-4h-1c-1.1,0 -1.99,0.9 -1.99,2l-0.01,12c0,1.1 0.9,2 2,2h16c1.1,0 1.99,-0.9 1.99,-2L22,4h-3.99zM20.01,18h-16L4.01,6.47L5.77,10L16,10l-0.63,1.37L14,12l1.37,0.63L16,14l0.63,-1.37L18,12l-1.37,-0.63L16,10h4.01v8z" /> diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_security.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_security.xml new file mode 100644 index 000000000..5a7fbc504 --- /dev/null +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_security.xml @@ -0,0 +1,33 @@ + + + + + diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_security_black_24dp_alpha.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_security_black_24dp_alpha.xml deleted file mode 100644 index bedd755fb..000000000 --- a/Example/nrf-mesh/app/src/main/res/drawable/ic_security_black_24dp_alpha.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_settings_nordic_gray_24dp.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_settings.xml similarity index 93% rename from Example/nrf-mesh/app/src/main/res/drawable/ic_settings_nordic_gray_24dp.xml rename to Example/nrf-mesh/app/src/main/res/drawable/ic_settings.xml index 722f9e890..21c647574 100644 --- a/Example/nrf-mesh/app/src/main/res/drawable/ic_settings_nordic_gray_24dp.xml +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_settings.xml @@ -21,11 +21,11 @@ --> + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:fillColor="#FF000000" + android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z" /> diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_settings_black.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_settings_black.xml deleted file mode 100644 index 61ef5e244..000000000 --- a/Example/nrf-mesh/app/src/main/res/drawable/ic_settings_black.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_shield_key.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_shield_key.xml new file mode 100644 index 000000000..2e5353ddc --- /dev/null +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_shield_key.xml @@ -0,0 +1,11 @@ + + + diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_shield_key_black_alpha_24dp.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_shield_key_black_alpha_24dp.xml deleted file mode 100644 index 12a045dcc..000000000 --- a/Example/nrf-mesh/app/src/main/res/drawable/ic_shield_key_black_alpha_24dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_shield_provisioner.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_shield_provisioner.xml new file mode 100644 index 000000000..d8eff0c8f --- /dev/null +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_shield_provisioner.xml @@ -0,0 +1,11 @@ + + + diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_shield_provisioner_black_alpha_24dp.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_shield_provisioner_black_alpha_24dp.xml deleted file mode 100644 index 4260bae83..000000000 --- a/Example/nrf-mesh/app/src/main/res/drawable/ic_shield_provisioner_black_alpha_24dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_signal_0_bar.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_signal_0_bar.xml new file mode 100644 index 000000000..ae1809729 --- /dev/null +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_signal_0_bar.xml @@ -0,0 +1,33 @@ + + + + + diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_signal_1_bar.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_signal_1_bar.xml new file mode 100644 index 000000000..516ebabed --- /dev/null +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_signal_1_bar.xml @@ -0,0 +1,36 @@ + + + + + + diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_signal_2_bar.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_signal_2_bar.xml new file mode 100644 index 000000000..4db4a14b0 --- /dev/null +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_signal_2_bar.xml @@ -0,0 +1,36 @@ + + + + + + diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_signal_3_bar.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_signal_3_bar.xml new file mode 100644 index 000000000..204898b3c --- /dev/null +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_signal_3_bar.xml @@ -0,0 +1,36 @@ + + + + + + diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_arrow_back_black_alpha.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_signal_4_bar.xml similarity index 80% rename from Example/nrf-mesh/app/src/main/res/drawable/ic_arrow_back_black_alpha.xml rename to Example/nrf-mesh/app/src/main/res/drawable/ic_signal_4_bar.xml index 49815c4a9..d8390268a 100644 --- a/Example/nrf-mesh/app/src/main/res/drawable/ic_arrow_back_black_alpha.xml +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_signal_4_bar.xml @@ -20,8 +20,13 @@ ~ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --> - - + + diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_rssi_bar.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_signal_bar.xml similarity index 80% rename from Example/nrf-mesh/app/src/main/res/drawable/ic_rssi_bar.xml rename to Example/nrf-mesh/app/src/main/res/drawable/ic_signal_bar.xml index d0cb5aa8b..930f9f35e 100644 --- a/Example/nrf-mesh/app/src/main/res/drawable/ic_rssi_bar.xml +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_signal_bar.xml @@ -21,16 +21,19 @@ --> - - - - + + + + + diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_space_bar.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_space_bar.xml new file mode 100644 index 000000000..16328def1 --- /dev/null +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_space_bar.xml @@ -0,0 +1,11 @@ + + + diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_space_bar_black_alpha_24dp.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_space_bar_black_alpha_24dp.xml deleted file mode 100644 index 8895d1587..000000000 --- a/Example/nrf-mesh/app/src/main/res/drawable/ic_space_bar_black_alpha_24dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_barcode_black_24dp_alpha.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_subscribe.xml similarity index 80% rename from Example/nrf-mesh/app/src/main/res/drawable/ic_barcode_black_24dp_alpha.xml rename to Example/nrf-mesh/app/src/main/res/drawable/ic_subscribe.xml index 703039580..fe9bef71a 100644 --- a/Example/nrf-mesh/app/src/main/res/drawable/ic_barcode_black_24dp_alpha.xml +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_subscribe.xml @@ -20,8 +20,14 @@ ~ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --> - - + + diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_subscribe_black_alpha_24dp.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_subscribe_black_alpha_24dp.xml deleted file mode 100644 index 1da555614..000000000 --- a/Example/nrf-mesh/app/src/main/res/drawable/ic_subscribe_black_alpha_24dp.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_timer.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_timer.xml index eea792889..272387d21 100644 --- a/Example/nrf-mesh/app/src/main/res/drawable/ic_timer.xml +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_timer.xml @@ -20,8 +20,14 @@ ~ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --> - - + + diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_vpn_key_24dp.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_vpn_key_24dp.xml new file mode 100644 index 000000000..85a1e74fd --- /dev/null +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_vpn_key_24dp.xml @@ -0,0 +1,11 @@ + + + diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_vpn_key_black_alpha_48dp.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_vpn_key_48dp.xml similarity index 90% rename from Example/nrf-mesh/app/src/main/res/drawable/ic_vpn_key_black_alpha_48dp.xml rename to Example/nrf-mesh/app/src/main/res/drawable/ic_vpn_key_48dp.xml index 1daec18a6..9b4e813b9 100644 --- a/Example/nrf-mesh/app/src/main/res/drawable/ic_vpn_key_black_alpha_48dp.xml +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_vpn_key_48dp.xml @@ -21,12 +21,13 @@ --> + android:width="48dp" + android:height="48dp" + android:alpha="0.60" + android:tint="@color/colorForeground" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:pathData="M12.65,10C11.83,7.67 9.61,6 7,6c-3.31,0 -6,2.69 -6,6s2.69,6 6,6c2.61,0 4.83,-1.67 5.65,-4H17v4h4v-4h2v-4H12.65zM7,14c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2z" /> diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_vpn_key_black_alpha_24dp.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_vpn_key_black_alpha_24dp.xml deleted file mode 100644 index dcbe3fcc7..000000000 --- a/Example/nrf-mesh/app/src/main/res/drawable/ic_vpn_key_black_alpha_24dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_widgets.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_widgets.xml new file mode 100644 index 000000000..c59c09487 --- /dev/null +++ b/Example/nrf-mesh/app/src/main/res/drawable/ic_widgets.xml @@ -0,0 +1,11 @@ + + + diff --git a/Example/nrf-mesh/app/src/main/res/drawable/ic_widgets_black_24dp_alpha.xml b/Example/nrf-mesh/app/src/main/res/drawable/ic_widgets_black_24dp_alpha.xml deleted file mode 100644 index b5a2e86fc..000000000 --- a/Example/nrf-mesh/app/src/main/res/drawable/ic_widgets_black_24dp_alpha.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/Example/nrf-mesh/app/src/main/res/drawable/red_button_states.xml b/Example/nrf-mesh/app/src/main/res/drawable/red_button_states.xml index 03859ed90..219d343cc 100644 --- a/Example/nrf-mesh/app/src/main/res/drawable/red_button_states.xml +++ b/Example/nrf-mesh/app/src/main/res/drawable/red_button_states.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/layout-land/activity_ranges.xml b/Example/nrf-mesh/app/src/main/res/layout-land/activity_ranges.xml index 0f35290ab..b5fc82bd6 100644 --- a/Example/nrf-mesh/app/src/main/res/layout-land/activity_ranges.xml +++ b/Example/nrf-mesh/app/src/main/res/layout-land/activity_ranges.xml @@ -43,11 +43,10 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"> - @@ -110,7 +109,7 @@ android:text="@string/action_resolve" app:backgroundTint="@color/nordicRed" app:fabSize="normal" - app:icon="@drawable/ic_check_white_24dp" + app:icon="@drawable/ic_check" app:layout_anchor="@id/fab_add" app:layout_anchorGravity="start"/> diff --git a/Example/nrf-mesh/app/src/main/res/layout-land/info_range_legend.xml b/Example/nrf-mesh/app/src/main/res/layout-land/info_range_legend.xml index ca20003ab..895cda8dc 100644 --- a/Example/nrf-mesh/app/src/main/res/layout-land/info_range_legend.xml +++ b/Example/nrf-mesh/app/src/main/res/layout-land/info_range_legend.xml @@ -1,5 +1,4 @@ - - - @@ -42,23 +39,23 @@ app:layout_constraintTop_toTopOf="parent" tools:visibility="visible"> - + tools:ignore="HardcodedText" /> - + tools:ignore="HardcodedText" /> + app:layout_constraintTop_toBottomOf="@id/start_address" /> @@ -91,9 +88,9 @@ android:src="@drawable/ic_range_nordic_light_gray" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - tools:ignore="ContentDescription"/> + tools:ignore="ContentDescription" /> - + app:layout_constraintTop_toTopOf="@id/img1" /> + tools:ignore="ContentDescription" /> - + app:layout_constraintTop_toTopOf="@id/img2" /> @@ -150,9 +147,9 @@ android:src="@drawable/ic_range_nordic_medium_gray" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - tools:ignore="ContentDescription"/> + tools:ignore="ContentDescription" /> - + app:layout_constraintTop_toTopOf="@id/img3" /> + tools:ignore="ContentDescription" /> - + app:layout_constraintTop_toTopOf="@id/img4" /> diff --git a/Example/nrf-mesh/app/src/main/res/layout-sw600dp/network_item.xml b/Example/nrf-mesh/app/src/main/res/layout-sw600dp/network_item.xml index 26741795a..d0c232519 100644 --- a/Example/nrf-mesh/app/src/main/res/layout-sw600dp/network_item.xml +++ b/Example/nrf-mesh/app/src/main/res/layout-sw600dp/network_item.xml @@ -1,5 +1,4 @@ - - - + app:srcCompat="@drawable/ic_delete_white" /> - + android:background="?colorSurface"> + android:paddingBottom="@dimen/activity_vertical_margin"> + app:srcCompat="@drawable/ic_mesh_white" /> - + app:layout_constraintTop_toTopOf="parent" /> - + tools:ignore="HardcodedText" /> - + tools:ignore="HardcodedText" /> - + app:layout_constraintTop_toBottomOf="@+id/unicast" /> - + tools:ignore="RtlSymmetry" /> - + app:layout_constraintTop_toBottomOf="@+id/company_identifier" /> - + tools:ignore="HardcodedText" /> - + app:layout_constraintTop_toBottomOf="@+id/elements" /> - + tools:ignore="HardcodedText" /> - + \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/layout/activity_add_keys.xml b/Example/nrf-mesh/app/src/main/res/layout/activity_add_keys.xml index a475a62c9..41d69b5e6 100644 --- a/Example/nrf-mesh/app/src/main/res/layout/activity_add_keys.xml +++ b/Example/nrf-mesh/app/src/main/res/layout/activity_add_keys.xml @@ -45,11 +45,10 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"> - - diff --git a/Example/nrf-mesh/app/src/main/res/layout/activity_config_groups.xml b/Example/nrf-mesh/app/src/main/res/layout/activity_config_groups.xml index 90816fa3f..e910e0c95 100644 --- a/Example/nrf-mesh/app/src/main/res/layout/activity_config_groups.xml +++ b/Example/nrf-mesh/app/src/main/res/layout/activity_config_groups.xml @@ -43,11 +43,10 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"> - diff --git a/Example/nrf-mesh/app/src/main/res/layout/activity_edit_key.xml b/Example/nrf-mesh/app/src/main/res/layout/activity_edit_key.xml index a2608753d..3a2194a92 100644 --- a/Example/nrf-mesh/app/src/main/res/layout/activity_edit_key.xml +++ b/Example/nrf-mesh/app/src/main/res/layout/activity_edit_key.xml @@ -40,11 +40,10 @@ android:layout_height="wrap_content" android:theme="@style/AppTheme.AppBarOverlay"> - @@ -60,11 +59,10 @@ android:orientation="vertical" android:paddingBottom="@dimen/activity_vertical_margin"> - - @@ -98,14 +96,13 @@ android:layout_width="match_parent" android:layout_height="wrap_content"/> - + - @@ -116,10 +113,10 @@ android:orientation="vertical" android:paddingBottom="@dimen/activity_vertical_margin"> - @@ -130,7 +127,7 @@ android:clipToPadding="false" android:scrollbars="none"/> - + diff --git a/Example/nrf-mesh/app/src/main/res/layout/activity_edit_provisioner.xml b/Example/nrf-mesh/app/src/main/res/layout/activity_edit_provisioner.xml index 0ef5a06ad..024e9e15e 100644 --- a/Example/nrf-mesh/app/src/main/res/layout/activity_edit_provisioner.xml +++ b/Example/nrf-mesh/app/src/main/res/layout/activity_edit_provisioner.xml @@ -40,11 +40,10 @@ android:layout_height="wrap_content" android:theme="@style/AppTheme.AppBarOverlay"> - @@ -60,11 +59,10 @@ android:orientation="vertical" android:paddingBottom="@dimen/item_padding_bottom"> - - @@ -121,13 +119,13 @@ app:srcCompat="@drawable/ic_account_check" tools:ignore="ContentDescription,VectorDrawableCompat"/> - - + - - @@ -194,7 +191,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content"/> - + diff --git a/Example/nrf-mesh/app/src/main/res/layout/activity_main.xml b/Example/nrf-mesh/app/src/main/res/layout/activity_main.xml index 8df1e2dd1..f3c97bc5d 100644 --- a/Example/nrf-mesh/app/src/main/res/layout/activity_main.xml +++ b/Example/nrf-mesh/app/src/main/res/layout/activity_main.xml @@ -1,5 +1,4 @@ - - - + app:layout_constraintTop_toTopOf="parent"> - + app:popupTheme="@style/AppTheme.PopupOverlay" /> @@ -52,63 +49,63 @@ android:name="no.nordicsemi.android.nrfmeshprovisioner.NetworkFragment" android:layout_width="0dp" android:layout_height="0dp" - app:layout_constraintTop_toBottomOf="@+id/app_bar_layout" + app:layout_constraintBottom_toTopOf="@+id/bottom_navigation_view" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" - app:layout_constraintBottom_toTopOf="@+id/bottom_navigation_view"/> + app:layout_constraintTop_toBottomOf="@+id/app_bar_layout" /> + app:layout_constraintTop_toBottomOf="@+id/app_bar_layout" /> + app:layout_constraintTop_toBottomOf="@+id/app_bar_layout" /> + app:layout_constraintTop_toBottomOf="@+id/app_bar_layout" /> + app:layout_behavior="null" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintRight_toRightOf="parent" /> + app:menu="@menu/menu_bottom_navigation" /> diff --git a/Example/nrf-mesh/app/src/main/res/layout/activity_mesh_provisioner.xml b/Example/nrf-mesh/app/src/main/res/layout/activity_mesh_provisioner.xml index 60d571711..d0a800c45 100644 --- a/Example/nrf-mesh/app/src/main/res/layout/activity_mesh_provisioner.xml +++ b/Example/nrf-mesh/app/src/main/res/layout/activity_mesh_provisioner.xml @@ -1,5 +1,4 @@ - - - - + app:popupTheme="@style/AppTheme.PopupOverlay" /> + android:visibility="invisible" /> @@ -66,10 +63,10 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_below="@+id/appbar_layout" - android:visibility="gone" - tools:visibility="visible" android:clipToPadding="false" - android:scrollbars="none"> + android:scrollbars="none" + android:visibility="gone" + tools:visibility="visible"> - - + app:titleTextAppearance="@style/Toolbar.TitleText" /> + app:layout_constraintTop_toBottomOf="@id/tool_bar" /> + app:layout_constraintTop_toBottomOf="@id/container_name" /> + tools:visibility="visible" /> - + app:layout_constraintTop_toBottomOf="@id/container_unicast" /> + app:layout_constraintTop_toBottomOf="@+id/div1" /> - + + tools:visibility="visible" /> @@ -170,9 +166,9 @@ layout="@layout/info_live_provisioning_status" android:layout_width="match_parent" android:layout_height="wrap_content" - android:visibility="gone" android:layout_below="@+id/appbar_layout" - android:layout_marginTop="@dimen/activity_vertical_margin"/> + android:layout_marginTop="@dimen/activity_vertical_margin" + android:visibility="gone" /> - + tools:text="@string/state_connecting" /> + android:indeterminate="true" /> diff --git a/Example/nrf-mesh/app/src/main/res/layout/activity_model_configuration.xml b/Example/nrf-mesh/app/src/main/res/layout/activity_model_configuration.xml index 3f049b712..f3d025d5d 100644 --- a/Example/nrf-mesh/app/src/main/res/layout/activity_model_configuration.xml +++ b/Example/nrf-mesh/app/src/main/res/layout/activity_model_configuration.xml @@ -1,5 +1,4 @@ - - - - + app:popupTheme="@style/AppTheme.PopupOverlay" /> + tools:ignore="UnusedAttribute" /> @@ -81,12 +78,11 @@ android:clipToPadding="false" android:paddingBottom="@dimen/activity_vertical_margin"> - - + app:titleTextAppearance="@style/Toolbar.TitleText" /> - + app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="parent" + tools:listitem="@layout/removable_row_item" + tools:visibility="visible"/> @@ -155,20 +153,21 @@ android:layout_height="1dp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/container_app_key_bind"/> + app:layout_constraintTop_toBottomOf="@id/container_app_key_bind" /> - + tools:visibility="visible" /> + app:layout_constraintTop_toBottomOf="@id/div1" /> - + - - + app:titleTextAppearance="@style/Toolbar.TitleText" /> - + app:layout_constraintTop_toTopOf="parent" /> - + tools:ignore="HardcodedText,RtlSymmetry" /> + app:srcCompat="@drawable/ic_lan_24dp" /> @@ -270,7 +269,7 @@ android:layout_height="1dp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/container_publish_address"/> + app:layout_constraintTop_toBottomOf="@id/container_publish_address" /> + app:layout_constraintTop_toBottomOf="@id/div2" /> + tools:visibility="visible" /> - + - - + app:titleTextAppearance="@style/Toolbar.TitleText" /> - + app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="parent" /> @@ -374,20 +372,21 @@ android:layout_height="1dp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/container_subscribe_address"/> + app:layout_constraintTop_toBottomOf="@id/container_subscribe_address" /> - + tools:visibility="visible" /> + app:layout_constraintTop_toBottomOf="@id/div3" /> - + - + app:layout_constraintTop_toBottomOf="@id/subscription_address_card" /> diff --git a/Example/nrf-mesh/app/src/main/res/layout/activity_net_keys.xml b/Example/nrf-mesh/app/src/main/res/layout/activity_net_keys.xml index 7016f0372..4345401a4 100644 --- a/Example/nrf-mesh/app/src/main/res/layout/activity_net_keys.xml +++ b/Example/nrf-mesh/app/src/main/res/layout/activity_net_keys.xml @@ -42,11 +42,10 @@ android:layout_height="wrap_content" android:theme="@style/AppTheme.AppBarOverlay"> - @@ -62,12 +61,11 @@ android:orientation="vertical" android:paddingBottom="@dimen/activity_vertical_margin"> - - @@ -91,14 +89,13 @@ android:layout_height="wrap_content"/> - + - - @@ -147,7 +144,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/recycler_view_keys"/> - - + diff --git a/Example/nrf-mesh/app/src/main/res/layout/activity_node_configuration.xml b/Example/nrf-mesh/app/src/main/res/layout/activity_node_configuration.xml index 4e9fa7aef..adece23e4 100644 --- a/Example/nrf-mesh/app/src/main/res/layout/activity_node_configuration.xml +++ b/Example/nrf-mesh/app/src/main/res/layout/activity_node_configuration.xml @@ -1,5 +1,4 @@ - - - - + app:popupTheme="@style/AppTheme.PopupOverlay" /> + tools:ignore="UnusedAttribute" /> @@ -80,11 +77,10 @@ android:orientation="vertical" android:paddingBottom="@dimen/activity_vertical_margin"> - - + app:titleTextAppearance="@style/Toolbar.TitleText" /> + app:layout_constraintTop_toBottomOf="@+id/network_settings_toolbar" /> + app:layout_constraintTop_toBottomOf="@id/container_app_keys" /> + android:text="@string/more" /> - + - @@ -145,19 +140,19 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + app:titleTextAppearance="@style/Toolbar.TitleText" /> - + app:layout_constraintTop_toBottomOf="@+id/composition_data_tool_bar" /> + app:layout_constraintTop_toBottomOf="@id/composition_data_tool_bar" /> - + app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toBottomOf="@+id/div1" /> - + - - + app:titleTextAppearance="@style/Toolbar.TitleText" /> + android:layout_height="wrap_content" /> + android:layout_height="wrap_content" /> - + - - + app:titleTextAppearance="@style/Toolbar.TitleText" /> + app:layout_constraintTop_toBottomOf="@id/ttl_toolbar" /> + app:layout_constraintTop_toBottomOf="@id/container_ttl" /> + app:layout_constraintEnd_toStartOf="@id/action_set_default_ttl" /> + app:layout_constraintTop_toBottomOf="@id/div2" /> - + - - + app:titleTextAppearance="@style/Toolbar.TitleText" /> - + app:layout_constraintTop_toBottomOf="@id/node_proxy_tool_bar" /> + app:layout_constraintTop_toBottomOf="@id/proxy_state_summary" /> + app:layout_constraintTop_toBottomOf="@id/div2" /> + app:layout_constraintTop_toBottomOf="@id/div2" /> - + - - + app:titleTextAppearance="@style/Toolbar.TitleText" /> - + app:layout_constraintTop_toBottomOf="@id/node_reset_tool_bar" /> + app:layout_constraintTop_toBottomOf="@id/textview" /> + app:layout_constraintTop_toBottomOf="@id/div2" /> - + diff --git a/Example/nrf-mesh/app/src/main/res/layout/activity_node_details.xml b/Example/nrf-mesh/app/src/main/res/layout/activity_node_details.xml index 3c9ff9919..d11681346 100644 --- a/Example/nrf-mesh/app/src/main/res/layout/activity_node_details.xml +++ b/Example/nrf-mesh/app/src/main/res/layout/activity_node_details.xml @@ -44,11 +44,10 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"> - @@ -71,12 +70,11 @@ android:paddingBottom="@dimen/activity_vertical_margin"> - - @@ -145,7 +143,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/container_device_key" app:layout_constraintTop_toTopOf="@id/container_device_key" - app:srcCompat="@drawable/ic_content_copy_black_24dp_alpha"/> + app:srcCompat="@drawable/ic_content_copy"/> - + diff --git a/Example/nrf-mesh/app/src/main/res/layout/activity_provisioners.xml b/Example/nrf-mesh/app/src/main/res/layout/activity_provisioners.xml index c662b5de5..d5fdaf71e 100644 --- a/Example/nrf-mesh/app/src/main/res/layout/activity_provisioners.xml +++ b/Example/nrf-mesh/app/src/main/res/layout/activity_provisioners.xml @@ -1,5 +1,4 @@ - - - - + app:popupTheme="@style/AppTheme.PopupOverlay" /> @@ -62,12 +59,11 @@ android:orientation="vertical" android:paddingBottom="@dimen/activity_vertical_margin"> - - + app:titleMarginStart="@dimen/toolbar_title_margin" /> + android:layout_height="wrap_content" /> - + - @@ -116,16 +111,16 @@ android:layout_height="match_parent" android:orientation="vertical"> - + app:titleMarginStart="@dimen/toolbar_title_margin" /> + app:layout_constraintTop_toBottomOf="@id/provisioner_toolbar" + tools:listitem="@layout/removable_row_item_provisioner" /> + app:layout_constraintTop_toBottomOf="@id/recycler_view_provisioners" /> - + tools:visibility="visible" /> - + @@ -176,5 +172,5 @@ app:elevation="@dimen/fab_elevation" app:fabSize="normal" app:icon="@drawable/ic_add_white" - app:srcCompat="@drawable/ic_add_white"/> + app:srcCompat="@drawable/ic_add_white" /> \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/layout/activity_publication_settings.xml b/Example/nrf-mesh/app/src/main/res/layout/activity_publication_settings.xml index 4ce00dff6..a912ed56b 100644 --- a/Example/nrf-mesh/app/src/main/res/layout/activity_publication_settings.xml +++ b/Example/nrf-mesh/app/src/main/res/layout/activity_publication_settings.xml @@ -20,11 +20,10 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"> - @@ -47,12 +46,11 @@ android:layout_height="wrap_content" android:orientation="vertical"> - - @@ -82,20 +80,20 @@ android:paddingTop="@dimen/item_padding_top" android:paddingBottom="@dimen/item_padding_bottom"> - - - + - - @@ -156,20 +153,20 @@ android:paddingTop="@dimen/item_padding_top" android:paddingBottom="@dimen/item_padding_bottom"> - - @@ -199,7 +196,7 @@ android:layout_height="wrap_content" android:padding="@dimen/activity_horizontal_margin"> - - + - - - - - + - - @@ -354,19 +349,19 @@ app:srcCompat="@drawable/ic_index" tools:ignore="ContentDescription"/> - - - + - - @@ -423,19 +417,19 @@ android:paddingTop="@dimen/item_padding_top" android:paddingBottom="@dimen/item_padding_bottom"> - - - - - + @@ -533,5 +527,5 @@ android:layout_gravity="bottom|end" android:layout_margin="@dimen/activity_vertical_margin" android:text="@string/action_apply" - app:icon="@drawable/ic_done_all_white_24dp"/> + app:icon="@drawable/ic_done_all_white"/> \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/layout/activity_ranges.xml b/Example/nrf-mesh/app/src/main/res/layout/activity_ranges.xml index c39a7edda..82a5b5435 100644 --- a/Example/nrf-mesh/app/src/main/res/layout/activity_ranges.xml +++ b/Example/nrf-mesh/app/src/main/res/layout/activity_ranges.xml @@ -43,11 +43,10 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"> - @@ -112,7 +111,7 @@ android:text="@string/action_resolve" app:elevation="@dimen/fab_elevation" app:fabSize="normal" - app:icon="@drawable/ic_check_white_24dp" + app:icon="@drawable/ic_check" app:layout_anchor="@id/fab_add" app:layout_anchorGravity="end|top" app:backgroundTint="@color/nordicRed"/> diff --git a/Example/nrf-mesh/app/src/main/res/layout/activity_reconnect.xml b/Example/nrf-mesh/app/src/main/res/layout/activity_reconnect.xml index 5eb0ce7e5..900cbd1fc 100644 --- a/Example/nrf-mesh/app/src/main/res/layout/activity_reconnect.xml +++ b/Example/nrf-mesh/app/src/main/res/layout/activity_reconnect.xml @@ -41,11 +41,10 @@ android:layout_height="wrap_content" android:theme="@style/AppTheme.AppBarOverlay"> - @@ -68,7 +67,7 @@ android:orientation="vertical" android:padding="@dimen/activity_horizontal_margin"> - - - + app:layout_constraintTop_toTopOf="parent"> - + app:popupTheme="@style/AppTheme.PopupOverlay" /> + app:layout_constraintTop_toTopOf="@+id/recycler_view_ble_devices" /> @@ -67,13 +64,14 @@ android:layout_width="0dp" android:layout_height="0dp" android:clipToPadding="false" - android:paddingBottom="@dimen/activity_vertical_margin_bottom" android:paddingTop="@dimen/activity_vertical_margin_top" + android:paddingBottom="@dimen/activity_vertical_margin_bottom" android:scrollbars="none" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/appbar_layout"/> + app:layout_constraintTop_toBottomOf="@id/appbar_layout" + tools:listitem="@layout/device_item"/> + app:layout_constraintTop_toBottomOf="@id/appbar_layout" /> + app:layout_constraintTop_toBottomOf="@id/appbar_layout" /> + app:layout_constraintTop_toBottomOf="@id/appbar_layout" /> + android:visibility="gone" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/appbar_layout"> - + tools:text="@string/state_connecting" /> + android:indeterminate="true" /> \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/layout/address_item.xml b/Example/nrf-mesh/app/src/main/res/layout/address_item.xml index 6fdf72b5e..93b9b4667 100644 --- a/Example/nrf-mesh/app/src/main/res/layout/address_item.xml +++ b/Example/nrf-mesh/app/src/main/res/layout/address_item.xml @@ -1,5 +1,4 @@ - - + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/container" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="@color/nordicRed" + android:foreground="?selectableItemBackground" + tools:ignore="ContentDescription"> - + app:srcCompat="@drawable/ic_delete_white" /> + app:srcCompat="@drawable/ic_lan_24dp" /> - + app:layout_constraintTop_toTopOf="parent" /> - - + tools:ignore="HardcodedText" /> \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/layout/address_type_item.xml b/Example/nrf-mesh/app/src/main/res/layout/address_type_item.xml index 73c62e870..5997e8d24 100644 --- a/Example/nrf-mesh/app/src/main/res/layout/address_type_item.xml +++ b/Example/nrf-mesh/app/src/main/res/layout/address_type_item.xml @@ -21,7 +21,7 @@ ~ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --> - - + app:srcCompat="@drawable/ic_close"/> diff --git a/Example/nrf-mesh/app/src/main/res/layout/device_item.xml b/Example/nrf-mesh/app/src/main/res/layout/device_item.xml index 0b5e64dd0..000951393 100644 --- a/Example/nrf-mesh/app/src/main/res/layout/device_item.xml +++ b/Example/nrf-mesh/app/src/main/res/layout/device_item.xml @@ -1,5 +1,4 @@ - - - + app:srcCompat="@drawable/ic_mesh_white" /> - + android:textAppearance="@style/TextAppearance.MaterialComponents.Headline5" + tools:text="Nordic_Blinky" /> - + android:textAppearance="@style/TextAppearance.MaterialComponents.Caption" + tools:text="AA:BB:CC:DD:EE:FF" /> + android:src="@drawable/ic_signal_bar" + tools:src="@drawable/ic_signal_3_bar" /> \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/layout/dialog_fragment_address_input.xml b/Example/nrf-mesh/app/src/main/res/layout/dialog_fragment_address_input.xml index f306df9a7..9c656506c 100644 --- a/Example/nrf-mesh/app/src/main/res/layout/dialog_fragment_address_input.xml +++ b/Example/nrf-mesh/app/src/main/res/layout/dialog_fragment_address_input.xml @@ -31,7 +31,7 @@ android:paddingStart="@dimen/alert_dialog_padding_left" android:paddingTop="@dimen/alert_dialog_padding"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -64,19 +64,19 @@ app:srcCompat="@drawable/ic_numeric" tools:ignore="ContentDescription"/> - - - - - - + android:textColor="?android:textColorPrimary"/> - + android:textColor="?android:textColorPrimary"/> - - - + app:layout_constraintTop_toTopOf="@id/element_title" + app:srcCompat="@drawable/ic_drawing" + tools:ignore="RtlSymmetry" /> - - - + tools:ignore="HardcodedText" /> - - - + - + app:layout_constraintStart_toEndOf="@id/element_title" + app:layout_constraintTop_toTopOf="@id/element_title" + app:srcCompat="@drawable/ic_edit_black" + tools:ignore="RtlSymmetry" /> - + app:layout_constraintTop_toTopOf="@id/element_title" + app:srcCompat="@drawable/ic_round_expand_more" + tools:ignore="RtlSymmetry" /> @@ -118,5 +111,5 @@ android:orientation="vertical" android:paddingTop="@dimen/item_padding_top" android:visibility="gone" - tools:visibility="visible"/> + tools:visibility="visible" /> \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/layout/fragment_bottom_sheet_dialog.xml b/Example/nrf-mesh/app/src/main/res/layout/fragment_bottom_sheet_dialog.xml index a25cecb40..da05509f0 100644 --- a/Example/nrf-mesh/app/src/main/res/layout/fragment_bottom_sheet_dialog.xml +++ b/Example/nrf-mesh/app/src/main/res/layout/fragment_bottom_sheet_dialog.xml @@ -1,34 +1,33 @@ - - + app:titleMarginStart="@dimen/toolbar_title_margin" /> + app:layout_constraintTop_toBottomOf="@id/capabilities_bar"> + tools:ignore="HardcodedText" /> @@ -46,12 +45,12 @@ android:id="@+id/action_apply" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginEnd="@dimen/activity_horizontal_margin" android:text="@string/action_apply" app:layout_constraintBottom_toBottomOf="@id/text_input_layout" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/text_input_layout" - app:layout_constraintTop_toTopOf="@id/text_input_layout" - android:layout_marginEnd="@dimen/activity_horizontal_margin"/> + app:layout_constraintTop_toTopOf="@id/text_input_layout" /> + app:layout_constraintTop_toBottomOf="@id/text_input_layout" /> \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/layout/fragment_network.xml b/Example/nrf-mesh/app/src/main/res/layout/fragment_network.xml index 8dcb1ab17..89fe74652 100644 --- a/Example/nrf-mesh/app/src/main/res/layout/fragment_network.xml +++ b/Example/nrf-mesh/app/src/main/res/layout/fragment_network.xml @@ -20,9 +20,9 @@ ~ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE ~ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --> - @@ -40,7 +40,8 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent"/> + app:layout_constraintTop_toTopOf="parent" + tools:listitem="@layout/network_item"/> - - - - + app:titleTextAppearance="@style/Toolbar.TitleText" /> - + app:layout_constraintTop_toBottomOf="@id/proxy_filter_tool_bar" /> + app:layout_constraintTop_toBottomOf="@id/proxy_filter_summary" /> + app:layout_constraintTop_toBottomOf="@id/div2" /> + app:layout_constraintTop_toTopOf="@id/action_disable" /> + app:layout_constraintTop_toTopOf="@id/action_black_list" /> - + - - + app:titleTextAppearance="@style/Toolbar.TitleText" /> - + app:layout_constraintTop_toTopOf="parent" /> + tools:listitem="@layout/address_item" + tools:visibility="visible" /> @@ -191,7 +184,7 @@ android:layout_height="1dp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/container_proxy_filter"/> + app:layout_constraintTop_toBottomOf="@id/container_proxy_filter" /> + app:layout_constraintTop_toBottomOf="@id/div2" /> + tools:visibility="visible" /> - + tools:visibility="visible" /> - + \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/layout/fragment_settings.xml b/Example/nrf-mesh/app/src/main/res/layout/fragment_settings.xml index 33b8512b6..61f132eba 100644 --- a/Example/nrf-mesh/app/src/main/res/layout/fragment_settings.xml +++ b/Example/nrf-mesh/app/src/main/res/layout/fragment_settings.xml @@ -33,12 +33,11 @@ android:layout_height="wrap_content" android:orientation="vertical"> - - + app:titleTextAppearance="@style/Toolbar.TitleText"/> @@ -105,14 +105,13 @@ app:layout_constraintTop_toBottomOf="@id/container_app_keys" /> - + - - @@ -143,6 +142,6 @@ app:layout_constraintTop_toBottomOf="@+id/about_tool_bar" /> - + \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/layout/group_element_item.xml b/Example/nrf-mesh/app/src/main/res/layout/group_element_item.xml index a066220a0..67aa3eac3 100644 --- a/Example/nrf-mesh/app/src/main/res/layout/group_element_item.xml +++ b/Example/nrf-mesh/app/src/main/res/layout/group_element_item.xml @@ -31,7 +31,7 @@ tools:ignore="ContentDescription" android:paddingTop="@dimen/item_padding_top"> - - - + app:srcCompat="@drawable/ic_delete_white" /> + android:background="?colorSurface"> + app:srcCompat="@drawable/ic_outline_group_white_48dp" + tools:ignore="ContentDescription,VectorDrawableCompat" /> - + tools:ignore="HardcodedText,RtlSymmetry" /> - + tools:ignore="HardcodedText,RtlSymmetry" /> - - + tools:ignore="HardcodedText,RtlSymmetry" /> \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/layout/group_model_item.xml b/Example/nrf-mesh/app/src/main/res/layout/group_model_item.xml index fe826dcc2..0c5e9e26e 100644 --- a/Example/nrf-mesh/app/src/main/res/layout/group_model_item.xml +++ b/Example/nrf-mesh/app/src/main/res/layout/group_model_item.xml @@ -40,9 +40,9 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" - app:srcCompat="@drawable/ic_lightbulb_outline_nordic_medium_grey_24dp"/> + app:srcCompat="@drawable/ic_lightbulb_outline_24dp"/> - - - + app:srcCompat="@drawable/ic_outline_group_24dp" /> - + app:layout_constraintTop_toTopOf="parent" /> - + tools:ignore="HardcodedText" /> \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/layout/grouped_app_key_item.xml b/Example/nrf-mesh/app/src/main/res/layout/grouped_app_key_item.xml index 7286268d4..fc4eeda42 100644 --- a/Example/nrf-mesh/app/src/main/res/layout/grouped_app_key_item.xml +++ b/Example/nrf-mesh/app/src/main/res/layout/grouped_app_key_item.xml @@ -1,5 +1,4 @@ - - - - + tools:ignore="HardcodedText" /> + tools:ignore="UselessLeaf" /> \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/layout/grouped_item.xml b/Example/nrf-mesh/app/src/main/res/layout/grouped_item.xml index 1b74d5a67..48fdfdf69 100644 --- a/Example/nrf-mesh/app/src/main/res/layout/grouped_item.xml +++ b/Example/nrf-mesh/app/src/main/res/layout/grouped_item.xml @@ -1,5 +1,4 @@ - - - - + android:background="?selectableItemBackground" + app:cardCornerRadius="6dp" + app:elevation="8dp"> + tools:ignore="ContentDescription"> + app:srcCompat="@drawable/ic_lightbulb_outline_48dp" + tools:ignore="RtlSymmetry" /> - + app:layout_constraintEnd_toEndOf="@id/icon" + app:layout_constraintStart_toStartOf="@id/icon" + app:layout_constraintTop_toBottomOf="@id/icon" + tools:ignore="HardcodedText" /> + app:layout_constraintTop_toBottomOf="@id/group_summary"> + + android:text="@string/action_generic_on" /> + android:text="@string/action_generic_off" /> @@ -107,35 +106,35 @@ android:paddingStart="@dimen/activity_horizontal_margin" android:paddingEnd="@dimen/activity_horizontal_margin" android:visibility="gone" - app:layout_constraintTop_toTopOf="@id/container_buttons" - app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="@id/container_buttons" tools:visibility="visible"> - + app:layout_constraintTop_toTopOf="parent" + tools:ignore="HardcodedText" /> - + android:text="@string/nordic_semiconductor_asa" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/subtitle" /> - + \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/layout/info_element_count.xml b/Example/nrf-mesh/app/src/main/res/layout/info_element_count.xml index b2d2a6651..64c4150e8 100644 --- a/Example/nrf-mesh/app/src/main/res/layout/info_element_count.xml +++ b/Example/nrf-mesh/app/src/main/res/layout/info_element_count.xml @@ -1,5 +1,4 @@ - - - - + app:layout_constraintTop_toTopOf="parent" + tools:ignore="RtlSymmetry" /> - + app:layout_constraintTop_toBottomOf="@id/title" + tools:ignore="RtlSymmetry" /> + tools:ignore="VectorDrawableCompat" /> \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/layout/info_input_oob_actions.xml b/Example/nrf-mesh/app/src/main/res/layout/info_input_oob_actions.xml index 130c8b4ab..41a5af579 100644 --- a/Example/nrf-mesh/app/src/main/res/layout/info_input_oob_actions.xml +++ b/Example/nrf-mesh/app/src/main/res/layout/info_input_oob_actions.xml @@ -29,25 +29,26 @@ android:layout_height="wrap_content" android:padding="@dimen/activity_horizontal_margin"> - + app:layout_constraintTop_toTopOf="parent" + tools:ignore="RtlSymmetry" /> - + app:layout_constraintTop_toBottomOf="@id/title" + tools:ignore="RtlSymmetry" /> \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/layout/info_input_oob_size.xml b/Example/nrf-mesh/app/src/main/res/layout/info_input_oob_size.xml index 84c3ab05e..1f63120dc 100644 --- a/Example/nrf-mesh/app/src/main/res/layout/info_input_oob_size.xml +++ b/Example/nrf-mesh/app/src/main/res/layout/info_input_oob_size.xml @@ -1,5 +1,4 @@ - - - - + app:layout_constraintTop_toTopOf="parent" /> - + app:layout_constraintTop_toBottomOf="@id/title" + tools:ignore="RtlSymmetry" /> + app:srcCompat="@drawable/ic_space_bar" + tools:ignore="VectorDrawableCompat" /> \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/layout/info_no_app_key_bound.xml b/Example/nrf-mesh/app/src/main/res/layout/info_no_app_key_bound.xml index 242320729..3edddaba5 100644 --- a/Example/nrf-mesh/app/src/main/res/layout/info_no_app_key_bound.xml +++ b/Example/nrf-mesh/app/src/main/res/layout/info_no_app_key_bound.xml @@ -1,5 +1,4 @@ - - - + app:srcCompat="@drawable/ic_vpn_key_48dp" /> - + android:text="@string/no_app_key_configured_title" + android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle2" + android:textColor="?colorSecondary" /> - + android:text="@string/no_app_key_configured_rationale" /> \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/layout/info_no_app_keys.xml b/Example/nrf-mesh/app/src/main/res/layout/info_no_app_keys.xml index 77342b5d5..d061c5605 100644 --- a/Example/nrf-mesh/app/src/main/res/layout/info_no_app_keys.xml +++ b/Example/nrf-mesh/app/src/main/res/layout/info_no_app_keys.xml @@ -37,16 +37,17 @@ android:layout_height="wrap_content" android:layout_gravity="center_horizontal" android:padding="@dimen/activity_horizontal_margin" - app:srcCompat="@drawable/ic_vpn_key_black_alpha_48dp"/> + app:srcCompat="@drawable/ic_vpn_key_48dp"/> - - - - + app:srcCompat="@drawable/ic_bluetooth_disabled" /> - + android:text="@string/bluetooth_disabled_title" + android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle2" + android:textColor="?colorSecondary" /> - + android:text="@string/bluetooth_disabled_info" /> + android:text="@string/bluetooth_disabled_action" /> \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/layout/info_no_devices.xml b/Example/nrf-mesh/app/src/main/res/layout/info_no_devices.xml index 27d6778ce..2876880b7 100644 --- a/Example/nrf-mesh/app/src/main/res/layout/info_no_devices.xml +++ b/Example/nrf-mesh/app/src/main/res/layout/info_no_devices.xml @@ -1,5 +1,4 @@ - - + app:srcCompat="@drawable/ic_bluetooth_searching" /> - + android:text="@string/unprovisioned_node_guide_title" + android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle2" + android:textColor="?colorSecondary" /> - + android:text="@string/unprovisioned_node_guide_info" /> + android:visibility="invisible" + tools:visibility="visible"> - + android:text="@string/unprovisioned_node_guide_location_info" /> + android:text="@string/unprovisioned_node_guide_location_action" /> \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/layout/info_no_groups_configured.xml b/Example/nrf-mesh/app/src/main/res/layout/info_no_groups_configured.xml index d73d5480c..32e786e0f 100644 --- a/Example/nrf-mesh/app/src/main/res/layout/info_no_groups_configured.xml +++ b/Example/nrf-mesh/app/src/main/res/layout/info_no_groups_configured.xml @@ -37,16 +37,17 @@ android:layout_height="wrap_content" android:layout_gravity="center_horizontal" android:padding="@dimen/activity_horizontal_margin" - app:srcCompat="@drawable/ic_outline_group_work_black_alpha_48dp"/> + app:srcCompat="@drawable/ic_outline_group_48dp"/> - - + app:srcCompat="@drawable/ic_outline_group_48dp"/> - - - - + app:srcCompat="@drawable/ic_mesh_black_48dp" /> - + android:text="@string/no_nodes_provisioned_title" + android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle2" + android:textColor="?colorSecondary" /> - + android:text="@string/no_nodes_provisioned_rationale" /> \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/layout/info_no_permission.xml b/Example/nrf-mesh/app/src/main/res/layout/info_no_permission.xml index 98b8880f8..a081c34aa 100644 --- a/Example/nrf-mesh/app/src/main/res/layout/info_no_permission.xml +++ b/Example/nrf-mesh/app/src/main/res/layout/info_no_permission.xml @@ -38,14 +38,15 @@ android:padding="@dimen/activity_horizontal_margin" app:srcCompat="@drawable/ic_location_off"/> - - + app:srcCompat="@drawable/ic_range_48dp"/> - - - - + android:padding="@dimen/activity_horizontal_margin" + android:focusable="true"> - + app:layout_constraintTop_toTopOf="parent" + tools:ignore="RtlSymmetry" /> - + app:layout_constraintTop_toBottomOf="@id/title" + tools:ignore="RtlSymmetry" /> + app:srcCompat="@drawable/ic_domain_black" + tools:ignore="ContentDescription,VectorDrawableCompat" /> \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/layout/info_node_crpl.xml b/Example/nrf-mesh/app/src/main/res/layout/info_node_crpl.xml index 36096cda3..90ed606ac 100644 --- a/Example/nrf-mesh/app/src/main/res/layout/info_node_crpl.xml +++ b/Example/nrf-mesh/app/src/main/res/layout/info_node_crpl.xml @@ -1,5 +1,4 @@ - - - - + app:layout_constraintTop_toTopOf="parent" + tools:ignore="RtlSymmetry" /> - + app:layout_constraintTop_toBottomOf="@id/title" + tools:ignore="RtlSymmetry" + tools:text="0020" /> + app:srcCompat="@drawable/ic_security" + tools:ignore="ContentDescription,VectorDrawableCompat" /> \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/layout/info_node_device_key.xml b/Example/nrf-mesh/app/src/main/res/layout/info_node_device_key.xml index 7aa68e7f1..49d32acf2 100644 --- a/Example/nrf-mesh/app/src/main/res/layout/info_node_device_key.xml +++ b/Example/nrf-mesh/app/src/main/res/layout/info_node_device_key.xml @@ -1,5 +1,4 @@ - - - + android:focusable="true" + android:padding="@dimen/activity_horizontal_margin"> - + tools:ignore="RtlSymmetry" /> - + tools:ignore="RtlSymmetry" /> + app:srcCompat="@drawable/ic_vpn_key_24dp" + tools:ignore="ContentDescription,VectorDrawableCompat" /> \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/layout/info_node_features.xml b/Example/nrf-mesh/app/src/main/res/layout/info_node_features.xml index c18d21077..556ad698b 100644 --- a/Example/nrf-mesh/app/src/main/res/layout/info_node_features.xml +++ b/Example/nrf-mesh/app/src/main/res/layout/info_node_features.xml @@ -1,5 +1,4 @@ - - - - + app:layout_constraintTop_toTopOf="parent" /> - + app:layout_constraintTop_toBottomOf="@id/title" /> + app:srcCompat="@drawable/ic_auto_fix_black" + tools:ignore="VectorDrawableCompat" /> \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/layout/info_node_identifier.xml b/Example/nrf-mesh/app/src/main/res/layout/info_node_identifier.xml index ea1553c91..a269f8b42 100644 --- a/Example/nrf-mesh/app/src/main/res/layout/info_node_identifier.xml +++ b/Example/nrf-mesh/app/src/main/res/layout/info_node_identifier.xml @@ -32,24 +32,23 @@ android:padding="@dimen/activity_horizontal_margin" tools:ignore="KeyboardInaccessibleWidget"> - - @@ -61,7 +60,7 @@ app:layout_constraintBottom_toBottomOf="@+id/text" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/title" - app:srcCompat="@drawable/ic_lock_open_black_alpha_24dp" + app:srcCompat="@drawable/ic_lock_open_24dp" tools:ignore="ContentDescription,VectorDrawableCompat"/> \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/layout/info_node_name.xml b/Example/nrf-mesh/app/src/main/res/layout/info_node_name.xml index 9447d9de5..283226511 100644 --- a/Example/nrf-mesh/app/src/main/res/layout/info_node_name.xml +++ b/Example/nrf-mesh/app/src/main/res/layout/info_node_name.xml @@ -1,5 +1,4 @@ - - - - + app:layout_constraintTop_toTopOf="parent" + tools:ignore="RtlSymmetry" /> - + app:layout_constraintTop_toBottomOf="@id/title" + tools:ignore="RtlSymmetry" /> + app:srcCompat="@drawable/ic_perm_identity" + tools:ignore="VectorDrawableCompat" /> \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/layout/info_node_product_identifier.xml b/Example/nrf-mesh/app/src/main/res/layout/info_node_product_identifier.xml index 16d5e9d56..13812f9e7 100644 --- a/Example/nrf-mesh/app/src/main/res/layout/info_node_product_identifier.xml +++ b/Example/nrf-mesh/app/src/main/res/layout/info_node_product_identifier.xml @@ -31,25 +31,26 @@ android:clickable="true" android:padding="@dimen/activity_horizontal_margin"> - + app:layout_constraintTop_toTopOf="parent" + tools:ignore="RtlSymmetry" /> - + app:layout_constraintTop_toBottomOf="@id/title" + tools:ignore="RtlSymmetry" /> \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/layout/info_node_product_version.xml b/Example/nrf-mesh/app/src/main/res/layout/info_node_product_version.xml index 41dc86031..68b01cf98 100644 --- a/Example/nrf-mesh/app/src/main/res/layout/info_node_product_version.xml +++ b/Example/nrf-mesh/app/src/main/res/layout/info_node_product_version.xml @@ -1,5 +1,4 @@ - - - + android:paddingEnd="@dimen/activity_horizontal_margin"> - + app:layout_constraintTop_toTopOf="parent" + tools:ignore="RtlSymmetry" /> - + app:layout_constraintTop_toBottomOf="@id/title" + tools:ignore="RtlSymmetry" /> + tools:ignore="VectorDrawableCompat" /> \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/layout/info_node_prov_timestamp.xml b/Example/nrf-mesh/app/src/main/res/layout/info_node_prov_timestamp.xml index d67ff7638..60de165d2 100644 --- a/Example/nrf-mesh/app/src/main/res/layout/info_node_prov_timestamp.xml +++ b/Example/nrf-mesh/app/src/main/res/layout/info_node_prov_timestamp.xml @@ -1,5 +1,4 @@ - - - - + app:layout_constraintTop_toTopOf="parent" + tools:ignore="RtlSymmetry" /> - + app:layout_constraintTop_toBottomOf="@id/title" + tools:ignore="HardcodedText,RtlSymmetry" /> + tools:ignore="VectorDrawableCompat" /> \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/layout/info_node_unicast_address.xml b/Example/nrf-mesh/app/src/main/res/layout/info_node_unicast_address.xml index b1f17e521..04803866d 100644 --- a/Example/nrf-mesh/app/src/main/res/layout/info_node_unicast_address.xml +++ b/Example/nrf-mesh/app/src/main/res/layout/info_node_unicast_address.xml @@ -1,5 +1,4 @@ - - - - + app:layout_constraintTop_toTopOf="parent" + tools:ignore="RtlSymmetry" /> - + app:layout_constraintTop_toBottomOf="@id/title" + tools:ignore="RtlSymmetry" /> + app:srcCompat="@drawable/ic_lan_24dp" + tools:ignore="VectorDrawableCompat" /> \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/layout/info_output_oob_actions.xml b/Example/nrf-mesh/app/src/main/res/layout/info_output_oob_actions.xml index e133a40d3..445e2dd34 100644 --- a/Example/nrf-mesh/app/src/main/res/layout/info_output_oob_actions.xml +++ b/Example/nrf-mesh/app/src/main/res/layout/info_output_oob_actions.xml @@ -1,5 +1,4 @@ - - - - + app:layout_constraintTop_toTopOf="parent" + tools:ignore="RtlSymmetry" /> - + app:layout_constraintTop_toBottomOf="@id/title" + tools:ignore="RtlSymmetry" /> + app:srcCompat="@drawable/ic_arrow_upward" + tools:ignore="VectorDrawableCompat" /> \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/layout/info_output_oob_size.xml b/Example/nrf-mesh/app/src/main/res/layout/info_output_oob_size.xml index 03caaeedf..7942353ac 100644 --- a/Example/nrf-mesh/app/src/main/res/layout/info_output_oob_size.xml +++ b/Example/nrf-mesh/app/src/main/res/layout/info_output_oob_size.xml @@ -1,5 +1,4 @@ - - - - + app:layout_constraintTop_toTopOf="parent" + tools:ignore="RtlSymmetry" /> - + app:layout_constraintTop_toBottomOf="@id/title" + tools:ignore="RtlSymmetry" /> + app:srcCompat="@drawable/ic_space_bar" + tools:ignore="VectorDrawableCompat" /> \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/layout/info_public_key_type.xml b/Example/nrf-mesh/app/src/main/res/layout/info_public_key_type.xml index d086c7647..901c8bf44 100644 --- a/Example/nrf-mesh/app/src/main/res/layout/info_public_key_type.xml +++ b/Example/nrf-mesh/app/src/main/res/layout/info_public_key_type.xml @@ -1,5 +1,4 @@ - - - - + app:layout_constraintTop_toTopOf="parent" + tools:ignore="RtlSymmetry" /> - + app:layout_constraintTop_toBottomOf="@id/title" + tools:ignore="RtlSymmetry" /> + app:srcCompat="@drawable/ic_vpn_key_24dp" + tools:ignore="VectorDrawableCompat" /> \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/layout/info_range_legend.xml b/Example/nrf-mesh/app/src/main/res/layout/info_range_legend.xml index d8badc94e..f079d827d 100644 --- a/Example/nrf-mesh/app/src/main/res/layout/info_range_legend.xml +++ b/Example/nrf-mesh/app/src/main/res/layout/info_range_legend.xml @@ -28,7 +28,6 @@ android:id="@+id/divider" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/white" android:padding="@dimen/activity_horizontal_margin" app:elevation="6dp"> @@ -42,7 +41,7 @@ android:visibility="gone" tools:visibility="visible"> - - - - - - - - \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/layout/info_supported_algorithms.xml b/Example/nrf-mesh/app/src/main/res/layout/info_supported_algorithms.xml index d9dc1528b..99aa8a77d 100644 --- a/Example/nrf-mesh/app/src/main/res/layout/info_supported_algorithms.xml +++ b/Example/nrf-mesh/app/src/main/res/layout/info_supported_algorithms.xml @@ -1,5 +1,4 @@ - - - - + app:layout_constraintTop_toTopOf="parent" + tools:ignore="RtlSymmetry" /> - + app:layout_constraintTop_toBottomOf="@id/title" + tools:ignore="RtlSymmetry" /> + app:srcCompat="@drawable/ic_security" + tools:ignore="VectorDrawableCompat" /> \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/layout/layout_capabilities.xml b/Example/nrf-mesh/app/src/main/res/layout/layout_capabilities.xml index 3c0f6ced9..4fb48b14c 100644 --- a/Example/nrf-mesh/app/src/main/res/layout/layout_capabilities.xml +++ b/Example/nrf-mesh/app/src/main/res/layout/layout_capabilities.xml @@ -1,10 +1,9 @@ - @@ -13,7 +12,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - \ No newline at end of file + \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/layout/layout_config_server_model.xml b/Example/nrf-mesh/app/src/main/res/layout/layout_config_server_model.xml index cfec7f542..a481a7aa2 100644 --- a/Example/nrf-mesh/app/src/main/res/layout/layout_config_server_model.xml +++ b/Example/nrf-mesh/app/src/main/res/layout/layout_config_server_model.xml @@ -1,41 +1,39 @@ - + android:paddingBottom="@dimen/activity_vertical_margin"> - - + app:titleTextAppearance="@style/Toolbar.TitleText" /> - + app:layout_constraintTop_toTopOf="parent" /> - + tools:ignore="HardcodedText" /> + tools:ignore="ContentDescription" /> @@ -112,33 +109,32 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@+id/relay_retransmit_interval_steps_title" app:srcCompat="@drawable/ic_index" - tools:ignore="ContentDescription"/> + tools:ignore="ContentDescription" /> - + app:layout_constraintTop_toTopOf="parent" /> - + tools:ignore="HardcodedText" /> @@ -148,7 +144,7 @@ android:layout_width="0dp" android:layout_height="1dp" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toBottomOf="@id/container_relay_retransmit_interval_steps"/> + app:layout_constraintTop_toBottomOf="@id/container_relay_retransmit_interval_steps" /> + app:layout_constraintTop_toBottomOf="@id/relay_retransmit_divider" /> + app:layout_constraintTop_toBottomOf="@id/relay_retransmit_divider" /> - + - + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/config_relay_set_card"> - + app:titleTextAppearance="@style/Toolbar.TitleText" /> - + app:layout_constraintTop_toTopOf="parent" /> - + tools:ignore="HardcodedText" /> + tools:ignore="ContentDescription" /> @@ -278,33 +272,32 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@+id/network_transmit_interval_steps_title" app:srcCompat="@drawable/ic_index" - tools:ignore="ContentDescription"/> + tools:ignore="ContentDescription" /> - + app:layout_constraintTop_toTopOf="parent" /> - + tools:ignore="HardcodedText" /> @@ -314,7 +307,7 @@ android:layout_width="0dp" android:layout_height="1dp" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toBottomOf="@id/container_network_transmit_interval_steps"/> + app:layout_constraintTop_toBottomOf="@id/container_network_transmit_interval_steps" /> + app:layout_constraintTop_toBottomOf="@id/network_transmit_divider" /> + app:layout_constraintTop_toBottomOf="@id/network_transmit_divider" /> - + \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/layout/layout_container.xml b/Example/nrf-mesh/app/src/main/res/layout/layout_container.xml index 805c9516c..78857c26b 100644 --- a/Example/nrf-mesh/app/src/main/res/layout/layout_container.xml +++ b/Example/nrf-mesh/app/src/main/res/layout/layout_container.xml @@ -43,25 +43,25 @@ app:layout_constraintTop_toTopOf="@id/title" tools:ignore="ContentDescription,VectorDrawableCompat" /> - - - + app:layout_constraintTop_toTopOf="@id/text" /> \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/layout/layout_divider.xml b/Example/nrf-mesh/app/src/main/res/layout/layout_divider.xml index abdae9e95..07bdd38a8 100644 --- a/Example/nrf-mesh/app/src/main/res/layout/layout_divider.xml +++ b/Example/nrf-mesh/app/src/main/res/layout/layout_divider.xml @@ -1,5 +1,4 @@ - - \ No newline at end of file + android:id="@+id/divider" + android:layout_width="match_parent" + android:layout_height="1dp" + android:background="?attr/dividerHorizontal" /> \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/layout/layout_generic_level.xml b/Example/nrf-mesh/app/src/main/res/layout/layout_generic_level.xml index aece10e7a..554296c04 100644 --- a/Example/nrf-mesh/app/src/main/res/layout/layout_generic_level.xml +++ b/Example/nrf-mesh/app/src/main/res/layout/layout_generic_level.xml @@ -1,6 +1,5 @@ - - - + app:titleTextAppearance="@style/Toolbar.TitleText" /> + app:layout_constraintTop_toBottomOf="@id/node_controls_tool_bar" /> - + app:layout_constraintTop_toTopOf="parent" /> - + tools:ignore="HardcodedText" /> + app:layout_constraintTop_toBottomOf="@id/transition" /> - + app:layout_constraintTop_toBottomOf="@id/transition_seekbar" /> - + tools:ignore="HardcodedText" /> + app:layout_constraintTop_toBottomOf="@id/delay" /> - + app:layout_constraintTop_toBottomOf="@id/delay_seekbar" /> - + tools:ignore="HardcodedText" /> + app:layout_constraintTop_toBottomOf="@id/title_level" /> @@ -201,7 +199,7 @@ android:layout_height="1dp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/container_controls"/> + app:layout_constraintTop_toBottomOf="@id/container_controls" /> + app:layout_constraintTop_toBottomOf="@id/div3" /> - + app:layout_constraintTop_toTopOf="@id/action_read" /> - + \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/layout/layout_generic_level_bottom_sheet.xml b/Example/nrf-mesh/app/src/main/res/layout/layout_generic_level_bottom_sheet.xml index 02d1b144d..1782fb6d8 100644 --- a/Example/nrf-mesh/app/src/main/res/layout/layout_generic_level_bottom_sheet.xml +++ b/Example/nrf-mesh/app/src/main/res/layout/layout_generic_level_bottom_sheet.xml @@ -1,198 +1,181 @@ - - - + + + + - - - - - - - - - - - - - - + app:layout_constraintTop_toBottomOf="@id/node_controls_tool_bar" /> - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/layout/layout_generic_on_off.xml b/Example/nrf-mesh/app/src/main/res/layout/layout_generic_on_off.xml index f8b733a09..6adaec900 100644 --- a/Example/nrf-mesh/app/src/main/res/layout/layout_generic_on_off.xml +++ b/Example/nrf-mesh/app/src/main/res/layout/layout_generic_on_off.xml @@ -1,18 +1,16 @@ - + android:paddingBottom="@dimen/activity_vertical_margin"> - - + app:titleTextAppearance="@style/Toolbar.TitleText" /> + app:layout_constraintTop_toBottomOf="@id/node_controls_tool_bar" /> - + app:layout_constraintTop_toTopOf="parent" /> - + tools:ignore="HardcodedText" /> + app:layout_constraintTop_toBottomOf="@id/transition" /> - + app:layout_constraintTop_toBottomOf="@id/transition_seekbar" /> - + tools:ignore="HardcodedText" /> + app:layout_constraintTop_toBottomOf="@id/delay" /> - + app:layout_constraintTop_toBottomOf="@id/container_controls" /> - + app:layout_constraintTop_toTopOf="@+id/state" /> + app:layout_constraintTop_toBottomOf="@id/state" /> + app:layout_constraintTop_toTopOf="@+id/action_on" /> + app:layout_constraintTop_toBottomOf="@id/div3" /> - + app:layout_constraintTop_toTopOf="@id/action_on" /> - + \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/layout/layout_generic_on_off_bottom_sheet.xml b/Example/nrf-mesh/app/src/main/res/layout/layout_generic_on_off_bottom_sheet.xml index 1b0745f7a..c952022e3 100644 --- a/Example/nrf-mesh/app/src/main/res/layout/layout_generic_on_off_bottom_sheet.xml +++ b/Example/nrf-mesh/app/src/main/res/layout/layout_generic_on_off_bottom_sheet.xml @@ -1,17 +1,16 @@ - + android:background="?colorSurface" + android:clipChildren="false" + android:clipToPadding="false"> - - + app:titleTextAppearance="@style/Toolbar.TitleText" /> + app:layout_constraintTop_toBottomOf="@id/node_controls_tool_bar" /> - + app:layout_constraintTop_toTopOf="parent" /> - + tools:ignore="HardcodedText" /> + app:layout_constraintTop_toBottomOf="@id/transition" /> - + app:layout_constraintTop_toBottomOf="@id/transition_seekbar" /> - + tools:ignore="HardcodedText" /> + app:layout_constraintTop_toBottomOf="@id/delay" /> @@ -157,7 +156,7 @@ android:layout_height="1dp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/container_controls"/> + app:layout_constraintTop_toBottomOf="@id/container_controls" /> + app:layout_constraintTop_toTopOf="@+id/action_on" /> + app:layout_constraintTop_toBottomOf="@id/div3" /> - + \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/layout/layout_group_subscription.xml b/Example/nrf-mesh/app/src/main/res/layout/layout_group_subscription.xml index cda672656..b18797382 100644 --- a/Example/nrf-mesh/app/src/main/res/layout/layout_group_subscription.xml +++ b/Example/nrf-mesh/app/src/main/res/layout/layout_group_subscription.xml @@ -18,7 +18,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"/> - - diff --git a/Example/nrf-mesh/app/src/main/res/layout/layout_vendor_model_bottom_sheet.xml b/Example/nrf-mesh/app/src/main/res/layout/layout_vendor_model_bottom_sheet.xml index a74b0f5e0..b9db3f305 100644 --- a/Example/nrf-mesh/app/src/main/res/layout/layout_vendor_model_bottom_sheet.xml +++ b/Example/nrf-mesh/app/src/main/res/layout/layout_vendor_model_bottom_sheet.xml @@ -7,10 +7,9 @@ android:layout_height="wrap_content" android:background="?selectableItemBackground"> - - - - - - - - + \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/layout/layout_vendor_model_controls.xml b/Example/nrf-mesh/app/src/main/res/layout/layout_vendor_model_controls.xml index 92037dd27..33ca4888e 100644 --- a/Example/nrf-mesh/app/src/main/res/layout/layout_vendor_model_controls.xml +++ b/Example/nrf-mesh/app/src/main/res/layout/layout_vendor_model_controls.xml @@ -10,10 +10,9 @@ android:clipToPadding="false" android:paddingBottom="@dimen/activity_vertical_margin"> - - - - - - - - + \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/layout/model_item.xml b/Example/nrf-mesh/app/src/main/res/layout/model_item.xml index 4636f6015..bedb44af4 100644 --- a/Example/nrf-mesh/app/src/main/res/layout/model_item.xml +++ b/Example/nrf-mesh/app/src/main/res/layout/model_item.xml @@ -1,5 +1,4 @@ - - - - + tools:ignore="HardcodedText" /> - + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/title" + tools:ignore="HardcodedText" /> \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/layout/model_item_details.xml b/Example/nrf-mesh/app/src/main/res/layout/model_item_details.xml deleted file mode 100644 index f65bb56b9..000000000 --- a/Example/nrf-mesh/app/src/main/res/layout/model_item_details.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/layout/network_item.xml b/Example/nrf-mesh/app/src/main/res/layout/network_item.xml index f102e92f7..b9499d060 100644 --- a/Example/nrf-mesh/app/src/main/res/layout/network_item.xml +++ b/Example/nrf-mesh/app/src/main/res/layout/network_item.xml @@ -1,5 +1,4 @@ - - - + app:srcCompat="@drawable/ic_delete_white" /> - + android:background="?colorSurface"> + android:paddingBottom="@dimen/activity_vertical_margin"> + app:srcCompat="@drawable/ic_mesh_white" /> - + app:layout_constraintTop_toTopOf="parent" /> - + tools:ignore="HardcodedText" /> - + tools:ignore="HardcodedText" /> - + app:layout_constraintTop_toBottomOf="@+id/unicast" /> - + tools:ignore="RtlSymmetry" /> - + app:layout_constraintTop_toBottomOf="@+id/company_identifier" /> - + tools:ignore="HardcodedText" /> - + app:layout_constraintTop_toBottomOf="@+id/elements" /> - + tools:ignore="HardcodedText" /> - + \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/layout/no_groups_layout.xml b/Example/nrf-mesh/app/src/main/res/layout/no_groups_layout.xml index 83bbab6ee..da1570b25 100644 --- a/Example/nrf-mesh/app/src/main/res/layout/no_groups_layout.xml +++ b/Example/nrf-mesh/app/src/main/res/layout/no_groups_layout.xml @@ -9,7 +9,7 @@ android:paddingEnd="@dimen/activity_horizontal_margin" android:paddingBottom="@dimen/item_padding_bottom"> - - \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/layout/progress_item.xml b/Example/nrf-mesh/app/src/main/res/layout/progress_item.xml index a469dcab6..29cfe3508 100644 --- a/Example/nrf-mesh/app/src/main/res/layout/progress_item.xml +++ b/Example/nrf-mesh/app/src/main/res/layout/progress_item.xml @@ -1,5 +1,4 @@ - - - + app:srcCompat="@drawable/ic_arrow_forward" /> - + android:textAppearance="@style/TextAppearance.MaterialComponents.Body1" + tools:ignore="RtlSymmetry" /> diff --git a/Example/nrf-mesh/app/src/main/res/layout/range_item.xml b/Example/nrf-mesh/app/src/main/res/layout/range_item.xml index ede45e2cf..071dba80a 100644 --- a/Example/nrf-mesh/app/src/main/res/layout/range_item.xml +++ b/Example/nrf-mesh/app/src/main/res/layout/range_item.xml @@ -1,5 +1,4 @@ - - + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/container" + android:layout_width="match_parent" + android:layout_height="?actionBarSize" + android:background="@color/nordicRed" + android:foreground="?selectableItemBackground" + tools:ignore="ContentDescription"> + app:srcCompat="@drawable/ic_delete_white" /> - + android:textAppearance="@style/TextAppearance.MaterialComponents.Body1" + tools:ignore="HardcodedText" /> - + android:layout_weight="1" /> \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/layout/removable_row_item.xml b/Example/nrf-mesh/app/src/main/res/layout/removable_row_item.xml index 4c73072bc..fca47b022 100644 --- a/Example/nrf-mesh/app/src/main/res/layout/removable_row_item.xml +++ b/Example/nrf-mesh/app/src/main/res/layout/removable_row_item.xml @@ -1,5 +1,4 @@ - - + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/container" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="@color/nordicRed" + android:foreground="?selectableItemBackground" + tools:ignore="ContentDescription"> + app:srcCompat="@drawable/ic_delete_white" /> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="@id/title" + app:srcCompat="@drawable/ic_vpn_key_24dp" /> - + tools:ignore="HardcodedText" /> - + tools:ignore="HardcodedText" /> \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/layout/removable_row_item1.xml b/Example/nrf-mesh/app/src/main/res/layout/removable_row_item1.xml deleted file mode 100644 index 7c2848bc7..000000000 --- a/Example/nrf-mesh/app/src/main/res/layout/removable_row_item1.xml +++ /dev/null @@ -1,100 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/layout/removable_row_item2.xml b/Example/nrf-mesh/app/src/main/res/layout/removable_row_item2.xml index 72a76c7b1..b6650ce04 100644 --- a/Example/nrf-mesh/app/src/main/res/layout/removable_row_item2.xml +++ b/Example/nrf-mesh/app/src/main/res/layout/removable_row_item2.xml @@ -1,5 +1,4 @@ - - + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/container" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="@color/nordicRed" + android:foreground="?selectableItemBackground" + tools:ignore="ContentDescription"> + app:srcCompat="@drawable/ic_delete_white" /> + android:background="?colorSurface" + android:paddingStart="@dimen/activity_horizontal_margin" + android:paddingTop="@dimen/item_padding_top" + android:paddingEnd="@dimen/activity_horizontal_margin" + android:paddingBottom="@dimen/item_padding_bottom" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + tools:ignore="ContentDescription"> - - - + app:srcCompat="@drawable/ic_vpn_key_24dp" /> - + - + - - + \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/layout/removable_row_item3.xml b/Example/nrf-mesh/app/src/main/res/layout/removable_row_item3.xml index 985848fe9..c10c5a657 100644 --- a/Example/nrf-mesh/app/src/main/res/layout/removable_row_item3.xml +++ b/Example/nrf-mesh/app/src/main/res/layout/removable_row_item3.xml @@ -1,5 +1,4 @@ - - + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/container" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="@color/nordicRed" + android:foreground="?selectableItemBackground" + tools:ignore="ContentDescription"> + app:srcCompat="@drawable/ic_delete_white" /> + app:srcCompat="@drawable/ic_vpn_key_24dp" /> - + tools:ignore="HardcodedText" /> - + tools:ignore="HardcodedText" /> + app:srcCompat="@drawable/ic_done_all_black" /> \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/layout/removable_row_item_provisioner.xml b/Example/nrf-mesh/app/src/main/res/layout/removable_row_item_provisioner.xml new file mode 100644 index 000000000..6b1b4b237 --- /dev/null +++ b/Example/nrf-mesh/app/src/main/res/layout/removable_row_item_provisioner.xml @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/layout/row_item_key.xml b/Example/nrf-mesh/app/src/main/res/layout/row_item_key.xml index d7540c95f..7f5763ad9 100644 --- a/Example/nrf-mesh/app/src/main/res/layout/row_item_key.xml +++ b/Example/nrf-mesh/app/src/main/res/layout/row_item_key.xml @@ -1,5 +1,4 @@ - - - + app:srcCompat="@drawable/ic_vpn_key_24dp" /> - + tools:ignore="HardcodedText" /> - + tools:ignore="HardcodedText" /> + app:srcCompat="@drawable/ic_done_all_black" /> \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/menu/menu_bottom_navigation.xml b/Example/nrf-mesh/app/src/main/res/menu/menu_bottom_navigation.xml index 0f5ee2472..aaf457917 100644 --- a/Example/nrf-mesh/app/src/main/res/menu/menu_bottom_navigation.xml +++ b/Example/nrf-mesh/app/src/main/res/menu/menu_bottom_navigation.xml @@ -35,7 +35,7 @@ @@ -51,7 +51,7 @@ diff --git a/Example/nrf-mesh/app/src/main/res/menu/menu_group_controls_connect.xml b/Example/nrf-mesh/app/src/main/res/menu/menu_group_controls_connect.xml index 476ada0c5..e72cb4f99 100644 --- a/Example/nrf-mesh/app/src/main/res/menu/menu_group_controls_connect.xml +++ b/Example/nrf-mesh/app/src/main/res/menu/menu_group_controls_connect.xml @@ -28,7 +28,7 @@ android:id="@+id/action_edit" android:enabled="true" android:title="@string/action_edit" - android:icon="@drawable/ic_edit_white_24dp" + android:icon="@drawable/ic_edit_white" app:showAsAction="always" tools:ignore="AlwaysShowAction"/> - - - - \ No newline at end of file + + + \ No newline at end of file diff --git a/Example/nrf-mesh/app/src/main/res/values-night/colors.xml b/Example/nrf-mesh/app/src/main/res/values-night/colors.xml new file mode 100644 index 000000000..dd2016ef4 --- /dev/null +++ b/Example/nrf-mesh/app/src/main/res/values-night/colors.xml @@ -0,0 +1,78 @@ + + + + + + + @color/nordicBlue + @color/white + @color/nordicBlue + + @color/black + @color/white + + @color/black + + @color/white + @color/white + + @color/nordicDarkGray + @color/nordicLake + @color/black + @color/nordicBlue + + + @color/white + @color/white + @color/black + @color/nordicDarkGray + + + #FF00A9CE + #FF0090B0 + #FF6AD1E3 + #FF0033A0 + #FF0077C8 + #FFD9E1E2 + #FF768692 + #FF333F48 + #FFD0DF00 + #FFFFCD00 + #FFEE2F4E + #FFF58220 + + + #FFFFFFFF + #FF000000 + #FFFF0000 + + @color/nordicGrass + @color/nordicSun + @color/nordicMediumGray + @color/nordicMediumGray + #a1a1a1 + diff --git a/Example/nrf-mesh/app/src/main/res/values-night/styles.xml b/Example/nrf-mesh/app/src/main/res/values-night/styles.xml new file mode 100644 index 000000000..6cab000c9 --- /dev/null +++ b/Example/nrf-mesh/app/src/main/res/values-night/styles.xml @@ -0,0 +1,8 @@ + + + + - - - - - @@ -102,16 +87,18 @@ @drawable/red_button_states - - \ No newline at end of file From 9d7c9c57c8a49a6075d2ebed66ec6e0ad8d10633 Mon Sep 17 00:00:00 2001 From: Roshan Rajaratnam Date: Tue, 12 May 2020 13:01:11 +0200 Subject: [PATCH 5/9] Upgrades build tools, removes an automatically added kotlin dependencies when a kotlin class was added instead of a java class. --- Example/nrf-mesh/app/build.gradle | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/Example/nrf-mesh/app/build.gradle b/Example/nrf-mesh/app/build.gradle index e7f4295ea..bfeedbf63 100644 --- a/Example/nrf-mesh/app/build.gradle +++ b/Example/nrf-mesh/app/build.gradle @@ -21,12 +21,10 @@ */ apply plugin: 'com.android.application' -apply plugin: 'kotlin-android-extensions' -apply plugin: 'kotlin-android' android { compileSdkVersion 29 - buildToolsVersion '29.0.2' + buildToolsVersion '29.0.3' defaultConfig { applicationId "no.nordicsemi.android.nrfmeshprovisioner" @@ -75,8 +73,8 @@ dependencies { implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' // Butter Knife - implementation 'com.jakewharton:butterknife:10.2.0' - annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.0' + implementation 'com.jakewharton:butterknife:10.2.1' + annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.1' // Brings the new BluetoothLeScanner API to older platforms implementation 'no.nordicsemi.android.support.v18:scanner:1.4.3' // Android BLE Library @@ -88,9 +86,6 @@ dependencies { annotationProcessor 'com.google.dagger:dagger-compiler:2.27' annotationProcessor 'com.google.dagger:dagger-android-processor:2.27' implementation project(':meshprovisioner') - implementation "androidx.core:core-ktx:+" - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0" - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" } repositories { mavenCentral() From 602767dbc895216562a0c61dfd4350fedcdb12df Mon Sep 17 00:00:00 2001 From: Roshan Rajaratnam Date: Tue, 12 May 2020 13:07:36 +0200 Subject: [PATCH 6/9] Upgrades build tools, removes an automatically added kotlin dependencies when a kotlin class was added instead of a java class. --- Example/nrf-mesh/build.gradle | 2 -- 1 file changed, 2 deletions(-) diff --git a/Example/nrf-mesh/build.gradle b/Example/nrf-mesh/build.gradle index baf68a81f..0c5d9d176 100644 --- a/Example/nrf-mesh/build.gradle +++ b/Example/nrf-mesh/build.gradle @@ -23,7 +23,6 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.3.72' repositories { google() @@ -31,7 +30,6 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:3.6.3' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong From b8b45add996f1fa9e1d0958150bc50cb681cc577 Mon Sep 17 00:00:00 2001 From: Roshan Rajaratnam Date: Tue, 12 May 2020 13:08:12 +0200 Subject: [PATCH 7/9] App version bumped for release. --- Example/nrf-mesh/app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Example/nrf-mesh/app/build.gradle b/Example/nrf-mesh/app/build.gradle index bfeedbf63..f00aca57f 100644 --- a/Example/nrf-mesh/app/build.gradle +++ b/Example/nrf-mesh/app/build.gradle @@ -30,8 +30,8 @@ android { applicationId "no.nordicsemi.android.nrfmeshprovisioner" minSdkVersion 18 targetSdkVersion 29 - versionCode 62 - versionName "2.2.0" + versionCode 63 + versionName "2.3.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" multiDexEnabled true vectorDrawables.useSupportLibrary = true From 76fcab633266c3437b44626a3e75cb1236086569 Mon Sep 17 00:00:00 2001 From: Roshan Rajaratnam Date: Tue, 12 May 2020 13:16:37 +0200 Subject: [PATCH 8/9] App version bumped for release. --- android-nrf-mesh-library/meshprovisioner/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android-nrf-mesh-library/meshprovisioner/build.gradle b/android-nrf-mesh-library/meshprovisioner/build.gradle index bc9a00c9a..effa0d38e 100644 --- a/android-nrf-mesh-library/meshprovisioner/build.gradle +++ b/android-nrf-mesh-library/meshprovisioner/build.gradle @@ -29,8 +29,8 @@ android { defaultConfig { minSdkVersion 18 targetSdkVersion 29 - versionCode 62 - versionName "2.2.0" + versionCode 63 + versionName "2.3.0" javaCompileOptions { annotationProcessorOptions { From 19c040527154c65eeaf109e335e1f8dd18fa277e Mon Sep 17 00:00:00 2001 From: Roshan Rajaratnam Date: Tue, 12 May 2020 13:16:37 +0200 Subject: [PATCH 9/9] Library version bumped for release and to maintain consistency with the app versioning scheme. --- android-nrf-mesh-library/meshprovisioner/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android-nrf-mesh-library/meshprovisioner/build.gradle b/android-nrf-mesh-library/meshprovisioner/build.gradle index bc9a00c9a..effa0d38e 100644 --- a/android-nrf-mesh-library/meshprovisioner/build.gradle +++ b/android-nrf-mesh-library/meshprovisioner/build.gradle @@ -29,8 +29,8 @@ android { defaultConfig { minSdkVersion 18 targetSdkVersion 29 - versionCode 62 - versionName "2.2.0" + versionCode 63 + versionName "2.3.0" javaCompileOptions { annotationProcessorOptions {