From b6f78a8667bcf8c0a3de827f9826099f035c7761 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Fri, 21 Oct 2022 12:49:08 -0300 Subject: [PATCH] Replace illustration for connecting via Bluetooth --- briar-android/artwork/bluetooth.svg | 61 ------------- .../artwork/il_bluetooth_connect_dark.svg | 25 ++++++ .../artwork/il_bluetooth_connect_light.svg | 25 ++++++ .../connect/BluetoothIntroFragment.java | 2 + .../drawable-night/il_bluetooth_connect.xml | 85 +++++++++++++++++++ .../src/main/res/drawable/ic_bluetooth.xml | 21 ----- .../res/drawable/il_bluetooth_connect.xml | 85 +++++++++++++++++++ .../res/layout/fragment_bluetooth_intro.xml | 85 ++++++++++--------- .../layout/fragment_bluetooth_progress.xml | 2 +- 9 files changed, 268 insertions(+), 123 deletions(-) delete mode 100644 briar-android/artwork/bluetooth.svg create mode 100644 briar-android/artwork/il_bluetooth_connect_dark.svg create mode 100644 briar-android/artwork/il_bluetooth_connect_light.svg create mode 100644 briar-android/src/main/res/drawable-night/il_bluetooth_connect.xml delete mode 100644 briar-android/src/main/res/drawable/ic_bluetooth.xml create mode 100644 briar-android/src/main/res/drawable/il_bluetooth_connect.xml diff --git a/briar-android/artwork/bluetooth.svg b/briar-android/artwork/bluetooth.svg deleted file mode 100644 index 0905e018e..000000000 --- a/briar-android/artwork/bluetooth.svg +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/briar-android/artwork/il_bluetooth_connect_dark.svg b/briar-android/artwork/il_bluetooth_connect_dark.svg new file mode 100644 index 000000000..2eb7d20d2 --- /dev/null +++ b/briar-android/artwork/il_bluetooth_connect_dark.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/briar-android/artwork/il_bluetooth_connect_light.svg b/briar-android/artwork/il_bluetooth_connect_light.svg new file mode 100644 index 000000000..e4778593e --- /dev/null +++ b/briar-android/artwork/il_bluetooth_connect_light.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/connect/BluetoothIntroFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/connect/BluetoothIntroFragment.java index ed774bcd2..63ceaa6fb 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contact/connect/BluetoothIntroFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/connect/BluetoothIntroFragment.java @@ -25,6 +25,7 @@ import androidx.lifecycle.ViewModelProvider; import static android.Manifest.permission.ACCESS_FINE_LOCATION; import static android.widget.Toast.LENGTH_LONG; import static org.briarproject.briar.android.AppModule.getAndroidComponent; +import static org.briarproject.briar.android.util.UiUtils.hideViewOnSmallScreen; @MethodsNotNullByDefault @ParametersNotNullByDefault @@ -71,6 +72,7 @@ public class BluetoothIntroFragment extends Fragment { @Override public void onStart() { super.onStart(); + hideViewOnSmallScreen(requireView().findViewById(R.id.introImageView)); conditionManager.reset(); } diff --git a/briar-android/src/main/res/drawable-night/il_bluetooth_connect.xml b/briar-android/src/main/res/drawable-night/il_bluetooth_connect.xml new file mode 100644 index 000000000..c9505b66b --- /dev/null +++ b/briar-android/src/main/res/drawable-night/il_bluetooth_connect.xml @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/briar-android/src/main/res/drawable/ic_bluetooth.xml b/briar-android/src/main/res/drawable/ic_bluetooth.xml deleted file mode 100644 index cd6f7cb41..000000000 --- a/briar-android/src/main/res/drawable/ic_bluetooth.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - diff --git a/briar-android/src/main/res/drawable/il_bluetooth_connect.xml b/briar-android/src/main/res/drawable/il_bluetooth_connect.xml new file mode 100644 index 000000000..8ab5e0acc --- /dev/null +++ b/briar-android/src/main/res/drawable/il_bluetooth_connect.xml @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/briar-android/src/main/res/layout/fragment_bluetooth_intro.xml b/briar-android/src/main/res/layout/fragment_bluetooth_intro.xml index f7c5a272c..ac9198215 100644 --- a/briar-android/src/main/res/layout/fragment_bluetooth_intro.xml +++ b/briar-android/src/main/res/layout/fragment_bluetooth_intro.xml @@ -1,51 +1,56 @@ - + android:orientation="vertical"> - + android:layout_height="0dp" + android:layout_weight="1"> - + - + -