Skip to content

Commit

Permalink
feat: Disable Dialogs Floating Button
Browse files Browse the repository at this point in the history
Co-authored-by: 23rd <[email protected]>
  • Loading branch information
omg-xtao and 23rd committed Feb 13, 2024
1 parent 5892af3 commit 3ad1be7
Show file tree
Hide file tree
Showing 27 changed files with 59 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ public class DrawerLayoutAdapter extends RecyclerListView.SelectionAdapter imple
private SideMenultItemAnimator itemAnimator;
private boolean hasGps;

public static int nkbtnNewStory = 1000;

public DrawerLayoutAdapter(Context context, SideMenultItemAnimator animator, DrawerLayoutContainer drawerLayoutContainer) {
mContext = context;
mDrawerLayoutContainer = drawerLayoutContainer;
Expand Down Expand Up @@ -361,6 +363,10 @@ private void resetItems() {
if (MessagesController.getInstance(UserConfig.selectedAccount).storiesEnabled()) {
items.add(new Item(16, LocaleController.getString("ProfileMyStories", R.string.ProfileMyStories), R.drawable.msg_menu_stories));
showDivider = true;

if (NaConfig.INSTANCE.getDisableDialogsFloatingButton().Bool()) {
items.add(new Item(nkbtnNewStory, LocaleController.getString("RecorderNewStory", R.string.RecorderNewStory), R.drawable.msg_menu_stories));
}
}
TLRPC.TL_attachMenuBots menuBots = MediaDataController.getInstance(UserConfig.selectedAccount).getAttachMenuBots();
if (menuBots != null && menuBots.bots != null) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6847,6 +6847,9 @@ public int getTopOffset(int tag) {
updateVisibleRows(0, false);
updateProxyButton(false, true);
updateStoriesVisibility(false);
if (NaConfig.INSTANCE.getDisableDialogsFloatingButton().Bool()) {
hideFloatingButton(true);
}
checkSuggestClearDatabase();
}

Expand Down Expand Up @@ -10874,6 +10877,10 @@ public void onAnimationEnd(Animator animation) {
}

private void hideFloatingButton(boolean hide) {
if (NaConfig.INSTANCE.getDisableDialogsFloatingButton().Bool()) {
hide = true;
}

if (rightSlidingDialogContainer.hasFragment()) {
hide = true;
}
Expand Down
17 changes: 17 additions & 0 deletions TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -695,6 +695,23 @@ public boolean drawChild(Canvas canvas, View child, long drawingTime) {
args.putInt("type", MediaActivity.TYPE_STORIES);
drawerLayoutContainer.closeDrawer(true);
presentFragment(new MediaActivity(args, null));
} else if (id == DrawerLayoutAdapter.nkbtnNewStory) {
final StoriesController.StoryLimit storyLimit = MessagesController.getInstance(currentAccount).getStoriesController().checkStoryLimit();
if (storyLimit != null) {
BaseFragment fragment = actionBarLayout.getFragmentStack().get(0);
LimitReachedBottomSheet limitReachedBottomSheet = new LimitReachedBottomSheet(
fragment,
this,
storyLimit.getLimitReachedType(),
currentAccount,
null);
fragment.showDialog(limitReachedBottomSheet);
limitReachedBottomSheet.onShowPremiumScreenRunnable = () -> drawerLayoutContainer.closeDrawer(false);
return;
}

StoryRecorder.getInstance(LaunchActivity.this, currentAccount).open(null);
drawerLayoutContainer.closeDrawer(true);
}
}
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,7 @@ public class NekoGeneralSettingsActivity extends BaseNekoXSettingsActivity {
private final AbstractConfigCell header_chatblur = cellGroup.appendCell(new ConfigCellHeader(LocaleController.getString("ChatBlurAlphaValue")));
private final AbstractConfigCell chatBlurAlphaValueRow = cellGroup.appendCell(new ConfigCellCustom("ChatBlurAlphaValue", ConfigCellCustom.CUSTOM_ITEM_CharBlurAlpha, NekoConfig.forceBlurInChat.Bool()));

private final AbstractConfigCell disableDialogsFloatingButtonRow = cellGroup.appendCell(new ConfigCellTextCheck(NaConfig.INSTANCE.getDisableDialogsFloatingButton()));
private final AbstractConfigCell divider5 = cellGroup.appendCell(new ConfigCellDivider());

private final AbstractConfigCell header6 = cellGroup.appendCell(new ConfigCellHeader(LocaleController.getString("PrivacyTitle")));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -524,6 +524,12 @@ object NaConfig {
ConfigItem.configTypeBool,
false
)
val disableDialogsFloatingButton =
addConfig(
"DisableDialogsFloatingButton",
ConfigItem.configTypeBool,
false
)

private fun addConfig(
k: String,
Expand Down
1 change: 1 addition & 0 deletions TMessagesProj/src/main/res/values-ar-rSA/strings_na.xml
Original file line number Diff line number Diff line change
Expand Up @@ -122,4 +122,5 @@
<string name="ShowSmallGIF">إظهار الغاز الصغير</string>
<string name="DisableClickCommandToSend">تعطيل نص أمر النقر لإرساله</string>
<string name="DisableClickCommandToSendHint">لمنع اللمس العرضي</string>
<string name="DisableDialogsFloatingButton">تعطيل مربعات الحوار الزر العائم</string>
</resources>
1 change: 1 addition & 0 deletions TMessagesProj/src/main/res/values-cs-rCZ/strings_na.xml
Original file line number Diff line number Diff line change
Expand Up @@ -122,4 +122,5 @@
<string name="ShowSmallGIF">Zobrazit malý Gif</string>
<string name="DisableClickCommandToSend">Zakázat kliknutí na text příkazu pro odeslání</string>
<string name="DisableClickCommandToSendHint">Aby se zabránilo náhodnému dotyku</string>
<string name="DisableDialogsFloatingButton">Zakázat plovoucí tlačítko dialogů</string>
</resources>
1 change: 1 addition & 0 deletions TMessagesProj/src/main/res/values-da-rDK/strings_na.xml
Original file line number Diff line number Diff line change
Expand Up @@ -122,4 +122,5 @@
<string name="ShowSmallGIF">Vis Lille Gif</string>
<string name="DisableClickCommandToSend">Deaktivér klikkommandotekst for at sende</string>
<string name="DisableClickCommandToSendHint">For at forhindre utilsigtet berøring</string>
<string name="DisableDialogsFloatingButton">Deaktivér Dialoger Flydende Knap</string>
</resources>
1 change: 1 addition & 0 deletions TMessagesProj/src/main/res/values-de-rDE/strings_na.xml
Original file line number Diff line number Diff line change
Expand Up @@ -122,4 +122,5 @@
<string name="ShowSmallGIF">Kleine Gif anzeigen</string>
<string name="DisableClickCommandToSend">Deaktiviere Befehlstext zum Senden</string>
<string name="DisableClickCommandToSendHint">Um zufällige Berührung zu verhindern</string>
<string name="DisableDialogsFloatingButton">Schwebende Dialoge deaktivieren</string>
</resources>
1 change: 1 addition & 0 deletions TMessagesProj/src/main/res/values-el-rGR/strings_na.xml
Original file line number Diff line number Diff line change
Expand Up @@ -122,4 +122,5 @@
<string name="ShowSmallGIF">Εμφάνιση Μικρού Gif</string>
<string name="DisableClickCommandToSend">Απενεργοποιήστε το κλικ στην εντολή κειμένου για αποστολή</string>
<string name="DisableClickCommandToSendHint">Για την πρόληψη ακούσιας αφής</string>
<string name="DisableDialogsFloatingButton">Απενεργοποίηση Πλωτού Κουμπιού Dialogs</string>
</resources>
1 change: 1 addition & 0 deletions TMessagesProj/src/main/res/values-es-rES/strings_na.xml
Original file line number Diff line number Diff line change
Expand Up @@ -122,4 +122,5 @@
<string name="ShowSmallGIF">Mostrar Gif pequeño</string>
<string name="DisableClickCommandToSend">Deshabilitar comando de clic para enviar</string>
<string name="DisableClickCommandToSendHint">Para prevenir toques accidentales</string>
<string name="DisableDialogsFloatingButton">Desactivar el botón flotante de diálogos</string>
</resources>
1 change: 1 addition & 0 deletions TMessagesProj/src/main/res/values-fi-rFI/strings_na.xml
Original file line number Diff line number Diff line change
Expand Up @@ -122,4 +122,5 @@
<string name="ShowSmallGIF">Näytä Pieni Gif</string>
<string name="DisableClickCommandToSend">Poista komennon teksti käytöstä lähettääksesi</string>
<string name="DisableClickCommandToSendHint">Estä vahingossa kosketus</string>
<string name="DisableDialogsFloatingButton">Poista Dialogien Kelluva Painike Käytöstä</string>
</resources>
1 change: 1 addition & 0 deletions TMessagesProj/src/main/res/values-fr-rFR/strings_na.xml
Original file line number Diff line number Diff line change
Expand Up @@ -122,4 +122,5 @@
<string name="ShowSmallGIF">Afficher le petit Gif</string>
<string name="DisableClickCommandToSend">Désactiver le texte de la commande pour envoyer</string>
<string name="DisableClickCommandToSendHint">Pour éviter un toucher accidentel</string>
<string name="DisableDialogsFloatingButton">Désactiver le bouton flottant des boîtes de dialogue</string>
</resources>
1 change: 1 addition & 0 deletions TMessagesProj/src/main/res/values-it-rIT/strings_na.xml
Original file line number Diff line number Diff line change
Expand Up @@ -122,4 +122,5 @@
<string name="ShowSmallGIF">Mostra Gif Piccolo</string>
<string name="DisableClickCommandToSend">Disabilita il clic sul testo del comando da inviare</string>
<string name="DisableClickCommandToSendHint">Per evitare tocchi accidentali</string>
<string name="DisableDialogsFloatingButton">Disabilita Le Finestre Pulsante Fluttuante</string>
</resources>
1 change: 1 addition & 0 deletions TMessagesProj/src/main/res/values-ja-rJP/strings_na.xml
Original file line number Diff line number Diff line change
Expand Up @@ -122,4 +122,5 @@
<string name="ShowSmallGIF">小さなGifを表示</string>
<string name="DisableClickCommandToSend">送信するコマンドテキストをクリックしない</string>
<string name="DisableClickCommandToSendHint">偶発的なタッチを防ぐため</string>
<string name="DisableDialogsFloatingButton">ダイアログのフローティングボタンを無効化</string>
</resources>
1 change: 1 addition & 0 deletions TMessagesProj/src/main/res/values-nl-rNL/strings_na.xml
Original file line number Diff line number Diff line change
Expand Up @@ -122,4 +122,5 @@
<string name="ShowSmallGIF">Kleine Gif weergeven</string>
<string name="DisableClickCommandToSend">Schakel klik op opdracht tekst uit om te verzenden</string>
<string name="DisableClickCommandToSendHint">Ongewenste aanraking voorkomen</string>
<string name="DisableDialogsFloatingButton">Zwevende knop dialoogknop uitschakelen</string>
</resources>
1 change: 1 addition & 0 deletions TMessagesProj/src/main/res/values-no-rNO/strings_na.xml
Original file line number Diff line number Diff line change
Expand Up @@ -122,4 +122,5 @@
<string name="ShowSmallGIF">Vis liten Gif</string>
<string name="DisableClickCommandToSend">Deaktiver komprimeringstekst for å sende</string>
<string name="DisableClickCommandToSendHint">Å forhindre utilsiktet berøring</string>
<string name="DisableDialogsFloatingButton">Deaktiver dialoger med flytende knapp</string>
</resources>
1 change: 1 addition & 0 deletions TMessagesProj/src/main/res/values-pl-rPL/strings_na.xml
Original file line number Diff line number Diff line change
Expand Up @@ -122,4 +122,5 @@
<string name="ShowSmallGIF">Pokaż mały Gif</string>
<string name="DisableClickCommandToSend">Wyłącz tekst polecenia, aby wysłać</string>
<string name="DisableClickCommandToSendHint">Aby zapobiec przypadkowemu dotknięciu</string>
<string name="DisableDialogsFloatingButton">Wyłącz pływający przycisk dialogów</string>
</resources>
1 change: 1 addition & 0 deletions TMessagesProj/src/main/res/values-pt-rBR/strings_na.xml
Original file line number Diff line number Diff line change
Expand Up @@ -122,4 +122,5 @@
<string name="ShowSmallGIF">Mostrar Pequeno Gif</string>
<string name="DisableClickCommandToSend">Desative clique no texto de comando para enviar</string>
<string name="DisableClickCommandToSendHint">Para prevenir toques acidentais</string>
<string name="DisableDialogsFloatingButton">Desativar Botão de Diálogos Flutuantes</string>
</resources>
1 change: 1 addition & 0 deletions TMessagesProj/src/main/res/values-pt-rPT/strings_na.xml
Original file line number Diff line number Diff line change
Expand Up @@ -122,4 +122,5 @@
<string name="ShowSmallGIF">Mostrar Pequeno Gif</string>
<string name="DisableClickCommandToSend">Desative clique no texto de comando para enviar</string>
<string name="DisableClickCommandToSendHint">Para prevenir toques acidentais</string>
<string name="DisableDialogsFloatingButton">Desativar Botão de Diálogos Flutuantes</string>
</resources>
1 change: 1 addition & 0 deletions TMessagesProj/src/main/res/values-ro-rRO/strings_na.xml
Original file line number Diff line number Diff line change
Expand Up @@ -122,4 +122,5 @@
<string name="ShowSmallGIF">Arată Gif Mic</string>
<string name="DisableClickCommandToSend">Dezactivează clic pe textul de comandă pentru a trimite</string>
<string name="DisableClickCommandToSendHint">Pentru a preveni atingerea accidentală</string>
<string name="DisableDialogsFloatingButton">Dezactivează dialogul cu butonul plutitor</string>
</resources>
1 change: 1 addition & 0 deletions TMessagesProj/src/main/res/values-ru-rRU/strings_na.xml
Original file line number Diff line number Diff line change
Expand Up @@ -122,4 +122,5 @@
<string name="ShowSmallGIF">Показать маленький Gif</string>
<string name="DisableClickCommandToSend">Отключите команду клика для отправки</string>
<string name="DisableClickCommandToSendHint">Во избежание случайного касания</string>
<string name="DisableDialogsFloatingButton">Отключить плавающую кнопку диалогов</string>
</resources>
1 change: 1 addition & 0 deletions TMessagesProj/src/main/res/values-sv-rSE/strings_na.xml
Original file line number Diff line number Diff line change
Expand Up @@ -122,4 +122,5 @@
<string name="ShowSmallGIF">Visa liten Gif</string>
<string name="DisableClickCommandToSend">Inaktivera klickkommandotext för att skicka</string>
<string name="DisableClickCommandToSendHint">För att förhindra oavsiktligt tryck</string>
<string name="DisableDialogsFloatingButton">Inaktivera dialoger flytande knapp</string>
</resources>
1 change: 1 addition & 0 deletions TMessagesProj/src/main/res/values-uk-rUA/strings_na.xml
Original file line number Diff line number Diff line change
Expand Up @@ -122,4 +122,5 @@
<string name="ShowSmallGIF">Показати маленький Gif</string>
<string name="DisableClickCommandToSend">Вимкнути командний текст, щоб відправити</string>
<string name="DisableClickCommandToSendHint">Щоб запобігти випадковому дотику</string>
<string name="DisableDialogsFloatingButton">Вимкнути плаваючу кнопку діалогу</string>
</resources>
1 change: 1 addition & 0 deletions TMessagesProj/src/main/res/values-zh-rCN/strings_na.xml
Original file line number Diff line number Diff line change
Expand Up @@ -122,4 +122,5 @@
<string name="ShowSmallGIF">GIF 显示得更小</string>
<string name="DisableClickCommandToSend">禁用点击指令文本发送</string>
<string name="DisableClickCommandToSendHint">妈妈再也不用担心我会误触啦</string>
<string name="DisableDialogsFloatingButton">禁用主页浮动按钮</string>
</resources>
1 change: 1 addition & 0 deletions TMessagesProj/src/main/res/values-zh-rTW/strings_na.xml
Original file line number Diff line number Diff line change
Expand Up @@ -122,4 +122,5 @@
<string name="ShowSmallGIF">Show Small Gif</string>
<string name="DisableClickCommandToSend">Disable click command text to send</string>
<string name="DisableClickCommandToSendHint">To prevent accidental touch</string>
<string name="DisableDialogsFloatingButton">Disable Dialogs Floating Button</string>
</resources>
1 change: 1 addition & 0 deletions TMessagesProj/src/main/res/values/strings_na.xml
Original file line number Diff line number Diff line change
Expand Up @@ -122,4 +122,5 @@
<string name="ShowSmallGIF">Show Small Gif</string>
<string name="DisableClickCommandToSend">Disable click command text to send</string>
<string name="DisableClickCommandToSendHint">To prevent accidental touch</string>
<string name="DisableDialogsFloatingButton">Disable Dialogs Floating Button</string>
</resources>

0 comments on commit 3ad1be7

Please sign in to comment.