awesome-bookmarks/arcanechat-android
3
0
Fork 0
mirror of https://github.com/ArcaneChat/android.git synced 2026-07-03 14:05:24 +02:00
Code Issues Packages Projects Releases 3 Wiki Activity

Cleanup notify code.

Browse Source
This commit is contained in:
B. Petersen
2016-12-21 00:38:22 +01:00
parent 1e58912226
commit 1ae26ecfa5
2 changed files with 19 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MessengerProj/src/main/java/com/b44t/ui/Components/ChatActivityEnterView.java
+12 -10
View File
@@ -290,13 +290,13 @@ public class ChatActivityEnterView extends FrameLayout implements NotificationCe
private RecordDot recordDot;
private SizeNotifierFrameLayout sizeNotifierLayout;
private LinearLayout attachButton;
private ImageView botButton;
//private ImageView botButton;
private LinearLayout textFieldContainer;
private FrameLayout sendButtonContainer;
private View topView;
//private PopupWindow botKeyboardPopup;
//private BotKeyboardView botKeyboardView;
private ImageView notifyButton;
//private ImageView notifyButton;
private RecordCircle recordCircle;
private CloseProgressDrawable2 progressDrawable;
private Drawable backgroundDrawable;
@@ -677,6 +677,7 @@ public class ChatActivityEnterView extends FrameLayout implements NotificationCe
attachButton.setPivotX(AndroidUtilities.dp(48));
frameLayout.addView(attachButton, LayoutHelper.createFrame(LayoutHelper.WRAP_CONTENT, 48, Gravity.BOTTOM | Gravity.RIGHT));
/*
botButton = new ImageView(context);
botButton.setImageResource(R.drawable.bot_keyboard2);
botButton.setScaleType(ImageView.ScaleType.CENTER);
@@ -688,7 +689,6 @@ public class ChatActivityEnterView extends FrameLayout implements NotificationCe
botButton.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
/*
if (botReplyMarkup != null) {
if (!isPopupShowing() || currentPopupContentType != 1) {
showPopup(1, 1);
@@ -705,10 +705,11 @@ public class ChatActivityEnterView extends FrameLayout implements NotificationCe
setFieldText("/");
openKeyboard();
}
*/
}
});
*/
/*
notifyButton = new ImageView(context);
notifyButton.setImageResource(silent ? R.drawable.notify_members_off : R.drawable.notify_members_on);
notifyButton.setScaleType(ImageView.ScaleType.CENTER);
@@ -732,6 +733,7 @@ public class ChatActivityEnterView extends FrameLayout implements NotificationCe
updateFieldHint();
}
});
*/
}
recordedAudioPanel = new FrameLayout(context);
@@ -1227,11 +1229,11 @@ public class ChatActivityEnterView extends FrameLayout implements NotificationCe
TLRPC.Chat currentChat = MessagesController.getInstance().getChat(-(int) dialog_id);
silent = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE).getBoolean("silent_" + dialog_id, false);
//canWriteToChannel = ChatObject.isChannel(currentChat) && (currentChat.creator || currentChat.editor) && !currentChat.megagroup;
if (notifyButton != null) {
/*if (notifyButton != null) {
notifyButton.setVisibility(canWriteToChannel ? VISIBLE : GONE);
notifyButton.setImageResource(silent ? R.drawable.notify_members_off : R.drawable.notify_members_on);
attachButton.setPivotX(AndroidUtilities.dp((botButton == null || botButton.getVisibility() == GONE) && (notifyButton == null || notifyButton.getVisibility() == GONE) ? 48 : 96));
}
}*/
if (attachButton != null) {
updateFieldRight(attachButton.getVisibility() == VISIBLE ? 1 : 0);
}
@@ -1579,16 +1581,16 @@ public class ChatActivityEnterView extends FrameLayout implements NotificationCe
}
FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) messageEditText.getLayoutParams();
if (attachVisible == 1) {
if (botButton != null && botButton.getVisibility() == VISIBLE || notifyButton != null && notifyButton.getVisibility() == VISIBLE) {
/*if (botButton != null && botButton.getVisibility() == VISIBLE || notifyButton != null && notifyButton.getVisibility() == VISIBLE) {
layoutParams.rightMargin = AndroidUtilities.dp(98);
} else {
} else*/ {
layoutParams.rightMargin = AndroidUtilities.dp(50);
}
} else if (attachVisible == 2) {
if (layoutParams.rightMargin != AndroidUtilities.dp(2)) {
if (botButton != null && botButton.getVisibility() == VISIBLE || notifyButton != null && notifyButton.getVisibility() == VISIBLE) {
/*if (botButton != null && botButton.getVisibility() == VISIBLE || notifyButton != null && notifyButton.getVisibility() == VISIBLE) {
layoutParams.rightMargin = AndroidUtilities.dp(98);
} else {
} else*/ {
layoutParams.rightMargin = AndroidUtilities.dp(50);
}
}
MessengerProj/src/main/java/com/b44t/ui/NotificationsSettingsActivity.java
+7 -52
View File
@@ -77,14 +77,9 @@ public class NotificationsSettingsActivity extends BaseFragment implements Notif
private int inappPreviewRow;
private int inchatSoundRow;
private int inappPriorityRow;
private int eventsSectionRow2;
private int eventsSectionRow;
private int contactJoinedRow;
private int pinnedMessageRow;
private int otherSectionRow2;
private int otherSectionRow;
private int badgeNumberRow;
private int androidAutoAlertRow;
private int repeatRow;
private int resetSectionRow2;
private int resetSectionRow;
@@ -129,16 +124,11 @@ public class NotificationsSettingsActivity extends BaseFragment implements Notif
} else {
inappPriorityRow = -1;
}
eventsSectionRow2 = rowCount++;
eventsSectionRow = -1; // EDIT BY MT -- rowCount++;
contactJoinedRow = -1; // EDIT BY MR -- rowCount++;
pinnedMessageRow = -1; // EDIT BY MR -- rowCount++;
otherSectionRow2 = -1; // EDIT BY MR -- rowCount++;
otherSectionRow2 = rowCount++;
otherSectionRow = rowCount++;
notificationsServiceRow = rowCount++;
notificationsServiceConnectionRow = rowCount++;
badgeNumberRow = rowCount++;
androidAutoAlertRow = -1;
repeatRow = rowCount++;
resetSectionRow2 = rowCount++;
resetSectionRow = rowCount++;
@@ -309,29 +299,6 @@ public class NotificationsSettingsActivity extends BaseFragment implements Notif
enabled = preferences.getBoolean("EnableInAppPriority", false);
editor.putBoolean("EnableInAppPriority", !enabled);
editor.commit();
} else if (i == contactJoinedRow) {
/* EDIT BY MR
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE);
SharedPreferences.Editor editor = preferences.edit();
enabled = preferences.getBoolean("EnableContactJoined", true);
MessagesController.getInstance().enableJoined = !enabled;
editor.putBoolean("EnableContactJoined", !enabled);
editor.commit();
*/
} else if (i == pinnedMessageRow) {
/* EDIT BY MR
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE);
SharedPreferences.Editor editor = preferences.edit();
enabled = preferences.getBoolean("PinnedMessages", true);
editor.putBoolean("PinnedMessages", !enabled);
editor.commit();
*/
} else if (i == androidAutoAlertRow) {
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE);
SharedPreferences.Editor editor = preferences.edit();
enabled = preferences.getBoolean("EnableAutoNotifications", false);
editor.putBoolean("EnableAutoNotifications", !enabled);
editor.commit();
} else if (i == badgeNumberRow) {
SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE);
SharedPreferences.Editor editor = preferences.edit();
@@ -635,8 +602,8 @@ public class NotificationsSettingsActivity extends BaseFragment implements Notif
@Override
public boolean isEnabled(int i) {
return !(i == messageSectionRow || i == groupSectionRow || i == inappSectionRow ||
i == eventsSectionRow || i == otherSectionRow || i == resetSectionRow ||
i == eventsSectionRow2 || i == groupSectionRow2 ||
i == otherSectionRow || i == resetSectionRow ||
i == groupSectionRow2 ||
i == inappSectionRow2 || i == otherSectionRow2 || i == resetSectionRow2);
}
@@ -673,8 +640,6 @@ public class NotificationsSettingsActivity extends BaseFragment implements Notif
((HeaderCell) view).setText(LocaleController.getString("GroupNotifications", R.string.GroupNotifications));
} else if (i == inappSectionRow) {
((HeaderCell) view).setText(LocaleController.getString("InAppNotifications", R.string.InAppNotifications));
} else if (i == eventsSectionRow) {
((HeaderCell) view).setText(LocaleController.getString("Events", R.string.Events));
} else if (i == otherSectionRow) {
((HeaderCell) view).setText(LocaleController.getString("NotificationsOther", R.string.NotificationsOther));
} else if (i == resetSectionRow) {
@@ -703,16 +668,6 @@ public class NotificationsSettingsActivity extends BaseFragment implements Notif
checkCell.setTextAndCheck(LocaleController.getString("InAppPreview", R.string.InAppPreview), preferences.getBoolean("EnableInAppPreview", true), true);
} else if (i == inappPriorityRow) {
checkCell.setTextAndCheck(LocaleController.getString("NotificationsPriority", R.string.NotificationsPriority), preferences.getBoolean("EnableInAppPriority", false), false);
} else if (i == contactJoinedRow) {
/* EDIT BY MR
checkCell.setTextAndCheck(LocaleController.getString("ContactJoined", R.string.ContactJoined), preferences.getBoolean("EnableContactJoined", true), true);
*/
} else if (i == pinnedMessageRow) {
/* EDIT BY MR
checkCell.setTextAndCheck(LocaleController.getString("PinnedMessages", R.string.PinnedMessages), preferences.getBoolean("PinnedMessages", true), false);
*/
} else if (i == androidAutoAlertRow) {
checkCell.setTextAndCheck("Android Auto", preferences.getBoolean("EnableAutoNotifications", false), true);
} else if (i == notificationsServiceRow) {
checkCell.setTextAndValueAndCheck(LocaleController.getString("NotificationsService", R.string.NotificationsService), LocaleController.getString("NotificationsServiceInfo", R.string.NotificationsServiceInfo), preferences.getBoolean("pushService", true), true, true);
} else if (i == notificationsServiceConnectionRow) {
@@ -836,17 +791,17 @@ public class NotificationsSettingsActivity extends BaseFragment implements Notif
@Override
public int getItemViewType(int i) {
if (i == messageSectionRow || i == groupSectionRow || i == inappSectionRow ||
i == eventsSectionRow || i == otherSectionRow || i == resetSectionRow) {
i == otherSectionRow || i == resetSectionRow) {
return 0;
} else if (i == messageAlertRow || i == messagePreviewRow || i == groupAlertRow ||
i == groupPreviewRow || i == inappSoundRow || i == inappVibrateRow ||
i == inappPreviewRow || i == contactJoinedRow || i == pinnedMessageRow ||
i == inappPreviewRow ||
i == notificationsServiceRow || i == badgeNumberRow || i == inappPriorityRow ||
i == inchatSoundRow || i == androidAutoAlertRow || i == notificationsServiceConnectionRow) {
i == inchatSoundRow || i == notificationsServiceConnectionRow) {
return 1;
} else if (i == messageLedRow || i == groupLedRow) {
return 3;
} else if (i == eventsSectionRow2 || i == groupSectionRow2 ||
} else if ( i == groupSectionRow2 ||
i == inappSectionRow2 || i == otherSectionRow2 || i == resetSectionRow2) {
return 4;
} else {