From 7692e1db1021460ec777928bdf418432cac9e7cb Mon Sep 17 00:00:00 2001 From: cyBerta Date: Tue, 26 Jul 2022 00:16:44 +0200 Subject: prepare viewBinding --- app/build.gradle | 4 ++++ .../bitmaskclient/base/fragments/ObfuscationProxyDialog.java | 2 ++ app/src/main/res/layout-port/f_eip.xml | 4 +++- app/src/main/res/layout-xlarge-port/a_add_provider.xml | 3 ++- .../main/res/layout-xlarge-port/a_custom_provider_setup.xml | 3 ++- .../main/res/layout-xlarge-port/a_provider_credentials.xml | 3 ++- app/src/main/res/layout-xlarge-port/a_provider_detail.xml | 3 ++- app/src/main/res/layout-xlarge-port/a_provider_list.xml | 3 ++- app/src/main/res/layout-xlarge-port/f_eip.xml | 1 + app/src/main/res/layout-xlarge-port/f_log.xml | 3 ++- app/src/main/res/layout-xlarge/a_add_provider.xml | 3 ++- app/src/main/res/layout-xlarge/a_custom_provider_setup.xml | 3 ++- app/src/main/res/layout-xlarge/a_provider_credentials.xml | 3 ++- app/src/main/res/layout-xlarge/a_provider_detail.xml | 3 ++- app/src/main/res/layout-xlarge/a_provider_list.xml | 3 ++- app/src/main/res/layout-xlarge/f_about.xml | 3 ++- app/src/main/res/layout-xlarge/f_eip.xml | 1 + app/src/main/res/layout-xlarge/f_log.xml | 2 ++ app/src/main/res/layout-xlarge/v_icon_text_list_item.xml | 3 ++- app/src/main/res/layout-xlarge/v_loading_screen.xml | 1 + app/src/main/res/layout-xlarge/v_provider_header.xml | 4 +++- app/src/main/res/layout-xlarge/v_provider_list_item.xml | 3 ++- app/src/main/res/layout-xlarge/v_single_list_item.xml | 4 +++- app/src/main/res/layout-xlarge/v_switch_list_item.xml | 1 + app/src/main/res/layout-xlarge/v_vpn_status.xml | 3 ++- app/src/main/res/layout/a_add_provider.xml | 4 +++- app/src/main/res/layout/a_add_provider_tablet_scrollview.xml | 7 ++++--- app/src/main/res/layout/a_custom_provider_setup.xml | 4 +++- .../layout/a_custom_provider_setup_tablet_linear_layout.xml | 4 +++- app/src/main/res/layout/a_main.xml | 4 +++- app/src/main/res/layout/a_provider_credentials.xml | 7 ++++--- .../layout/a_provider_credentials_tablet_linear_layout.xml | 7 ++++--- app/src/main/res/layout/a_provider_detail.xml | 4 +++- .../res/layout/a_provider_detail_tablet_linear_layout.xml | 7 ++++--- app/src/main/res/layout/a_provider_list.xml | 3 ++- .../main/res/layout/a_provider_list_tablet_linear_layout.xml | 4 +++- app/src/main/res/layout/allowed_application_layout.xml | 4 +++- app/src/main/res/layout/allowed_vpn_apps.xml | 4 +++- app/src/main/res/layout/custom_toast.xml | 4 +++- app/src/main/res/layout/d_checkbox_confirm.xml | 6 ++++-- app/src/main/res/layout/d_list_selection.xml | 4 +++- app/src/main/res/layout/donation_reminder_dialog.xml | 4 +++- app/src/main/res/layout/f_about.xml | 3 ++- app/src/main/res/layout/f_drawer_main.xml | 1 + app/src/main/res/layout/f_eip.xml | 4 +++- app/src/main/res/layout/f_gateway_selection.xml | 4 +++- app/src/main/res/layout/f_log.xml | 1 + app/src/main/res/layout/f_log_sliders.xml | 3 ++- app/src/main/res/layout/f_settings.xml | 12 +++++++++++- app/src/main/res/layout/v_custom_notification.xml | 1 + app/src/main/res/layout/v_icon_select_text_list_item.xml | 3 ++- app/src/main/res/layout/v_icon_text_list_item.xml | 3 ++- app/src/main/res/layout/v_loading_screen.xml | 1 + app/src/main/res/layout/v_location_button.xml | 4 +++- app/src/main/res/layout/v_location_status_indicator.xml | 1 + app/src/main/res/layout/v_log_item.xml | 1 + app/src/main/res/layout/v_main_btn.xml | 4 +++- app/src/main/res/layout/v_provider_credentials.xml | 4 +++- app/src/main/res/layout/v_provider_header.xml | 4 +++- app/src/main/res/layout/v_provider_list_item.xml | 3 ++- app/src/main/res/layout/v_select_text_list_item.xml | 3 ++- app/src/main/res/layout/v_simple_checkbox.xml | 6 ++++-- app/src/main/res/layout/v_single_list_item.xml | 4 +++- app/src/main/res/layout/v_switch_list_item.xml | 1 + app/src/main/res/layout/v_vpn_status.xml | 3 ++- app/src/production/res/layout-xlarge/d_new_provider.xml | 5 ++++- app/src/production/res/layout/d_new_provider.xml | 4 +++- 67 files changed, 170 insertions(+), 63 deletions(-) create mode 100644 app/src/main/java/se/leap/bitmaskclient/base/fragments/ObfuscationProxyDialog.java (limited to 'app') diff --git a/app/build.gradle b/app/build.gradle index 3e4f4ee2..342e3b85 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,6 +13,10 @@ android { sourceCompatibility 1.8 } + viewBinding { + enabled = true + } + defaultConfig { applicationId "se.leap.bitmaskclient" // the factor 1000 is used so that gplay users can upgrade from split apks ((current version number - 1) * 1000) + n diff --git a/app/src/main/java/se/leap/bitmaskclient/base/fragments/ObfuscationProxyDialog.java b/app/src/main/java/se/leap/bitmaskclient/base/fragments/ObfuscationProxyDialog.java new file mode 100644 index 00000000..b7f16fa4 --- /dev/null +++ b/app/src/main/java/se/leap/bitmaskclient/base/fragments/ObfuscationProxyDialog.java @@ -0,0 +1,2 @@ +package se.leap.bitmaskclient.base.fragments;public class ObfuscationProxyDialog { +} diff --git a/app/src/main/res/layout-port/f_eip.xml b/app/src/main/res/layout-port/f_eip.xml index 99004387..cb99a700 100644 --- a/app/src/main/res/layout-port/f_eip.xml +++ b/app/src/main/res/layout-port/f_eip.xml @@ -4,7 +4,9 @@ android:layout_width="match_parent" android:layout_height="match_parent" xmlns:tools="http://schemas.android.com/tools" - android:id="@+id/eipServiceFragment"> + android:id="@+id/eipServiceFragment" + tools:viewBindingIgnore="true" + > + tools:context=".providersetup.activities.ProviderCredentialsBaseActivity" + tools:viewBindingIgnore="true"> + tools:context=".providersetup.activities.CustomProviderSetupActivity" + tools:viewBindingIgnore="true"> + tools:context=".providersetup.activities.ProviderCredentialsBaseActivity" + tools:viewBindingIgnore="true"> + style="@style/BitmaskActivity" + tools:viewBindingIgnore="true"> + tools:context=".providersetup.ProviderListActivity" + tools:viewBindingIgnore="true"> + android:id="@+id/log_layout" + tools:viewBindingIgnore="true"> + tools:context=".providersetup.activities.ProviderCredentialsBaseActivity" + tools:viewBindingIgnore="true"> + tools:context=".providersetup.activities.CustomProviderSetupActivity" + tools:viewBindingIgnore="true"> + tools:context=".providersetup.activities.ProviderCredentialsBaseActivity" + tools:viewBindingIgnore="true"> + style="@style/BitmaskActivity" + tools:viewBindingIgnore="true"> + tools:context=".providersetup.ProviderListActivity" + tools:viewBindingIgnore="true"> + tools:context=".base.MainActivity" + tools:viewBindingIgnore="true"> + xmlns:tools="http://schemas.android.com/tools" + tools:viewBindingIgnore="true"> + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + tools:viewBindingIgnore="true"> + tools:viewBindingIgnore="true"> + android:minHeight="?android:attr/listPreferredItemHeight" + tools:viewBindingIgnore="true" /> diff --git a/app/src/main/res/layout-xlarge/v_switch_list_item.xml b/app/src/main/res/layout-xlarge/v_switch_list_item.xml index a24f5089..4a112139 100644 --- a/app/src/main/res/layout-xlarge/v_switch_list_item.xml +++ b/app/src/main/res/layout-xlarge/v_switch_list_item.xml @@ -4,6 +4,7 @@ android:layout_height="wrap_content" android:layout_width="match_parent" android:orientation="vertical" + tools:viewBindingIgnore="true" > + xmlns:android="http://schemas.android.com/apk/res/android" + tools:viewBindingIgnore="true"> + tools:context=".providersetup.AddProviderActivity" + tools:viewBindingIgnore="true" + > - + xmlns:app="http://schemas.android.com/apk/res-auto" + tools:viewBindingIgnore="true" + xmlns:tools="http://schemas.android.com/tools"> + style="@style/BitmaskActivity" + tools:viewBindingIgnore="true" + > diff --git a/app/src/main/res/layout/a_custom_provider_setup_tablet_linear_layout.xml b/app/src/main/res/layout/a_custom_provider_setup_tablet_linear_layout.xml index 4879c76f..7e8cd51d 100644 --- a/app/src/main/res/layout/a_custom_provider_setup_tablet_linear_layout.xml +++ b/app/src/main/res/layout/a_custom_provider_setup_tablet_linear_layout.xml @@ -1,5 +1,6 @@ + app:layout_constraintTop_toTopOf="@+id/guideline_top" + tools:viewBindingIgnore="true"> + tools:context="se.leap.bitmaskclient.base.MainActivity" + tools:viewBindingIgnore="true" + > + xmlns:android="http://schemas.android.com/apk/res/android" + tools:viewBindingIgnore="true"> + android:textSize="24sp" + tools:viewBindingIgnore="true" + > + android:orientation="vertical" + tools:viewBindingIgnore="true">