From 2ce2a0d5c3ada4a3852e8755766e1cabb6f399d1 Mon Sep 17 00:00:00 2001
From: Jake McGinty <me@jake.su>
Date: Mon, 16 Nov 2015 15:25:39 -0800
Subject: [PATCH] add refresh in overflow to NewConversationActivity

fixes #4470
closes #4564
// FREEBIE
---
 res/layout/contact_filter_toolbar.xml         |  2 ++
 res/menu/new_conversation_activity.xml        |  7 +++++++
 res/values/strings.xml                        |  2 ++
 res/values/styles.xml                         |  1 +
 .../ContactSelectionListFragment.java         |  4 ++++
 .../securesms/NewConversationActivity.java    | 19 ++++++++++++++++++-
 6 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 res/menu/new_conversation_activity.xml

diff --git a/res/layout/contact_filter_toolbar.xml b/res/layout/contact_filter_toolbar.xml
index 44662bac88..f441433e5b 100644
--- a/res/layout/contact_filter_toolbar.xml
+++ b/res/layout/contact_filter_toolbar.xml
@@ -36,6 +36,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
+                android:paddingLeft="10dp"
+                android:paddingRight="10dp"
                 android:gravity="center">
 
                 <ImageView android:id="@+id/search_dialpad"
diff --git a/res/menu/new_conversation_activity.xml b/res/menu/new_conversation_activity.xml
new file mode 100644
index 0000000000..589fc4afb2
--- /dev/null
+++ b/res/menu/new_conversation_activity.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item android:title="@string/new_conversation_activity__refresh"
+          android:id="@+id/menu_refresh"
+          app:showAsAction="never" />
+</menu>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 05977fb663..f5c56d6984 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1104,6 +1104,8 @@
     <!-- media_preview_activity -->
     <string name="media_preview_activity__image_content_description">Image Preview</string>
 
+    <!-- new_conversation_activity -->
+    <string name="new_conversation_activity__refresh">Refresh</string>
     <!-- redphone_audio_popup_menu -->
     <string name="redphone_audio_popup_menu__handset">Handset</string>
     <string name="redphone_audio_popup_menu__headset">Headset</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index e8564b8ec5..bc35a2942e 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -45,6 +45,7 @@
         <item name="elevation">2dp</item>
         <item name="logo">@drawable/actionbar_icon_holo_dark</item>
         <item name="icon">@drawable/actionbar_icon_holo_dark</item>
+        <item name="popupTheme">@style/ThemeOverlay.AppCompat.Light</item>
         <item name="titleTextStyle">@style/TextSecure.TitleTextStyle</item>
         <item name="subtitleTextStyle">@style/TextSecure.SubtitleTextStyle</item>
         <item name="android:textColorPrimary">@color/white</item>
diff --git a/src/org/thoughtcrime/securesms/ContactSelectionListFragment.java b/src/org/thoughtcrime/securesms/ContactSelectionListFragment.java
index bcb7c909a9..8991bb2d09 100644
--- a/src/org/thoughtcrime/securesms/ContactSelectionListFragment.java
+++ b/src/org/thoughtcrime/securesms/ContactSelectionListFragment.java
@@ -143,6 +143,10 @@ public class ContactSelectionListFragment extends    Fragment
     swipeRefresh.setRefreshing(false);
   }
 
+  public void setRefreshing(boolean refreshing) {
+    swipeRefresh.setRefreshing(refreshing);
+  }
+
   public void reset() {
     selectedContacts.clear();
     getLoaderManager().restartLoader(0, null, this);
diff --git a/src/org/thoughtcrime/securesms/NewConversationActivity.java b/src/org/thoughtcrime/securesms/NewConversationActivity.java
index 4cfec5b1ad..4e7c62575d 100644
--- a/src/org/thoughtcrime/securesms/NewConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/NewConversationActivity.java
@@ -19,7 +19,10 @@ package org.thoughtcrime.securesms;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
+import android.view.Menu;
+import android.view.MenuInflater;
 import android.view.MenuItem;
+import android.view.View;
 
 import org.thoughtcrime.securesms.crypto.MasterSecret;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
@@ -71,10 +74,24 @@ public class NewConversationActivity extends ContactSelectionActivity {
     super.onOptionsItemSelected(item);
 
     switch (item.getItemId()) {
-      case android.R.id.home: super.onBackPressed(); return true;
+    case android.R.id.home: super.onBackPressed(); return true;
+    case R.id.menu_refresh: handleManualRefresh(); return true;
     }
 
     return false;
   }
 
+  private void handleManualRefresh() {
+    contactsFragment.setRefreshing(true);
+    onRefresh();
+  }
+
+  @Override
+  protected boolean onPrepareOptionsPanel(View view, Menu menu) {
+    MenuInflater inflater = this.getMenuInflater();
+    menu.clear();
+    inflater.inflate(R.menu.new_conversation_activity, menu);
+    super.onPrepareOptionsMenu(menu);
+    return true;
+  }
 }