mirror of https://github.com/NekoX-Dev/NekoX.git
Medium phone text
This commit is contained in:
parent
6e0285415b
commit
b49f6c5a3c
|
@ -160,8 +160,9 @@ public class DrawerProfileCell extends FrameLayout {
|
||||||
shadowView.getDrawable().setColorFilter(new PorterDuffColorFilter(color, PorterDuff.Mode.SRC_IN));
|
shadowView.getDrawable().setColorFilter(new PorterDuffColorFilter(color, PorterDuff.Mode.SRC_IN));
|
||||||
}
|
}
|
||||||
nameTextView.setTextColor(Theme.getColor(Theme.key_chats_menuName));
|
nameTextView.setTextColor(Theme.getColor(Theme.key_chats_menuName));
|
||||||
|
phoneTextView.setTextColor(Theme.getColor(Theme.key_chats_menuName));
|
||||||
|
|
||||||
if (useAdb() || useImageBackground) {
|
if (useAdb() || useImageBackground) {
|
||||||
phoneTextView.setTextColor(Theme.getColor(Theme.key_chats_menuPhone));
|
|
||||||
if (shadowView.getVisibility() != VISIBLE) {
|
if (shadowView.getVisibility() != VISIBLE) {
|
||||||
shadowView.setVisibility(VISIBLE);
|
shadowView.setVisibility(VISIBLE);
|
||||||
}
|
}
|
||||||
|
@ -190,7 +191,6 @@ public class DrawerProfileCell extends FrameLayout {
|
||||||
if (shadowView.getVisibility() != visibility) {
|
if (shadowView.getVisibility() != visibility) {
|
||||||
shadowView.setVisibility(visibility);
|
shadowView.setVisibility(visibility);
|
||||||
}
|
}
|
||||||
phoneTextView.setTextColor(Theme.getColor(Theme.key_chats_menuPhoneCats));
|
|
||||||
super.onDraw(canvas);
|
super.onDraw(canvas);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -118,6 +118,7 @@ import java.util.Set;
|
||||||
|
|
||||||
import cn.hutool.core.util.RuntimeUtil;
|
import cn.hutool.core.util.RuntimeUtil;
|
||||||
import kotlin.Unit;
|
import kotlin.Unit;
|
||||||
|
import libv2ray.Libv2ray;
|
||||||
import tw.nekomimi.nekogram.BottomBuilder;
|
import tw.nekomimi.nekogram.BottomBuilder;
|
||||||
import tw.nekomimi.nekogram.NekoConfig;
|
import tw.nekomimi.nekogram.NekoConfig;
|
||||||
import tw.nekomimi.nekogram.NekoXConfig;
|
import tw.nekomimi.nekogram.NekoXConfig;
|
||||||
|
@ -519,10 +520,17 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
|
||||||
NekoXConfig.developerModeEntrance = true;
|
NekoXConfig.developerModeEntrance = true;
|
||||||
}
|
}
|
||||||
BottomBuilder builder = new BottomBuilder(getParentActivity());
|
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.addItem(LocaleController.getString("Copy", R.string.Copy), R.drawable.baseline_content_copy_24, (it) -> {
|
||||||
builder.dismiss();
|
builder.dismiss();
|
||||||
AndroidUtilities.addToClipboard(cell.getTextView().getText().toString());
|
AndroidUtilities.addToClipboard(finalMessage);
|
||||||
AlertUtil.showToast(LocaleController.getString("TextCopied", R.string.TextCopied));
|
AlertUtil.showToast(LocaleController.getString("TextCopied", R.string.TextCopied));
|
||||||
return Unit.INSTANCE;
|
return Unit.INSTANCE;
|
||||||
});
|
});
|
||||||
|
@ -2349,8 +2357,8 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
|
||||||
cell.getTextView().setMovementMethod(null);
|
cell.getTextView().setMovementMethod(null);
|
||||||
cell.setBackgroundDrawable(Theme.getThemedDrawable(mContext, R.drawable.greydivider_bottom, Theme.key_windowBackgroundGrayShadow));
|
cell.setBackgroundDrawable(Theme.getThemedDrawable(mContext, R.drawable.greydivider_bottom, Theme.key_windowBackgroundGrayShadow));
|
||||||
|
|
||||||
String abi = FileUtil.getAbi();
|
cell.setText("Nekogram X v" + BuildConfig.VERSION_NAME + " " + FileUtil.getAbi() + " " + BuildConfig.BUILD_TYPE);
|
||||||
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.getTextView().setPadding(0, AndroidUtilities.dp(14), 0, AndroidUtilities.dp(14));
|
cell.getTextView().setPadding(0, AndroidUtilities.dp(14), 0, AndroidUtilities.dp(14));
|
||||||
view = cell;
|
view = cell;
|
||||||
Drawable drawable = Theme.getThemedDrawable(mContext, R.drawable.greydivider_bottom, Theme.key_windowBackgroundGrayShadow);
|
Drawable drawable = Theme.getThemedDrawable(mContext, R.drawable.greydivider_bottom, Theme.key_windowBackgroundGrayShadow);
|
||||||
|
|
|
@ -162,7 +162,7 @@ public class NekoConfig {
|
||||||
hideKeyboardOnChatScroll = preferences.getBoolean("hideKeyboardOnChatScroll", false);
|
hideKeyboardOnChatScroll = preferences.getBoolean("hideKeyboardOnChatScroll", false);
|
||||||
avatarAsDrawerBackground = preferences.getBoolean("avatarAsDrawerBackground", true);
|
avatarAsDrawerBackground = preferences.getBoolean("avatarAsDrawerBackground", true);
|
||||||
useSystemEmoji = preferences.getBoolean("useSystemEmoji", false);
|
useSystemEmoji = preferences.getBoolean("useSystemEmoji", false);
|
||||||
showTabsOnForward = preferences.getBoolean("showTabsOnForward", showTabsOnForward);
|
showTabsOnForward = preferences.getBoolean("showTabsOnForward", false);
|
||||||
rearVideoMessages = preferences.getBoolean("rearVideoMessages", false);
|
rearVideoMessages = preferences.getBoolean("rearVideoMessages", false);
|
||||||
hideAllTab = preferences.getBoolean("hideAllTab", false);
|
hideAllTab = preferences.getBoolean("hideAllTab", false);
|
||||||
|
|
||||||
|
|
|
@ -137,7 +137,11 @@ object FileUtil {
|
||||||
|
|
||||||
if (libDirs.size == 1) libDirs[0] else {
|
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 {
|
}.also {
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue