diff options
67 files changed, 170 insertions, 63 deletions
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" + > <androidx.constraintlayout.widget.Guideline android:id="@+id/guideline_vertical_left" diff --git a/app/src/main/res/layout-xlarge-port/a_add_provider.xml b/app/src/main/res/layout-xlarge-port/a_add_provider.xml index 9d1614aa..80eef3c3 100644 --- a/app/src/main/res/layout-xlarge-port/a_add_provider.xml +++ b/app/src/main/res/layout-xlarge-port/a_add_provider.xml @@ -5,7 +5,8 @@ style="@style/BitmaskActivity" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".providersetup.activities.ProviderCredentialsBaseActivity"> + tools:context=".providersetup.activities.ProviderCredentialsBaseActivity" + tools:viewBindingIgnore="true"> <androidx.appcompat.widget.AppCompatImageView android:layout_width="match_parent" diff --git a/app/src/main/res/layout-xlarge-port/a_custom_provider_setup.xml b/app/src/main/res/layout-xlarge-port/a_custom_provider_setup.xml index da813a23..dfb58b8c 100644 --- a/app/src/main/res/layout-xlarge-port/a_custom_provider_setup.xml +++ b/app/src/main/res/layout-xlarge-port/a_custom_provider_setup.xml @@ -6,7 +6,8 @@ style="@style/BitmaskActivity" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".providersetup.activities.CustomProviderSetupActivity"> + tools:context=".providersetup.activities.CustomProviderSetupActivity" + tools:viewBindingIgnore="true"> <androidx.appcompat.widget.AppCompatImageView android:layout_width="match_parent" diff --git a/app/src/main/res/layout-xlarge-port/a_provider_credentials.xml b/app/src/main/res/layout-xlarge-port/a_provider_credentials.xml index 75f6244a..e1295853 100644 --- a/app/src/main/res/layout-xlarge-port/a_provider_credentials.xml +++ b/app/src/main/res/layout-xlarge-port/a_provider_credentials.xml @@ -5,7 +5,8 @@ style="@style/BitmaskActivity" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".providersetup.activities.ProviderCredentialsBaseActivity"> + tools:context=".providersetup.activities.ProviderCredentialsBaseActivity" + tools:viewBindingIgnore="true"> <androidx.appcompat.widget.AppCompatImageView android:layout_width="match_parent" diff --git a/app/src/main/res/layout-xlarge-port/a_provider_detail.xml b/app/src/main/res/layout-xlarge-port/a_provider_detail.xml index 7d1e8444..34719df9 100644 --- a/app/src/main/res/layout-xlarge-port/a_provider_detail.xml +++ b/app/src/main/res/layout-xlarge-port/a_provider_detail.xml @@ -6,7 +6,8 @@ android:layout_width="match_parent" android:layout_height="match_parent" tools:context=".providersetup.ProviderDetailActivity" - style="@style/BitmaskActivity"> + style="@style/BitmaskActivity" + tools:viewBindingIgnore="true"> <androidx.appcompat.widget.AppCompatImageView android:layout_width="match_parent" diff --git a/app/src/main/res/layout-xlarge-port/a_provider_list.xml b/app/src/main/res/layout-xlarge-port/a_provider_list.xml index 87ca6427..184cbf93 100644 --- a/app/src/main/res/layout-xlarge-port/a_provider_list.xml +++ b/app/src/main/res/layout-xlarge-port/a_provider_list.xml @@ -6,7 +6,8 @@ style="@style/BitmaskActivity" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".providersetup.ProviderListActivity"> + tools:context=".providersetup.ProviderListActivity" + tools:viewBindingIgnore="true"> <androidx.appcompat.widget.AppCompatImageView android:layout_width="match_parent" diff --git a/app/src/main/res/layout-xlarge-port/f_eip.xml b/app/src/main/res/layout-xlarge-port/f_eip.xml index c3d3fd36..10b7a7e3 100644 --- a/app/src/main/res/layout-xlarge-port/f_eip.xml +++ b/app/src/main/res/layout-xlarge-port/f_eip.xml @@ -5,6 +5,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:id="@+id/eipServiceFragment" + tools:viewBindingIgnore="true" > <androidx.constraintlayout.widget.Guideline diff --git a/app/src/main/res/layout-xlarge-port/f_log.xml b/app/src/main/res/layout-xlarge-port/f_log.xml index ebadeb74..56848206 100644 --- a/app/src/main/res/layout-xlarge-port/f_log.xml +++ b/app/src/main/res/layout-xlarge-port/f_log.xml @@ -10,7 +10,8 @@ xmlns:tools="http://schemas.android.com/tools" android:orientation="vertical" android:padding="@dimen/activity_margin" - android:id="@+id/log_layout"> + android:id="@+id/log_layout" + tools:viewBindingIgnore="true"> <LinearLayout android:background="@drawable/white_rect" diff --git a/app/src/main/res/layout-xlarge/a_add_provider.xml b/app/src/main/res/layout-xlarge/a_add_provider.xml index e4ebdadf..db63b32c 100644 --- a/app/src/main/res/layout-xlarge/a_add_provider.xml +++ b/app/src/main/res/layout-xlarge/a_add_provider.xml @@ -5,7 +5,8 @@ style="@style/BitmaskActivity" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".providersetup.activities.ProviderCredentialsBaseActivity"> + tools:context=".providersetup.activities.ProviderCredentialsBaseActivity" + tools:viewBindingIgnore="true"> <androidx.appcompat.widget.AppCompatImageView android:layout_width="match_parent" diff --git a/app/src/main/res/layout-xlarge/a_custom_provider_setup.xml b/app/src/main/res/layout-xlarge/a_custom_provider_setup.xml index 23bf7d40..130ad95a 100644 --- a/app/src/main/res/layout-xlarge/a_custom_provider_setup.xml +++ b/app/src/main/res/layout-xlarge/a_custom_provider_setup.xml @@ -6,7 +6,8 @@ style="@style/BitmaskActivity" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".providersetup.activities.CustomProviderSetupActivity"> + tools:context=".providersetup.activities.CustomProviderSetupActivity" + tools:viewBindingIgnore="true"> <androidx.appcompat.widget.AppCompatImageView android:layout_width="match_parent" diff --git a/app/src/main/res/layout-xlarge/a_provider_credentials.xml b/app/src/main/res/layout-xlarge/a_provider_credentials.xml index c5b35fdc..61a638d4 100644 --- a/app/src/main/res/layout-xlarge/a_provider_credentials.xml +++ b/app/src/main/res/layout-xlarge/a_provider_credentials.xml @@ -5,7 +5,8 @@ style="@style/BitmaskActivity" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".providersetup.activities.ProviderCredentialsBaseActivity"> + tools:context=".providersetup.activities.ProviderCredentialsBaseActivity" + tools:viewBindingIgnore="true"> <androidx.appcompat.widget.AppCompatImageView android:layout_width="match_parent" diff --git a/app/src/main/res/layout-xlarge/a_provider_detail.xml b/app/src/main/res/layout-xlarge/a_provider_detail.xml index 59e9c18d..74a0c72c 100644 --- a/app/src/main/res/layout-xlarge/a_provider_detail.xml +++ b/app/src/main/res/layout-xlarge/a_provider_detail.xml @@ -6,7 +6,8 @@ android:layout_width="match_parent" android:layout_height="match_parent" tools:context=".providersetup.ProviderDetailActivity" - style="@style/BitmaskActivity"> + style="@style/BitmaskActivity" + tools:viewBindingIgnore="true"> <androidx.appcompat.widget.AppCompatImageView android:layout_width="match_parent" diff --git a/app/src/main/res/layout-xlarge/a_provider_list.xml b/app/src/main/res/layout-xlarge/a_provider_list.xml index 6504db10..c8c7a763 100644 --- a/app/src/main/res/layout-xlarge/a_provider_list.xml +++ b/app/src/main/res/layout-xlarge/a_provider_list.xml @@ -6,7 +6,8 @@ style="@style/BitmaskActivity" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".providersetup.ProviderListActivity"> + tools:context=".providersetup.ProviderListActivity" + tools:viewBindingIgnore="true"> <androidx.appcompat.widget.AppCompatImageView android:layout_width="match_parent" diff --git a/app/src/main/res/layout-xlarge/f_about.xml b/app/src/main/res/layout-xlarge/f_about.xml index 96156a71..ed7f4f1a 100644 --- a/app/src/main/res/layout-xlarge/f_about.xml +++ b/app/src/main/res/layout-xlarge/f_about.xml @@ -8,7 +8,8 @@ android:layout_marginStart="@dimen/stdpadding" android:layout_marginEnd="@dimen/stdpadding" android:layout_marginRight="@dimen/stdpadding" - tools:context=".base.MainActivity" > + tools:context=".base.MainActivity" + tools:viewBindingIgnore="true"> <LinearLayout android:layout_width="match_parent" diff --git a/app/src/main/res/layout-xlarge/f_eip.xml b/app/src/main/res/layout-xlarge/f_eip.xml index 4042933e..e6b28c67 100644 --- a/app/src/main/res/layout-xlarge/f_eip.xml +++ b/app/src/main/res/layout-xlarge/f_eip.xml @@ -9,6 +9,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:id="@+id/eipServiceFragment" + tools:viewBindingIgnore="true" > <androidx.constraintlayout.widget.Guideline diff --git a/app/src/main/res/layout-xlarge/f_log.xml b/app/src/main/res/layout-xlarge/f_log.xml index b014ee9d..f1ccc23a 100644 --- a/app/src/main/res/layout-xlarge/f_log.xml +++ b/app/src/main/res/layout-xlarge/f_log.xml @@ -5,11 +5,13 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="horizontal" android:padding="20dp" android:id="@+id/log_layout" + tools:viewBindingIgnore="true" > <LinearLayout diff --git a/app/src/main/res/layout-xlarge/v_icon_text_list_item.xml b/app/src/main/res/layout-xlarge/v_icon_text_list_item.xml index 530660af..dd7dc37a 100644 --- a/app/src/main/res/layout-xlarge/v_icon_text_list_item.xml +++ b/app/src/main/res/layout-xlarge/v_icon_text_list_item.xml @@ -3,7 +3,8 @@ android:layout_height="wrap_content" android:layout_width="match_parent" android:orientation="vertical" - xmlns:tools="http://schemas.android.com/tools"> + xmlns:tools="http://schemas.android.com/tools" + tools:viewBindingIgnore="true"> <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/app/src/main/res/layout-xlarge/v_loading_screen.xml b/app/src/main/res/layout-xlarge/v_loading_screen.xml index 2ecb8f42..22b72f29 100644 --- a/app/src/main/res/layout-xlarge/v_loading_screen.xml +++ b/app/src/main/res/layout-xlarge/v_loading_screen.xml @@ -8,6 +8,7 @@ android:orientation="vertical" android:visibility="gone" tools:visibility="visible" + tools:viewBindingIgnore="true" > <androidx.appcompat.widget.AppCompatImageView diff --git a/app/src/main/res/layout-xlarge/v_provider_header.xml b/app/src/main/res/layout-xlarge/v_provider_header.xml index 6d826783..28bcaa6c 100644 --- a/app/src/main/res/layout-xlarge/v_provider_header.xml +++ b/app/src/main/res/layout-xlarge/v_provider_header.xml @@ -2,7 +2,9 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_height="wrap_content" android:layout_width="match_parent" - xmlns:app="http://schemas.android.com/apk/res-auto" > + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + tools:viewBindingIgnore="true"> <androidx.appcompat.widget.AppCompatImageView android:id="@+id/provider_header_logo" diff --git a/app/src/main/res/layout-xlarge/v_provider_list_item.xml b/app/src/main/res/layout-xlarge/v_provider_list_item.xml index eea55be2..2e3506b5 100644 --- a/app/src/main/res/layout-xlarge/v_provider_list_item.xml +++ b/app/src/main/res/layout-xlarge/v_provider_list_item.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" android:orientation="vertical" android:paddingTop="2dip" android:paddingBottom="2dip" @@ -8,7 +9,7 @@ android:layout_height="wrap_content" android:background="?android:attr/activatedBackgroundIndicator" android:minHeight="?android:attr/listPreferredItemHeight" -> + tools:viewBindingIgnore="true"> <androidx.appcompat.widget.AppCompatTextView android:id="@+id/provider_domain" android:layout_width="match_parent" diff --git a/app/src/main/res/layout-xlarge/v_single_list_item.xml b/app/src/main/res/layout-xlarge/v_single_list_item.xml index 6a318ff5..44cd16e5 100644 --- a/app/src/main/res/layout-xlarge/v_single_list_item.xml +++ b/app/src/main/res/layout-xlarge/v_single_list_item.xml @@ -15,6 +15,7 @@ --> <androidx.appcompat.widget.AppCompatTextView xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" android:id="@android:id/text1" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -25,4 +26,5 @@ android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" android:paddingRight="?android:attr/listPreferredItemPaddingRight" android:background="?android:attr/activatedBackgroundIndicator" - android:minHeight="?android:attr/listPreferredItemHeight" /> + 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" > <RelativeLayout android:layout_width="match_parent" diff --git a/app/src/main/res/layout-xlarge/v_vpn_status.xml b/app/src/main/res/layout-xlarge/v_vpn_status.xml index ce8e6928..02f0659a 100644 --- a/app/src/main/res/layout-xlarge/v_vpn_status.xml +++ b/app/src/main/res/layout-xlarge/v_vpn_status.xml @@ -5,7 +5,8 @@ --> <merge xmlns:tools="http://schemas.android.com/tools" - xmlns:android="http://schemas.android.com/apk/res/android"> + xmlns:android="http://schemas.android.com/apk/res/android" + tools:viewBindingIgnore="true"> <Space android:layout_weight="1" diff --git a/app/src/main/res/layout/a_add_provider.xml b/app/src/main/res/layout/a_add_provider.xml index c78db432..517c8c19 100644 --- a/app/src/main/res/layout/a_add_provider.xml +++ b/app/src/main/res/layout/a_add_provider.xml @@ -6,7 +6,9 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:padding="@dimen/stdpadding" - tools:context=".providersetup.AddProviderActivity"> + tools:context=".providersetup.AddProviderActivity" + tools:viewBindingIgnore="true" + > <LinearLayout android:id="@+id/content" diff --git a/app/src/main/res/layout/a_add_provider_tablet_scrollview.xml b/app/src/main/res/layout/a_add_provider_tablet_scrollview.xml index 4debbf9f..d3b8fc58 100644 --- a/app/src/main/res/layout/a_add_provider_tablet_scrollview.xml +++ b/app/src/main/res/layout/a_add_provider_tablet_scrollview.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<ScrollView - android:orientation="vertical" +<ScrollView android:orientation="vertical" style="@style/BitmaskActivity" android:layout_width="0dp" android:layout_height="0dp" @@ -15,7 +14,9 @@ android:isScrollContainer="true" android:fadeScrollbars="false" xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto"> + xmlns:app="http://schemas.android.com/apk/res-auto" + tools:viewBindingIgnore="true" + xmlns:tools="http://schemas.android.com/tools"> <LinearLayout android:id="@+id/content" diff --git a/app/src/main/res/layout/a_custom_provider_setup.xml b/app/src/main/res/layout/a_custom_provider_setup.xml index 782537d9..0e4e3edf 100644 --- a/app/src/main/res/layout/a_custom_provider_setup.xml +++ b/app/src/main/res/layout/a_custom_provider_setup.xml @@ -6,7 +6,9 @@ android:layout_height="match_parent" tools:context=".providersetup.activities.CustomProviderSetupActivity" android:padding="@dimen/stdpadding" - style="@style/BitmaskActivity" > + style="@style/BitmaskActivity" + tools:viewBindingIgnore="true" + > <!-- a "content" view that is required for ConfigWizardBaseActivities --> 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 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" android:orientation="vertical" android:layout_width="0dp" android:layout_height="0dp" @@ -10,7 +11,8 @@ app:layout_constraintEnd_toStartOf="@+id/guideline_right" app:layout_constraintHeight_min="411dp" app:layout_constraintStart_toStartOf="@+id/guideline_left" - app:layout_constraintTop_toTopOf="@+id/guideline_top"> + app:layout_constraintTop_toTopOf="@+id/guideline_top" + tools:viewBindingIgnore="true"> <!-- a "content" view that is required for ConfigWizardBaseActivities --> <LinearLayout diff --git a/app/src/main/res/layout/a_main.xml b/app/src/main/res/layout/a_main.xml index 0e30d2a8..92e0a3c0 100644 --- a/app/src/main/res/layout/a_main.xml +++ b/app/src/main/res/layout/a_main.xml @@ -5,7 +5,9 @@ android:id="@+id/drawer_layout" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context="se.leap.bitmaskclient.base.MainActivity"> + tools:context="se.leap.bitmaskclient.base.MainActivity" + tools:viewBindingIgnore="true" + > <!-- As the main content view, the view below consumes the entire diff --git a/app/src/main/res/layout/a_provider_credentials.xml b/app/src/main/res/layout/a_provider_credentials.xml index b5dfa088..c5ff5f99 100644 --- a/app/src/main/res/layout/a_provider_credentials.xml +++ b/app/src/main/res/layout/a_provider_credentials.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content" android:padding="@dimen/stdpadding" - style="@style/BitmaskActivity"> + style="@style/BitmaskActivity" + tools:viewBindingIgnore="true"> <include layout="@layout/v_loading_screen" /> diff --git a/app/src/main/res/layout/a_provider_credentials_tablet_linear_layout.xml b/app/src/main/res/layout/a_provider_credentials_tablet_linear_layout.xml index ea0b6dd4..56222813 100644 --- a/app/src/main/res/layout/a_provider_credentials_tablet_linear_layout.xml +++ b/app/src/main/res/layout/a_provider_credentials_tablet_linear_layout.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" android:orientation="vertical" style="@style/BitmaskActivity" android:layout_width="0dp" @@ -13,7 +13,8 @@ app:layout_constraintEnd_toStartOf="@+id/guideline_right" app:layout_constraintHeight_min="411dp" app:layout_constraintStart_toStartOf="@+id/guideline_left" - app:layout_constraintTop_toTopOf="@+id/guideline_top"> + app:layout_constraintTop_toTopOf="@+id/guideline_top" + tools:viewBindingIgnore="true"> <include layout="@layout/v_loading_screen" /> diff --git a/app/src/main/res/layout/a_provider_detail.xml b/app/src/main/res/layout/a_provider_detail.xml index bdc17ee9..4a456c32 100644 --- a/app/src/main/res/layout/a_provider_detail.xml +++ b/app/src/main/res/layout/a_provider_detail.xml @@ -1,11 +1,13 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" android:id="@+id/provider_detail_fragment" android:layout_width="match_parent" android:layout_height="match_parent" android:padding="@dimen/stdpadding" android:orientation="vertical" - style="@style/BitmaskActivity" > + style="@style/BitmaskActivity" + tools:viewBindingIgnore="true"> <include layout="@layout/v_loading_screen" /> diff --git a/app/src/main/res/layout/a_provider_detail_tablet_linear_layout.xml b/app/src/main/res/layout/a_provider_detail_tablet_linear_layout.xml index 0c7e02d1..5601a3d5 100644 --- a/app/src/main/res/layout/a_provider_detail_tablet_linear_layout.xml +++ b/app/src/main/res/layout/a_provider_detail_tablet_linear_layout.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout - android:orientation="vertical" +<LinearLayout android:orientation="vertical" android:padding="@dimen/stdpadding" style="@style/BitmaskActivity" android:layout_width="0dp" @@ -13,7 +12,9 @@ app:layout_constraintStart_toStartOf="@+id/guideline_left" app:layout_constraintTop_toTopOf="@+id/guideline_top" xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto"> + xmlns:app="http://schemas.android.com/apk/res-auto" + tools:viewBindingIgnore="true" + xmlns:tools="http://schemas.android.com/tools"> <include layout="@layout/v_loading_screen" /> diff --git a/app/src/main/res/layout/a_provider_list.xml b/app/src/main/res/layout/a_provider_list.xml index 5d7efae7..867d6d8d 100644 --- a/app/src/main/res/layout/a_provider_list.xml +++ b/app/src/main/res/layout/a_provider_list.xml @@ -5,7 +5,8 @@ android:layout_height="match_parent" tools:context=".providersetup.ProviderListActivity" android:padding="@dimen/stdpadding" - style="@style/BitmaskActivity" > + style="@style/BitmaskActivity" + tools:viewBindingIgnore="true"> <include layout="@layout/v_loading_screen" /> diff --git a/app/src/main/res/layout/a_provider_list_tablet_linear_layout.xml b/app/src/main/res/layout/a_provider_list_tablet_linear_layout.xml index 487edd1d..67f82976 100644 --- a/app/src/main/res/layout/a_provider_list_tablet_linear_layout.xml +++ b/app/src/main/res/layout/a_provider_list_tablet_linear_layout.xml @@ -12,7 +12,9 @@ app:layout_constraintStart_toStartOf="@+id/guideline_left" app:layout_constraintTop_toTopOf="@+id/guideline_top" xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto"> + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + tools:viewBindingIgnore="true"> <include layout="@layout/v_loading_screen" /> diff --git a/app/src/main/res/layout/allowed_application_layout.xml b/app/src/main/res/layout/allowed_application_layout.xml index 61fc12c3..671a54fc 100644 --- a/app/src/main/res/layout/allowed_application_layout.xml +++ b/app/src/main/res/layout/allowed_application_layout.xml @@ -14,7 +14,9 @@ android:paddingTop="8dip" android:paddingBottom="8dip" android:columnCount="4" - tools:ignore="RtlCompat"> + tools:ignore="RtlCompat" + tools:viewBindingIgnore="true" + > <ImageView android:id="@+id/app_icon" diff --git a/app/src/main/res/layout/allowed_vpn_apps.xml b/app/src/main/res/layout/allowed_vpn_apps.xml index f76b5f4f..1930adf2 100644 --- a/app/src/main/res/layout/allowed_vpn_apps.xml +++ b/app/src/main/res/layout/allowed_vpn_apps.xml @@ -8,7 +8,9 @@ android:orientation="vertical" android:layout_width="match_parent" tools:ignore="RtlCompat" - android:layout_height="match_parent"> + android:layout_height="match_parent" + tools:viewBindingIgnore="true" + > <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" diff --git a/app/src/main/res/layout/custom_toast.xml b/app/src/main/res/layout/custom_toast.xml index c267fb86..b333a9b0 100644 --- a/app/src/main/res/layout/custom_toast.xml +++ b/app/src/main/res/layout/custom_toast.xml @@ -6,7 +6,9 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" android:padding="16dp" - android:background="@drawable/cust_toast_background"> + android:background="@drawable/cust_toast_background" + tools:viewBindingIgnore="true" + > <ImageView android:src="@drawable/retry" android:layout_width="24dp" android:layout_height="24dp" diff --git a/app/src/main/res/layout/d_checkbox_confirm.xml b/app/src/main/res/layout/d_checkbox_confirm.xml index f8aace6e..d8811226 100644 --- a/app/src/main/res/layout/d_checkbox_confirm.xml +++ b/app/src/main/res/layout/d_checkbox_confirm.xml @@ -1,7 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> -<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:layout_height="wrap_content"> + android:layout_height="wrap_content" + xmlns:tools="http://schemas.android.com/tools" + tools:viewBindingIgnore="true"> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" diff --git a/app/src/main/res/layout/d_list_selection.xml b/app/src/main/res/layout/d_list_selection.xml index d9a1b013..908c228f 100644 --- a/app/src/main/res/layout/d_list_selection.xml +++ b/app/src/main/res/layout/d_list_selection.xml @@ -1,7 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:layout_height="wrap_content"> + android:layout_height="wrap_content" + xmlns:tools="http://schemas.android.com/tools" + tools:viewBindingIgnore="true"> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" diff --git a/app/src/main/res/layout/donation_reminder_dialog.xml b/app/src/main/res/layout/donation_reminder_dialog.xml index d6b6ea80..0a93c867 100644 --- a/app/src/main/res/layout/donation_reminder_dialog.xml +++ b/app/src/main/res/layout/donation_reminder_dialog.xml @@ -3,7 +3,9 @@ android:layout_width="match_parent" android:layout_height="match_parent" xmlns:app="http://schemas.android.com/apk/res-auto" - android:scrollbars="none"> + xmlns:tools="http://schemas.android.com/tools" + android:scrollbars="none" + tools:viewBindingIgnore="true"> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" diff --git a/app/src/main/res/layout/f_about.xml b/app/src/main/res/layout/f_about.xml index b73d2191..e0193c1b 100644 --- a/app/src/main/res/layout/f_about.xml +++ b/app/src/main/res/layout/f_about.xml @@ -8,7 +8,8 @@ android:layout_marginStart="@dimen/stdpadding" android:layout_marginRight="@dimen/stdpadding" android:layout_marginEnd="@dimen/stdpadding" - tools:context=".base.MainActivity"> + tools:context=".base.MainActivity" + tools:viewBindingIgnore="true"> <LinearLayout android:layout_width="match_parent" diff --git a/app/src/main/res/layout/f_drawer_main.xml b/app/src/main/res/layout/f_drawer_main.xml index bf418bc0..a948d9ce 100644 --- a/app/src/main/res/layout/f_drawer_main.xml +++ b/app/src/main/res/layout/f_drawer_main.xml @@ -8,6 +8,7 @@ android:clickable="true" android:focusable="true" android:fillViewport="true" + tools:viewBindingIgnore="true" > <LinearLayout diff --git a/app/src/main/res/layout/f_eip.xml b/app/src/main/res/layout/f_eip.xml index fa2d4ded..9a823b65 100644 --- a/app/src/main/res/layout/f_eip.xml +++ b/app/src/main/res/layout/f_eip.xml @@ -8,7 +8,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" + > <androidx.constraintlayout.widget.Guideline android:id="@+id/guideline_horizontal_top" diff --git a/app/src/main/res/layout/f_gateway_selection.xml b/app/src/main/res/layout/f_gateway_selection.xml index 8ab2b1c3..5a614ce9 100644 --- a/app/src/main/res/layout/f_gateway_selection.xml +++ b/app/src/main/res/layout/f_gateway_selection.xml @@ -4,7 +4,9 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:padding="@dimen/stdpadding" - tools:context=".base.fragments.GatewaySelectionFragment"> + tools:context=".base.fragments.GatewaySelectionFragment" + tools:viewBindingIgnore="true" + > <LinearLayout android:id="@+id/current_location_container" diff --git a/app/src/main/res/layout/f_log.xml b/app/src/main/res/layout/f_log.xml index ac77abd5..792770f6 100644 --- a/app/src/main/res/layout/f_log.xml +++ b/app/src/main/res/layout/f_log.xml @@ -11,6 +11,7 @@ android:orientation="vertical" android:padding="16dp" android:id="@+id/log_layout" + tools:viewBindingIgnore="true" > <LinearLayout diff --git a/app/src/main/res/layout/f_log_sliders.xml b/app/src/main/res/layout/f_log_sliders.xml index ea444b3d..3e4bbee4 100644 --- a/app/src/main/res/layout/f_log_sliders.xml +++ b/app/src/main/res/layout/f_log_sliders.xml @@ -14,7 +14,8 @@ android:visibility="gone" tools:visibility="visible" android:layout_width="wrap_content" - android:layout_height="wrap_content"> + android:layout_height="wrap_content" + tools:viewBindingIgnore="true"> <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" diff --git a/app/src/main/res/layout/f_settings.xml b/app/src/main/res/layout/f_settings.xml index f89dc956..d41126b9 100644 --- a/app/src/main/res/layout/f_settings.xml +++ b/app/src/main/res/layout/f_settings.xml @@ -4,8 +4,9 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" + xmlns:tools="http://schemas.android.com/tools" android:padding="@dimen/stdpadding" - > + tools:viewBindingIgnore="true"> <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" @@ -123,5 +124,14 @@ app:subtitle="These transports might circumvent censorship, but are still in a testing phase" /> + <se.leap.bitmaskclient.base.views.IconTextEntry + android:id="@+id/obfuscation_proxy_pinning" + android:layout_width="match_parent" + android:layout_height="wrap_content" + app:text="Obfuscation proxy pinning" + app:singleLine="false" + app:subtitle="Connect to a specific obfuscation proxy for debugging purposes" + /> + </LinearLayout> </ScrollView>
\ No newline at end of file diff --git a/app/src/main/res/layout/v_custom_notification.xml b/app/src/main/res/layout/v_custom_notification.xml index e97fcbe2..c9854ff3 100644 --- a/app/src/main/res/layout/v_custom_notification.xml +++ b/app/src/main/res/layout/v_custom_notification.xml @@ -5,6 +5,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" style="@android:style/TextAppearance.StatusBar.EventContent" + tools:viewBindingIgnore="true" > <ImageView diff --git a/app/src/main/res/layout/v_icon_select_text_list_item.xml b/app/src/main/res/layout/v_icon_select_text_list_item.xml index 801a372a..60c5908c 100644 --- a/app/src/main/res/layout/v_icon_select_text_list_item.xml +++ b/app/src/main/res/layout/v_icon_select_text_list_item.xml @@ -3,7 +3,8 @@ android:layout_height="?android:attr/listPreferredItemHeightSmall" android:layout_width="match_parent" android:orientation="horizontal" - xmlns:tools="http://schemas.android.com/tools"> + xmlns:tools="http://schemas.android.com/tools" + tools:viewBindingIgnore="true"> <androidx.appcompat.widget.AppCompatImageView android:id="@+id/material_icon" diff --git a/app/src/main/res/layout/v_icon_text_list_item.xml b/app/src/main/res/layout/v_icon_text_list_item.xml index d183864d..814fd4d5 100644 --- a/app/src/main/res/layout/v_icon_text_list_item.xml +++ b/app/src/main/res/layout/v_icon_text_list_item.xml @@ -3,7 +3,8 @@ android:layout_height="wrap_content" android:layout_width="match_parent" android:orientation="vertical" - xmlns:tools="http://schemas.android.com/tools"> + xmlns:tools="http://schemas.android.com/tools" + tools:viewBindingIgnore="true"> <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/app/src/main/res/layout/v_loading_screen.xml b/app/src/main/res/layout/v_loading_screen.xml index 26ab25cc..dd83aa38 100644 --- a/app/src/main/res/layout/v_loading_screen.xml +++ b/app/src/main/res/layout/v_loading_screen.xml @@ -8,6 +8,7 @@ android:orientation="vertical" android:visibility="gone" tools:visibility="visible" + tools:viewBindingIgnore="true" > <androidx.appcompat.widget.AppCompatImageView diff --git a/app/src/main/res/layout/v_location_button.xml b/app/src/main/res/layout/v_location_button.xml index 7f16a6b1..d304d429 100644 --- a/app/src/main/res/layout/v_location_button.xml +++ b/app/src/main/res/layout/v_location_button.xml @@ -7,7 +7,9 @@ android:layout_gravity="center_vertical" android:padding="@dimen/stdpadding" android:background="@drawable/cust_button_primary_rect" - android:layout_height="match_parent"> + android:layout_height="match_parent" + tools:viewBindingIgnore="true" + > <androidx.appcompat.widget.AppCompatImageView android:id="@+id/world_icn" diff --git a/app/src/main/res/layout/v_location_status_indicator.xml b/app/src/main/res/layout/v_location_status_indicator.xml index a8ba905e..af831cb0 100644 --- a/app/src/main/res/layout/v_location_status_indicator.xml +++ b/app/src/main/res/layout/v_location_status_indicator.xml @@ -5,6 +5,7 @@ android:orientation="horizontal" android:layout_width="match_parent" android:layout_height="match_parent" + tools:viewBindingIgnore="true" > <androidx.constraintlayout.widget.Guideline diff --git a/app/src/main/res/layout/v_log_item.xml b/app/src/main/res/layout/v_log_item.xml index 5f809523..91bb99fd 100644 --- a/app/src/main/res/layout/v_log_item.xml +++ b/app/src/main/res/layout/v_log_item.xml @@ -3,6 +3,7 @@ android:orientation="vertical" android:layout_height="wrap_content" android:layout_width="match_parent" + tools:viewBindingIgnore="true" > <androidx.appcompat.widget.AppCompatTextView android:id="@android:id/text1" diff --git a/app/src/main/res/layout/v_main_btn.xml b/app/src/main/res/layout/v_main_btn.xml index c561e4cd..3ab62e5a 100644 --- a/app/src/main/res/layout/v_main_btn.xml +++ b/app/src/main/res/layout/v_main_btn.xml @@ -4,7 +4,9 @@ android:layout_height="wrap_content" android:id="@+id/vpn_btn_container" xmlns:app="http://schemas.android.com/apk/res-auto" - xmlns:tools="http://schemas.android.com/tools"> + xmlns:tools="http://schemas.android.com/tools" + tools:viewBindingIgnore="true" + > <androidx.appcompat.widget.AppCompatImageView android:id="@+id/vpn_btn_glow" diff --git a/app/src/main/res/layout/v_provider_credentials.xml b/app/src/main/res/layout/v_provider_credentials.xml index be40c233..189bace6 100644 --- a/app/src/main/res/layout/v_provider_credentials.xml +++ b/app/src/main/res/layout/v_provider_credentials.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <merge xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto"> + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools"> <androidx.appcompat.widget.AppCompatTextView android:id="@+id/provider_credentials_user_message" @@ -9,6 +10,7 @@ style="@style/TextAppearance.Design.Error" android:visibility="gone" android:linksClickable="true" + tools:viewBindingIgnore="true" /> <com.google.android.material.textfield.TextInputLayout diff --git a/app/src/main/res/layout/v_provider_header.xml b/app/src/main/res/layout/v_provider_header.xml index e0961ea6..42f4f783 100644 --- a/app/src/main/res/layout/v_provider_header.xml +++ b/app/src/main/res/layout/v_provider_header.xml @@ -2,7 +2,9 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_height="wrap_content" android:layout_width="match_parent" - xmlns:app="http://schemas.android.com/apk/res-auto" > + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + tools:viewBindingIgnore="true"> <androidx.appcompat.widget.AppCompatImageView android:id="@+id/provider_header_logo" diff --git a/app/src/main/res/layout/v_provider_list_item.xml b/app/src/main/res/layout/v_provider_list_item.xml index b4f41793..0e7cc7f3 100644 --- a/app/src/main/res/layout/v_provider_list_item.xml +++ b/app/src/main/res/layout/v_provider_list_item.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" android:orientation="vertical" android:paddingTop="2dip" android:paddingBottom="2dip" @@ -8,7 +9,7 @@ android:layout_height="wrap_content" android:background="?android:attr/activatedBackgroundIndicator" android:minHeight="?android:attr/listPreferredItemHeight" -> + tools:viewBindingIgnore="true"> <androidx.appcompat.widget.AppCompatTextView android:id="@+id/provider_domain" android:layout_width="match_parent" diff --git a/app/src/main/res/layout/v_select_text_list_item.xml b/app/src/main/res/layout/v_select_text_list_item.xml index 44e82906..47a1f4ad 100644 --- a/app/src/main/res/layout/v_select_text_list_item.xml +++ b/app/src/main/res/layout/v_select_text_list_item.xml @@ -4,7 +4,8 @@ android:layout_height="wrap_content" android:layout_width="match_parent" android:orientation="vertical" - android:background="?attr/selectableItemBackground"> + android:background="?attr/selectableItemBackground" + tools:viewBindingIgnore="true"> <LinearLayout android:layout_width="match_parent" diff --git a/app/src/main/res/layout/v_simple_checkbox.xml b/app/src/main/res/layout/v_simple_checkbox.xml index 8bae20b9..a5520341 100644 --- a/app/src/main/res/layout/v_simple_checkbox.xml +++ b/app/src/main/res/layout/v_simple_checkbox.xml @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" - android:layout_width="match_parent" android:layout_height="match_parent" - > + android:layout_width="match_parent" + android:layout_height="match_parent" + xmlns:tools="http://schemas.android.com/tools"> <View android:layout_width="wrap_content" @@ -18,6 +19,7 @@ android:layout_marginRight="8dp" android:layout_marginBottom="2dp" android:background="@drawable/cust_checkbox" + tools:viewBindingIgnore="true" /> <androidx.appcompat.widget.AppCompatImageView android:id="@+id/check_view" diff --git a/app/src/main/res/layout/v_single_list_item.xml b/app/src/main/res/layout/v_single_list_item.xml index 7b35bf7f..7bf772da 100644 --- a/app/src/main/res/layout/v_single_list_item.xml +++ b/app/src/main/res/layout/v_single_list_item.xml @@ -1,4 +1,5 @@ <androidx.appcompat.widget.AppCompatTextView xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" android:id="@android:id/text1" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -9,4 +10,5 @@ android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" android:paddingRight="?android:attr/listPreferredItemPaddingRight" android:background="?android:attr/activatedBackgroundIndicator" - android:minHeight="?android:attr/listPreferredItemHeightSmall" />
\ No newline at end of file + android:minHeight="?android:attr/listPreferredItemHeightSmall" + tools:viewBindingIgnore="true" />
\ No newline at end of file diff --git a/app/src/main/res/layout/v_switch_list_item.xml b/app/src/main/res/layout/v_switch_list_item.xml index 3ba37b81..514f28e7 100644 --- a/app/src/main/res/layout/v_switch_list_item.xml +++ b/app/src/main/res/layout/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" > <RelativeLayout android:layout_width="match_parent" diff --git a/app/src/main/res/layout/v_vpn_status.xml b/app/src/main/res/layout/v_vpn_status.xml index ce8e6928..02f0659a 100644 --- a/app/src/main/res/layout/v_vpn_status.xml +++ b/app/src/main/res/layout/v_vpn_status.xml @@ -5,7 +5,8 @@ --> <merge xmlns:tools="http://schemas.android.com/tools" - xmlns:android="http://schemas.android.com/apk/res/android"> + xmlns:android="http://schemas.android.com/apk/res/android" + tools:viewBindingIgnore="true"> <Space android:layout_weight="1" diff --git a/app/src/production/res/layout-xlarge/d_new_provider.xml b/app/src/production/res/layout-xlarge/d_new_provider.xml index 12616625..6e64c8c0 100644 --- a/app/src/production/res/layout-xlarge/d_new_provider.xml +++ b/app/src/production/res/layout-xlarge/d_new_provider.xml @@ -1,9 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="vertical" - android:textSize="24sp" > + android:textSize="24sp" + tools:viewBindingIgnore="true" + > <EditText android:id="@+id/new_provider_url" diff --git a/app/src/production/res/layout/d_new_provider.xml b/app/src/production/res/layout/d_new_provider.xml index 36eb0d6a..e58db08a 100644 --- a/app/src/production/res/layout/d_new_provider.xml +++ b/app/src/production/res/layout/d_new_provider.xml @@ -1,8 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:orientation="vertical" > + android:orientation="vertical" + tools:viewBindingIgnore="true"> <EditText android:id="@+id/new_provider_url" |