Skip to content

Commit e38f999

Browse files
committed
Added "Share" context menu item for outgoing sharing.
Removed Share button.
1 parent 2413c21 commit e38f999

File tree

3 files changed

+32
-15
lines changed

3 files changed

+32
-15
lines changed

res/layout/thememanager.xml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
android:layout_width="wrap_content"
99
android:layout_height="wrap_content"
1010
android:layout_alignParentBottom="true"
11-
android:layout_toLeftOf="@+id/SelectBackgroundButton"
1211
android:onClick="openThemeSettings"
1312
android:text="@string/theme_settings" />
1413

@@ -20,13 +19,4 @@
2019
android:layout_alignParentTop="true"
2120
android:layout_marginTop="82dp" />
2221

23-
<Button
24-
android:id="@+id/sharebtn"
25-
android:layout_width="wrap_content"
26-
android:layout_height="wrap_content"
27-
android:layout_alignParentBottom="true"
28-
android:layout_toLeftOf="@+id/themeprefsbutton"
29-
android:onClick="shareStuff"
30-
android:text="@string/share_btn" />
31-
3222
</RelativeLayout>

src/com/javaposse/android/zenwriter/AndroidZenWriterActivity.java

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66
import java.io.FileOutputStream;
77
import java.io.IOException;
88
import java.io.InputStreamReader;
9-
import java.util.Date;
10-
import java.util.Map;
11-
import java.util.Properties;
129

1310
import android.app.Activity;
1411
import android.content.Context;
@@ -21,8 +18,11 @@
2118
import android.os.Bundle;
2219
import android.preference.PreferenceManager;
2320
import android.support.v4.view.ViewPager;
24-
import android.util.DisplayMetrics;
2521
import android.util.Log;
22+
import android.view.ContextMenu;
23+
import android.view.ContextMenu.ContextMenuInfo;
24+
import android.view.Menu;
25+
import android.view.MenuItem;
2626
import android.view.View;
2727
import android.widget.EditText;
2828
import android.widget.Toast;
@@ -45,6 +45,7 @@ public void onCreate(Bundle savedInstanceState) {
4545
pager.setCurrentItem(1, true);
4646

4747
applyPreferences();
48+
4849

4950
}
5051

@@ -55,7 +56,7 @@ public void openThemeSettings(View parent) {
5556
startActivityForResult(settingsActivity, EDIT_PREFERENCES);
5657
}
5758

58-
public void shareStuff(View parent) {
59+
public void shareStuff() {
5960
Intent sharingIntent = new Intent(android.content.Intent.ACTION_SEND);
6061
sharingIntent.setType("text/plain");
6162

@@ -218,5 +219,19 @@ public static Drawable getDrawable(Context context, String filename) {
218219
return null;
219220

220221
}
222+
223+
public static final int SHARE_CONTEXT_MENU_ITEMID = 100;
224+
225+
@Override
226+
public boolean onContextItemSelected(MenuItem item) {
227+
// TODO Auto-generated method stub
228+
super.onContextItemSelected(item);
229+
230+
if(item.getItemId() == SHARE_CONTEXT_MENU_ITEMID) {
231+
shareStuff();
232+
}
233+
234+
return true;
235+
}
221236

222237
}

src/com/javaposse/android/zenwriter/ZenAdapter.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,16 @@
44
import android.content.Context;
55
import android.graphics.Color;
66
import android.support.v4.view.PagerAdapter;
7+
import android.view.ContextMenu;
78
import android.view.LayoutInflater;
9+
import android.view.Menu;
810
import android.view.View;
911
import android.view.ViewGroup;
12+
import android.view.ContextMenu.ContextMenuInfo;
1013
import android.widget.AdapterView;
1114
import android.widget.AdapterView.OnItemClickListener;
1215
import android.widget.Button;
16+
import android.widget.EditText;
1317
import android.widget.Gallery;
1418
import android.widget.TextView;
1519

@@ -55,6 +59,14 @@ public Object instantiateItem(ViewGroup container, int position) {
5559

5660
if (position == 1) {
5761
context.loadFile(AndroidZenWriterActivity.currentFilename);
62+
EditText editor = (EditText) view.findViewById(R.id.editText1);
63+
View.OnCreateContextMenuListener editorOnContextMenuCreateListener = new View.OnCreateContextMenuListener() {
64+
65+
public void onCreateContextMenu(ContextMenu menu, View view, ContextMenuInfo menuInfo) {
66+
menu.add(Menu.NONE, AndroidZenWriterActivity.SHARE_CONTEXT_MENU_ITEMID, Menu.NONE, "Share");
67+
}
68+
};
69+
editor.setOnCreateContextMenuListener(editorOnContextMenuCreateListener);
5870
}
5971

6072
if (position == 2) {

0 commit comments

Comments
 (0)