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

fix: merge bugs

This commit is contained in:
luvletter2333 2023-03-28 05:42:24 +08:00
parent e392d0db9b
commit 4799b030b4
No known key found for this signature in database
GPG Key ID: 9EB7723F3A0ACF92
3 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
TMessagesProj/src/main/java/org/telegram/ui/Components/ChatActivityEnterView.java
View File

@ -2063,6 +2063,8 @@ public class ChatActivityEnterView extends BlurredFrameLayout implements Notific
sendButtonContainer.addView(audioVideoButtonContainer, LayoutHelper.createFrame(48, 48));
if (NekoConfig.useChatAttachMediaMenu.Bool()) {
audioVideoButtonContainer.setOnClickListener(v -> {
createRecordAudioPanel();
createRecordCircle();
if (recordCircle.isSendButtonVisible()) {
if (!hasRecordVideo || calledRecordRunnable) {
startedDraggingX = -1;
@ -2271,9 +2273,6 @@ public class ChatActivityEnterView extends BlurredFrameLayout implements Notific
audioVideoButtonContainer.addView(audioVideoSendButton, LayoutHelper.createFrame(48, 48));
// NekoX: fix this for chatInputMenu
createRecordCircle();
cancelBotButton = new ImageView(context);
cancelBotButton.setVisibility(INVISIBLE);
cancelBotButton.setScaleType(ImageView.ScaleType.CENTER_INSIDE);

14
TMessagesProj/src/main/java/org/telegram/ui/DataSettingsActivity.java
View File

@ -70,7 +70,7 @@ public class DataSettingsActivity extends BaseFragment {
@SuppressWarnings("FieldCanBeLocal")
private LinearLayoutManager layoutManager;
private ArrayList<File> storageDirs;
// private ArrayList<File> storageDirs;
private int mediaDownloadSectionRow;
private int mobileRow;
@ -577,17 +577,7 @@ public class DataSettingsActivity extends BaseFragment {
);
textCell.setTextAndValueAndColorfulIcon(LocaleController.getString("NetworkUsage", R.string.NetworkUsage), AndroidUtilities.formatFileSize(size), true, R.drawable.msg_filled_datausage, getThemedColor(Theme.key_color_green), storageNumRow != -1);
} else if (position == storageNumRow) {
String dir = storageDirs.get(0).getAbsolutePath();
if (!TextUtils.isEmpty(SharedConfig.storageCacheDir)) {
for (int a = 0, N = storageDirs.size(); a < N; a++) {
String path = storageDirs.get(a).getAbsolutePath();
if (path.startsWith(SharedConfig.storageCacheDir)) {
dir = path;
break;
}
}
}
final String value = dir == null || dir.contains("/storage/emulated/") ? LocaleController.getString("InternalStorage", R.string.InternalStorage) : LocaleController.getString("SdCard", R.string.SdCard);
String value = NekoConfig.cachePath.String();
textCell.setTextAndValueAndColorfulIcon(LocaleController.getString("StoragePath", R.string.StoragePath), value, true, R.drawable.msg_filled_sdcard, getThemedColor(Theme.key_color_yellow), false);
}
break;

2
TMessagesProj/src/main/java/tw/nekomimi/nekogram/utils/AlertUtil.kt
View File

@ -144,7 +144,7 @@ object AlertUtil {
@JvmStatic
fun showProgress(ctx: Context, text: String = LocaleController.getString("Loading", R.string.Loading)): AlertDialog {
return AlertDialog.Builder(ctx, 1).apply {
return AlertDialog.Builder(ctx, AlertDialog.ALERT_TYPE_MESSAGE).apply {
setMessage(text)