diff options
Diffstat (limited to 'app/src/main/res')
33 files changed, 157 insertions, 157 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 index 67aef3d6..2ec2f1b7 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 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" +<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" @@ -7,35 +7,35 @@ android:layout_height="match_parent" tools:context=".ProviderCredentialsBaseActivity"> - <android.support.v7.widget.AppCompatImageView + <androidx.appcompat.widget.AppCompatImageView android:layout_width="match_parent" android:layout_height="match_parent" app:srcCompat="@drawable/background_main" android:scaleType="centerCrop" /> - <android.support.constraint.Guideline + <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" /> - <android.support.constraint.Guideline + <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" /> - <android.support.constraint.Guideline + <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" /> - <android.support.constraint.Guideline + <androidx.constraintlayout.widget.Guideline android:id="@+id/guideline_bottom" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -43,4 +43,4 @@ app:layout_constraintGuide_percent="0.725" /> <include layout="@layout/a_add_provider_tablet_scrollview"/> -</android.support.constraint.ConstraintLayout>
\ No newline at end of file +</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 index f32cdd65..1f285968 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 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" +<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" @@ -8,35 +8,35 @@ android:layout_height="match_parent" tools:context=".CustomProviderSetupActivity"> - <android.support.v7.widget.AppCompatImageView + <androidx.appcompat.widget.AppCompatImageView android:layout_width="match_parent" android:layout_height="match_parent" app:srcCompat="@drawable/background_main" android:scaleType="centerCrop" /> - <android.support.constraint.Guideline + <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" /> - <android.support.constraint.Guideline + <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" /> - <android.support.constraint.Guideline + <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" /> - <android.support.constraint.Guideline + <androidx.constraintlayout.widget.Guideline android:id="@+id/guideline_bottom" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -45,4 +45,4 @@ <include layout="@layout/a_custom_provider_setup_tablet_linear_layout" /> -</android.support.constraint.ConstraintLayout> +</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 index ab140a2e..73c2131c 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 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" +<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" @@ -7,35 +7,35 @@ android:layout_height="match_parent" tools:context=".ProviderCredentialsBaseActivity"> - <android.support.v7.widget.AppCompatImageView + <androidx.appcompat.widget.AppCompatImageView android:layout_width="match_parent" android:layout_height="match_parent" app:srcCompat="@drawable/background_main" android:scaleType="centerCrop" /> - <android.support.constraint.Guideline + <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" /> - <android.support.constraint.Guideline + <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" /> - <android.support.constraint.Guideline + <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" /> - <android.support.constraint.Guideline + <androidx.constraintlayout.widget.Guideline android:id="@+id/guideline_bottom" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -43,4 +43,4 @@ app:layout_constraintGuide_percent="0.725" /> <include layout="@layout/a_provider_credentials_tablet_linear_layout"/> -</android.support.constraint.ConstraintLayout>
\ No newline at end of file +</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 index dac21eaf..cb2045c9 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 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" +<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" @@ -8,35 +8,35 @@ tools:context=".ProviderDetailActivity" style="@style/BitmaskActivity"> - <android.support.v7.widget.AppCompatImageView + <androidx.appcompat.widget.AppCompatImageView android:layout_width="match_parent" android:layout_height="match_parent" app:srcCompat="@drawable/background_main" android:scaleType="centerCrop" /> - <android.support.constraint.Guideline + <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" /> - <android.support.constraint.Guideline + <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" /> - <android.support.constraint.Guideline + <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" /> - <android.support.constraint.Guideline + <androidx.constraintlayout.widget.Guideline android:id="@+id/guideline_bottom" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -44,4 +44,4 @@ app:layout_constraintGuide_percent="0.725" /> <include layout="@layout/a_provider_detail_tablet_linear_layout" /> -</android.support.constraint.ConstraintLayout>
\ No newline at end of file +</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 index 61ea6882..94829b42 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 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" +<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" @@ -8,35 +8,35 @@ android:layout_height="match_parent" tools:context=".ProviderListActivity"> - <android.support.v7.widget.AppCompatImageView + <androidx.appcompat.widget.AppCompatImageView android:layout_width="match_parent" android:layout_height="match_parent" app:srcCompat="@drawable/background_main" android:scaleType="centerCrop" /> - <android.support.constraint.Guideline + <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" /> - <android.support.constraint.Guideline + <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" /> - <android.support.constraint.Guideline + <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" /> - <android.support.constraint.Guideline + <androidx.constraintlayout.widget.Guideline android:id="@+id/guideline_bottom" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -44,4 +44,4 @@ app:layout_constraintGuide_percent="0.725" /> <include layout="@layout/a_provider_list_tablet_linear_layout" /> -</android.support.constraint.ConstraintLayout> +</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 index 4e6abd3d..8cfd43c5 100644 --- a/app/src/main/res/layout-xlarge/a_add_provider.xml +++ b/app/src/main/res/layout-xlarge/a_add_provider.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" +<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" @@ -7,35 +7,35 @@ android:layout_height="match_parent" tools:context=".ProviderCredentialsBaseActivity"> - <android.support.v7.widget.AppCompatImageView + <androidx.appcompat.widget.AppCompatImageView android:layout_width="match_parent" android:layout_height="match_parent" app:srcCompat="@drawable/background_main" android:scaleType="centerCrop" /> - <android.support.constraint.Guideline + <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" /> - <android.support.constraint.Guideline + <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" /> - <android.support.constraint.Guideline + <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" /> - <android.support.constraint.Guideline + <androidx.constraintlayout.widget.Guideline android:id="@+id/guideline_bottom" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -43,4 +43,4 @@ app:layout_constraintGuide_percent="0.85" /> <include layout="@layout/a_add_provider_tablet_scrollview"/> -</android.support.constraint.ConstraintLayout>
\ No newline at end of file +</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 index a6578c2a..7c9a1798 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 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" +<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" @@ -8,35 +8,35 @@ android:layout_height="match_parent" tools:context=".CustomProviderSetupActivity"> - <android.support.v7.widget.AppCompatImageView + <androidx.appcompat.widget.AppCompatImageView android:layout_width="match_parent" android:layout_height="match_parent" app:srcCompat="@drawable/background_main" android:scaleType="centerCrop" /> - <android.support.constraint.Guideline + <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" /> - <android.support.constraint.Guideline + <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" /> - <android.support.constraint.Guideline + <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" /> - <android.support.constraint.Guideline + <androidx.constraintlayout.widget.Guideline android:id="@+id/guideline_bottom" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -45,4 +45,4 @@ <include layout="@layout/a_custom_provider_setup_tablet_linear_layout" /> -</android.support.constraint.ConstraintLayout> +</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 index 02ad25f9..2cf9e16a 100644 --- a/app/src/main/res/layout-xlarge/a_provider_credentials.xml +++ b/app/src/main/res/layout-xlarge/a_provider_credentials.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" +<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" @@ -7,35 +7,35 @@ android:layout_height="match_parent" tools:context=".ProviderCredentialsBaseActivity"> - <android.support.v7.widget.AppCompatImageView + <androidx.appcompat.widget.AppCompatImageView android:layout_width="match_parent" android:layout_height="match_parent" app:srcCompat="@drawable/background_main" android:scaleType="centerCrop" /> - <android.support.constraint.Guideline + <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" /> - <android.support.constraint.Guideline + <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" /> - <android.support.constraint.Guideline + <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" /> - <android.support.constraint.Guideline + <androidx.constraintlayout.widget.Guideline android:id="@+id/guideline_bottom" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -43,4 +43,4 @@ app:layout_constraintGuide_percent="0.85" /> <include layout="@layout/a_provider_credentials_tablet_linear_layout"/> -</android.support.constraint.ConstraintLayout>
\ No newline at end of file +</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 index 75aa8bbd..bead7d92 100644 --- a/app/src/main/res/layout-xlarge/a_provider_detail.xml +++ b/app/src/main/res/layout-xlarge/a_provider_detail.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" +<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" @@ -8,35 +8,35 @@ tools:context=".ProviderDetailActivity" style="@style/BitmaskActivity"> - <android.support.v7.widget.AppCompatImageView + <androidx.appcompat.widget.AppCompatImageView android:layout_width="match_parent" android:layout_height="match_parent" app:srcCompat="@drawable/background_main" android:scaleType="centerCrop" /> - <android.support.constraint.Guideline + <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" /> - <android.support.constraint.Guideline + <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" /> - <android.support.constraint.Guideline + <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" /> - <android.support.constraint.Guideline + <androidx.constraintlayout.widget.Guideline android:id="@+id/guideline_bottom" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -44,4 +44,4 @@ app:layout_constraintGuide_percent="0.85" /> <include layout="@layout/a_provider_detail_tablet_linear_layout" /> -</android.support.constraint.ConstraintLayout>
\ No newline at end of file +</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 index 7bdcba9e..58d75246 100644 --- a/app/src/main/res/layout-xlarge/a_provider_list.xml +++ b/app/src/main/res/layout-xlarge/a_provider_list.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" +<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" @@ -8,35 +8,35 @@ android:layout_height="match_parent" tools:context=".ProviderListActivity"> - <android.support.v7.widget.AppCompatImageView + <androidx.appcompat.widget.AppCompatImageView android:layout_width="match_parent" android:layout_height="match_parent" app:srcCompat="@drawable/background_main" android:scaleType="centerCrop" /> - <android.support.constraint.Guideline + <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" /> - <android.support.constraint.Guideline + <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" /> - <android.support.constraint.Guideline + <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" /> - <android.support.constraint.Guideline + <androidx.constraintlayout.widget.Guideline android:id="@+id/guideline_bottom" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -44,4 +44,4 @@ app:layout_constraintGuide_percent="0.85" /> <include layout="@layout/a_provider_list_tablet_linear_layout" /> -</android.support.constraint.ConstraintLayout> +</androidx.constraintlayout.widget.ConstraintLayout> diff --git a/app/src/main/res/layout-xlarge/f_eip.xml b/app/src/main/res/layout-xlarge/f_eip.xml index 1c355d58..fdaab8ca 100644 --- a/app/src/main/res/layout-xlarge/f_eip.xml +++ b/app/src/main/res/layout-xlarge/f_eip.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" +<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:layout_width="match_parent" @@ -7,7 +7,7 @@ android:id="@+id/eipServiceFragment" > - <android.support.constraint.Guideline + <androidx.constraintlayout.widget.Guideline android:id="@+id/guideline_horizontal_top" android:layout_width="0dp" android:layout_height="0dp" @@ -17,7 +17,7 @@ app:layout_constraintGuide_percent="0.3" /> - <android.support.constraint.Guideline + <androidx.constraintlayout.widget.Guideline android:id="@+id/guideline_vertical_left" android:layout_width="0dp" android:layout_height="0dp" @@ -27,7 +27,7 @@ /> - <android.support.constraint.Guideline + <androidx.constraintlayout.widget.Guideline android:id="@+id/guideline_horizontal_bottom" android:layout_width="0dp" android:layout_height="0dp" @@ -37,7 +37,7 @@ app:layout_constraintGuide_percent="0.7" /> - <android.support.constraint.Guideline + <androidx.constraintlayout.widget.Guideline android:id="@+id/guideline_vertical_right" android:layout_width="0dp" android:layout_height="0dp" @@ -46,7 +46,7 @@ app:layout_constraintGuide_percent="0.7" /> - <android.support.v7.widget.AppCompatImageView + <androidx.appcompat.widget.AppCompatImageView android:id="@+id/background" android:layout_width="match_parent" android:layout_height="match_parent" @@ -54,7 +54,7 @@ app:srcCompat="@drawable/background_eip" /> - <android.support.v7.widget.AppCompatTextView + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/eipLabel" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -80,7 +80,7 @@ app:layout_constraintTop_toTopOf="@+id/guideline_horizontal_top" app:layout_constraintDimensionRatio="1:1" /> - <android.support.v7.widget.AppCompatButton + <androidx.appcompat.widget.AppCompatButton android:id="@+id/vpn_main_button" android:layout_width="wrap_content" android:layout_height="40dp" @@ -101,7 +101,7 @@ style="@style/BitmaskButtonBlack" /> - <android.support.v7.widget.AppCompatTextView + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/routed_text" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -116,7 +116,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/eipLabel" /> - <android.support.v7.widget.AppCompatTextView + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/vpn_route" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -129,4 +129,4 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/routed_text" /> -</android.support.constraint.ConstraintLayout> +</androidx.constraintlayout.widget.ConstraintLayout> 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 2af6b411..a002665f 100644 --- a/app/src/main/res/layout-xlarge/v_loading_screen.xml +++ b/app/src/main/res/layout-xlarge/v_loading_screen.xml @@ -7,7 +7,7 @@ android:orientation="vertical" android:visibility="gone"> - <android.support.v7.widget.AppCompatImageView + <androidx.appcompat.widget.AppCompatImageView android:layout_width="32dp" android:layout_height="32dp" android:adjustViewBounds="true" @@ -17,7 +17,7 @@ android:layout_marginBottom="@dimen/loading_screen_icon_vertical_margin" /> - <android.support.v7.widget.AppCompatTextView + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/progressbar_description" android:layout_width="wrap_content" android:layout_height="wrap_content" 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 cbd5813c..6d826783 100644 --- a/app/src/main/res/layout-xlarge/v_provider_header.xml +++ b/app/src/main/res/layout-xlarge/v_provider_header.xml @@ -4,14 +4,14 @@ android:layout_width="match_parent" xmlns:app="http://schemas.android.com/apk/res-auto" > - <android.support.v7.widget.AppCompatImageView + <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" /> - <android.support.v7.widget.AppCompatTextView + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/provider_header_text" android:layout_width="match_parent" android:layout_height="wrap_content" 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 8ad83650..3fa2ac7d 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 @@ -5,7 +5,7 @@ android:layout_width="match_parent" > - <android.support.v7.widget.AppCompatImageView + <androidx.appcompat.widget.AppCompatImageView android:id="@+id/material_icon" android:layout_width="?android:attr/listPreferredItemHeight" android:layout_height="?android:attr/listPreferredItemHeight" @@ -54,7 +54,7 @@ android:layout_toRightOf="@+id/material_icon" /> - <android.support.v7.widget.SwitchCompat + <androidx.appcompat.widget.SwitchCompat android:id="@+id/option_switch" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/app/src/main/res/layout/a_add_provider.xml b/app/src/main/res/layout/a_add_provider.xml index c1322bef..eab1693e 100644 --- a/app/src/main/res/layout/a_add_provider.xml +++ b/app/src/main/res/layout/a_add_provider.xml @@ -23,7 +23,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content"/> - <android.support.design.widget.TextInputLayout + <com.google.android.material.textfield.TextInputLayout android:id="@+id/text_uri_error" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -31,14 +31,14 @@ android:hint="@string/new_provider_uri" app:errorEnabled="true"> - <android.support.design.widget.TextInputEditText + <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" /> - </android.support.design.widget.TextInputLayout> + </com.google.android.material.textfield.TextInputLayout> <RelativeLayout android:layout_width="match_parent" 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 4510af7d..31c8d07c 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 @@ -28,7 +28,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content"/> - <android.support.design.widget.TextInputLayout + <com.google.android.material.textfield.TextInputLayout android:id="@+id/text_uri_error" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -36,14 +36,14 @@ android:hint="@string/new_provider_uri" app:errorEnabled="true"> - <android.support.design.widget.TextInputEditText + <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" /> - </android.support.design.widget.TextInputLayout> + </com.google.android.material.textfield.TextInputLayout> <RelativeLayout android:layout_width="match_parent" diff --git a/app/src/main/res/layout/a_main.xml b/app/src/main/res/layout/a_main.xml index 0344e5af..1977be74 100644 --- a/app/src/main/res/layout/a_main.xml +++ b/app/src/main/res/layout/a_main.xml @@ -1,5 +1,5 @@ <!-- A DrawerLayout is intended to be used as the top-level content view using match_parent for both width and height to consume the full space available. --> -<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android" +<androidx.drawerlayout.widget.DrawerLayout 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/drawer_layout" @@ -15,7 +15,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - <android.support.v7.widget.Toolbar + <androidx.appcompat.widget.Toolbar android:id="@+id/toolbar" android:minHeight="?attr/actionBarSize" android:layout_width="match_parent" @@ -23,7 +23,7 @@ app:titleTextColor="@color/colorActionBarTitleFont" app:subtitleTextColor="@color/colorActionBarSubtitleFont" android:background="?attr/colorPrimary"> - </android.support.v7.widget.Toolbar> + </androidx.appcompat.widget.Toolbar> <FrameLayout android:id="@+id/main_container" @@ -40,4 +40,4 @@ android:layout_gravity="start" tools:layout="@layout/f_drawer_main" /> -</android.support.v4.widget.DrawerLayout> +</androidx.drawerlayout.widget.DrawerLayout> diff --git a/app/src/main/res/layout/a_provider_credentials.xml b/app/src/main/res/layout/a_provider_credentials.xml index 99287cfe..93f44208 100644 --- a/app/src/main/res/layout/a_provider_credentials.xml +++ b/app/src/main/res/layout/a_provider_credentials.xml @@ -37,7 +37,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" /> - <android.support.v7.widget.AppCompatButton + <androidx.appcompat.widget.AppCompatButton android:id="@+id/button" android:layout_width="wrap_content" android:layout_height="wrap_content" 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 486d0419..bf022d51 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 @@ -43,7 +43,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" /> - <android.support.v7.widget.AppCompatButton + <androidx.appcompat.widget.AppCompatButton android:id="@+id/button" android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/app/src/main/res/layout/a_provider_detail.xml b/app/src/main/res/layout/a_provider_detail.xml index 11f4957d..840d60df 100644 --- a/app/src/main/res/layout/a_provider_detail.xml +++ b/app/src/main/res/layout/a_provider_detail.xml @@ -20,7 +20,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" /> - <android.support.v7.widget.AppCompatTextView + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/provider_detail_description" android:layout_width="wrap_content" android:layout_height="wrap_content" 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 14400672..51c5ab0f 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 @@ -28,7 +28,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content"/> - <android.support.v7.widget.AppCompatTextView + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/provider_detail_description" android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/app/src/main/res/layout/d_checkbox_confirm.xml b/app/src/main/res/layout/d_checkbox_confirm.xml index a9a84c0e..b2b61eca 100644 --- a/app/src/main/res/layout/d_checkbox_confirm.xml +++ b/app/src/main/res/layout/d_checkbox_confirm.xml @@ -10,7 +10,7 @@ xmlns:tools="http://schemas.android.com/tools" android:orientation="vertical"> - <android.support.v7.widget.AppCompatTextView + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/tvTitle" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -36,7 +36,7 @@ android:textSize="17sp" /> - <android.support.v7.widget.AppCompatTextView + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/block_vpn_user_message" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/app/src/main/res/layout/d_list_selection.xml b/app/src/main/res/layout/d_list_selection.xml index ef963303..d9a1b013 100644 --- a/app/src/main/res/layout/d_list_selection.xml +++ b/app/src/main/res/layout/d_list_selection.xml @@ -10,7 +10,7 @@ xmlns:tools="http://schemas.android.com/tools" android:orientation="vertical"> - <android.support.v7.widget.AppCompatTextView + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/tvTitle" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -23,7 +23,7 @@ android:textStyle="bold" /> - <android.support.v7.widget.AppCompatTextView + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/user_message" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -34,7 +34,7 @@ android:textSize="17sp" /> - <android.support.v7.widget.RecyclerView + <androidx.recyclerview.widget.RecyclerView android:id="@+id/selection_list_view" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/app/src/main/res/layout/donation_reminder_dialog.xml b/app/src/main/res/layout/donation_reminder_dialog.xml index 7a41474a..dc16906b 100644 --- a/app/src/main/res/layout/donation_reminder_dialog.xml +++ b/app/src/main/res/layout/donation_reminder_dialog.xml @@ -32,7 +32,7 @@ android:gravity="center" android:text="@string/donate_message" /> - <android.support.v7.widget.CardView + <androidx.cardview.widget.CardView android:layout_width="120dp" android:layout_height="120dp" android:innerRadius="0dp" @@ -44,7 +44,7 @@ android:layout_height="match_parent" android:scaleType="centerCrop" app:srcCompat="@drawable/donation_img" /> - </android.support.v7.widget.CardView> + </androidx.cardview.widget.CardView> <Button diff --git a/app/src/main/res/layout/f_drawer_main.xml b/app/src/main/res/layout/f_drawer_main.xml index 7e6291b7..5a0977da 100644 --- a/app/src/main/res/layout/f_drawer_main.xml +++ b/app/src/main/res/layout/f_drawer_main.xml @@ -20,7 +20,7 @@ android:layout_width="match_parent" android:layout_height="150dp"> - <android.support.v7.widget.AppCompatImageView + <androidx.appcompat.widget.AppCompatImageView android:id="@+id/background" android:layout_width="match_parent" android:layout_height="match_parent" @@ -29,7 +29,7 @@ android:scaleType="fitXY" app:srcCompat="@drawable/background_drawer" /> - <android.support.v7.widget.AppCompatImageView + <androidx.appcompat.widget.AppCompatImageView android:id="@+id/foreground" android:layout_width="match_parent" android:layout_height="match_parent" diff --git a/app/src/main/res/layout/f_eip.xml b/app/src/main/res/layout/f_eip.xml index 960c6fca..01feb0cd 100644 --- a/app/src/main/res/layout/f_eip.xml +++ b/app/src/main/res/layout/f_eip.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> -<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" +<androidx.constraintlayout.widget.ConstraintLayout 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" xmlns:tools="http://schemas.android.com/tools" android:id="@+id/eipServiceFragment"> - <android.support.constraint.Guideline + <androidx.constraintlayout.widget.Guideline android:id="@+id/guideline_horizontal_top" android:layout_width="0dp" android:layout_height="0dp" @@ -16,7 +16,7 @@ app:layout_constraintGuide_percent="0.225" /> - <android.support.constraint.Guideline + <androidx.constraintlayout.widget.Guideline android:id="@+id/guideline_vertical_left" android:layout_width="0dp" android:layout_height="0dp" @@ -26,7 +26,7 @@ /> - <android.support.constraint.Guideline + <androidx.constraintlayout.widget.Guideline android:id="@+id/guideline_horizontal_bottom" android:layout_width="0dp" android:layout_height="0dp" @@ -36,7 +36,7 @@ app:layout_constraintGuide_percent="0.775" /> - <android.support.constraint.Guideline + <androidx.constraintlayout.widget.Guideline android:id="@+id/guideline_vertical_right" android:layout_width="0dp" android:layout_height="0dp" @@ -45,7 +45,7 @@ app:layout_constraintGuide_percent="0.775" /> - <android.support.v7.widget.AppCompatImageView + <androidx.appcompat.widget.AppCompatImageView android:id="@+id/background" android:layout_width="match_parent" android:layout_height="match_parent" @@ -53,7 +53,7 @@ app:srcCompat="@drawable/background_eip" /> - <android.support.v7.widget.AppCompatTextView + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/eipLabel" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -82,7 +82,7 @@ app:layout_constraintDimensionRatio="1:1" /> - <android.support.v7.widget.AppCompatButton + <androidx.appcompat.widget.AppCompatButton android:id="@+id/vpn_main_button" android:layout_width="wrap_content" android:layout_height="32dp" @@ -103,7 +103,7 @@ style="@style/BitmaskButtonBlack" /> - <android.support.v7.widget.AppCompatTextView + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/routed_text" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -119,7 +119,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/eipLabel" /> - <android.support.v7.widget.AppCompatTextView + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/vpn_route" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -132,4 +132,4 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/routed_text" /> -</android.support.constraint.ConstraintLayout> +</androidx.constraintlayout.widget.ConstraintLayout> diff --git a/app/src/main/res/layout/v_add_provider.xml b/app/src/main/res/layout/v_add_provider.xml index 44146fb5..afcae4af 100644 --- a/app/src/main/res/layout/v_add_provider.xml +++ b/app/src/main/res/layout/v_add_provider.xml @@ -7,7 +7,7 @@ android:orientation="vertical" android:visibility="gone"> - <android.support.v7.widget.AppCompatImageView + <androidx.appcompat.widget.AppCompatImageView android:layout_width="wrap_content" android:layout_height="wrap_content" android:adjustViewBounds="true" @@ -17,7 +17,7 @@ android:layout_marginBottom="@dimen/loading_screen_icon_vertical_margin" /> - <android.support.v7.widget.AppCompatTextView + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/progressbar_description" android:layout_width="wrap_content" android:layout_height="wrap_content" 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 2fa56b46..f38bac6e 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 @@ -5,7 +5,7 @@ android:orientation="horizontal" xmlns:tools="http://schemas.android.com/tools"> - <android.support.v7.widget.AppCompatImageView + <androidx.appcompat.widget.AppCompatImageView android:id="@+id/material_icon" android:layout_width="?android:attr/listPreferredItemHeightSmall" android:layout_height="?android:attr/listPreferredItemHeightSmall" @@ -31,7 +31,7 @@ android:layout_toRightOf="@+id/material_icon" /> - <android.support.v7.widget.AppCompatImageView + <androidx.appcompat.widget.AppCompatImageView android:id="@+id/checked_icon" android:layout_width="?android:attr/listPreferredItemHeightSmall" android:layout_height="?android:attr/listPreferredItemHeightSmall" diff --git a/app/src/main/res/layout/v_loading_screen.xml b/app/src/main/res/layout/v_loading_screen.xml index f4c7eb95..a3498e97 100644 --- a/app/src/main/res/layout/v_loading_screen.xml +++ b/app/src/main/res/layout/v_loading_screen.xml @@ -7,7 +7,7 @@ android:orientation="vertical" android:visibility="gone"> - <android.support.v7.widget.AppCompatImageView + <androidx.appcompat.widget.AppCompatImageView android:layout_width="wrap_content" android:layout_height="wrap_content" android:adjustViewBounds="true" @@ -17,7 +17,7 @@ android:layout_marginBottom="@dimen/loading_screen_icon_vertical_margin" /> - <android.support.v7.widget.AppCompatTextView + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/progressbar_description" android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/app/src/main/res/layout/v_main_button.xml b/app/src/main/res/layout/v_main_button.xml index 06504f3c..d8ae211c 100644 --- a/app/src/main/res/layout/v_main_button.xml +++ b/app/src/main/res/layout/v_main_button.xml @@ -1,33 +1,33 @@ <?xml version="1.0" encoding="utf-8"?> -<android.support.constraint.ConstraintLayout +<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" xmlns:app="http://schemas.android.com/apk/res-auto"> - <android.support.constraint.Guideline + <androidx.constraintlayout.widget.Guideline android:id="@+id/vpn_btn_guideline_left" android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="vertical" app:layout_constraintGuide_percent="0.125" /> - <android.support.constraint.Guideline + <androidx.constraintlayout.widget.Guideline android:id="@+id/vpn_btn_guideline_right" android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="vertical" app:layout_constraintGuide_percent="0.875" /> - <android.support.constraint.Guideline + <androidx.constraintlayout.widget.Guideline android:id="@+id/vpn_btn_guideline_top" android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="horizontal" app:layout_constraintGuide_percent="0.125" /> - <android.support.constraint.Guideline + <androidx.constraintlayout.widget.Guideline android:id="@+id/vpn_btn_guideline_bottom" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -35,56 +35,56 @@ app:layout_constraintGuide_percent="0.875" /> - <android.support.constraint.Guideline + <androidx.constraintlayout.widget.Guideline android:id="@+id/icn_guideline_left" android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="vertical" app:layout_constraintGuide_percent="0.2" /> - <android.support.constraint.Guideline + <androidx.constraintlayout.widget.Guideline android:id="@+id/icn_guideline_right" android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="vertical" app:layout_constraintGuide_percent="0.8" /> - <android.support.constraint.Guideline + <androidx.constraintlayout.widget.Guideline android:id="@+id/icn_guideline_top" android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="horizontal" app:layout_constraintGuide_percent="0.2" /> - <android.support.constraint.Guideline + <androidx.constraintlayout.widget.Guideline android:id="@+id/icn_guideline_bottom" android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="horizontal" app:layout_constraintGuide_percent="0.8" /> - <android.support.constraint.Guideline + <androidx.constraintlayout.widget.Guideline android:id="@+id/border_guideline_left" android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="vertical" app:layout_constraintGuide_percent="0.025" /> - <android.support.constraint.Guideline + <androidx.constraintlayout.widget.Guideline android:id="@+id/border_guideline_right" android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="vertical" app:layout_constraintGuide_percent="0.975" /> - <android.support.constraint.Guideline + <androidx.constraintlayout.widget.Guideline android:id="@+id/border_guideline_top" android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="horizontal" app:layout_constraintGuide_percent="0.025" /> - <android.support.constraint.Guideline + <androidx.constraintlayout.widget.Guideline android:id="@+id/border_guideline_bottom" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -109,7 +109,7 @@ android:indeterminateBehavior="cycle" /> - <android.support.v7.widget.AppCompatImageView + <androidx.appcompat.widget.AppCompatImageView android:id="@+id/circle" android:layout_width="0dp" android:layout_height="0dp" @@ -119,7 +119,7 @@ app:layout_constraintTop_toTopOf="@+id/vpn_btn_guideline_top" app:srcCompat="@drawable/black_circle" /> - <android.support.v7.widget.AppCompatImageView + <androidx.appcompat.widget.AppCompatImageView android:id="@+id/vpn_state_key" android:layout_width="0dp" android:layout_height="0dp" @@ -129,4 +129,4 @@ app:layout_constraintTop_toTopOf="@id/icn_guideline_top" app:srcCompat="@drawable/vpn_connected" /> -</android.support.constraint.ConstraintLayout>
\ No newline at end of file +</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/v_provider_credentials.xml b/app/src/main/res/layout/v_provider_credentials.xml index 65f554aa..be40c233 100644 --- a/app/src/main/res/layout/v_provider_credentials.xml +++ b/app/src/main/res/layout/v_provider_credentials.xml @@ -2,7 +2,7 @@ <merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto"> - <android.support.v7.widget.AppCompatTextView + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/provider_credentials_user_message" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -11,7 +11,7 @@ android:linksClickable="true" /> - <android.support.design.widget.TextInputLayout + <com.google.android.material.textfield.TextInputLayout android:id="@+id/provider_credentials_username_error" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -20,16 +20,16 @@ android:layout_marginTop="@dimen/standard_margin" app:errorTextAppearance="@style/error_appearance"> - <android.support.design.widget.TextInputEditText + <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" /> - </android.support.design.widget.TextInputLayout> + </com.google.android.material.textfield.TextInputLayout> - <android.support.design.widget.TextInputLayout + <com.google.android.material.textfield.TextInputLayout android:id="@+id/provider_credentials_password_error" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -38,16 +38,16 @@ app:errorEnabled="true" app:errorTextAppearance="@style/error_appearance"> - <android.support.design.widget.TextInputEditText + <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" /> - </android.support.design.widget.TextInputLayout> + </com.google.android.material.textfield.TextInputLayout> - <android.support.design.widget.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" @@ -57,7 +57,7 @@ android:visibility="gone" app:errorTextAppearance="@style/error_appearance"> - <android.support.design.widget.TextInputEditText + <com.google.android.material.textfield.TextInputEditText android:id="@+id/provider_credentials_password_verification" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -65,5 +65,5 @@ android:visibility="gone" /> - </android.support.design.widget.TextInputLayout> + </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 index 823f3163..e0961ea6 100644 --- a/app/src/main/res/layout/v_provider_header.xml +++ b/app/src/main/res/layout/v_provider_header.xml @@ -4,14 +4,14 @@ android:layout_width="match_parent" xmlns:app="http://schemas.android.com/apk/res-auto" > - <android.support.v7.widget.AppCompatImageView + <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" /> - <android.support.v7.widget.AppCompatTextView + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/provider_header_text" android:layout_width="match_parent" android:layout_height="wrap_content" 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 6a2e4a8d..b595e7ce 100644 --- a/app/src/main/res/layout/v_switch_list_item.xml +++ b/app/src/main/res/layout/v_switch_list_item.xml @@ -5,7 +5,7 @@ android:layout_width="match_parent" > - <android.support.v7.widget.AppCompatImageView + <androidx.appcompat.widget.AppCompatImageView android:id="@+id/material_icon" android:layout_width="?android:attr/listPreferredItemHeightSmall" android:layout_height="?android:attr/listPreferredItemHeightSmall" @@ -54,7 +54,7 @@ android:layout_toRightOf="@+id/material_icon" /> - <android.support.v7.widget.SwitchCompat + <androidx.appcompat.widget.SwitchCompat android:id="@+id/option_switch" android:layout_width="match_parent" android:layout_height="wrap_content" |