From ab0c510fdaec8b12cfa2409b9f62197b1677c696 Mon Sep 17 00:00:00 2001
From: Alinson Xavier <axavier@uwaterloo.ca>
Date: Sat, 18 Mar 2017 22:22:07 -0400
Subject: [PATCH] Rename export action and move to overflow menu

---
 .../uhabits/activities/habits/show/ShowHabitsMenu.java     | 6 +++---
 app/src/main/res/menu/show_habit.xml                       | 7 +++----
 app/src/main/res/values/strings.xml                        | 1 +
 .../uhabits/activities/habits/show/ShowHabitsMenuTest.java | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitsMenu.java b/app/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitsMenu.java
index 93a507154..03f688a06 100644
--- a/app/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitsMenu.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitsMenu.java
@@ -60,7 +60,7 @@ public class ShowHabitsMenu extends BaseMenu
         this.exportCSVFactory = exportCSVFactory;
     }
 
-    public void downloadHabit()
+    public void exportHabit()
     {
         List<Habit> selected = new LinkedList<>();
         selected.add(habit);
@@ -80,8 +80,8 @@ public class ShowHabitsMenu extends BaseMenu
                 screen.showEditHabitDialog();
                 return true;
 
-            case R.id.download:
-                this.downloadHabit();
+            case R.id.export:
+                this.exportHabit();
                 return true;
 
             default:
diff --git a/app/src/main/res/menu/show_habit.xml b/app/src/main/res/menu/show_habit.xml
index e318eaf34..366a53e6c 100644
--- a/app/src/main/res/menu/show_habit.xml
+++ b/app/src/main/res/menu/show_habit.xml
@@ -22,10 +22,9 @@
       xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
-        android:id="@+id/download"
-        android:icon="?iconDownload"
-        android:title="@string/download"
-        app:showAsAction="ifRoom"/>
+        android:id="@+id/export"
+        android:title="@string/export"
+        app:showAsAction="never"/>
 
     <item
         android:id="@+id/action_edit_habit"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 04b2c20bc..1e94bea9a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -203,4 +203,5 @@
     <string name="by_color">By color</string>
     <string name="by_score">By score</string>
     <string name="download">Download</string>
+    <string name="export">Export</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/test/java/org/isoron/uhabits/activities/habits/show/ShowHabitsMenuTest.java b/app/src/test/java/org/isoron/uhabits/activities/habits/show/ShowHabitsMenuTest.java
index 4a4722208..90cfdf512 100644
--- a/app/src/test/java/org/isoron/uhabits/activities/habits/show/ShowHabitsMenuTest.java
+++ b/app/src/test/java/org/isoron/uhabits/activities/habits/show/ShowHabitsMenuTest.java
@@ -61,7 +61,7 @@ public class ShowHabitsMenuTest extends BaseUnitTest
     @Test
     public void testOnDownloadHabit()
     {
-        onItemSelected(R.id.download);
+        onItemSelected(R.id.export);
         verify(taskRunner).execute(any());
     }