TeamPGM/Nagram
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' into m_10.6.0

Browse Source
This commit is contained in:
xtaodada 2024-02-15 19:42:14 +08:00
commit 083eb47970
Signed by: xtaodada
GPG Key ID: 4CBB3F4FA8C85659
2 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
TMessagesProj/src/main/java/tw/nekomimi/nekogram/settings/NekoChatSettingsActivity.java
View File

@ -206,6 +206,20 @@ public class NekoChatSettingsActivity extends BaseNekoXSettingsActivity implemen
private UndoView tooltip;
public NekoChatSettingsActivity() {
if (!NekoXConfig.isDeveloper()) {
cellGroup.rows.remove(disableChatActionRow);
cellGroup.rows.remove(disableChoosingStickerRow);
cellGroup.rows.remove(ignoreBlockedRow);
cellGroup.rows.remove(dividerEnd);
NekoConfig.disableChatAction.setConfigBool(false);
NekoConfig.disableChoosingSticker.setConfigBool(false);
NekoConfig.ignoreBlocked.setConfigBool(false);
}
if (!NekoConfig.showRepeat.Bool() || NaConfig.INSTANCE.getShowRepeatAsCopy().Bool()){
cellGroup.rows.remove(autoReplaceRepeatRow);
NaConfig.INSTANCE.getAutoReplaceRepeat().setConfigBool(false);
}
addRowsToMap(cellGroup);
}
@ -251,21 +265,6 @@ public class NekoChatSettingsActivity extends BaseNekoXSettingsActivity implemen
}
});
// Before listAdapter
if (!NekoXConfig.isDeveloper()) {
cellGroup.rows.remove(disableChatActionRow);
cellGroup.rows.remove(disableChoosingStickerRow);
cellGroup.rows.remove(ignoreBlockedRow);
cellGroup.rows.remove(dividerEnd);
NekoConfig.disableChatAction.setConfigBool(false);
NekoConfig.disableChoosingSticker.setConfigBool(false);
NekoConfig.ignoreBlocked.setConfigBool(false);
}
if (!NekoConfig.showRepeat.Bool() || NaConfig.INSTANCE.getShowRepeatAsCopy().Bool()){
cellGroup.rows.remove(autoReplaceRepeatRow);
NaConfig.INSTANCE.getAutoReplaceRepeat().setConfigBool(false);
}
listAdapter = new ListAdapter(context);
fragmentView = new FrameLayout(context);

13
TMessagesProj/src/main/java/tw/nekomimi/nekogram/settings/NekoGeneralSettingsActivity.java
View File

@ -245,6 +245,13 @@ public class NekoGeneralSettingsActivity extends BaseNekoXSettingsActivity {
private UndoView restartTooltip;
public NekoGeneralSettingsActivity() {
if (!NekoXConfig.isDeveloper()) {
cellGroup.rows.remove(hideSponsoredMessageRow);
}
if (!BuildVars.isGServicesCompiled) {
cellGroup.rows.remove(mapDriftingFixForGoogleMapsRow);
}
addRowsToMap(cellGroup);
}
@ -854,13 +861,13 @@ public class NekoGeneralSettingsActivity extends BaseNekoXSettingsActivity {
}
private void setCanNotChange() {
if (!NekoXConfig.isDeveloper())
cellGroup.rows.remove(hideSponsoredMessageRow);
// if (!NekoXConfig.isDeveloper())
// cellGroup.rows.remove(hideSponsoredMessageRow);
if (!BuildVars.isGServicesCompiled) {
NekoConfig.useOSMDroidMap.setConfigBool(true);
((ConfigCellTextCheck) useOSMDroidMapRow).setEnabled(false);
cellGroup.rows.remove(mapDriftingFixForGoogleMapsRow);
// cellGroup.rows.remove(mapDriftingFixForGoogleMapsRow);
} else {
if (NekoConfig.useOSMDroidMap.Bool())
((ConfigCellTextCheck) mapDriftingFixForGoogleMapsRow).setEnabled(false);