Removing privacy from root Settings menu (#456)

kickstarter · Feb 1, 2019 · 2868e60 · 2868e60
1 parent 397e999
commit 2868e60
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 23 deletions.
diff --git a/app/src/main/java/com/kickstarter/ui/activities/SettingsActivity.kt b/app/src/main/java/com/kickstarter/ui/activities/SettingsActivity.kt
@@ -56,18 +56,18 @@ class SettingsActivity : BaseActivity<SettingsViewModel.ViewModel>() {
         this.viewModel.outputs.showConfirmLogoutPrompt()
                 .compose(bindToLifecycle())
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe({ show ->
+                .subscribe { show ->
                     if (show) {
                         lazyLogoutConfirmationDialog().show()
                     } else {
                         lazyLogoutConfirmationDialog().dismiss()
                     }
-                })
+                }
 
         this.viewModel.outputs.userNameTextViewText()
                 .compose(bindToLifecycle())
                 .compose(Transformers.observeForUI())
-                .subscribe({ name_text_view.text = it })
+                .subscribe { name_text_view.text = it }
 
         account_row.setOnClickListener {
             startActivityWithSlideUpTransition(Intent(this, AccountActivity::class.java))
@@ -93,10 +93,6 @@ class SettingsActivity : BaseActivity<SettingsViewModel.ViewModel>() {
             startActivityWithSlideUpTransition(Intent(this, NotificationsActivity::class.java))
         }
 
-        privacy_row.setOnClickListener {
-            startActivityWithSlideUpTransition(Intent(this, PrivacyActivity::class.java))
-        }
-
         rate_us_row.setOnClickListener { ViewUtils.openStoreRating(this, this.packageName) }
     }
 

diff --git a/app/src/main/res/layout/settings_layout.xml b/app/src/main/res/layout/settings_layout.xml
@@ -107,21 +107,10 @@
         android:layout_marginBottom="@dimen/grid_3"
         android:layout_marginTop="@dimen/grid_3">
 
-        <LinearLayout
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:orientation="vertical">
-
-          <TextView
-            android:id="@+id/help_row"
-            style="@style/SettingsSingleRow"
-            android:text="@string/Help" />
-
-          <TextView
-            android:id="@+id/privacy_row"
-            style="@style/SettingsSingleRow"
-            android:text="@string/Privacy" />
-        </LinearLayout>
+        <TextView
+          android:id="@+id/help_row"
+          style="@style/SettingsSingleRow"
+          android:text="@string/Help" />
 
       </LinearLayout>
 
@@ -156,7 +145,8 @@
           <TextView
             android:id="@+id/version_name_text_view"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
+            android:layout_height="wrap_content"
+            tools:text="@string/App_version" />
         </LinearLayout>
 
       </LinearLayout>