diff --git a/app/src/main/java/app/fedilab/android/helper/SpannableHelper.java b/app/src/main/java/app/fedilab/android/helper/SpannableHelper.java index 49021fcc..26cb125d 100644 --- a/app/src/main/java/app/fedilab/android/helper/SpannableHelper.java +++ b/app/src/main/java/app/fedilab/android/helper/SpannableHelper.java @@ -52,6 +52,7 @@ import androidx.lifecycle.ViewModelStoreOwner; import androidx.preference.PreferenceManager; import com.bumptech.glide.Glide; +import com.google.android.material.dialog.MaterialAlertDialogBuilder; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; @@ -289,10 +290,10 @@ public class SpannableHelper { @Override public void onLongClick(View view) { Context mContext = view.getContext(); - AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(mContext); + MaterialAlertDialogBuilder materialAlertDialogBuilder = new MaterialAlertDialogBuilder(mContext); PopupLinksBinding popupLinksBinding = PopupLinksBinding.inflate(LayoutInflater.from(context)); - dialogBuilder.setView(popupLinksBinding.getRoot()); - AlertDialog alertDialog = dialogBuilder.create(); + materialAlertDialogBuilder.setView(popupLinksBinding.getRoot()); + AlertDialog alertDialog = materialAlertDialogBuilder.create(); alertDialog.show(); String finalURl = newURL; String uniqueUrl = newURL.endsWith("…") ? newURL : newURL + "…"; diff --git a/app/src/main/res/drawable/ic_check_redirect.xml b/app/src/main/res/drawable/ic_check_redirect.xml new file mode 100644 index 00000000..f4ff8870 --- /dev/null +++ b/app/src/main/res/drawable/ic_check_redirect.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_copy_link.xml b/app/src/main/res/drawable/ic_copy_link.xml new file mode 100644 index 00000000..46278812 --- /dev/null +++ b/app/src/main/res/drawable/ic_copy_link.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_full_link.xml b/app/src/main/res/drawable/ic_full_link.xml new file mode 100644 index 00000000..16b494d3 --- /dev/null +++ b/app/src/main/res/drawable/ic_full_link.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_open_external.xml b/app/src/main/res/drawable/ic_open_external.xml new file mode 100644 index 00000000..f7aa3cbb --- /dev/null +++ b/app/src/main/res/drawable/ic_open_external.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_share_link.xml b/app/src/main/res/drawable/ic_share_link.xml new file mode 100644 index 00000000..21496e7a --- /dev/null +++ b/app/src/main/res/drawable/ic_share_link.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout/popup_links.xml b/app/src/main/res/layout/popup_links.xml index 994ef23e..1ddeb8ef 100644 --- a/app/src/main/res/layout/popup_links.xml +++ b/app/src/main/res/layout/popup_links.xml @@ -3,67 +3,52 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="@dimen/fab_margin" android:orientation="vertical" - android:padding="@dimen/fab_margin"> + android:padding="12dp"> - + android:textAlignment="textStart" + app:icon="@drawable/ic_full_link" /> - + android:textAlignment="textStart" + app:icon="@drawable/ic_share_link" /> - + android:textAlignment="textStart" + app:icon="@drawable/ic_open_external" /> - + android:textAlignment="textStart" + app:icon="@drawable/ic_copy_link" /> - + android:textAlignment="textStart" + app:icon="@drawable/ic_check_redirect" /> +