diff --git a/MessengerProj/src/main/java/com/b44t/messenger/AndroidUtilities.java b/MessengerProj/src/main/java/com/b44t/messenger/AndroidUtilities.java index 83f3c93cc..aa1707153 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/AndroidUtilities.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/AndroidUtilities.java @@ -482,28 +482,6 @@ public class AndroidUtilities { return src; } - public static void setListViewEdgeEffectColor(AbsListView listView, int color) { - if (Build.VERSION.SDK_INT >= 21) { - try { - Field field = AbsListView.class.getDeclaredField("mEdgeGlowTop"); - field.setAccessible(true); - EdgeEffect mEdgeGlowTop = (EdgeEffect) field.get(listView); - if (mEdgeGlowTop != null) { - mEdgeGlowTop.setColor(color); - } - - field = AbsListView.class.getDeclaredField("mEdgeGlowBottom"); - field.setAccessible(true); - EdgeEffect mEdgeGlowBottom = (EdgeEffect) field.get(listView); - if (mEdgeGlowBottom != null) { - mEdgeGlowBottom.setColor(color); - } - } catch (Exception e) { - FileLog.e("messenger", e); - } - } - } - @SuppressLint("NewApi") public static void clearDrawableAnimation(View view) { if (Build.VERSION.SDK_INT < 21 || view == null) { diff --git a/MessengerProj/src/main/java/com/b44t/ui/AudioSelectActivity.java b/MessengerProj/src/main/java/com/b44t/ui/AudioSelectActivity.java index e95645172..b674bcc22 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/AudioSelectActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/AudioSelectActivity.java @@ -118,7 +118,6 @@ public class AudioSelectActivity extends BaseFragment implements NotificationCen ListView listView = new ListView(context); listView.setEmptyView(progressView); - listView.setVerticalScrollBarEnabled(false); listView.setDivider(null); listView.setDividerHeight(0); listView.setAdapter(listViewAdapter = new ListAdapter(context)); diff --git a/MessengerProj/src/main/java/com/b44t/ui/BlockedUsersActivity.java b/MessengerProj/src/main/java/com/b44t/ui/BlockedUsersActivity.java index ea91b61f9..eb8e65d20 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/BlockedUsersActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/BlockedUsersActivity.java @@ -118,7 +118,6 @@ public class BlockedUsersActivity extends BaseFragment implements NotificationCe listView = new ListView(context); listView.setEmptyView(emptyTextView); - listView.setVerticalScrollBarEnabled(false); listView.setDivider(null); listView.setDividerHeight(0); listView.setAdapter(listViewAdapter = new ListAdapter(context)); diff --git a/MessengerProj/src/main/java/com/b44t/ui/CacheControlActivity.java b/MessengerProj/src/main/java/com/b44t/ui/CacheControlActivity.java index af4292414..bbc7677fd 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/CacheControlActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/CacheControlActivity.java @@ -96,7 +96,6 @@ public class CacheControlActivity extends BaseFragment { ListView listView = new ListView(context); listView.setDivider(null); listView.setDividerHeight(0); - listView.setVerticalScrollBarEnabled(false); listView.setDrawSelectorOnTop(true); frameLayout.addView(listView, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, LayoutHelper.MATCH_PARENT)); listView.setAdapter(listAdapter); diff --git a/MessengerProj/src/main/java/com/b44t/ui/Components/EmojiView.java b/MessengerProj/src/main/java/com/b44t/ui/Components/EmojiView.java index 34e2b4f54..0c1e91a71 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Components/EmojiView.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Components/EmojiView.java @@ -592,7 +592,6 @@ public class EmojiView extends FrameLayout implements NotificationCenter.Notific EmojiGridAdapter emojiGridAdapter = new EmojiGridAdapter(i - 1); gridView.setAdapter(emojiGridAdapter); - AndroidUtilities.setListViewEdgeEffectColor(gridView, 0xfff5f6f7); adapters.add(emojiGridAdapter); } @@ -648,7 +647,6 @@ public class EmojiView extends FrameLayout implements NotificationCenter.Notific } }; stickersGridView.setOnItemClickListener(stickersOnItemClickListener); - AndroidUtilities.setListViewEdgeEffectColor(stickersGridView, 0xfff5f6f7); stickersWrap = new FrameLayout(context); stickersWrap.addView(stickersGridView); diff --git a/MessengerProj/src/main/java/com/b44t/ui/GroupCreateFinalActivity.java b/MessengerProj/src/main/java/com/b44t/ui/GroupCreateFinalActivity.java index 0e269a307..3445eff51 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/GroupCreateFinalActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/GroupCreateFinalActivity.java @@ -274,7 +274,6 @@ public class GroupCreateFinalActivity extends BaseFragment implements Notificati listView = new ListView(context); listView.setDivider(null); listView.setDividerHeight(0); - listView.setVerticalScrollBarEnabled(false); listView.setAdapter(listAdapter = new ListAdapter(context)); linearLayout.addView(listView); layoutParams = (LinearLayout.LayoutParams) listView.getLayoutParams(); diff --git a/MessengerProj/src/main/java/com/b44t/ui/LanguageSelectActivity.java b/MessengerProj/src/main/java/com/b44t/ui/LanguageSelectActivity.java index 8cd395f08..441915913 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/LanguageSelectActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/LanguageSelectActivity.java @@ -176,7 +176,7 @@ public class LanguageSelectActivity extends BaseFragment { listView = new ListView(context); listView.setEmptyView(emptyTextLayout); - listView.setVerticalScrollBarEnabled(false); + listView.setDrawSelectorOnTop(true); listView.setDivider(null); listView.setDividerHeight(0); listView.setAdapter(listAdapter); diff --git a/MessengerProj/src/main/java/com/b44t/ui/LaunchActivity.java b/MessengerProj/src/main/java/com/b44t/ui/LaunchActivity.java index 298ba362c..d16eff7d6 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/LaunchActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/LaunchActivity.java @@ -348,7 +348,7 @@ public class LaunchActivity extends Activity implements ActionBarLayout.ActionBa if ( MrMailbox.isConfigured()==0 ) { Bundle args = new Bundle(); args.putBoolean("fromIntro", true); - actionBarLayout.addFragmentToStack(new AccountSettingsActivity(args)); + actionBarLayout.addFragmentToStack(new SettingsAccountActivity(args)); drawerLayoutContainer.setAllowOpenDrawer(false, false); } else { actionBarLayout.addFragmentToStack(new DialogsActivity(null)); diff --git a/MessengerProj/src/main/java/com/b44t/ui/PasscodeActivity.java b/MessengerProj/src/main/java/com/b44t/ui/PasscodeActivity.java index c33fe13f7..ff68bee31 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/PasscodeActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/PasscodeActivity.java @@ -312,7 +312,6 @@ public class PasscodeActivity extends BaseFragment implements NotificationCenter listView = new ListView(context); listView.setDivider(null); listView.setDividerHeight(0); - listView.setVerticalScrollBarEnabled(false); listView.setDrawSelectorOnTop(true); frameLayout.addView(listView); FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) listView.getLayoutParams(); diff --git a/MessengerProj/src/main/java/com/b44t/ui/PhotoAlbumPickerActivity.java b/MessengerProj/src/main/java/com/b44t/ui/PhotoAlbumPickerActivity.java index e7a791e47..8aafddf9f 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/PhotoAlbumPickerActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/PhotoAlbumPickerActivity.java @@ -221,7 +221,6 @@ public class PhotoAlbumPickerActivity extends BaseFragment implements Notificati layoutParams.bottomMargin = AndroidUtilities.dp(48); listView.setLayoutParams(layoutParams); listView.setAdapter(listAdapter = new ListAdapter(context)); - AndroidUtilities.setListViewEdgeEffectColor(listView, Theme.ACTION_BAR_COLOR); emptyView = new TextView(context); emptyView.setTextColor(0xff808080); diff --git a/MessengerProj/src/main/java/com/b44t/ui/PhotoPickerActivity.java b/MessengerProj/src/main/java/com/b44t/ui/PhotoPickerActivity.java index a6e7c6c25..3bada5e14 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/PhotoPickerActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/PhotoPickerActivity.java @@ -142,7 +142,6 @@ public class PhotoPickerActivity extends BaseFragment implements NotificationCen layoutParams.bottomMargin = singlePhoto ? 0 : AndroidUtilities.dp(48); listView.setLayoutParams(layoutParams); listView.setAdapter(listAdapter = new ListAdapter(context)); - AndroidUtilities.setListViewEdgeEffectColor(listView, Theme.ACTION_BAR_COLOR); listView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override public void onItemClick(AdapterView adapterView, View view, int i, long l) { diff --git a/MessengerProj/src/main/java/com/b44t/ui/ProfileActivity.java b/MessengerProj/src/main/java/com/b44t/ui/ProfileActivity.java index e3a119853..7c5ca7e81 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/ProfileActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/ProfileActivity.java @@ -355,7 +355,6 @@ public class ProfileActivity extends BaseFragment implements NotificationCenter. listView.setTag(6); listView.setPadding(0, AndroidUtilities.dp(88), 0, 0); listView.setBackgroundColor(0xffffffff); - listView.setVerticalScrollBarEnabled(false); listView.setItemAnimator(null); listView.setLayoutAnimation(null); listView.setClipToPadding(false); diff --git a/MessengerProj/src/main/java/com/b44t/ui/ProfileNotificationsActivity.java b/MessengerProj/src/main/java/com/b44t/ui/ProfileNotificationsActivity.java index c696bad42..2914c2074 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/ProfileNotificationsActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/ProfileNotificationsActivity.java @@ -141,8 +141,6 @@ public class ProfileNotificationsActivity extends BaseFragment implements Notifi listView = new ListView(context); listView.setDivider(null); listView.setDividerHeight(0); - listView.setVerticalScrollBarEnabled(false); - AndroidUtilities.setListViewEdgeEffectColor(listView, Theme.ACTION_BAR_COLOR); frameLayout.addView(listView); final FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) listView.getLayoutParams(); layoutParams.width = LayoutHelper.MATCH_PARENT; diff --git a/MessengerProj/src/main/java/com/b44t/ui/AccountSettingsActivity.java b/MessengerProj/src/main/java/com/b44t/ui/SettingsAccountActivity.java similarity index 99% rename from MessengerProj/src/main/java/com/b44t/ui/AccountSettingsActivity.java rename to MessengerProj/src/main/java/com/b44t/ui/SettingsAccountActivity.java index 10997f1fc..753624272 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/AccountSettingsActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/SettingsAccountActivity.java @@ -58,7 +58,7 @@ import com.b44t.ui.Components.LayoutHelper; import static android.app.ProgressDialog.STYLE_HORIZONTAL; -public class AccountSettingsActivity extends BaseFragment implements NotificationCenter.NotificationCenterDelegate { +public class SettingsAccountActivity extends BaseFragment implements NotificationCenter.NotificationCenterDelegate { // the list private ListView listView; @@ -117,7 +117,7 @@ public class AccountSettingsActivity extends BaseFragment implements Notificatio private boolean fromIntro; private boolean m_expanded = false; - public AccountSettingsActivity(Bundle args) { + public SettingsAccountActivity(Bundle args) { super(); if( args!=null ) { fromIntro = args.getBoolean("fromIntro", false); @@ -236,7 +236,6 @@ public class AccountSettingsActivity extends BaseFragment implements Notificatio listView = new ListView(context); listView.setDivider(null); listView.setDividerHeight(0); - listView.setVerticalScrollBarEnabled(false); listView.setDrawSelectorOnTop(true); frameLayout.addView(listView, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, LayoutHelper.MATCH_PARENT)); listView.setAdapter(listAdapter); diff --git a/MessengerProj/src/main/java/com/b44t/ui/SettingsActivity.java b/MessengerProj/src/main/java/com/b44t/ui/SettingsActivity.java index b6cbf7f7b..cf08fa4ee 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/SettingsActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/SettingsActivity.java @@ -53,8 +53,6 @@ import com.b44t.ui.Cells.TextDetailSettingsCell; import com.b44t.ui.Cells.TextSettingsCell; import com.b44t.ui.Components.LayoutHelper; -import java.util.Locale; - public class SettingsActivity extends BaseFragment { @@ -123,24 +121,23 @@ public class SettingsActivity extends BaseFragment { ListView listView = new ListView(context); listView.setDivider(null); listView.setDividerHeight(0); - listView.setVerticalScrollBarEnabled(false); - AndroidUtilities.setListViewEdgeEffectColor(listView, Theme.ACTION_BAR_COLOR); + listView.setDrawSelectorOnTop(true); frameLayout.addView(listView, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, LayoutHelper.MATCH_PARENT)); listView.setAdapter(listAdapter); listView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override public void onItemClick(final AdapterView adapterView, View view, final int i, long l) { if (i == usernameRow) { - presentFragment(new NameSettingsActivity()); + presentFragment(new SettingsNameActivity()); } else if (i == accountSettingsRow) { - presentFragment(new AccountSettingsActivity(null)); + presentFragment(new SettingsAccountActivity(null)); } else if (i == privacyRow) { - presentFragment(new PrivacySettingsActivity()); + presentFragment(new SettingsPrivacyActivity()); } else if (i == notificationRow) { - presentFragment(new NotificationsSettingsActivity()); + presentFragment(new SettingsNotificationsActivity()); } else if (i == backgroundRow) { presentFragment(new WallpapersActivity()); diff --git a/MessengerProj/src/main/java/com/b44t/ui/SettingsAdvActivity.java b/MessengerProj/src/main/java/com/b44t/ui/SettingsAdvActivity.java index 9c62fc619..997e78f1b 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/SettingsAdvActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/SettingsAdvActivity.java @@ -118,8 +118,7 @@ public class SettingsAdvActivity extends BaseFragment { listView = new ListView(context); listView.setDivider(null); listView.setDividerHeight(0); - listView.setVerticalScrollBarEnabled(false); - AndroidUtilities.setListViewEdgeEffectColor(listView, Theme.ACTION_BAR_COLOR); + listView.setDrawSelectorOnTop(true); frameLayout.addView(listView, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, LayoutHelper.MATCH_PARENT, Gravity.TOP | Gravity.LEFT)); listView.setAdapter(listAdapter); listView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/MessengerProj/src/main/java/com/b44t/ui/NameSettingsActivity.java b/MessengerProj/src/main/java/com/b44t/ui/SettingsNameActivity.java similarity index 98% rename from MessengerProj/src/main/java/com/b44t/ui/NameSettingsActivity.java rename to MessengerProj/src/main/java/com/b44t/ui/SettingsNameActivity.java index 94c3f05fb..349cf2cf1 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/NameSettingsActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/SettingsNameActivity.java @@ -51,7 +51,7 @@ import com.b44t.ui.Cells.TextInfoCell; import com.b44t.ui.Components.LayoutHelper; -public class NameSettingsActivity extends BaseFragment { +public class SettingsNameActivity extends BaseFragment { // the list private ListAdapter listAdapter; @@ -119,7 +119,6 @@ public class NameSettingsActivity extends BaseFragment { ListView listView = new ListView(context); listView.setDivider(null); listView.setDividerHeight(0); - listView.setVerticalScrollBarEnabled(false); listView.setDrawSelectorOnTop(true); frameLayout.addView(listView, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, LayoutHelper.MATCH_PARENT)); listView.setAdapter(listAdapter); diff --git a/MessengerProj/src/main/java/com/b44t/ui/NotificationsSettingsActivity.java b/MessengerProj/src/main/java/com/b44t/ui/SettingsNotificationsActivity.java similarity index 95% rename from MessengerProj/src/main/java/com/b44t/ui/NotificationsSettingsActivity.java rename to MessengerProj/src/main/java/com/b44t/ui/SettingsNotificationsActivity.java index e96fe289e..aefb74618 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/NotificationsSettingsActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/SettingsNotificationsActivity.java @@ -60,7 +60,7 @@ import com.b44t.ui.Cells.TextSettingsCell; import com.b44t.ui.Components.ColorPickerView; import com.b44t.ui.Components.LayoutHelper; -public class NotificationsSettingsActivity extends BaseFragment implements NotificationCenter.NotificationCenterDelegate { +public class SettingsNotificationsActivity extends BaseFragment implements NotificationCenter.NotificationCenterDelegate { private ListView listView; @@ -74,7 +74,6 @@ public class NotificationsSettingsActivity extends BaseFragment implements Notif private int groupSectionRow2; private int groupSectionRow; private int groupAlertRow; - //private int groupPreviewRow; private int groupVibrateRow; private int groupSoundRow; private int groupLedRow; @@ -83,7 +82,6 @@ public class NotificationsSettingsActivity extends BaseFragment implements Notif private int inappSectionRow; private int inappSoundRow; private int inappVibrateRow; - //private int inappPreviewRow; private int inchatSoundRow; private int inappPriorityRow; private int otherSectionRow2; @@ -113,7 +111,6 @@ public class NotificationsSettingsActivity extends BaseFragment implements Notif groupSectionRow2 = rowCount++; groupSectionRow = rowCount++; groupAlertRow = rowCount++; - //groupPreviewRow = rowCount++; groupSoundRow = rowCount++; groupVibrateRow = rowCount++; groupLedRow = rowCount++; @@ -123,7 +120,6 @@ public class NotificationsSettingsActivity extends BaseFragment implements Notif inappSectionRow = rowCount++; inappSoundRow = rowCount++; inappVibrateRow = rowCount++; - //inappPreviewRow = rowCount++; inappPriorityRow = Build.VERSION.SDK_INT >= 21? rowCount++ : -1; otherSectionRow2 = rowCount++; @@ -165,7 +161,7 @@ public class NotificationsSettingsActivity extends BaseFragment implements Notif listView = new ListView(context); listView.setDivider(null); listView.setDividerHeight(0); - listView.setVerticalScrollBarEnabled(false); + listView.setDrawSelectorOnTop(true); frameLayout.addView(listView); FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) listView.getLayoutParams(); layoutParams.width = LayoutHelper.MATCH_PARENT; @@ -187,16 +183,11 @@ public class NotificationsSettingsActivity extends BaseFragment implements Notif editor.putBoolean("EnableGroup", !enabled); } editor.apply(); - } else if (i == messagePreviewRow /*|| i == groupPreviewRow*/) { + } else if (i == messagePreviewRow ) { SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); SharedPreferences.Editor editor = preferences.edit(); - //if (i == messagePreviewRow) { - enabled = preferences.getBoolean("EnablePreviewAll", true); - editor.putBoolean("EnablePreviewAll", !enabled); - //} else if (i == groupPreviewRow) { - // enabled = preferences.getBoolean("EnablePreviewGroup", true); - // editor.putBoolean("EnablePreviewGroup", !enabled); - //} + enabled = preferences.getBoolean("EnablePreviewAll", true); + editor.putBoolean("EnablePreviewAll", !enabled); editor.apply(); } else if (i == messageSoundRow || i == groupSoundRow) { try { @@ -269,12 +260,6 @@ public class NotificationsSettingsActivity extends BaseFragment implements Notif enabled = preferences.getBoolean("EnableInAppVibrate", true); editor.putBoolean("EnableInAppVibrate", !enabled); editor.apply(); - /*} else if (i == inappPreviewRow) { - SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); - SharedPreferences.Editor editor = preferences.edit(); - enabled = preferences.getBoolean("EnableInAppPreview", true); - editor.putBoolean("EnableInAppPreview", !enabled); - editor.commit();*/ } else if (i == inchatSoundRow) { SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Activity.MODE_PRIVATE); SharedPreferences.Editor editor = preferences.edit(); @@ -570,14 +555,10 @@ public class NotificationsSettingsActivity extends BaseFragment implements Notif checkCell.setTextAndCheck(LocaleController.getString("Alert", R.string.Alert), preferences.getBoolean("EnableGroup", true), true); } else if (i == messagePreviewRow) { checkCell.setTextAndCheck(LocaleController.getString("MessagePreview", R.string.MessagePreview), preferences.getBoolean("EnablePreviewAll", true), true); - /*} else if (i == groupPreviewRow) { - checkCell.setTextAndCheck(LocaleController.getString("MessagePreview", R.string.MessagePreview), preferences.getBoolean("EnablePreviewGroup", true), true);*/ } else if (i == inappSoundRow) { checkCell.setTextAndCheck(LocaleController.getString("Sound", R.string.Sound), preferences.getBoolean("EnableInAppSounds", true), true); } else if (i == inappVibrateRow) { checkCell.setTextAndCheck(LocaleController.getString("Vibrate", R.string.Vibrate), preferences.getBoolean("EnableInAppVibrate", true), true); - /*} else if (i == inappPreviewRow) { - checkCell.setTextAndCheck(LocaleController.getString("MessagePreview", R.string.MessagePreview), preferences.getBoolean("EnableInAppPreview", true), true);*/ } else if (i == badgeNumberRow) { checkCell.setTextAndCheck(LocaleController.getString("BadgeNumber", R.string.BadgeNumber), preferences.getBoolean("badgeNumber", true), true); } else if (i == inchatSoundRow) { @@ -684,8 +665,7 @@ public class NotificationsSettingsActivity extends BaseFragment implements Notif i == otherSectionRow ) { return TYPE_HEADER; } else if (i == messageAlertRow || i == messagePreviewRow || i == groupAlertRow || - /*i == groupPreviewRow ||*/ i == inappSoundRow || i == inappVibrateRow || - /*i == inappPreviewRow ||*/ + i == inappSoundRow || i == inappVibrateRow || i == badgeNumberRow || i == inchatSoundRow ) { return TYPE_CHECK_CELL; diff --git a/MessengerProj/src/main/java/com/b44t/ui/PrivacySettingsActivity.java b/MessengerProj/src/main/java/com/b44t/ui/SettingsPrivacyActivity.java similarity index 70% rename from MessengerProj/src/main/java/com/b44t/ui/PrivacySettingsActivity.java rename to MessengerProj/src/main/java/com/b44t/ui/SettingsPrivacyActivity.java index 3409bac88..3938e5e8e 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/PrivacySettingsActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/SettingsPrivacyActivity.java @@ -36,28 +36,24 @@ import com.b44t.messenger.ApplicationLoader; import com.b44t.messenger.LocaleController; import com.b44t.messenger.MrChat; import com.b44t.messenger.MrMailbox; -import com.b44t.messenger.NotificationCenter; import com.b44t.messenger.R; import com.b44t.messenger.UserConfig; import com.b44t.ui.ActionBar.ActionBar; import com.b44t.ui.ActionBar.BaseFragment; import com.b44t.ui.Adapters.BaseFragmentAdapter; -import com.b44t.ui.Cells.HeaderCell; import com.b44t.ui.Cells.TextCheckCell; import com.b44t.ui.Cells.TextInfoCell; import com.b44t.ui.Cells.TextSettingsCell; import com.b44t.ui.Components.LayoutHelper; -public class PrivacySettingsActivity extends BaseFragment implements NotificationCenter.NotificationCenterDelegate { +public class SettingsPrivacyActivity extends BaseFragment { private ListAdapter listAdapter; - private int privacySectionRow; private int e2eEncryptionRow; private int readReceiptsRow; private int blockedRow; private int showUnknownSendersRow; - private int securitySectionRow; private int passcodeRow; private int secretDetailRow; private int manageKeysRow; @@ -65,38 +61,25 @@ public class PrivacySettingsActivity extends BaseFragment implements Notificatio private final int TYPE_TEXTSETTING = 0; private final int TYPE_TEXT_INFO = 1; - private final int TYPE_HEADER = 2; - private final int TYPE_CHECK_CELL = 3; - private final int TYPE_COUNT = 4; + private final int TYPE_CHECK_CELL = 2; + private final int TYPE_COUNT = 3; @Override public boolean onFragmentCreate() { super.onFragmentCreate(); - //ContactsController.getInstance().loadPrivacySettings(); - rowCount = 0; - privacySectionRow = -1; passcodeRow = rowCount++; blockedRow = rowCount++; showUnknownSendersRow = rowCount++; readReceiptsRow = rowCount++; e2eEncryptionRow = rowCount++; manageKeysRow = rowCount++; - securitySectionRow = -1; secretDetailRow = rowCount++; - //NotificationCenter.getInstance().addObserver(this, NotificationCenter.privacyRulesUpdated); - return true; } - @Override - public void onFragmentDestroy() { - super.onFragmentDestroy(); - //NotificationCenter.getInstance().removeObserver(this, NotificationCenter.privacyRulesUpdated); - } - @Override public View createView(Context context) { actionBar.setBackButtonImage(R.drawable.ic_ab_back); @@ -120,7 +103,6 @@ public class PrivacySettingsActivity extends BaseFragment implements Notificatio ListView listView = new ListView(context); listView.setDivider(null); listView.setDividerHeight(0); - listView.setVerticalScrollBarEnabled(false); listView.setDrawSelectorOnTop(true); frameLayout.addView(listView, LayoutHelper.createFrame(LayoutHelper.MATCH_PARENT, LayoutHelper.MATCH_PARENT)); listView.setAdapter(listAdapter); @@ -173,67 +155,6 @@ public class PrivacySettingsActivity extends BaseFragment implements Notificatio return fragmentView; } - @Override - public void didReceivedNotification(int id, Object... args) { - /*if (id == NotificationCenter.privacyRulesUpdated) { - if (listAdapter != null) { - listAdapter.notifyDataSetChanged(); - } - }*/ - } - - /* - private String formatRulesString(boolean isGroup) { - ArrayList privacyRules = ContactsController.getInstance().getPrivacyRules(isGroup); - if (privacyRules.size() == 0) { - return LocaleController.getString("LastSeenNobody", R.string.LastSeenNobody); - } - int type = -1; - int plus = 0; - int minus = 0; - for (int a = 0; a < privacyRules.size(); a++) { - TLRPC.PrivacyRule rule = privacyRules.get(a); - if (rule instanceof TLRPC.TL_privacyValueAllowUsers) { - plus += rule.users.size(); - } else if (rule instanceof TLRPC.TL_privacyValueDisallowUsers) { - minus += rule.users.size(); - } else if (rule instanceof TLRPC.TL_privacyValueAllowAll) { - type = 0; - } else if (rule instanceof TLRPC.TL_privacyValueDisallowAll) { - type = 1; - } else { - type = 2; - } - } - if (type == 0 || type == -1 && minus > 0) { - if (minus == 0) { - return LocaleController.getString("LastSeenEverybody", R.string.LastSeenEverybody); - } else { - return LocaleController.formatString("LastSeenEverybodyMinus", R.string.LastSeenEverybodyMinus, minus); - } - } else if (type == 2 || type == -1 && minus > 0 && plus > 0) { - if (plus == 0 && minus == 0) { - return LocaleController.getString("LastSeenContacts", R.string.LastSeenContacts); - } else { - if (plus != 0 && minus != 0) { - return LocaleController.formatString("LastSeenContactsMinusPlus", R.string.LastSeenContactsMinusPlus, minus, plus); - } else if (minus != 0) { - return LocaleController.formatString("LastSeenContactsMinus", R.string.LastSeenContactsMinus, minus); - } else { - return LocaleController.formatString("LastSeenContactsPlus", R.string.LastSeenContactsPlus, plus); - } - } - } else if (type == 1 || plus > 0) { - if (plus == 0) { - return LocaleController.getString("LastSeenNobody", R.string.LastSeenNobody); - } else { - return LocaleController.formatString("LastSeenNobodyPlus", R.string.LastSeenNobodyPlus, plus); - } - } - return "unknown"; - } - */ - @Override public void onResume() { super.onResume(); @@ -257,7 +178,7 @@ public class PrivacySettingsActivity extends BaseFragment implements Notificatio @Override public boolean isEnabled(int i) { int type = getItemViewType(i); - return type!=TYPE_HEADER && type!=TYPE_TEXT_INFO; + return type!=TYPE_TEXT_INFO; } @Override @@ -307,16 +228,6 @@ public class PrivacySettingsActivity extends BaseFragment implements Notificatio ((TextInfoCell) view).setText(""); view.setBackgroundResource(R.drawable.greydivider_bottom); } - } else if (type == TYPE_HEADER) { - if (view == null) { - view = new HeaderCell(mContext); - view.setBackgroundColor(0xffffffff); - } - if (i == privacySectionRow) { - ((HeaderCell) view).setText(LocaleController.getString("Settings", R.string.Settings)); - } else if (i == securitySectionRow) { - ((HeaderCell) view).setText(LocaleController.getString("SecurityTitle", R.string.SecurityTitle)); - } } else if (type == TYPE_CHECK_CELL ) { if (view == null) { view = new TextCheckCell(mContext); @@ -343,8 +254,6 @@ public class PrivacySettingsActivity extends BaseFragment implements Notificatio public int getItemViewType(int i) { if (i == secretDetailRow) { return TYPE_TEXT_INFO; - } else if (i == securitySectionRow || i == privacySectionRow ) { - return TYPE_HEADER; } else if (i==showUnknownSendersRow || i==e2eEncryptionRow || i==readReceiptsRow ) { return TYPE_CHECK_CELL; }