diff options
Diffstat (limited to 'app/src/main/res')
31 files changed, 12 insertions, 1191 deletions
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 deleted file mode 100644 index 80eef3c3..00000000 --- a/app/src/main/res/layout-xlarge-port/a_add_provider.xml +++ /dev/null @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<androidx.constraintlayout.widget.ConstraintLayout 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" - style="@style/BitmaskActivity" - android:layout_width="match_parent" - android:layout_height="match_parent" - tools:context=".providersetup.activities.ProviderCredentialsBaseActivity" - tools:viewBindingIgnore="true"> - - <androidx.appcompat.widget.AppCompatImageView - android:layout_width="match_parent" - android:layout_height="match_parent" - app:srcCompat="@drawable/background_main" - android:scaleType="centerCrop" - /> - - <androidx.constraintlayout.widget.Guideline - android:id="@+id/guideline_left" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="vertical" - app:layout_constraintGuide_percent="0.2" /> - - <androidx.constraintlayout.widget.Guideline - android:id="@+id/guideline_right" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="vertical" - app:layout_constraintGuide_percent="0.8" /> - - <androidx.constraintlayout.widget.Guideline - android:id="@+id/guideline_top" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="horizontal" - app:layout_constraintGuide_percent="0.275" /> - - <androidx.constraintlayout.widget.Guideline - android:id="@+id/guideline_bottom" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="horizontal" - app:layout_constraintGuide_percent="0.725" /> - - <include layout="@layout/a_add_provider_tablet_scrollview"/> -</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file 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 deleted file mode 100644 index dfb58b8c..00000000 --- a/app/src/main/res/layout-xlarge-port/a_custom_provider_setup.xml +++ /dev/null @@ -1,49 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<androidx.constraintlayout.widget.ConstraintLayout 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:id="@+id/provider_list_layout" - style="@style/BitmaskActivity" - android:layout_width="match_parent" - android:layout_height="match_parent" - tools:context=".providersetup.activities.CustomProviderSetupActivity" - tools:viewBindingIgnore="true"> - - <androidx.appcompat.widget.AppCompatImageView - android:layout_width="match_parent" - android:layout_height="match_parent" - app:srcCompat="@drawable/background_main" - android:scaleType="centerCrop" - /> - - <androidx.constraintlayout.widget.Guideline - android:id="@+id/guideline_left" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="vertical" - app:layout_constraintGuide_percent="0.2" /> - - <androidx.constraintlayout.widget.Guideline - android:id="@+id/guideline_right" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="vertical" - app:layout_constraintGuide_percent="0.8" /> - - <androidx.constraintlayout.widget.Guideline - android:id="@+id/guideline_top" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="horizontal" - app:layout_constraintGuide_percent="0.275" /> - - <androidx.constraintlayout.widget.Guideline - android:id="@+id/guideline_bottom" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="horizontal" - app:layout_constraintGuide_percent="0.725" /> - - <include layout="@layout/a_custom_provider_setup_tablet_linear_layout" /> - -</androidx.constraintlayout.widget.ConstraintLayout> 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 deleted file mode 100644 index e1295853..00000000 --- a/app/src/main/res/layout-xlarge-port/a_provider_credentials.xml +++ /dev/null @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<androidx.constraintlayout.widget.ConstraintLayout 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" - style="@style/BitmaskActivity" - android:layout_width="match_parent" - android:layout_height="match_parent" - tools:context=".providersetup.activities.ProviderCredentialsBaseActivity" - tools:viewBindingIgnore="true"> - - <androidx.appcompat.widget.AppCompatImageView - android:layout_width="match_parent" - android:layout_height="match_parent" - app:srcCompat="@drawable/background_main" - android:scaleType="centerCrop" - /> - - <androidx.constraintlayout.widget.Guideline - android:id="@+id/guideline_left" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="vertical" - app:layout_constraintGuide_percent="0.2" /> - - <androidx.constraintlayout.widget.Guideline - android:id="@+id/guideline_right" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="vertical" - app:layout_constraintGuide_percent="0.8" /> - - <androidx.constraintlayout.widget.Guideline - android:id="@+id/guideline_top" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="horizontal" - app:layout_constraintGuide_percent="0.275" /> - - <androidx.constraintlayout.widget.Guideline - android:id="@+id/guideline_bottom" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="horizontal" - app:layout_constraintGuide_percent="0.725" /> - - <include layout="@layout/a_provider_credentials_tablet_linear_layout"/> -</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file 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 deleted file mode 100644 index 34719df9..00000000 --- a/app/src/main/res/layout-xlarge-port/a_provider_detail.xml +++ /dev/null @@ -1,48 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<androidx.constraintlayout.widget.ConstraintLayout 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:id="@+id/provider_list_layout" - android:layout_width="match_parent" - android:layout_height="match_parent" - tools:context=".providersetup.ProviderDetailActivity" - style="@style/BitmaskActivity" - tools:viewBindingIgnore="true"> - - <androidx.appcompat.widget.AppCompatImageView - android:layout_width="match_parent" - android:layout_height="match_parent" - app:srcCompat="@drawable/background_main" - android:scaleType="centerCrop" - /> - - <androidx.constraintlayout.widget.Guideline - android:id="@+id/guideline_left" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="vertical" - app:layout_constraintGuide_percent="0.2" /> - - <androidx.constraintlayout.widget.Guideline - android:id="@+id/guideline_right" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="vertical" - app:layout_constraintGuide_percent="0.8" /> - - <androidx.constraintlayout.widget.Guideline - android:id="@+id/guideline_top" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="horizontal" - app:layout_constraintGuide_percent="0.275" /> - - <androidx.constraintlayout.widget.Guideline - android:id="@+id/guideline_bottom" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="horizontal" - app:layout_constraintGuide_percent="0.725" /> - - <include layout="@layout/a_provider_detail_tablet_linear_layout" /> -</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file 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 deleted file mode 100644 index 184cbf93..00000000 --- a/app/src/main/res/layout-xlarge-port/a_provider_list.xml +++ /dev/null @@ -1,48 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<androidx.constraintlayout.widget.ConstraintLayout 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:id="@+id/provider_list_layout" - style="@style/BitmaskActivity" - android:layout_width="match_parent" - android:layout_height="match_parent" - tools:context=".providersetup.ProviderListActivity" - tools:viewBindingIgnore="true"> - - <androidx.appcompat.widget.AppCompatImageView - android:layout_width="match_parent" - android:layout_height="match_parent" - app:srcCompat="@drawable/background_main" - android:scaleType="centerCrop" - /> - - <androidx.constraintlayout.widget.Guideline - android:id="@+id/guideline_left" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="vertical" - app:layout_constraintGuide_percent="0.2" /> - - <androidx.constraintlayout.widget.Guideline - android:id="@+id/guideline_right" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="vertical" - app:layout_constraintGuide_percent="0.8" /> - - <androidx.constraintlayout.widget.Guideline - android:id="@+id/guideline_top" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="horizontal" - app:layout_constraintGuide_percent="0.275" /> - - <androidx.constraintlayout.widget.Guideline - android:id="@+id/guideline_bottom" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="horizontal" - app:layout_constraintGuide_percent="0.725" /> - - <include layout="@layout/a_provider_list_tablet_linear_layout" /> -</androidx.constraintlayout.widget.ConstraintLayout> diff --git a/app/src/main/res/layout-xlarge/a_add_provider.xml b/app/src/main/res/layout-xlarge/a_add_provider.xml deleted file mode 100644 index db63b32c..00000000 --- a/app/src/main/res/layout-xlarge/a_add_provider.xml +++ /dev/null @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<androidx.constraintlayout.widget.ConstraintLayout 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" - style="@style/BitmaskActivity" - android:layout_width="match_parent" - android:layout_height="match_parent" - tools:context=".providersetup.activities.ProviderCredentialsBaseActivity" - tools:viewBindingIgnore="true"> - - <androidx.appcompat.widget.AppCompatImageView - android:layout_width="match_parent" - android:layout_height="match_parent" - app:srcCompat="@drawable/background_main" - android:scaleType="centerCrop" - /> - - <androidx.constraintlayout.widget.Guideline - android:id="@+id/guideline_left" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="vertical" - app:layout_constraintGuide_percent="0.2" /> - - <androidx.constraintlayout.widget.Guideline - android:id="@+id/guideline_right" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="vertical" - app:layout_constraintGuide_percent="0.8" /> - - <androidx.constraintlayout.widget.Guideline - android:id="@+id/guideline_top" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="horizontal" - app:layout_constraintGuide_percent="0.15" /> - - <androidx.constraintlayout.widget.Guideline - android:id="@+id/guideline_bottom" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="horizontal" - app:layout_constraintGuide_percent="0.85" /> - - <include layout="@layout/a_add_provider_tablet_scrollview"/> -</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file 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 deleted file mode 100644 index 130ad95a..00000000 --- a/app/src/main/res/layout-xlarge/a_custom_provider_setup.xml +++ /dev/null @@ -1,49 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<androidx.constraintlayout.widget.ConstraintLayout 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:id="@+id/provider_list_layout" - style="@style/BitmaskActivity" - android:layout_width="match_parent" - android:layout_height="match_parent" - tools:context=".providersetup.activities.CustomProviderSetupActivity" - tools:viewBindingIgnore="true"> - - <androidx.appcompat.widget.AppCompatImageView - android:layout_width="match_parent" - android:layout_height="match_parent" - app:srcCompat="@drawable/background_main" - android:scaleType="centerCrop" - /> - - <androidx.constraintlayout.widget.Guideline - android:id="@+id/guideline_left" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="vertical" - app:layout_constraintGuide_percent="0.2" /> - - <androidx.constraintlayout.widget.Guideline - android:id="@+id/guideline_right" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="vertical" - app:layout_constraintGuide_percent="0.8" /> - - <androidx.constraintlayout.widget.Guideline - android:id="@+id/guideline_top" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="horizontal" - app:layout_constraintGuide_percent="0.15" /> - - <androidx.constraintlayout.widget.Guideline - android:id="@+id/guideline_bottom" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="horizontal" - app:layout_constraintGuide_percent="0.85" /> - - <include layout="@layout/a_custom_provider_setup_tablet_linear_layout" /> - -</androidx.constraintlayout.widget.ConstraintLayout> diff --git a/app/src/main/res/layout-xlarge/a_provider_credentials.xml b/app/src/main/res/layout-xlarge/a_provider_credentials.xml deleted file mode 100644 index 61a638d4..00000000 --- a/app/src/main/res/layout-xlarge/a_provider_credentials.xml +++ /dev/null @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<androidx.constraintlayout.widget.ConstraintLayout 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" - style="@style/BitmaskActivity" - android:layout_width="match_parent" - android:layout_height="match_parent" - tools:context=".providersetup.activities.ProviderCredentialsBaseActivity" - tools:viewBindingIgnore="true"> - - <androidx.appcompat.widget.AppCompatImageView - android:layout_width="match_parent" - android:layout_height="match_parent" - app:srcCompat="@drawable/background_main" - android:scaleType="centerCrop" - /> - - <androidx.constraintlayout.widget.Guideline - android:id="@+id/guideline_left" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="vertical" - app:layout_constraintGuide_percent="0.2" /> - - <androidx.constraintlayout.widget.Guideline - android:id="@+id/guideline_right" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="vertical" - app:layout_constraintGuide_percent="0.8" /> - - <androidx.constraintlayout.widget.Guideline - android:id="@+id/guideline_top" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="horizontal" - app:layout_constraintGuide_percent="0.15" /> - - <androidx.constraintlayout.widget.Guideline - android:id="@+id/guideline_bottom" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="horizontal" - app:layout_constraintGuide_percent="0.85" /> - - <include layout="@layout/a_provider_credentials_tablet_linear_layout"/> -</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout-xlarge/a_provider_detail.xml b/app/src/main/res/layout-xlarge/a_provider_detail.xml deleted file mode 100644 index 74a0c72c..00000000 --- a/app/src/main/res/layout-xlarge/a_provider_detail.xml +++ /dev/null @@ -1,48 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<androidx.constraintlayout.widget.ConstraintLayout 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:id="@+id/provider_list_layout" - android:layout_width="match_parent" - android:layout_height="match_parent" - tools:context=".providersetup.ProviderDetailActivity" - style="@style/BitmaskActivity" - tools:viewBindingIgnore="true"> - - <androidx.appcompat.widget.AppCompatImageView - android:layout_width="match_parent" - android:layout_height="match_parent" - app:srcCompat="@drawable/background_main" - android:scaleType="centerCrop" - /> - - <androidx.constraintlayout.widget.Guideline - android:id="@+id/guideline_left" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="vertical" - app:layout_constraintGuide_percent="0.2" /> - - <androidx.constraintlayout.widget.Guideline - android:id="@+id/guideline_right" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="vertical" - app:layout_constraintGuide_percent="0.8" /> - - <androidx.constraintlayout.widget.Guideline - android:id="@+id/guideline_top" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="horizontal" - app:layout_constraintGuide_percent="0.15" /> - - <androidx.constraintlayout.widget.Guideline - android:id="@+id/guideline_bottom" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="horizontal" - app:layout_constraintGuide_percent="0.85" /> - - <include layout="@layout/a_provider_detail_tablet_linear_layout" /> -</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout-xlarge/a_provider_list.xml b/app/src/main/res/layout-xlarge/a_provider_list.xml deleted file mode 100644 index c8c7a763..00000000 --- a/app/src/main/res/layout-xlarge/a_provider_list.xml +++ /dev/null @@ -1,48 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<androidx.constraintlayout.widget.ConstraintLayout 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:id="@+id/provider_list_layout" - style="@style/BitmaskActivity" - android:layout_width="match_parent" - android:layout_height="match_parent" - tools:context=".providersetup.ProviderListActivity" - tools:viewBindingIgnore="true"> - - <androidx.appcompat.widget.AppCompatImageView - android:layout_width="match_parent" - android:layout_height="match_parent" - app:srcCompat="@drawable/background_main" - android:scaleType="centerCrop" - /> - - <androidx.constraintlayout.widget.Guideline - android:id="@+id/guideline_left" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="vertical" - app:layout_constraintGuide_percent="0.2" /> - - <androidx.constraintlayout.widget.Guideline - android:id="@+id/guideline_right" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="vertical" - app:layout_constraintGuide_percent="0.8" /> - - <androidx.constraintlayout.widget.Guideline - android:id="@+id/guideline_top" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="horizontal" - app:layout_constraintGuide_percent="0.15" /> - - <androidx.constraintlayout.widget.Guideline - android:id="@+id/guideline_bottom" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="horizontal" - app:layout_constraintGuide_percent="0.85" /> - - <include layout="@layout/a_provider_list_tablet_linear_layout" /> -</androidx.constraintlayout.widget.ConstraintLayout> diff --git a/app/src/main/res/layout-xlarge/f_about.xml b/app/src/main/res/layout-xlarge/f_about.xml index ed7f4f1a..90a263a0 100644 --- a/app/src/main/res/layout-xlarge/f_about.xml +++ b/app/src/main/res/layout-xlarge/f_about.xml @@ -1,3 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> + <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:id="@+id/aboutLayout" @@ -8,8 +10,7 @@ android:layout_marginStart="@dimen/stdpadding" android:layout_marginEnd="@dimen/stdpadding" android:layout_marginRight="@dimen/stdpadding" - tools:context=".base.MainActivity" - tools:viewBindingIgnore="true"> + tools:context=".base.MainActivity"> <LinearLayout android:layout_width="match_parent" 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 deleted file mode 100644 index 2e3506b5..00000000 --- a/app/src/main/res/layout-xlarge/v_provider_list_item.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?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" - android:layout_width="match_parent" - 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" - android:layout_height="wrap_content" - android:paddingStart="?android:attr/listPreferredItemPaddingStart" - android:paddingLeft="?android:attr/listPreferredItemPaddingLeft" - android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" - android:paddingRight="?android:attr/listPreferredItemPaddingRight" - android:layout_marginTop="6dip" - android:textAppearance="?android:attr/textAppearanceLarge" - /> - - <androidx.appcompat.widget.AppCompatTextView android:id="@+id/provider_name" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingStart="?android:attr/listPreferredItemPaddingStart" - android:paddingLeft="?android:attr/listPreferredItemPaddingLeft" - android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" - android:paddingRight="?android:attr/listPreferredItemPaddingRight" - android:textAppearance="?android:attr/textAppearanceMedium" - /> - -</LinearLayout> diff --git a/app/src/main/res/layout/a_add_provider.xml b/app/src/main/res/layout/a_add_provider.xml deleted file mode 100644 index aad64630..00000000 --- a/app/src/main/res/layout/a_add_provider.xml +++ /dev/null @@ -1,90 +0,0 @@ -<?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" - xmlns:tools="http://schemas.android.com/tools" - style="@style/BitmaskActivity" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:padding="@dimen/stdpadding" - tools:context=".providersetup.AddProviderActivity" - tools:viewBindingIgnore="true" - > - - <LinearLayout - android:id="@+id/content" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_alignParentEnd="true" - android:layout_alignParentRight="true" - android:layout_alignParentTop="true" - android:orientation="vertical"> - - <!-- the header contains the mask--> - <se.leap.bitmaskclient.base.views.ProviderHeaderView - android:id="@+id/header" - android:layout_width="match_parent" - android:layout_height="wrap_content"/> - - <com.google.android.material.textfield.TextInputLayout - android:id="@+id/text_uri_error" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="@dimen/activity_vertical_margin" - android:hint="@string/new_provider_uri" - app:errorEnabled="true"> - - <com.google.android.material.textfield.TextInputEditText - android:id="@+id/text_uri" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:ems="10" - android:inputType="text" /> - - </com.google.android.material.textfield.TextInputLayout> - - <RelativeLayout - android:layout_width="match_parent" - android:layout_height="wrap_content"> - - <CheckBox - android:id="@+id/danger_checkbox" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_alignParentStart="true" - android:visibility="gone" - android:layout_marginBottom="@dimen/add_button_margin" - /> - - <LinearLayout - android:id="@+id/button_container" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:layout_alignParentRight="true" - android:layout_alignParentEnd="true" - android:gravity="right" - android:orientation="horizontal" - android:layout_below="@id/danger_checkbox"> - - <Button - android:id="@+id/button_cancel" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textColor="@color/color_font_btn_primary" - android:text="@string/cancel" /> - - <Button - android:id="@+id/button_save" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="@dimen/add_button_margin" - android:layout_marginStart="@dimen/add_button_margin" - android:enabled="false" - android:textColor="@color/color_font_btn_primary" - android:text="@string/save" /> - - </LinearLayout> - </RelativeLayout> - </LinearLayout> - -</RelativeLayout> 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 deleted file mode 100644 index 74904f36..00000000 --- a/app/src/main/res/layout/a_add_provider_tablet_scrollview.xml +++ /dev/null @@ -1,94 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<ScrollView android:orientation="vertical" - style="@style/BitmaskActivity" - android:layout_width="0dp" - android:layout_height="0dp" - app:layout_constraintBottom_toTopOf="@+id/guideline_bottom" - 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" - android:layout_margin="@dimen/stdpadding" - android:padding="@dimen/stdpadding" - android:background="@color/colorBackground" - android:isScrollContainer="true" - android:fadeScrollbars="false" - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - tools:viewBindingIgnore="true" - xmlns:tools="http://schemas.android.com/tools"> - - <LinearLayout - android:id="@+id/content" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical"> - - <se.leap.bitmaskclient.base.views.ProviderHeaderView - android:id="@+id/header" - android:layout_width="match_parent" - android:layout_height="wrap_content"/> - - <com.google.android.material.textfield.TextInputLayout - android:id="@+id/text_uri_error" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="@dimen/activity_vertical_margin" - android:hint="@string/new_provider_uri" - app:errorEnabled="true"> - - <com.google.android.material.textfield.TextInputEditText - android:id="@+id/text_uri" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:ems="10" - android:inputType="text" /> - - </com.google.android.material.textfield.TextInputLayout> - - <RelativeLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - > - <CheckBox - android:id="@+id/danger_checkbox" - android:layout_alignParentLeft="true" - android:layout_alignParentStart="true" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:visibility="gone" - android:layout_marginBottom="@dimen/add_button_margin"/> - - <LinearLayout - android:id="@+id/button_container" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:layout_alignParentEnd="true" - android:layout_alignParentRight="true" - android:gravity="right" - android:orientation="horizontal" - android:layout_below="@+id/danger_checkbox" - > - - <Button - android:id="@+id/button_cancel" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:minWidth="80dp" - android:textColor="@color/color_font_btn_primary" - android:text="@string/cancel" /> - - <Button - android:id="@+id/button_save" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:minWidth="80dp" - android:layout_marginLeft="@dimen/add_button_margin" - android:layout_marginStart="@dimen/add_button_margin" - android:textColor="@color/color_font_btn_primary" - android:enabled="false" - android:text="@string/save" /> - </LinearLayout> - </RelativeLayout> - </LinearLayout> -</ScrollView>
\ No newline at end of file diff --git a/app/src/main/res/layout/a_custom_provider_setup.xml b/app/src/main/res/layout/a_custom_provider_setup.xml deleted file mode 100644 index 0e4e3edf..00000000 --- a/app/src/main/res/layout/a_custom_provider_setup.xml +++ /dev/null @@ -1,32 +0,0 @@ -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" - xmlns:tools="http://schemas.android.com/tools" - android:id="@+id/custom_provider_setup_layout" - android:layout_width="match_parent" - android:layout_height="match_parent" - tools:context=".providersetup.activities.CustomProviderSetupActivity" - android:padding="@dimen/stdpadding" - style="@style/BitmaskActivity" - tools:viewBindingIgnore="true" - > - - <!-- a "content" view that is required for - ConfigWizardBaseActivities --> - <LinearLayout - android:orientation="horizontal" - android:layout_height="0dp" - android:layout_width="0dp" - android:id="@id/content"> - <se.leap.bitmaskclient.base.views.ProviderHeaderView - android:id="@+id/header" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:visibility="visible" - /> - </LinearLayout> - - <include layout="@layout/v_loading_screen" - android:visibility="visible" - /> - -</LinearLayout> 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 deleted file mode 100644 index 7e8cd51d..00000000 --- a/app/src/main/res/layout/a_custom_provider_setup_tablet_linear_layout.xml +++ /dev/null @@ -1,34 +0,0 @@ -<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" - android:layout_margin="@dimen/stdpadding" - android:padding="@dimen/stdpadding" - android:background="@color/colorBackground" - app:layout_constraintBottom_toTopOf="@+id/guideline_bottom" - 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" - tools:viewBindingIgnore="true"> - <!-- a "content" view that is required for - ConfigWizardBaseActivities --> - <LinearLayout - android:orientation="horizontal" - android:layout_height="0dp" - android:layout_width="0dp" - android:id="@id/content"> - <se.leap.bitmaskclient.base.views.ProviderHeaderView - android:id="@+id/header" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:visibility="visible" - /> - </LinearLayout> - - <include layout="@layout/v_loading_screen" - android:visibility="visible" - /> -</LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/a_provider_credentials.xml b/app/src/main/res/layout/a_provider_credentials.xml deleted file mode 100644 index 033aae16..00000000 --- a/app/src/main/res/layout/a_provider_credentials.xml +++ /dev/null @@ -1,53 +0,0 @@ -<?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:layout_width="match_parent" - android:layout_height="wrap_content" - android:padding="@dimen/stdpadding" - style="@style/BitmaskActivity" - tools:viewBindingIgnore="true"> - - <include layout="@layout/v_loading_screen" /> - - <LinearLayout - android:id="@+id/content" - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="match_parent" - > - - <se.leap.bitmaskclient.base.views.ProviderHeaderView - android:id="@+id/header" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> - - - <ScrollView - android:layout_height="match_parent" - android:layout_width="match_parent" - android:isScrollContainer="true" - > - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical"> - <include - layout="@layout/v_provider_credentials" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> - - <androidx.appcompat.widget.AppCompatButton - android:id="@+id/button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="end" - android:enabled="false" - android:textColor="@color/color_font_btn_primary" - android:text="@string/login_button" /> - - </LinearLayout> - </ScrollView> - </LinearLayout> -</LinearLayout> 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 deleted file mode 100644 index 73557853..00000000 --- a/app/src/main/res/layout/a_provider_credentials_tablet_linear_layout.xml +++ /dev/null @@ -1,59 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<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" - android:layout_height="0dp" - android:layout_margin="@dimen/stdpadding" - android:padding="@dimen/stdpadding" - android:background="@color/colorBackground" - app:layout_constraintBottom_toTopOf="@+id/guideline_bottom" - 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" - tools:viewBindingIgnore="true"> - - <include layout="@layout/v_loading_screen" /> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:id="@+id/content" - android:orientation="vertical"> - - <se.leap.bitmaskclient.base.views.ProviderHeaderView - android:id="@+id/header" - android:layout_width="match_parent" - android:layout_height="wrap_content"/> - - <ScrollView - android:layout_height="match_parent" - android:layout_width="match_parent" - android:isScrollContainer="true" - > - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical"> - <include - layout="@layout/v_provider_credentials" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> - - <androidx.appcompat.widget.AppCompatButton - android:id="@+id/button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="end" - android:enabled="false" - android:textColor="@color/color_font_btn_primary" - android:text="@string/login_button" /> - - </LinearLayout> - </ScrollView> - </LinearLayout> -</LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/a_provider_detail.xml b/app/src/main/res/layout/a_provider_detail.xml deleted file mode 100644 index 4a456c32..00000000 --- a/app/src/main/res/layout/a_provider_detail.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?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" - tools:viewBindingIgnore="true"> - - <include layout="@layout/v_loading_screen" /> - - <LinearLayout - android:id="@+id/content" - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <se.leap.bitmaskclient.base.views.ProviderHeaderView - android:id="@+id/header" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> - - <androidx.appcompat.widget.AppCompatTextView - android:id="@+id/provider_detail_description" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textStyle="normal" - android:textAppearance="?android:attr/textAppearanceSmall" - android:layout_marginTop="@dimen/standard_margin" - android:layout_marginBottom="@dimen/standard_margin" - /> - - <ListView - android:id="@+id/provider_detail_options" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="@dimen/standard_margin" - android:drawSelectorOnTop="false"/> - - </LinearLayout> -</LinearLayout>
\ No newline at end of file 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 deleted file mode 100644 index 5601a3d5..00000000 --- a/app/src/main/res/layout/a_provider_detail_tablet_linear_layout.xml +++ /dev/null @@ -1,51 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout android:orientation="vertical" - android:padding="@dimen/stdpadding" - style="@style/BitmaskActivity" - android:layout_width="0dp" - android:layout_height="0dp" - android:layout_margin="@dimen/stdpadding" - android:background="@color/colorBackground" - app:layout_constraintBottom_toTopOf="@+id/guideline_bottom" - 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" - xmlns:android="http://schemas.android.com/apk/res/android" - 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" /> - - <LinearLayout - android:id="@+id/content" - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="wrap_content"> - - <se.leap.bitmaskclient.base.views.ProviderHeaderView - android:id="@+id/header" - android:layout_width="match_parent" - android:layout_height="wrap_content"/> - - <androidx.appcompat.widget.AppCompatTextView - android:id="@+id/provider_detail_description" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textStyle="normal" - android:textAppearance="?android:attr/textAppearanceMedium" - android:layout_marginTop="@dimen/standard_margin" - android:layout_marginBottom="@dimen/standard_margin" - /> - - <ListView - android:id="@+id/provider_detail_options" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="@dimen/list_view_margin_top" - android:drawSelectorOnTop="false" - /> - - </LinearLayout> -</LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/a_provider_list.xml b/app/src/main/res/layout/a_provider_list.xml deleted file mode 100644 index 867d6d8d..00000000 --- a/app/src/main/res/layout/a_provider_list.xml +++ /dev/null @@ -1,34 +0,0 @@ -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" - android:id="@+id/provider_list_layout" - android:layout_width="match_parent" - android:layout_height="match_parent" - tools:context=".providersetup.ProviderListActivity" - android:padding="@dimen/stdpadding" - style="@style/BitmaskActivity" - tools:viewBindingIgnore="true"> - - <include layout="@layout/v_loading_screen" /> - - <LinearLayout - android:id="@+id/content" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> - - <se.leap.bitmaskclient.base.views.ProviderHeaderView - android:id="@+id/header" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> - - <ListView - android:id="@+id/provider_list" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:drawSelectorOnTop="false" - android:layout_marginTop="@dimen/standard_margin" - /> - - </LinearLayout> - -</RelativeLayout> 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 deleted file mode 100644 index 67f82976..00000000 --- a/app/src/main/res/layout/a_provider_list_tablet_linear_layout.xml +++ /dev/null @@ -1,41 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout android:orientation="vertical" - android:padding="@dimen/stdpadding" - style="@style/BitmaskActivity" - android:layout_width="0dp" - android:layout_height="0dp" - android:layout_margin="@dimen/stdpadding" - android:background="@color/colorBackground" - app:layout_constraintBottom_toTopOf="@+id/guideline_bottom" - 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" - 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" - tools:viewBindingIgnore="true"> - - <include layout="@layout/v_loading_screen" /> - - <LinearLayout - android:id="@+id/content" - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="wrap_content"> - - <se.leap.bitmaskclient.base.views.ProviderHeaderView - android:id="@+id/header" - android:layout_width="match_parent" - android:layout_height="wrap_content"/> - - <ListView - android:id="@+id/provider_list" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:drawSelectorOnTop="false" - android:layout_marginTop="@dimen/list_view_margin_top" - /> - - </LinearLayout> -</LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/d_checkbox_confirm.xml b/app/src/main/res/layout/d_checkbox_confirm.xml index d8811226..e55d5267 100644 --- a/app/src/main/res/layout/d_checkbox_confirm.xml +++ b/app/src/main/res/layout/d_checkbox_confirm.xml @@ -2,8 +2,7 @@ <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" - xmlns:tools="http://schemas.android.com/tools" - tools:viewBindingIgnore="true"> + xmlns:tools="http://schemas.android.com/tools"> <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 908c228f..6d87f1df 100644 --- a/app/src/main/res/layout/d_list_selection.xml +++ b/app/src/main/res/layout/d_list_selection.xml @@ -2,8 +2,7 @@ <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" - xmlns:tools="http://schemas.android.com/tools" - tools:viewBindingIgnore="true"> + xmlns:tools="http://schemas.android.com/tools"> <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 1260a99e..a4f3667a 100644 --- a/app/src/main/res/layout/donation_reminder_dialog.xml +++ b/app/src/main/res/layout/donation_reminder_dialog.xml @@ -4,8 +4,7 @@ android:layout_height="match_parent" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" - android:scrollbars="none" - tools:viewBindingIgnore="true"> + android:scrollbars="none"> <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 e0193c1b..190ac758 100644 --- a/app/src/main/res/layout/f_about.xml +++ b/app/src/main/res/layout/f_about.xml @@ -1,3 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> + <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:id="@+id/aboutLayout" @@ -8,8 +10,7 @@ android:layout_marginStart="@dimen/stdpadding" android:layout_marginRight="@dimen/stdpadding" android:layout_marginEnd="@dimen/stdpadding" - tools:context=".base.MainActivity" - tools:viewBindingIgnore="true"> + tools:context=".base.MainActivity"> <LinearLayout android:layout_width="match_parent" 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 60c5908c..46954b5e 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 @@ -1,10 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/item_container" android:layout_height="?android:attr/listPreferredItemHeightSmall" android:layout_width="match_parent" android:orientation="horizontal" - xmlns:tools="http://schemas.android.com/tools" - tools:viewBindingIgnore="true"> + xmlns:tools="http://schemas.android.com/tools"> <androidx.appcompat.widget.AppCompatImageView android:id="@+id/material_icon" diff --git a/app/src/main/res/layout/v_provider_credentials.xml b/app/src/main/res/layout/v_provider_credentials.xml deleted file mode 100644 index 189bace6..00000000 --- a/app/src/main/res/layout/v_provider_credentials.xml +++ /dev/null @@ -1,71 +0,0 @@ -<?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:tools="http://schemas.android.com/tools"> - - <androidx.appcompat.widget.AppCompatTextView - android:id="@+id/provider_credentials_user_message" - android:layout_width="match_parent" - android:layout_height="wrap_content" - style="@style/TextAppearance.Design.Error" - android:visibility="gone" - android:linksClickable="true" - tools:viewBindingIgnore="true" - /> - - <com.google.android.material.textfield.TextInputLayout - android:id="@+id/provider_credentials_username_error" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:hint="@string/auth_username" - app:errorEnabled="true" - android:layout_marginTop="@dimen/standard_margin" - app:errorTextAppearance="@style/error_appearance"> - - <com.google.android.material.textfield.TextInputEditText - android:id="@+id/provider_credentials_username" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:ems="10" - android:inputType="text" /> - - </com.google.android.material.textfield.TextInputLayout> - - <com.google.android.material.textfield.TextInputLayout - android:id="@+id/provider_credentials_password_error" - android:layout_width="match_parent" - android:layout_height="wrap_content" - app:passwordToggleEnabled="true" - android:hint="@string/password" - app:errorEnabled="true" - app:errorTextAppearance="@style/error_appearance"> - - <com.google.android.material.textfield.TextInputEditText - android:id="@+id/provider_credentials_password" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:inputType="textPassword" - /> - - </com.google.android.material.textfield.TextInputLayout> - - <com.google.android.material.textfield.TextInputLayout - android:id="@+id/provider_credentials_password_verification_error" - android:layout_width="match_parent" - android:layout_height="wrap_content" - app:passwordToggleEnabled="true" - android:hint="@string/password" - app:errorEnabled="true" - android:visibility="gone" - app:errorTextAppearance="@style/error_appearance"> - - <com.google.android.material.textfield.TextInputEditText - android:id="@+id/provider_credentials_password_verification" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:inputType="textPassword" - android:visibility="gone" - /> - - </com.google.android.material.textfield.TextInputLayout> -</merge>
\ No newline at end of file diff --git a/app/src/main/res/layout/v_provider_header.xml b/app/src/main/res/layout/v_provider_header.xml deleted file mode 100644 index 42f4f783..00000000 --- a/app/src/main/res/layout/v_provider_header.xml +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<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:tools="http://schemas.android.com/tools" - tools:viewBindingIgnore="true"> - - <androidx.appcompat.widget.AppCompatImageView - android:id="@+id/provider_header_logo" - android:layout_width="@dimen/bitmask_logo" - android:layout_height="@dimen/bitmask_logo" - android:adjustViewBounds="true" - app:srcCompat="@drawable/logo" /> - - <androidx.appcompat.widget.AppCompatTextView - android:id="@+id/provider_header_text" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_below="@id/provider_header_logo" - android:text="" - android:ellipsize="end" - android:gravity="center_vertical" - android:textAppearance="@style/Base.TextAppearance.AppCompat.Headline" - android:layout_marginTop="@dimen/standard_margin" - android:layout_marginBottom="@dimen/standard_margin" - /> - -</RelativeLayout> diff --git a/app/src/main/res/layout/v_provider_list_item.xml b/app/src/main/res/layout/v_provider_list_item.xml deleted file mode 100644 index 0e7cc7f3..00000000 --- a/app/src/main/res/layout/v_provider_list_item.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?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" - android:layout_width="match_parent" - 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" - android:layout_height="wrap_content" - android:paddingStart="?android:attr/listPreferredItemPaddingStart" - android:paddingLeft="?android:attr/listPreferredItemPaddingLeft" - android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" - android:paddingRight="?android:attr/listPreferredItemPaddingRight" - android:layout_marginTop="6dip" - android:textAppearance="?android:attr/textAppearanceListItem" - /> - - <androidx.appcompat.widget.AppCompatTextView android:id="@+id/provider_name" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingStart="?android:attr/listPreferredItemPaddingStart" - android:paddingLeft="?android:attr/listPreferredItemPaddingLeft" - android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" - android:paddingRight="?android:attr/listPreferredItemPaddingRight" - android:textAppearance="?android:attr/textAppearanceSmall" - /> - -</LinearLayout> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 56588bc1..5bddd094 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -237,4 +237,5 @@ <string name="title_setup_success">You\'re all set!</string> <string name="setup_success_description">Click the button below to connect</string> <string name="permission_rejected">Permission request rejected.</string> + <string name="login_not_supported">The current app version doesn\'t support logins, which you need to update your VPN certificate for this provider.</string> </resources> |