lynx
/
NekoX
mirror of https://github.com/NekoX-Dev/NekoX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: bottom sheet when long press link in profile

This commit is contained in:
Next Alone 2022-07-26 21:15:55 +08:00 committed by luvletter2333
parent b87cd3624d
commit fd452a03ac
No known key found for this signature in database
GPG Key ID: A26A8880836E1978
3 changed files with 37 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
TMessagesProj/src/main/java/org/telegram/ui/Cells/AboutLinkCell.java
View File

@ -27,7 +27,6 @@ import android.text.StaticLayout;
import android.text.TextUtils; import android.text.TextUtils;
import android.text.style.ClickableSpan; import android.text.style.ClickableSpan;
import android.text.style.URLSpan; import android.text.style.URLSpan;
import android.text.util.Linkify;
import android.util.TypedValue; import android.util.TypedValue;
import android.view.Gravity; import android.view.Gravity;
import android.view.HapticFeedbackConstants; import android.view.HapticFeedbackConstants;
@ -50,11 +49,10 @@ import org.telegram.messenger.MessageObject;
import org.telegram.messenger.R; import org.telegram.messenger.R;
import org.telegram.messenger.browser.Browser; import org.telegram.messenger.browser.Browser;
import org.telegram.ui.ActionBar.BaseFragment; import org.telegram.ui.ActionBar.BaseFragment;
import org.telegram.ui.ActionBar.BottomSheet;
import org.telegram.ui.ActionBar.Theme; import org.telegram.ui.ActionBar.Theme;
import org.telegram.ui.Components.AlertsCreator; import org.telegram.ui.Components.AlertsCreator;
import org.telegram.ui.Components.EmojiTextView;
import org.telegram.ui.Components.BulletinFactory; import org.telegram.ui.Components.BulletinFactory;
import org.telegram.ui.Components.EmojiTextView;
import org.telegram.ui.Components.LayoutHelper; import org.telegram.ui.Components.LayoutHelper;
import org.telegram.ui.Components.LinkPath; import org.telegram.ui.Components.LinkPath;
import org.telegram.ui.Components.LinkSpanDrawable; import org.telegram.ui.Components.LinkSpanDrawable;
@ -63,6 +61,9 @@ import org.telegram.ui.Components.URLSpanNoUnderline;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
import kotlin.Unit;
import tw.nekomimi.nekogram.ui.BottomBuilder;
public class AboutLinkCell extends FrameLayout { public class AboutLinkCell extends FrameLayout {
private StaticLayout textLayout; private StaticLayout textLayout;
@ -400,23 +401,29 @@ public class AboutLinkCell extends FrameLayout {
} catch (Exception ignore) {} } catch (Exception ignore) {}
ClickableSpan pressedLinkFinal = (ClickableSpan) pressedLink.getSpan(); ClickableSpan pressedLinkFinal = (ClickableSpan) pressedLink.getSpan();
BottomSheet.Builder builder = new BottomSheet.Builder(parentFragment.getParentActivity()); BottomBuilder builder = new BottomBuilder(parentFragment.getParentActivity());
builder.setTitle(url); builder.addTitle(url);
builder.setItems(new CharSequence[]{LocaleController.getString("Open", R.string.Open), LocaleController.getString("Copy", R.string.Copy)}, (dialog, which) -> { builder.addItems(new String[]{LocaleController.getString("Open", R.string.Open), LocaleController.getString("Copy", R.string.Copy)},
new int[]{R.drawable.msg_openin, R.drawable.msg_copy},
(which, __, ___) -> {
if (which == 0) { if (which == 0) {
onLinkClick(pressedLinkFinal); onLinkClick(pressedLinkFinal);
} else if (which == 1) { } else if (which == 1) {
AndroidUtilities.addToClipboard(url); AndroidUtilities.addToClipboard(url);
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) { if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) {
if (url.startsWith("@")) { if (url.startsWith("@")) {
BulletinFactory.of(parentFragment).createSimpleBulletin(R.raw.copy, LocaleController.getString("UsernameCopied", R.string.UsernameCopied)).show(); BulletinFactory.of(parentFragment).createSimpleBulletin(R.raw.copy,
LocaleController.getString("UsernameCopied", R.string.UsernameCopied)).show();
} else if (url.startsWith("#") || url.startsWith("$")) { } else if (url.startsWith("#") || url.startsWith("$")) {
BulletinFactory.of(parentFragment).createSimpleBulletin(R.raw.copy, LocaleController.getString("HashtagCopied", R.string.HashtagCopied)).show(); BulletinFactory.of(parentFragment).createSimpleBulletin(R.raw.copy,
LocaleController.getString("HashtagCopied", R.string.HashtagCopied)).show();
} else { } else {
BulletinFactory.of(parentFragment).createSimpleBulletin(R.raw.copy, LocaleController.getString("LinkCopied", R.string.LinkCopied)).show(); BulletinFactory.of(parentFragment).createSimpleBulletin(R.raw.copy,
LocaleController.getString("LinkCopied", R.string.LinkCopied)).show();
} }
} }
} }
return Unit.INSTANCE;
}); });
builder.setOnPreDismissListener(di -> resetPressedLink()); builder.setOnPreDismissListener(di -> resetPressedLink());
builder.show(); builder.show();

12
TMessagesProj/src/main/java/org/telegram/ui/PhotoViewer.java
View File

@ -68,7 +68,6 @@ import android.transition.TransitionManager;
import android.transition.TransitionSet; import android.transition.TransitionSet;
import android.transition.TransitionValues; import android.transition.TransitionValues;
import android.util.FloatProperty; import android.util.FloatProperty;
import android.util.Log;
import android.util.Property; import android.util.Property;
import android.util.Range; import android.util.Range;
import android.util.SparseArray; import android.util.SparseArray;
@ -257,6 +256,7 @@ import tw.nekomimi.nekogram.NekoXConfig;
import tw.nekomimi.nekogram.transtale.TranslateDb; import tw.nekomimi.nekogram.transtale.TranslateDb;
import tw.nekomimi.nekogram.transtale.Translator; import tw.nekomimi.nekogram.transtale.Translator;
import tw.nekomimi.nekogram.transtale.TranslatorKt; import tw.nekomimi.nekogram.transtale.TranslatorKt;
import tw.nekomimi.nekogram.ui.BottomBuilder;
import tw.nekomimi.nekogram.utils.AlertUtil; import tw.nekomimi.nekogram.utils.AlertUtil;
import tw.nekomimi.nekogram.utils.ProxyUtil; import tw.nekomimi.nekogram.utils.ProxyUtil;
@ -652,7 +652,7 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat
private void onLinkLongPress(URLSpan link, TextView widget, Runnable onDismiss) { private void onLinkLongPress(URLSpan link, TextView widget, Runnable onDismiss) {
int timestamp = -1; int timestamp = -1;
BottomSheet.Builder builder = new BottomSheet.Builder(parentActivity, false, resourcesProvider, 0xff1C2229); BottomBuilder builder = new BottomBuilder(parentActivity, false, 0xff1C2229);
if (link.getURL().startsWith("video?")) { if (link.getURL().startsWith("video?")) {
try { try {
String timestampStr = link.getURL().substring(link.getURL().indexOf('?') + 1); String timestampStr = link.getURL().substring(link.getURL().indexOf('?') + 1);
@ -662,12 +662,13 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat
} }
} }
if (timestamp >= 0) { if (timestamp >= 0) {
builder.setTitle(AndroidUtilities.formatDuration(timestamp, false)); builder.addTitle(AndroidUtilities.formatDuration(timestamp, false));
} else { } else {
builder.setTitle(link.getURL()); builder.addTitle(link.getURL());
} }
final int finalTimestamp = timestamp; final int finalTimestamp = timestamp;
builder.setItems(new CharSequence[]{LocaleController.getString("Open", R.string.Open), LocaleController.getString("Copy", R.string.Copy)}, (dialog, which) -> { builder.addItems(new String[]{LocaleController.getString("Open", R.string.Open), LocaleController.getString("Copy", R.string.Copy)},
new int[]{R.drawable.msg_openin, R.drawable.msg_copy}, (which,__,___ ) -> {
if (which == 0) { if (which == 0) {
onLinkClick(link, widget); onLinkClick(link, widget);
} else if (which == 1) { } else if (which == 1) {
@ -726,6 +727,7 @@ public class PhotoViewer implements NotificationCenter.NotificationCenterDelegat
BulletinFactory.of(containerView, resourcesProvider).createSimpleBulletin(R.raw.voip_invite, bulletinMessage).show(); BulletinFactory.of(containerView, resourcesProvider).createSimpleBulletin(R.raw.voip_invite, bulletinMessage).show();
} }
} }
return Unit.INSTANCE;
}); });
builder.setOnPreDismissListener(di -> onDismiss.run()); builder.setOnPreDismissListener(di -> onDismiss.run());
BottomSheet bottomSheet = builder.create(); BottomSheet bottomSheet = builder.create();

6
TMessagesProj/src/main/java/tw/nekomimi/nekogram/ui/BottomBuilder.kt
View File

@ -19,9 +19,9 @@ import org.telegram.ui.Components.LayoutHelper
import java.util.* import java.util.*
class BottomBuilder(val ctx: Context, val needFocus: Boolean = true) { class BottomBuilder(val ctx: Context, val needFocus: Boolean = true, val bgColor: Int = Theme.getColor(Theme.key_dialogBackground)) {
constructor(ctx: Context) : this(ctx, true) {} constructor(ctx: Context) : this(ctx, true) {}
constructor(ctx: Context, needFocus: Boolean) : this(ctx, needFocus, Theme.getColor(Theme.key_dialogBackground)) {}
val builder = BottomSheet.Builder(ctx, needFocus) val builder = BottomSheet.Builder(ctx, needFocus)
private val rootView = LinearLayout(ctx).apply { private val rootView = LinearLayout(ctx).apply {
@ -48,7 +48,7 @@ class BottomBuilder(val ctx: Context, val needFocus: Boolean = true) {
FrameLayout(ctx).apply { FrameLayout(ctx).apply {
setBackgroundColor(Theme.getColor(Theme.key_dialogBackground)) setBackgroundColor(bgColor)
this@BottomBuilder.rootView.addView(this, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, 50, Gravity.LEFT or Gravity.BOTTOM)) this@BottomBuilder.rootView.addView(this, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, 50, Gravity.LEFT or Gravity.BOTTOM))