From 31a7b66d7c6c04a7ee7cccbe5d6ed059cd3a054e Mon Sep 17 00:00:00 2001 From: cyBerta Date: Thu, 25 Nov 2021 14:09:15 +0100 Subject: show grey footer in navigation drawer, if there's enough place --- app/src/main/res/layout/f_drawer_main.xml | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'app/src/main/res') diff --git a/app/src/main/res/layout/f_drawer_main.xml b/app/src/main/res/layout/f_drawer_main.xml index bd7e66ae..bf418bc0 100644 --- a/app/src/main/res/layout/f_drawer_main.xml +++ b/app/src/main/res/layout/f_drawer_main.xml @@ -116,6 +116,12 @@ app:text="@string/about_fragment_title" app:icon="@drawable/ic_about_36" /> + -- cgit v1.2.3 From 63b83310a1d24003286b3610f3ae138d12784c00 Mon Sep 17 00:00:00 2001 From: cyBerta Date: Thu, 25 Nov 2021 14:32:29 +0100 Subject: fix location selection buttons on tablets --- app/src/main/res/layout-xlarge-port/f_eip.xml | 3 +-- app/src/main/res/layout-xlarge/f_eip.xml | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'app/src/main/res') diff --git a/app/src/main/res/layout-xlarge-port/f_eip.xml b/app/src/main/res/layout-xlarge-port/f_eip.xml index 839753e6..214c0c9a 100644 --- a/app/src/main/res/layout-xlarge-port/f_eip.xml +++ b/app/src/main/res/layout-xlarge-port/f_eip.xml @@ -105,7 +105,7 @@ - diff --git a/app/src/main/res/layout-xlarge/f_eip.xml b/app/src/main/res/layout-xlarge/f_eip.xml index 34d74805..c6850844 100644 --- a/app/src/main/res/layout-xlarge/f_eip.xml +++ b/app/src/main/res/layout-xlarge/f_eip.xml @@ -109,7 +109,7 @@ Date: Thu, 25 Nov 2021 14:33:57 +0100 Subject: tweak connection state font size on EipFragment --- app/src/main/res/layout-port/f_eip.xml | 3 ++- app/src/main/res/layout-xlarge-port/f_eip.xml | 7 ++++--- app/src/main/res/layout-xlarge/f_eip.xml | 3 ++- app/src/main/res/layout/f_eip.xml | 3 ++- 4 files changed, 10 insertions(+), 6 deletions(-) (limited to 'app/src/main/res') diff --git a/app/src/main/res/layout-port/f_eip.xml b/app/src/main/res/layout-port/f_eip.xml index a261c8ea..d99d9da9 100644 --- a/app/src/main/res/layout-port/f_eip.xml +++ b/app/src/main/res/layout-port/f_eip.xml @@ -64,10 +64,11 @@ app:layout_constraintBottom_toTopOf="@+id/sub_description" android:padding="@dimen/activity_margin" android:textAppearance="@android:style/TextAppearance.Large" + android:textSize="30sp" android:textStyle="bold" android:textColor="@color/colorEipFragmentFont" app:layout_constraintDimensionRatio="1:1" - tools:text="CONNETION" + tools:text="Connection secure" android:gravity="center" android:maxLines="1" /> diff --git a/app/src/main/res/layout-xlarge-port/f_eip.xml b/app/src/main/res/layout-xlarge-port/f_eip.xml index 214c0c9a..c3d3fd36 100644 --- a/app/src/main/res/layout-xlarge-port/f_eip.xml +++ b/app/src/main/res/layout-xlarge-port/f_eip.xml @@ -63,7 +63,7 @@ app:layout_constraintEnd_toStartOf="@+id/guideline_vertical_right" app:layout_constraintStart_toStartOf="@+id/guideline_vertical_left" app:layout_constraintTop_toTopOf="@+id/guideline_horizontal_top" - app:layout_constraintVertical_bias="0.4" /> + app:layout_constraintVertical_bias="0.425" /> @@ -92,7 +93,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintBottom_toTopOf="@+id/gateway_location_button" android:padding="@dimen/activity_margin" - android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium" + android:textAppearance="@android:style/TextAppearance.DeviceDefault.Large" android:textStyle="bold" android:textColor="@color/colorEipFragmentFont" app:layout_constraintDimensionRatio="1:1" diff --git a/app/src/main/res/layout-xlarge/f_eip.xml b/app/src/main/res/layout-xlarge/f_eip.xml index c6850844..4042933e 100644 --- a/app/src/main/res/layout-xlarge/f_eip.xml +++ b/app/src/main/res/layout-xlarge/f_eip.xml @@ -79,6 +79,7 @@ app:layout_constraintBottom_toTopOf="@+id/sub_description" android:padding="@dimen/stdpadding" android:textAppearance="@android:style/TextAppearance.DeviceDefault.Large" + android:textSize="45sp" android:textStyle="bold" android:textColor="@color/colorEipFragmentFont" app:layout_constraintDimensionRatio="1:1" @@ -95,7 +96,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintBottom_toTopOf="@+id/gateway_location_button" android:padding="@dimen/stdpadding" - android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium" + android:textAppearance="@android:style/TextAppearance.DeviceDefault.Large" android:textStyle="bold" android:textColor="@color/colorEipFragmentFont" app:layout_constraintDimensionRatio="1:1" diff --git a/app/src/main/res/layout/f_eip.xml b/app/src/main/res/layout/f_eip.xml index b5af785d..c6c48d69 100644 --- a/app/src/main/res/layout/f_eip.xml +++ b/app/src/main/res/layout/f_eip.xml @@ -96,10 +96,11 @@ android:paddingRight="@dimen/stdpadding" android:paddingEnd="@dimen/stdpadding" android:textAppearance="@android:style/TextAppearance.DeviceDefault.Large" + android:textSize="30sp" android:textStyle="bold" android:textColor="@color/colorEipFragmentFont" app:layout_constraintDimensionRatio="1:1" - tools:text="CONNETION SECURE" + tools:text="Connection secure" /> Date: Thu, 25 Nov 2021 14:34:29 +0100 Subject: remove top padding for first header in settings fragment --- app/src/main/res/layout/f_settings.xml | 1 - 1 file changed, 1 deletion(-) (limited to 'app/src/main/res') diff --git a/app/src/main/res/layout/f_settings.xml b/app/src/main/res/layout/f_settings.xml index a4d86fa6..ada74e12 100644 --- a/app/src/main/res/layout/f_settings.xml +++ b/app/src/main/res/layout/f_settings.xml @@ -17,7 +17,6 @@ android:layout_height="wrap_content" android:textAppearance="@style/TextAppearance.AppCompat.Title" android:text="@string/vpn_settings" - android:paddingTop="@dimen/activity_margin" /> Date: Thu, 25 Nov 2021 14:41:39 +0100 Subject: use darker yellow for location status indicator --- app/src/main/res/layout/v_location_status_indicator.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/src/main/res') diff --git a/app/src/main/res/layout/v_location_status_indicator.xml b/app/src/main/res/layout/v_location_status_indicator.xml index 548a965f..a8ba905e 100644 --- a/app/src/main/res/layout/v_location_status_indicator.xml +++ b/app/src/main/res/layout/v_location_status_indicator.xml @@ -130,7 +130,7 @@ android:id="@+id/level2" android:layout_width="0dp" android:layout_height="0dp" - android:background="@color/yellow200" + android:background="@color/amber200" android:visibility="visible" app:layout_constraintRight_toLeftOf="@+id/guideline_vertical_third" app:layout_constraintLeft_toRightOf="@id/guideline_vertical_second" @@ -146,7 +146,7 @@ android:id="@+id/level2_2" android:layout_width="0dp" android:layout_height="0dp" - android:background="@color/yellow200" + android:background="@color/amber200" android:visibility="visible" app:layout_constraintRight_toLeftOf="@+id/guideline_vertical_fourth" app:layout_constraintLeft_toRightOf="@id/guideline_vertical_third" -- cgit v1.2.3 From 37abb77b42eb63892b042e5fd158fd80e0a0ccf0 Mon Sep 17 00:00:00 2001 From: cyBerta Date: Thu, 25 Nov 2021 15:37:35 +0100 Subject: shrink text size on location selection button, if there's not enough space on small screens --- app/src/main/res/layout/v_location_button.xml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'app/src/main/res') diff --git a/app/src/main/res/layout/v_location_button.xml b/app/src/main/res/layout/v_location_button.xml index 8cba9d70..11410c62 100644 --- a/app/src/main/res/layout/v_location_button.xml +++ b/app/src/main/res/layout/v_location_button.xml @@ -1,6 +1,7 @@ @@ -42,7 +43,10 @@ android:maxLines="1" android:ellipsize="end" android:layout_height="wrap_content" - android:layout_width="wrap_content" + android:layout_width="match_parent" + app:autoSizeTextType="uniform" + android:gravity="center_vertical" + app:autoSizeMinTextSize="15sp" android:layout_toEndOf="@id/recommended_icn" android:layout_toRightOf="@+id/recommended_icn" android:layout_toLeftOf="@+id/bridge_icn" -- cgit v1.2.3 From 53f418cef621eb680bbfd7502004a0125eb3e09e Mon Sep 17 00:00:00 2001 From: cyBerta Date: Thu, 25 Nov 2021 15:38:33 +0100 Subject: adapt wording for hiding connection details, fixes #9051 --- app/src/main/res/layout-xlarge/v_loading_screen.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'app/src/main/res') 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 24b44f9a..2ecb8f42 100644 --- a/app/src/main/res/layout-xlarge/v_loading_screen.xml +++ b/app/src/main/res/layout-xlarge/v_loading_screen.xml @@ -80,7 +80,7 @@ android:maxLines="1" android:ellipsize="end" android:visibility="visible" - tools:text="@string/hide_connection_details" + tools:text="@string/hide" /> Informs about usage of bridges while configuring %s. Starting bridges failed. Do you want to retry or continue with an unobfuscated secure connection to configure %s? Retry unobfuscated - Hide connection details + Hide %s has no internet connection. Please check your WiFi and cellular data settings. Censorship circumvention Use Snowflake -- cgit v1.2.3 From 0e66d01eb7d24eef1e429eed3cfc046a9abce311 Mon Sep 17 00:00:00 2001 From: cyBerta Date: Thu, 25 Nov 2021 15:40:25 +0100 Subject: reduce connection state font size again a little bit --- app/src/main/res/layout-port/f_eip.xml | 2 +- app/src/main/res/layout/f_eip.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'app/src/main/res') diff --git a/app/src/main/res/layout-port/f_eip.xml b/app/src/main/res/layout-port/f_eip.xml index d99d9da9..99004387 100644 --- a/app/src/main/res/layout-port/f_eip.xml +++ b/app/src/main/res/layout-port/f_eip.xml @@ -64,7 +64,7 @@ app:layout_constraintBottom_toTopOf="@+id/sub_description" android:padding="@dimen/activity_margin" android:textAppearance="@android:style/TextAppearance.Large" - android:textSize="30sp" + android:textSize="26sp" android:textStyle="bold" android:textColor="@color/colorEipFragmentFont" app:layout_constraintDimensionRatio="1:1" diff --git a/app/src/main/res/layout/f_eip.xml b/app/src/main/res/layout/f_eip.xml index c6c48d69..fa2d4ded 100644 --- a/app/src/main/res/layout/f_eip.xml +++ b/app/src/main/res/layout/f_eip.xml @@ -96,7 +96,7 @@ android:paddingRight="@dimen/stdpadding" android:paddingEnd="@dimen/stdpadding" android:textAppearance="@android:style/TextAppearance.DeviceDefault.Large" - android:textSize="30sp" + android:textSize="26sp" android:textStyle="bold" android:textColor="@color/colorEipFragmentFont" app:layout_constraintDimensionRatio="1:1" -- cgit v1.2.3 From 4a914df3468534b585de466b5754782d47758de0 Mon Sep 17 00:00:00 2001 From: cyBerta Date: Thu, 25 Nov 2021 17:12:16 +0100 Subject: =?UTF-8?q?replace=20sofiapro=20regular=20font,=20fixes=20broken?= =?UTF-8?q?=20'=C3=9F'=20char?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/font/sofiapro_regular.otf | Bin 140748 -> 0 bytes app/src/main/res/font/sofiapro_regular.ttf | Bin 0 -> 97164 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 app/src/main/res/font/sofiapro_regular.otf create mode 100644 app/src/main/res/font/sofiapro_regular.ttf (limited to 'app/src/main/res') diff --git a/app/src/main/res/font/sofiapro_regular.otf b/app/src/main/res/font/sofiapro_regular.otf deleted file mode 100644 index 66d25156..00000000 Binary files a/app/src/main/res/font/sofiapro_regular.otf and /dev/null differ diff --git a/app/src/main/res/font/sofiapro_regular.ttf b/app/src/main/res/font/sofiapro_regular.ttf new file mode 100644 index 00000000..d7e5f95b Binary files /dev/null and b/app/src/main/res/font/sofiapro_regular.ttf differ -- cgit v1.2.3