Ghost552/FoxiGram
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions 1

Pin account-info row, add phone-number privacy option, update icon

Browse source 
- Account balance/subscription row now sits right after the archive folder
  so it stays visible even when the archive is auto-scrolled out of view
- New 'My phone number' setting (Show / Blur / Hide) under General >
  Privacy that masks the user's own number in Settings header and profile
- NekoConfig.formatOwnPhone() applies the chosen mode consistently
- Regenerate launcher icon from foxigram4.png
This commit is contained in:
instant992 2026-06-10 02:00:10 +04:00
parent 220b7334d5
commit a776898268
6 changed files with 97 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
TMessagesProj/src/main/java/org/telegram/ui/Adapters/DialogsAdapter.java
View file

@ -1500,10 +1500,6 @@ public class DialogsAdapter extends RecyclerListView.SelectionAdapter implements
return;
}
if (shouldShowFoxAccountInfo()) {
itemInternals.add(new ItemInternal(VIEW_TYPE_FOX_ACCOUNT_INFO));
}
if (!hasHints && dialogsType == 0 && folderId == 0 && messagesController.isDialogsEndReached(folderId) && !forceUpdatingContacts) {
if (messagesController.getAllFoldersDialogsCount() <= 10 && ContactsController.getInstance(currentAccount).doneLoadingContacts && !ContactsController.getInstance(currentAccount).contacts.isEmpty()) {
onlineContacts = new ArrayList<>(ContactsController.getInstance(currentAccount).contacts);
@ -1643,12 +1639,24 @@ public class DialogsAdapter extends RecyclerListView.SelectionAdapter implements
}
if (!stopUpdate) {
boolean foxInfoInserted = false;
for (int k = 0; k < array.size(); k++) {
if (dialogsType == DialogsActivity.DIALOGS_TYPE_ADD_USERS_TO && array.get(k) instanceof DialogsActivity.DialogsHeader) {
itemInternals.add(new ItemInternal(VIEW_TYPE_HEADER_2, array.get(k)));
} else {
itemInternals.add(new ItemInternal(VIEW_TYPE_DIALOG, array.get(k)));
}
// Insert the account-info row right after the archive folder so
// it stays pinned visible even when the archive is auto-scrolled
// out of view (the list auto-scrolls to position 1 in that case).
if (!foxInfoInserted && shouldShowFoxAccountInfo() && array.get(k) instanceof TLRPC.TL_dialogFolder) {
itemInternals.add(new ItemInternal(VIEW_TYPE_FOX_ACCOUNT_INFO));
foxInfoInserted = true;
}
}
// No archive folder present: just pin it to the very top.
if (!foxInfoInserted && shouldShowFoxAccountInfo()) {
itemInternals.add(0, new ItemInternal(VIEW_TYPE_FOX_ACCOUNT_INFO));
}
if (!forceShowEmptyCell && dialogsType != 7 && dialogsType != 8 && !MessagesController.getInstance(currentAccount).isDialogsEndReached(folderId)) {

10
TMessagesProj/src/main/java/org/telegram/ui/ProfileActivity.java
View file

@ -13613,7 +13613,11 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
phoneNumber = null;
}
isFragmentPhoneNumber = phoneNumber != null && phoneNumber.matches("888\\d{8}");
detailCell.setTextAndValue(text, LocaleController.getString(isFragmentPhoneNumber ? R.string.AnonymousNumber : R.string.PhoneMobile), false);
CharSequence phoneText = text;
if (user != null && user.id == getUserConfig().getClientUserId()) {
phoneText = tw.nekomimi.nekogram.NekoConfig.formatOwnPhone(text);
}
detailCell.setTextAndValue(phoneText, LocaleController.getString(isFragmentPhoneNumber ? R.string.AnonymousNumber : R.string.PhoneMobile), false);
} else if (position == noteRow) {
final TLRPC.UserFull userInfo = getMessagesController().getUserFull(userId);
if (userInfo == null) return;
@ -13719,9 +13723,9 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter.
}
} else if (position == numberRow) {
TLRPC.User user = UserConfig.getInstance(currentAccount).getCurrentUser();
String value;
CharSequence value;
if (user != null && user.phone != null && user.phone.length() != 0) {
value = PhoneFormat.getInstance().format("+" + user.phone);
value = tw.nekomimi.nekogram.NekoConfig.formatOwnPhone(PhoneFormat.getInstance().format("+" + user.phone));
} else {
value = LocaleController.getString(R.string.NumberUnknown);
}

2
TMessagesProj/src/main/java/org/telegram/ui/SettingsActivity.java
View file

@ -531,7 +531,7 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
titleView.setText(UserObject.getUserName(user));
final StringBuilder sb = new StringBuilder();
if (user != null) {
sb.append(PhoneFormat.getInstance().format("+" + user.phone));
sb.append(tw.nekomimi.nekogram.NekoConfig.formatOwnPhone(PhoneFormat.getInstance().format("+" + user.phone)));
}
final String username = UserObject.getPublicUsername(user);
if (username != null) {

45
TMessagesProj/src/main/java/tw/nekomimi/nekogram/NekoConfig.java
View file

@ -150,6 +150,12 @@ public class NekoConfig {
public static boolean shouldNOTTrustMe = false;
// How the user's OWN phone number is presented across the app.
public static final int PHONE_SHOW = 0;
public static final int PHONE_BLUR = 1;
public static final int PHONE_HIDE = 2;
public static int hidePhoneNumber = PHONE_SHOW;
public static int userMcc = 0;
private static final SharedPreferences.OnSharedPreferenceChangeListener listener = (preferences, key) -> {
@ -199,6 +205,7 @@ public class NekoConfig {
askBeforeCall = preferences.getBoolean("askBeforeCall", true);
shouldNOTTrustMe = preferences.getBoolean("shouldNOTTrustMe", false);
disableNumberRounding = preferences.getBoolean("disableNumberRounding", false);
hidePhoneNumber = preferences.getInt("hidePhoneNumber", PHONE_SHOW);
disableAppBarShadow = preferences.getBoolean("disableAppBarShadow", false);
mediaPreview = preferences.getBoolean("mediaPreview", true);
idType = preferences.getInt("idType", ID_TYPE_API);
@ -668,6 +675,44 @@ public class NekoConfig {
editor.apply();
}
public static void setHidePhoneNumber(int mode) {
hidePhoneNumber = mode;
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("nekoconfig", Activity.MODE_PRIVATE);
SharedPreferences.Editor editor = preferences.edit();
editor.putInt("hidePhoneNumber", hidePhoneNumber);
editor.apply();
}
/**
* Transform the user's OWN already-formatted phone number according to the
* {@link #hidePhoneNumber} setting:
* <ul>
* <li>{@link #PHONE_SHOW}: returned unchanged.</li>
* <li>{@link #PHONE_BLUR}: every digit replaced with the bullet '•',
* keeping the leading '+', spaces and separators so it still looks
* like a phone number.</li>
* <li>{@link #PHONE_HIDE}: a localized "hidden" placeholder.</li>
* </ul>
*/
public static CharSequence formatOwnPhone(CharSequence formatted) {
if (formatted == null || hidePhoneNumber == PHONE_SHOW) {
return formatted;
}
if (hidePhoneNumber == PHONE_HIDE) {
return org.telegram.messenger.LocaleController.getString(org.telegram.messenger.R.string.MobileHidden);
}
StringBuilder sb = new StringBuilder(formatted.length());
for (int i = 0; i < formatted.length(); i++) {
char c = formatted.charAt(i);
if (Character.isDigit(c)) {
sb.append('•');
} else {
sb.append(c);
}
}
return sb.toString();
}
public static void setNameOrder(int order) {
nameOrder = order;
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("nekoconfig", Activity.MODE_PRIVATE);

27
TMessagesProj/src/main/java/tw/nekomimi/nekogram/settings/NekoGeneralSettingsActivity.java
View file

@ -38,6 +38,7 @@ public class NekoGeneralSettingsActivity extends BaseNekoSettingsActivity {
private final int nameOrderRow = rowId++;
private final int idTypeRow = rowId++;
private final int hidePhoneNumberRow = rowId++;
private final int disabledInstantCameraRow = rowId++;
private final int askBeforeCallRow = rowId++;
@ -104,6 +105,14 @@ public class NekoGeneralSettingsActivity extends BaseNekoSettingsActivity {
return app == null ? "" : app.title;
}
private CharSequence getHidePhoneNumberValue() {
return switch (NekoConfig.hidePhoneNumber) {
case NekoConfig.PHONE_BLUR -> LocaleController.getString(R.string.HidePhoneNumberBlur);
case NekoConfig.PHONE_HIDE -> LocaleController.getString(R.string.HidePhoneNumberHide);
default -> LocaleController.getString(R.string.HidePhoneNumberShow);
};
}
@Override
protected void fillItems(ArrayList<UItem> items, UniversalAdapter adapter) {
items.add(UItem.asHeader(LocaleController.getString(R.string.Connection)));
@ -142,6 +151,10 @@ public class NekoGeneralSettingsActivity extends BaseNekoSettingsActivity {
}).slug("idType"));
items.add(UItem.asShadow(LocaleController.getString(R.string.IdTypeAbout)));
items.add(UItem.asHeader(LocaleController.getString(R.string.PrivacyTitle)));
items.add(TextSettingsCellFactory.of(hidePhoneNumberRow, LocaleController.getString(R.string.HidePhoneNumber), getHidePhoneNumberValue()).slug("hidePhoneNumber"));
items.add(UItem.asShadow(LocaleController.getString(R.string.HidePhoneNumberAbout)));
items.add(UItem.asHeader(LocaleController.getString(R.string.General)));
items.add(UItem.asCheck(disabledInstantCameraRow, LocaleController.getString(R.string.DisableInstantCamera)).slug("disabledInstantCamera").setChecked(NekoConfig.disableInstantCamera));
items.add(UItem.asCheck(askBeforeCallRow, LocaleController.getString(R.string.AskBeforeCalling)).slug("askBeforeCall").setChecked(NekoConfig.askBeforeCall));
@ -223,6 +236,20 @@ public class NekoGeneralSettingsActivity extends BaseNekoSettingsActivity {
listView.adapter.notifyItemChanged(position, PARTIAL);
parentLayout.rebuildAllFragmentViews(false, false);
}, resourcesProvider);
} else if (id == hidePhoneNumberRow) {
ArrayList<String> arrayList = new ArrayList<>();
ArrayList<Integer> types = new ArrayList<>();
arrayList.add(LocaleController.getString(R.string.HidePhoneNumberShow));
types.add(NekoConfig.PHONE_SHOW);
arrayList.add(LocaleController.getString(R.string.HidePhoneNumberBlur));
types.add(NekoConfig.PHONE_BLUR);
arrayList.add(LocaleController.getString(R.string.HidePhoneNumberHide));
types.add(NekoConfig.PHONE_HIDE);
PopupHelper.show(arrayList, LocaleController.getString(R.string.HidePhoneNumber), types.indexOf(NekoConfig.hidePhoneNumber), getParentActivity(), view, i -> {
NekoConfig.setHidePhoneNumber(types.get(i));
item.textValue = getHidePhoneNumberValue();
listView.adapter.notifyItemChanged(position, PARTIAL);
}, resourcesProvider);
} else if (id == accentAsNotificationColorRow) {
NekoConfig.toggleAccentAsNotificationColor();
if (view instanceof TextCheckCell) {

5
TMessagesProj/src/main/res/values/strings_neko.xml
View file

@ -81,6 +81,11 @@
<string name="IdTypeHidden">Hide</string>
<string name="IdTypeAPI">Telegram API</string>
<string name="IdTypeBOTAPI">Bot API</string>
<string name="HidePhoneNumber">My phone number</string>
<string name="HidePhoneNumberAbout">Choose how your own phone number is shown across the app (drawer, settings and your profile). This only changes how it looks on this device.</string>
<string name="HidePhoneNumberShow">Show</string>
<string name="HidePhoneNumberBlur">Blur</string>
<string name="HidePhoneNumberHide">Hide</string>
<string name="AutoPauseVideo">Auto pause video</string>
<string name="AutoPauseVideoAbout">When lock screen/switch to background.</string>
<string name="DisableProximityEvents">Disable proximity events</string>