From b49f6c5a3c8d7bc37a38b279a9208d7e9b1f193a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= Date: Fri, 26 Jun 2020 08:48:53 +0000 Subject: [PATCH] Medium phone text --- .../org/telegram/ui/Cells/DrawerProfileCell.java | 4 ++-- .../java/org/telegram/ui/SettingsActivity.java | 16 ++++++++++++---- .../java/tw/nekomimi/nekogram/NekoConfig.java | 2 +- .../java/tw/nekomimi/nekogram/utils/FileUtil.kt | 6 +++++- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Cells/DrawerProfileCell.java b/TMessagesProj/src/main/java/org/telegram/ui/Cells/DrawerProfileCell.java index 5099b5559..72e5ab12f 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Cells/DrawerProfileCell.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Cells/DrawerProfileCell.java @@ -160,8 +160,9 @@ public class DrawerProfileCell extends FrameLayout { shadowView.getDrawable().setColorFilter(new PorterDuffColorFilter(color, PorterDuff.Mode.SRC_IN)); } nameTextView.setTextColor(Theme.getColor(Theme.key_chats_menuName)); + phoneTextView.setTextColor(Theme.getColor(Theme.key_chats_menuName)); + if (useAdb() || useImageBackground) { - phoneTextView.setTextColor(Theme.getColor(Theme.key_chats_menuPhone)); if (shadowView.getVisibility() != VISIBLE) { shadowView.setVisibility(VISIBLE); } @@ -190,7 +191,6 @@ public class DrawerProfileCell extends FrameLayout { if (shadowView.getVisibility() != visibility) { shadowView.setVisibility(visibility); } - phoneTextView.setTextColor(Theme.getColor(Theme.key_chats_menuPhoneCats)); super.onDraw(canvas); } diff --git a/TMessagesProj/src/main/java/org/telegram/ui/SettingsActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/SettingsActivity.java index f8529db32..77e330d73 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/SettingsActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/SettingsActivity.java @@ -118,6 +118,7 @@ import java.util.Set; import cn.hutool.core.util.RuntimeUtil; import kotlin.Unit; +import libv2ray.Libv2ray; import tw.nekomimi.nekogram.BottomBuilder; import tw.nekomimi.nekogram.NekoConfig; import tw.nekomimi.nekogram.NekoXConfig; @@ -519,10 +520,17 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter NekoXConfig.developerModeEntrance = true; } BottomBuilder builder = new BottomBuilder(getParentActivity()); - builder.addTitle(cell.getTextView().getText().toString(), false); + String message = cell.getTextView().getText().toString(); + try { + if (!BuildVars.isMini) { + message += "\n" + Libv2ray.checkVersionX(); + } + } catch (Exception ignored) {} + builder.addTitle(message); + String finalMessage = message; builder.addItem(LocaleController.getString("Copy", R.string.Copy), R.drawable.baseline_content_copy_24, (it) -> { builder.dismiss(); - AndroidUtilities.addToClipboard(cell.getTextView().getText().toString()); + AndroidUtilities.addToClipboard(finalMessage); AlertUtil.showToast(LocaleController.getString("TextCopied", R.string.TextCopied)); return Unit.INSTANCE; }); @@ -2349,8 +2357,8 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter cell.getTextView().setMovementMethod(null); cell.setBackgroundDrawable(Theme.getThemedDrawable(mContext, R.drawable.greydivider_bottom, Theme.key_windowBackgroundGrayShadow)); - String abi = FileUtil.getAbi(); - cell.setText(String.format("%1$s %2$s", LocaleController.getString("NekoX", R.string.NekoX), String.format(Locale.US, "v%s %s %s", BuildConfig.VERSION_NAME, abi, BuildConfig.BUILD_TYPE))); + cell.setText("Nekogram X v" + BuildConfig.VERSION_NAME + " " + FileUtil.getAbi() + " " + BuildConfig.BUILD_TYPE); + cell.getTextView().setPadding(0, AndroidUtilities.dp(14), 0, AndroidUtilities.dp(14)); view = cell; Drawable drawable = Theme.getThemedDrawable(mContext, R.drawable.greydivider_bottom, Theme.key_windowBackgroundGrayShadow); diff --git a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/NekoConfig.java b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/NekoConfig.java index 9de82ab13..65d8c093b 100644 --- a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/NekoConfig.java +++ b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/NekoConfig.java @@ -162,7 +162,7 @@ public class NekoConfig { hideKeyboardOnChatScroll = preferences.getBoolean("hideKeyboardOnChatScroll", false); avatarAsDrawerBackground = preferences.getBoolean("avatarAsDrawerBackground", true); useSystemEmoji = preferences.getBoolean("useSystemEmoji", false); - showTabsOnForward = preferences.getBoolean("showTabsOnForward", showTabsOnForward); + showTabsOnForward = preferences.getBoolean("showTabsOnForward", false); rearVideoMessages = preferences.getBoolean("rearVideoMessages", false); hideAllTab = preferences.getBoolean("hideAllTab", false); diff --git a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/utils/FileUtil.kt b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/utils/FileUtil.kt index 2809ceab7..a3f058960 100644 --- a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/utils/FileUtil.kt +++ b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/utils/FileUtil.kt @@ -137,7 +137,11 @@ object FileUtil { if (libDirs.size == 1) libDirs[0] else { - Build.CPU_ABI.toLowerCase() + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { + Build.SUPPORTED_ABIS[0] + } else { + Build.CPU_ABI + }.toLowerCase() }.also {