diff --git a/briar-android/artwork/il_share_app_dark.svg b/briar-android/artwork/il_share_app_dark.svg
new file mode 100644
index 000000000..b3c73c3a7
--- /dev/null
+++ b/briar-android/artwork/il_share_app_dark.svg
@@ -0,0 +1,30 @@
+
diff --git a/briar-android/artwork/il_share_app_light.svg b/briar-android/artwork/il_share_app_light.svg
new file mode 100644
index 000000000..4ec2c0adb
--- /dev/null
+++ b/briar-android/artwork/il_share_app_light.svg
@@ -0,0 +1,30 @@
+
diff --git a/briar-android/artwork/share_app.svg b/briar-android/artwork/share_app.svg
deleted file mode 100644
index 024783b1c..000000000
--- a/briar-android/artwork/share_app.svg
+++ /dev/null
@@ -1,83 +0,0 @@
-
-
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotIntroFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotIntroFragment.java
index 1a8223e67..c7e9bcd30 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotIntroFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotIntroFragment.java
@@ -9,7 +9,6 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.ProgressBar;
-import android.widget.ScrollView;
import android.widget.TextView;
import com.google.android.material.snackbar.Snackbar;
@@ -27,12 +26,12 @@ import androidx.lifecycle.ViewModelProvider;
import static android.content.pm.ApplicationInfo.FLAG_TEST_ONLY;
import static android.os.Build.VERSION.SDK_INT;
-import static android.view.View.FOCUS_DOWN;
import static android.view.View.INVISIBLE;
import static android.view.View.VISIBLE;
import static androidx.transition.TransitionManager.beginDelayedTransition;
import static com.google.android.material.snackbar.BaseTransientBottomBar.LENGTH_LONG;
import static org.briarproject.briar.android.AppModule.getAndroidComponent;
+import static org.briarproject.briar.android.util.UiUtils.hideViewOnSmallScreen;
@MethodsNotNullByDefault
@ParametersNotNullByDefault
@@ -48,7 +47,6 @@ public class HotspotIntroFragment extends Fragment {
private Button startButton;
private ProgressBar progressBar;
private TextView progressTextView;
- private ScrollView scrollView;
private final AbstractConditionManager conditionManager = SDK_INT < 29 ?
new ConditionManager(this, this::onPermissionUpdate) :
@@ -73,7 +71,6 @@ public class HotspotIntroFragment extends Fragment {
startButton = v.findViewById(R.id.startButton);
progressBar = v.findViewById(R.id.progressBar);
progressTextView = v.findViewById(R.id.progressTextView);
- scrollView = v.findViewById(R.id.scrollView);
startButton.setOnClickListener(this::onButtonClick);
@@ -86,8 +83,7 @@ public class HotspotIntroFragment extends Fragment {
public void onStart() {
super.onStart();
conditionManager.onStart();
- // Scroll down in case the screen is small, so the button is visible
- scrollView.post(() -> scrollView.fullScroll(FOCUS_DOWN));
+ hideViewOnSmallScreen(requireView().findViewById(R.id.imageView));
}
private void onButtonClick(View view) {
diff --git a/briar-android/src/main/res/drawable-night/il_share_app.xml b/briar-android/src/main/res/drawable-night/il_share_app.xml
new file mode 100644
index 000000000..f092e3167
--- /dev/null
+++ b/briar-android/src/main/res/drawable-night/il_share_app.xml
@@ -0,0 +1,103 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/briar-android/src/main/res/drawable/ic_share_app.xml b/briar-android/src/main/res/drawable/ic_share_app.xml
deleted file mode 100644
index d8ae02dc4..000000000
--- a/briar-android/src/main/res/drawable/ic_share_app.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/briar-android/src/main/res/drawable/il_share_app.xml b/briar-android/src/main/res/drawable/il_share_app.xml
new file mode 100644
index 000000000..16b4bb9a1
--- /dev/null
+++ b/briar-android/src/main/res/drawable/il_share_app.xml
@@ -0,0 +1,103 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/briar-android/src/main/res/layout/fragment_hotspot_intro.xml b/briar-android/src/main/res/layout/fragment_hotspot_intro.xml
index 5e5ff456a..5d2778cfa 100644
--- a/briar-android/src/main/res/layout/fragment_hotspot_intro.xml
+++ b/briar-android/src/main/res/layout/fragment_hotspot_intro.xml
@@ -1,52 +1,64 @@
-
+ android:orientation="vertical">
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
\ No newline at end of file
+