From d46a227cfce8131fe3cbd24d81aaf228940e2718 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Wed, 19 Oct 2022 13:44:33 -0300 Subject: [PATCH] Add new illustration for adding contact remotely --- .../artwork/il_add_contact_remote_dark.svg | 34 ++ .../artwork/il_add_contact_remote_light.svg | 40 ++ .../add/remote/LinkExchangeFragment.java | 29 +- .../drawable-night/il_add_contact_remote.xml | 114 +++++ .../res/drawable/il_add_contact_remote.xml | 138 ++++++ .../res/layout/fragment_link_exchange.xml | 458 +++++++++--------- 6 files changed, 569 insertions(+), 244 deletions(-) create mode 100644 briar-android/artwork/il_add_contact_remote_dark.svg create mode 100644 briar-android/artwork/il_add_contact_remote_light.svg create mode 100644 briar-android/src/main/res/drawable-night/il_add_contact_remote.xml create mode 100644 briar-android/src/main/res/drawable/il_add_contact_remote.xml diff --git a/briar-android/artwork/il_add_contact_remote_dark.svg b/briar-android/artwork/il_add_contact_remote_dark.svg new file mode 100644 index 000000000..7a575dcf8 --- /dev/null +++ b/briar-android/artwork/il_add_contact_remote_dark.svg @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/briar-android/artwork/il_add_contact_remote_light.svg b/briar-android/artwork/il_add_contact_remote_light.svg new file mode 100644 index 000000000..ec2d9361f --- /dev/null +++ b/briar-android/artwork/il_add_contact_remote_light.svg @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/LinkExchangeFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/LinkExchangeFragment.java index 38f46b4f4..42097e32a 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/LinkExchangeFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/LinkExchangeFragment.java @@ -1,15 +1,12 @@ package org.briarproject.briar.android.contact.add.remote; -import android.animation.ObjectAnimator; import android.content.ClipData; import android.content.ClipboardManager; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.view.ViewTreeObserver.OnGlobalLayoutListener; import android.widget.Button; -import android.widget.ScrollView; import android.widget.TextView; import android.widget.Toast; @@ -33,12 +30,12 @@ import androidx.lifecycle.ViewModelProvider; import static android.content.Context.CLIPBOARD_SERVICE; import static android.widget.Toast.LENGTH_SHORT; import static org.briarproject.bramble.api.contact.HandshakeLinkConstants.LINK_REGEX; +import static org.briarproject.briar.android.util.UiUtils.hideViewOnSmallScreen; import static org.briarproject.briar.android.util.UiUtils.observeOnce; @MethodsNotNullByDefault @ParametersNotNullByDefault -public class LinkExchangeFragment extends BaseFragment - implements OnGlobalLayoutListener { +public class LinkExchangeFragment extends BaseFragment { private static final String TAG = LinkExchangeFragment.class.getName(); @@ -92,29 +89,13 @@ public class LinkExchangeFragment extends BaseFragment observeOnce(viewModel.getHandshakeLink(), this, this::onHandshakeLinkLoaded); - - if (savedInstanceState == null) { - ScrollView scrollView = (ScrollView) v; - // we need to wait for views to be laid out to get the heights - scrollView.getViewTreeObserver().addOnGlobalLayoutListener(this); - } - return v; } @Override - public void onGlobalLayout() { - ScrollView scrollView = (ScrollView) requireView(); - View layout = scrollView.getChildAt(0); - int scrollBy = layout.getHeight() - scrollView.getHeight(); - if (scrollBy > 0) { - // smoothScrollTo() is too fast due to the transition animation - ObjectAnimator animator = ObjectAnimator - .ofInt(scrollView, "scrollY", scrollBy); - animator.setDuration(1000); - animator.start(); - } - layout.getViewTreeObserver().removeGlobalOnLayoutListener(this); + public void onStart() { + super.onStart(); + hideViewOnSmallScreen(requireView().findViewById(R.id.imageView)); } private void onHandshakeLinkLoaded(String link) { diff --git a/briar-android/src/main/res/drawable-night/il_add_contact_remote.xml b/briar-android/src/main/res/drawable-night/il_add_contact_remote.xml new file mode 100644 index 000000000..9c3f9245b --- /dev/null +++ b/briar-android/src/main/res/drawable-night/il_add_contact_remote.xml @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/briar-android/src/main/res/drawable/il_add_contact_remote.xml b/briar-android/src/main/res/drawable/il_add_contact_remote.xml new file mode 100644 index 000000000..36d63f8af --- /dev/null +++ b/briar-android/src/main/res/drawable/il_add_contact_remote.xml @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/briar-android/src/main/res/layout/fragment_link_exchange.xml b/briar-android/src/main/res/layout/fragment_link_exchange.xml index cdd06e18a..4ebd1a64c 100644 --- a/briar-android/src/main/res/layout/fragment_link_exchange.xml +++ b/briar-android/src/main/res/layout/fragment_link_exchange.xml @@ -1,232 +1,250 @@ - + android:orientation="vertical"> - + android:layout_height="0dp" + android:layout_weight="1"> - - - - - - - - - - - - - - - - - - -