From 8bf5d98d04ef0dd412021a6dfce3f7eca1e98fa2 Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Sat, 6 May 2017 15:05:10 +0200
Subject: [PATCH] Pimp settings dialog.

---
 .../src/main/java/com/b44t/ui/SettingsAdvActivity.java     | 4 +++-
 .../java/com/b44t/ui/SettingsNotificationsActivity.java    | 7 ++++++-
 .../src/main/java/com/b44t/ui/SettingsPrivacyActivity.java | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/MessengerProj/src/main/java/com/b44t/ui/SettingsAdvActivity.java b/MessengerProj/src/main/java/com/b44t/ui/SettingsAdvActivity.java
index 561d4dcb4..aba3e84d3 100644
--- a/MessengerProj/src/main/java/com/b44t/ui/SettingsAdvActivity.java
+++ b/MessengerProj/src/main/java/com/b44t/ui/SettingsAdvActivity.java
@@ -238,7 +238,9 @@ public class SettingsAdvActivity extends BaseFragment {
                 if (view == null) {
                     view = new ShadowSectionCell(mContext);
                 }
-                view.setBackgroundResource(i == finalShadowRow? R.drawable.greydivider_bottom : R.drawable.greydivider);
+                if( i==finalShadowRow ) {
+                    view.setBackgroundResource(R.drawable.greydivider_bottom);
+                }
             } else if (type == ROWTYPE_TEXT_SETTINGS) {
                 if (view == null) {
                     view = new TextSettingsCell(mContext);
diff --git a/MessengerProj/src/main/java/com/b44t/ui/SettingsNotificationsActivity.java b/MessengerProj/src/main/java/com/b44t/ui/SettingsNotificationsActivity.java
index 0ccb1d373..7dca7cc4f 100644
--- a/MessengerProj/src/main/java/com/b44t/ui/SettingsNotificationsActivity.java
+++ b/MessengerProj/src/main/java/com/b44t/ui/SettingsNotificationsActivity.java
@@ -85,6 +85,7 @@ public class SettingsNotificationsActivity extends BaseFragment implements Notif
     private int badgeNumberRow;
     private int repeatRow;
     private int resetNotificationsRow;
+    private int finalShadowRow;
     private int rowCount = 0;
 
     private final int TYPE_HEADER      = 0;
@@ -123,6 +124,7 @@ public class SettingsNotificationsActivity extends BaseFragment implements Notif
         badgeNumberRow = rowCount++;
         repeatRow = rowCount++;
         resetNotificationsRow = rowCount++;
+        finalShadowRow = rowCount++;
 
         NotificationCenter.getInstance().addObserver(this, NotificationCenter.notificationsSettingsUpdated);
 
@@ -643,6 +645,9 @@ public class SettingsNotificationsActivity extends BaseFragment implements Notif
                 if (view == null) {
                     view = new ShadowSectionCell(mContext);
                 }
+                if( i== finalShadowRow ) {
+                    view.setBackgroundResource(R.drawable.greydivider_bottom);
+                }
             }
             return view;
         }
@@ -658,7 +663,7 @@ public class SettingsNotificationsActivity extends BaseFragment implements Notif
                     i == inchatSoundRow ) {
                 return TYPE_CHECK_CELL;
             } else if ( i == groupSectionRow2 ||
-                    i == inappSectionRow2 || i == otherSectionRow2 ) {
+                    i == inappSectionRow2 || i == otherSectionRow2 || i == finalShadowRow ) {
                 return TYPE_SHADOW;
             } else {
                 return TYPE_TEXTSETTING;
diff --git a/MessengerProj/src/main/java/com/b44t/ui/SettingsPrivacyActivity.java b/MessengerProj/src/main/java/com/b44t/ui/SettingsPrivacyActivity.java
index d1756a262..144dd9679 100644
--- a/MessengerProj/src/main/java/com/b44t/ui/SettingsPrivacyActivity.java
+++ b/MessengerProj/src/main/java/com/b44t/ui/SettingsPrivacyActivity.java
@@ -217,7 +217,7 @@ public class SettingsPrivacyActivity extends BaseFragment {
                     textCell.setTextAndValue(mContext.getString(R.string.Passcode), val, true);
                 }
                 else if( i==manageKeysRow ) {
-                    textCell.setText(mContext.getString(R.string.E2EManagePrivateKeys), true);
+                    textCell.setText(mContext.getString(R.string.E2EManagePrivateKeys), false);
                 }
             } else if (type == TYPE_TEXT_INFO) {
                 if (view == null) {