MGislv/NekoX
1
0
Fork 0
mirror of https://github.com/MGislv/NekoX.git synced 2024-06-30 10:14:04 +00:00
Code Releases Activity

Fix merge

Browse Source
This commit is contained in:
luvletter2333 2022-02-03 23:27:20 +08:00
parent 83e8a1b61a
commit b1d798c8d3
7 changed files with 21 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TMessagesProj/src/main/java/org/telegram/ui/Adapters/LocationActivityAdapter.java
View File

@ -46,8 +46,6 @@ import java.util.Locale;
import androidx.recyclerview.widget.RecyclerView;
import com.google.android.gms.vision.Frame;
public class LocationActivityAdapter extends BaseLocationAdapter implements LocationController.LocationFetchCallback {
private int currentAccount = UserConfig.selectedAccount;

3
TMessagesProj/src/main/java/org/telegram/ui/ArticleViewer.java
View File

@ -164,7 +164,6 @@ import org.telegram.ui.Components.TextPaintMarkSpan;
import org.telegram.ui.Components.TextPaintSpan;
import org.telegram.ui.Components.TextPaintUrlSpan;
import org.telegram.ui.Components.TextPaintWebpageUrlSpan;
import org.telegram.ui.Components.TranslateAlert;
import org.telegram.ui.Components.TypefaceSpan;
import org.telegram.ui.Components.WebPlayerView;
@ -3711,7 +3710,7 @@ public class ArticleViewer implements NotificationCenter.NotificationCenterDeleg
textSelectionHelper.setParentView(listView[0]);
if (MessagesController.getGlobalMainSettings().getBoolean("translate_button", false)) {
textSelectionHelper.setOnTranslate((text, fromLang, toLang, onAlertDismiss) -> {
TranslateAlert.showAlert(parentActivity, parentFragment, fromLang, toLang, text, false, null, onAlertDismiss);
// TranslateAlert.showAlert(parentActivity, parentFragment, fromLang, toLang, text, false, null, onAlertDismiss);
});
}
textSelectionHelper.layoutManager = layoutManager[0];

43
TMessagesProj/src/main/java/org/telegram/ui/Cells/TextSelectionHelper.java
View File

@ -44,7 +44,6 @@ import org.telegram.messenger.AndroidUtilities;
import org.telegram.messenger.ApplicationLoader;
import org.telegram.messenger.Emoji;
import org.telegram.messenger.FileLog;
import org.telegram.messenger.LanguageDetector;
import org.telegram.messenger.LocaleController;
import org.telegram.messenger.MessageObject;
import org.telegram.messenger.R;
@ -1262,36 +1261,24 @@ public abstract class TextSelectionHelper<Cell extends TextSelectionHelper.Selec
}
menu.getItem(2).setVisible(selectedView instanceof View);
}
if (LanguageDetector.hasSupport() && getSelectedText() != null) {
LanguageDetector.detectLanguage(getSelectedText().toString(), lng -> {
translateFromLanguage = lng;
updateTranslateButton(menu);
}, err -> {
FileLog.e("mlkit: failed to detect language in selection");
FileLog.e(err);
translateFromLanguage = null;
updateTranslateButton(menu);
});
} else {
translateFromLanguage = null;
updateTranslateButton(menu);
}
// NekoX: Merge 8.5.0, remove due to removing LanguageDetector
return true;
}
private String translateFromLanguage = null;
private void updateTranslateButton(Menu menu) {
String translateToLanguage = LocaleController.getInstance().getCurrentLocale().getLanguage();
menu.getItem(2).setVisible(
onTranslateListener != null && (
(
translateFromLanguage != null &&
(!translateFromLanguage.equals(translateToLanguage) || translateFromLanguage.equals("und")) &&
!RestrictedLanguagesSelectActivity.getRestrictedLanguages().contains(translateFromLanguage)
) || !LanguageDetector.hasSupport()
)
);
}
// NekoX: Merge 8.5.0, remove due to removing LanguageDetector
// private String translateFromLanguage = null;
// private void updateTranslateButton(Menu menu) {
// String translateToLanguage = LocaleController.getInstance().getCurrentLocale().getLanguage();
// menu.getItem(2).setVisible(
// onTranslateListener != null && (
// (
// translateFromLanguage != null &&
// (!translateFromLanguage.equals(translateToLanguage) || translateFromLanguage.equals("und")) &&
// !RestrictedLanguagesSelectActivity.getRestrictedLanguages().contains(translateFromLanguage)
// ) || !LanguageDetector.hasSupport()
// )
// );
// }
@Override
public boolean onActionItemClicked(ActionMode mode, MenuItem item) {

4
TMessagesProj/src/main/java/org/telegram/ui/Components/AlertsCreator.java
View File

@ -2987,8 +2987,8 @@ public class AlertsCreator {
}
BottomBuilder builder = new BottomBuilder(context);
builder.setDimBehind(hideDim == null);
builder.setOnPreDismissListener(di -> {
builder.getBuilder().setDimBehind(hideDim == null);
builder.getBuilder().setOnPreDismissListener(di -> {
if (hideDim != null) {
hideDim.run();
}

1
TMessagesProj/src/main/java/org/telegram/ui/Components/EmojiView.java
View File

@ -69,6 +69,7 @@ import androidx.viewpager.widget.PagerAdapter;
import androidx.viewpager.widget.ViewPager;
import org.telegram.messenger.AndroidUtilities;
import org.telegram.messenger.BuildVars;
import org.telegram.messenger.ChatObject;
import org.telegram.messenger.DocumentObject;
import org.telegram.messenger.Emoji;

2
TMessagesProj/src/main/java/org/telegram/ui/Components/SharedMediaLayout.java
View File

@ -2255,7 +2255,7 @@ public class SharedMediaLayout extends FrameLayout implements NotificationCenter
for (Integer id1 : ids) {
if (id1 > 0) {
MessageObject msg = selectedFiles[a].get(id1);
if (msg != && msg.messageOwner != null && msg.messageOwner.noforwards) {
if (msg != null && msg.messageOwner != null && msg.messageOwner.noforwards) {
hasNoforwardsMessage = true;
break;
}

1
TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java
View File

@ -36,6 +36,7 @@ import android.graphics.Typeface;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.GradientDrawable;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.os.SystemClock;