diff options
Diffstat (limited to 'app/src/main/res')
25 files changed, 103 insertions, 103 deletions
diff --git a/app/src/main/res/font/sofiapro_regular.otf b/app/src/main/res/font/sofiapro_regular.otf Binary files differnew file mode 100644 index 00000000..66d25156 --- /dev/null +++ b/app/src/main/res/font/sofiapro_regular.otf diff --git a/app/src/main/res/layout-xlarge/f_about.xml b/app/src/main/res/layout-xlarge/f_about.xml index 704a7319..e018c8fc 100644 --- a/app/src/main/res/layout-xlarge/f_about.xml +++ b/app/src/main/res/layout-xlarge/f_about.xml @@ -12,7 +12,7 @@ android:layout_height="wrap_content" android:orientation="vertical" > - <TextView + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/version" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -22,7 +22,7 @@ android:layout_width="match_parent" android:layout_height="12sp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/terms_of_service" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -31,7 +31,7 @@ android:paddingBottom="12dp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:textSize="18sp" @@ -42,14 +42,14 @@ android:layout_width="match_parent" android:layout_height="12sp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:textSize="18sp" android:autoLink="all" android:text="@string/repository_url_text" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:textSize="18sp" @@ -60,7 +60,7 @@ android:layout_width="match_parent" android:layout_height="18sp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:textSize="18sp" @@ -71,7 +71,7 @@ android:layout_width="match_parent" android:layout_height="12sp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:textSize="18sp" @@ -82,7 +82,7 @@ android:layout_width="match_parent" android:layout_height="18sp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:textSize="18sp" @@ -92,7 +92,7 @@ android:layout_width="match_parent" android:layout_height="20sp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:textSize="24sp" @@ -106,7 +106,7 @@ android:src="@drawable/openvpnLogo" /> --> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:textSize="18sp" @@ -116,14 +116,14 @@ android:layout_width="match_parent" android:layout_height="20sp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:textSize="24sp" android:text="@string/lzo" android:textAppearance="?android:attr/textAppearanceMedium" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:textSize="18sp" @@ -133,14 +133,14 @@ android:layout_width="match_parent" android:layout_height="20sp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:textSize="24sp" android:text="@string/openssl" android:textAppearance="?android:attr/textAppearanceMedium" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:textSize="18sp" @@ -149,14 +149,14 @@ android:layout_width="match_parent" android:layout_height="20sp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/okhttp" android:textSize="24sp" android:textAppearance="?android:attr/textAppearanceMedium" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:textSize="18sp" @@ -166,14 +166,14 @@ android:layout_width="match_parent" android:layout_height="20sp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/mbetTLS" android:textSize="24sp" android:textAppearance="?android:attr/textAppearanceMedium" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:textSize="18sp" @@ -184,14 +184,14 @@ android:layout_width="match_parent" android:layout_height="20sp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/asio" android:textSize="24sp" android:textAppearance="?android:attr/textAppearanceMedium" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:textSize="18sp" @@ -201,14 +201,14 @@ android:layout_width="match_parent" android:layout_height="20sp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/openvpn3" android:textSize="24sp" android:textAppearance="?android:attr/textAppearanceMedium" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:textSize="18sp" @@ -218,14 +218,14 @@ android:layout_width="match_parent" android:layout_height="20sp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/shapeshifter_library" android:textSize="24sp" android:textAppearance="?android:attr/textAppearanceMedium" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:textSize="18sp" @@ -235,14 +235,14 @@ android:layout_width="match_parent" android:layout_height="20sp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/shapeshifter_dispatcher" android:textSize="24sp" android:textAppearance="?android:attr/textAppearanceMedium" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:textSize="18sp" @@ -252,14 +252,14 @@ android:layout_width="match_parent" android:layout_height="20sp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/shapeshifter_transports" android:textSize="24sp" android:textAppearance="?android:attr/textAppearanceMedium" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:textSize="18sp" diff --git a/app/src/main/res/layout-xlarge/v_icon_text_list_item.xml b/app/src/main/res/layout-xlarge/v_icon_text_list_item.xml index 7d679ae3..b39540a6 100644 --- a/app/src/main/res/layout-xlarge/v_icon_text_list_item.xml +++ b/app/src/main/res/layout-xlarge/v_icon_text_list_item.xml @@ -15,7 +15,7 @@ tools:src="@drawable/ic_add_circle_outline_grey600_24dp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:id="@android:id/text1" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -34,7 +34,7 @@ android:layout_above="@+id/subtitle" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/subtitle" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/app/src/main/res/layout-xlarge/v_provider_list_item.xml b/app/src/main/res/layout-xlarge/v_provider_list_item.xml index ec1e1242..eea55be2 100644 --- a/app/src/main/res/layout-xlarge/v_provider_list_item.xml +++ b/app/src/main/res/layout-xlarge/v_provider_list_item.xml @@ -10,7 +10,7 @@ android:minHeight="?android:attr/listPreferredItemHeight" > - <TextView android:id="@+id/provider_domain" + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/provider_domain" android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingStart="?android:attr/listPreferredItemPaddingStart" @@ -21,7 +21,7 @@ android:textAppearance="?android:attr/textAppearanceLarge" /> - <TextView android:id="@+id/provider_name" + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/provider_name" android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingStart="?android:attr/listPreferredItemPaddingStart" diff --git a/app/src/main/res/layout-xlarge/v_single_list_item.xml b/app/src/main/res/layout-xlarge/v_single_list_item.xml index ad3de093..6a318ff5 100644 --- a/app/src/main/res/layout-xlarge/v_single_list_item.xml +++ b/app/src/main/res/layout-xlarge/v_single_list_item.xml @@ -14,7 +14,7 @@ limitations under the License. --> -<TextView xmlns:android="http://schemas.android.com/apk/res/android" +<androidx.appcompat.widget.AppCompatTextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/text1" 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 02e52d6d..f4c3e892 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 @@ -27,7 +27,7 @@ android:minHeight="?android:attr/listPreferredItemHeight" android:layout_width="wrap_content" android:layout_height="wrap_content"> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -41,7 +41,7 @@ android:textAppearance="?android:attr/textAppearanceListItem" tools:text=".,m.,msdflksdjflksjdflkjsdflksdlsdflkj lskjdf lkjsdf lkjsdf fsdls" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/subtitle" android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/app/src/main/res/layout-xlarge/v_vpn_status.xml b/app/src/main/res/layout-xlarge/v_vpn_status.xml index 3b464b62..ce8e6928 100644 --- a/app/src/main/res/layout-xlarge/v_vpn_status.xml +++ b/app/src/main/res/layout-xlarge/v_vpn_status.xml @@ -13,20 +13,20 @@ android:layout_height="wrap_content"/> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:text="@string/uploaded_data" style="@style/logWindowStatusTitle"/> - <TextView + <androidx.appcompat.widget.AppCompatTextView style="@style/logWindowStatusText" android:id="@+id/speedUp" tools:text="4 Mbit/s 6.7 GB"/> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:text="@string/downloaded_data" style="@style/logWindowStatusTitle"/> - <TextView + <androidx.appcompat.widget.AppCompatTextView style="@style/logWindowStatusText" android:id="@+id/speedDown" tools:text="2 Mbit/s 4.7 GB"/> @@ -38,11 +38,11 @@ android:layout_height="wrap_content"/> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:text="@string/vpn_status" style="@style/logWindowStatusTitle"/> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/speedStatus" tools:text="Connected to a very long ipv4 and 3483489348238824829482384928" diff --git a/app/src/main/res/layout/allowed_application_layout.xml b/app/src/main/res/layout/allowed_application_layout.xml index d8d846f9..f1556875 100644 --- a/app/src/main/res/layout/allowed_application_layout.xml +++ b/app/src/main/res/layout/allowed_application_layout.xml @@ -26,7 +26,7 @@ tools:background="@drawable/icon" android:contentDescription="@null" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView tools:text="@string/app" android:id="@+id/app_name" android:layout_width="0dip" @@ -45,14 +45,14 @@ android:layout_rowSpan="1" android:visibility="visible" /> -<!-- <TextView +<!-- <androidx.appcompat.widget.AppCompatTextView android:id="@+id/app_size" android:layout_width="0dip" android:layout_gravity="fill_horizontal|top" android:textAppearance="?android:attr/textAppearanceSmall" android:textAlignment="viewStart" /> --> - <!-- <TextView + <!-- <androidx.appcompat.widget.AppCompatTextView android:id="@+id/app_disabled" android:layout_marginStart="8dip" android:layout_gravity="top" diff --git a/app/src/main/res/layout/allowed_vpn_apps.xml b/app/src/main/res/layout/allowed_vpn_apps.xml index c1711d56..f76b5f4f 100644 --- a/app/src/main/res/layout/allowed_vpn_apps.xml +++ b/app/src/main/res/layout/allowed_vpn_apps.xml @@ -10,7 +10,7 @@ tools:ignore="RtlCompat" android:layout_height="match_parent"> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center" @@ -50,7 +50,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceSmall" diff --git a/app/src/main/res/layout/custom_toast.xml b/app/src/main/res/layout/custom_toast.xml index 70a9df8c..c267fb86 100644 --- a/app/src/main/res/layout/custom_toast.xml +++ b/app/src/main/res/layout/custom_toast.xml @@ -13,7 +13,7 @@ android:layout_marginRight="8dp" android:layout_gravity="center" /> - <TextView android:id="@+id/text" + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/text" android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium" android:layout_width="wrap_content" 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 3af36086..d6b6ea80 100644 --- a/app/src/main/res/layout/donation_reminder_dialog.xml +++ b/app/src/main/res/layout/donation_reminder_dialog.xml @@ -11,7 +11,7 @@ android:gravity="center" android:orientation="vertical"> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/tvTitle" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -24,7 +24,7 @@ android:textSize="28sp" android:textStyle="bold" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/tvMessage" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/app/src/main/res/layout/f_about.xml b/app/src/main/res/layout/f_about.xml index ec7369ef..b10cc555 100644 --- a/app/src/main/res/layout/f_about.xml +++ b/app/src/main/res/layout/f_about.xml @@ -12,7 +12,7 @@ android:layout_height="wrap_content" android:orientation="vertical" > - <TextView + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/version" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -22,7 +22,7 @@ android:layout_width="match_parent" android:layout_height="10sp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/terms_of_service" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -31,7 +31,7 @@ android:paddingBottom="12dp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:autoLink="all" @@ -41,7 +41,7 @@ android:layout_width="match_parent" android:layout_height="10sp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:autoLink="all" @@ -52,13 +52,13 @@ android:layout_width="match_parent" android:layout_height="10sp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:autoLink="all" android:text="@string/repository_url_text" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:autoLink="all" @@ -68,7 +68,7 @@ android:layout_width="match_parent" android:layout_height="10sp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:autoLink="all" @@ -78,7 +78,7 @@ android:layout_width="match_parent" android:layout_height="10sp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:autoLink="all" @@ -88,7 +88,7 @@ android:layout_width="match_parent" android:layout_height="10sp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/copyright_others" /> @@ -97,7 +97,7 @@ android:layout_width="match_parent" android:layout_height="10sp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/openvpn" @@ -110,7 +110,7 @@ android:src="@drawable/openvpnLogo" /> --> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/opevpn_copyright" /> @@ -119,13 +119,13 @@ android:layout_width="match_parent" android:layout_height="20sp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/lzo" android:textAppearance="?android:attr/textAppearanceMedium" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/lzo_copyright" /> @@ -134,13 +134,13 @@ android:layout_width="match_parent" android:layout_height="20sp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/openssl" android:textAppearance="?android:attr/textAppearanceMedium" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/copyright_openssl" /> @@ -149,13 +149,13 @@ android:layout_width="match_parent" android:layout_height="20sp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/okhttp" android:textAppearance="?android:attr/textAppearanceMedium" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/copyright_okhttp" /> @@ -164,13 +164,13 @@ android:layout_width="match_parent" android:layout_height="20sp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/mbetTLS" android:textAppearance="?android:attr/textAppearanceMedium" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:autoLink="web" @@ -180,13 +180,13 @@ android:layout_width="match_parent" android:layout_height="20sp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/asio" android:textAppearance="?android:attr/textAppearanceMedium" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/copyright_asio" /> @@ -195,13 +195,13 @@ android:layout_width="match_parent" android:layout_height="20sp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/openvpn3" android:textAppearance="?android:attr/textAppearanceMedium" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/copyright_openvpn3" /> @@ -210,13 +210,13 @@ android:layout_width="match_parent" android:layout_height="20sp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/shapeshifter_library" android:textAppearance="?android:attr/textAppearanceMedium" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/copyright_shapeshifter_library" /> @@ -225,13 +225,13 @@ android:layout_width="match_parent" android:layout_height="20sp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/shapeshifter_dispatcher" android:textAppearance="?android:attr/textAppearanceMedium" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/copyright_shapeshifter_dispatcher" /> @@ -240,13 +240,13 @@ android:layout_width="match_parent" android:layout_height="20sp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/shapeshifter_transports" android:textAppearance="?android:attr/textAppearanceMedium" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/copyright_shapeshifter_transports" /> @@ -255,13 +255,13 @@ android:layout_width="match_parent" android:layout_height="20sp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/circleImageView" android:textAppearance="?android:attr/textAppearanceMedium" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/copyright_circleImageView" /> diff --git a/app/src/main/res/layout/f_drawer_main.xml b/app/src/main/res/layout/f_drawer_main.xml index 97479ec3..65179857 100644 --- a/app/src/main/res/layout/f_drawer_main.xml +++ b/app/src/main/res/layout/f_drawer_main.xml @@ -108,7 +108,7 @@ android:visibility="gone" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/show_experimental_features" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/app/src/main/res/layout/f_log.xml b/app/src/main/res/layout/f_log.xml index 47a80e50..ac77abd5 100644 --- a/app/src/main/res/layout/f_log.xml +++ b/app/src/main/res/layout/f_log.xml @@ -21,7 +21,7 @@ <include layout="@layout/f_log_sliders"/> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:text="@string/speed_waiting" android:singleLine="true" android:id="@+id/speed" diff --git a/app/src/main/res/layout/f_log_sliders.xml b/app/src/main/res/layout/f_log_sliders.xml index 4196e243..ea444b3d 100644 --- a/app/src/main/res/layout/f_log_sliders.xml +++ b/app/src/main/res/layout/f_log_sliders.xml @@ -16,7 +16,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content"> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/log_verbosity_level"/> @@ -29,7 +29,7 @@ tools:max="5" android:indeterminate="false"/> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/timestamps"/> diff --git a/app/src/main/res/layout/v_custom_notification.xml b/app/src/main/res/layout/v_custom_notification.xml index e97fcbe2..e3996dcc 100644 --- a/app/src/main/res/layout/v_custom_notification.xml +++ b/app/src/main/res/layout/v_custom_notification.xml @@ -28,7 +28,7 @@ android:gravity="center_vertical" android:orientation="vertical"> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -36,7 +36,7 @@ tools:text="Bitmask - Amsterdam" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/message" 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 f38bac6e..801a372a 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 @@ -15,7 +15,7 @@ tools:src="@drawable/ic_bluetooth" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:id="@android:id/text1" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/app/src/main/res/layout/v_icon_text_list_item.xml b/app/src/main/res/layout/v_icon_text_list_item.xml index 0b2d5b11..06b70a2e 100644 --- a/app/src/main/res/layout/v_icon_text_list_item.xml +++ b/app/src/main/res/layout/v_icon_text_list_item.xml @@ -14,7 +14,7 @@ android:paddingLeft="?android:attr/listPreferredItemPaddingLeft" tools:src="@drawable/ic_add_circle_outline_grey600_24dp" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:id="@android:id/text1" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -33,7 +33,7 @@ android:layout_above="@+id/subtitle" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/subtitle" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/app/src/main/res/layout/v_log_item.xml b/app/src/main/res/layout/v_log_item.xml index 713c3b1f..5f809523 100644 --- a/app/src/main/res/layout/v_log_item.xml +++ b/app/src/main/res/layout/v_log_item.xml @@ -4,7 +4,7 @@ android:layout_height="wrap_content" android:layout_width="match_parent" > - <TextView + <androidx.appcompat.widget.AppCompatTextView android:id="@android:id/text1" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/app/src/main/res/layout/v_provider_list_item.xml b/app/src/main/res/layout/v_provider_list_item.xml index 1f0e135b..b4f41793 100644 --- a/app/src/main/res/layout/v_provider_list_item.xml +++ b/app/src/main/res/layout/v_provider_list_item.xml @@ -10,7 +10,7 @@ android:minHeight="?android:attr/listPreferredItemHeight" > - <TextView android:id="@+id/provider_domain" + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/provider_domain" android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingStart="?android:attr/listPreferredItemPaddingStart" @@ -21,7 +21,7 @@ android:textAppearance="?android:attr/textAppearanceListItem" /> - <TextView android:id="@+id/provider_name" + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/provider_name" android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingStart="?android:attr/listPreferredItemPaddingStart" diff --git a/app/src/main/res/layout/v_single_list_item.xml b/app/src/main/res/layout/v_single_list_item.xml index 652cb693..7b35bf7f 100644 --- a/app/src/main/res/layout/v_single_list_item.xml +++ b/app/src/main/res/layout/v_single_list_item.xml @@ -1,4 +1,4 @@ -<TextView xmlns:android="http://schemas.android.com/apk/res/android" +<androidx.appcompat.widget.AppCompatTextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/text1" 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 1686a99d..5bd4de1b 100644 --- a/app/src/main/res/layout/v_switch_list_item.xml +++ b/app/src/main/res/layout/v_switch_list_item.xml @@ -27,7 +27,7 @@ android:minHeight="?android:attr/listPreferredItemHeightSmall" android:layout_width="wrap_content" android:layout_height="wrap_content"> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -41,7 +41,7 @@ android:textAppearance="?android:attr/textAppearanceListItemSmall" tools:text=".,m.,msdflksdjflksjdflkjsdflksdlsdflkj lskjdf lkjsdf lkjsdf fsdls" /> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/subtitle" android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/app/src/main/res/layout/v_vpn_status.xml b/app/src/main/res/layout/v_vpn_status.xml index 3b464b62..ce8e6928 100644 --- a/app/src/main/res/layout/v_vpn_status.xml +++ b/app/src/main/res/layout/v_vpn_status.xml @@ -13,20 +13,20 @@ android:layout_height="wrap_content"/> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:text="@string/uploaded_data" style="@style/logWindowStatusTitle"/> - <TextView + <androidx.appcompat.widget.AppCompatTextView style="@style/logWindowStatusText" android:id="@+id/speedUp" tools:text="4 Mbit/s 6.7 GB"/> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:text="@string/downloaded_data" style="@style/logWindowStatusTitle"/> - <TextView + <androidx.appcompat.widget.AppCompatTextView style="@style/logWindowStatusText" android:id="@+id/speedDown" tools:text="2 Mbit/s 4.7 GB"/> @@ -38,11 +38,11 @@ android:layout_height="wrap_content"/> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:text="@string/vpn_status" style="@style/logWindowStatusTitle"/> - <TextView + <androidx.appcompat.widget.AppCompatTextView android:id="@+id/speedStatus" tools:text="Connected to a very long ipv4 and 3483489348238824829482384928" diff --git a/app/src/main/res/values-v21/themes.xml b/app/src/main/res/values-v21/themes.xml index 0a426ced..233eec9d 100644 --- a/app/src/main/res/values-v21/themes.xml +++ b/app/src/main/res/values-v21/themes.xml @@ -3,7 +3,7 @@ <style name="BitmaskTheme" parent="Theme.AppCompat.Light.NoActionBar"> <item name="colorPrimary">@color/colorPrimary</item> <item name="colorPrimaryDark">@color/colorPrimaryDark</item> - + <item name="android:fontFamily">@font/sofiapro_regular</item> <item name="textColorError">@color/colorError</item> <!-- progressBar color --> diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index ab489fc6..e54feaff 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -3,9 +3,9 @@ <style name="BitmaskTheme" parent="Theme.AppCompat.Light.NoActionBar"> <item name="colorPrimary">@color/colorPrimary</item> <item name="colorPrimaryDark">@color/colorPrimaryDark</item> + <item name="android:fontFamily">@font/sofiapro_regular</item> <item name="textColorError">@color/colorError</item> - <!-- progressBar color --> <item name="colorAccent">@color/colorPrimary</item> |