Merge remote-tracking branch 'upstream/master'

Author: mattgrommes

TODO.txt

@@ -0,0 +1,5 @@
+Support customization of font size and family?
+Support customization of Margins?
+Flip back and forth to get to different documents
+Search Action
+Package for Android Market (Play)

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

@@ -282,8 +282,7 @@ public static Drawable getDrawable(Context context, String filename) {
 
         BitmapFactory.Options opts = new BitmapFactory.Options();
         opts.inSampleSize = 2;
-        Bitmap backgroundBitmap = BitmapFactory.decodeFile(context
-                .getFileStreamPath(filename).getAbsolutePath(), opts);
+        Bitmap backgroundBitmap = BitmapFactory.decodeFile(filename, opts);
 
         if (backgroundBitmap != null) {
             BitmapDrawable drawable = new BitmapDrawable(backgroundBitmap);
@@ -314,6 +313,7 @@ public boolean onContextItemSelected(MenuItem item) {
     public static final int ACTION_SAVE = 5;
     public static final int ACTION_SHARE = 6;
     public static final int ACTION_DELETE = 7;
+    public static final int ACTION_SETTINGS = 8;
 
     // Action Bar
     @Override
@@ -358,6 +358,13 @@ public boolean onCreateOptionsMenu(com.actionbarsherlock.view.Menu menu) {
                         com.actionbarsherlock.view.MenuItem.SHOW_AS_ACTION_ALWAYS);
 
 
+        menu.add(com.actionbarsherlock.view.Menu.NONE, ACTION_SETTINGS,
+                ACTION_SETTINGS, "Settings")
+                .setIcon(android.R.drawable.ic_menu_preferences)
+                .setShowAsAction(
+                        com.actionbarsherlock.view.MenuItem.SHOW_AS_ACTION_IF_ROOM);
+        
+
         return true;
     }
 
@@ -375,6 +382,8 @@ public boolean onOptionsItemSelected(
             ret = true;
         } else if (itemId == ACTION_SEARCH) {
             // TODO: Implement Search
+        } else if (itemId == ACTION_SETTINGS) {
+            openThemeSettings(null);
         } else if (itemId == ACTION_EDIT) {
             AlertDialog.Builder alert = new AlertDialog.Builder(this);
 

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

@@ -36,7 +36,9 @@ public boolean onPreferenceClick(Preference preference) {
                 });
         SharedPreferences prefs = PreferenceManager
                 .getDefaultSharedPreferences(this);
-        backgroundPref.setSummary(prefs.getString("backgroundpref", ""));
+        if(prefs.getString("backgroundpref", "").length() > 0) {
+            backgroundPref.setSummary(new File(prefs.getString("backgroundpref", "")).getName());
+        }
     }
 
     public boolean selectBackgroundImage(Preference pref) {
@@ -60,7 +62,7 @@ protected void onActivityResult(int requestCode, int resultCode,
                 String path = getPath(selectedImage);
                 Log.i("SelectedImage", "File Path: " + path);
                 File selectedImageFile = new File(path);
-
+/*
                 try {
 
                     File destFile = getFileStreamPath(selectedImageFile
@@ -97,11 +99,12 @@ protected void onActivityResult(int requestCode, int resultCode,
                 } catch (Exception e) {
                     Log.e("SelectedImage", "Failed to Copy Image", e);
                 }
+                */
 
                 SharedPreferences prefs = PreferenceManager
                         .getDefaultSharedPreferences(this);
                 SharedPreferences.Editor editor = prefs.edit();
-                editor.putString("backgroundpref", selectedImageFile.getName());
+                editor.putString("backgroundpref", selectedImageFile.getAbsolutePath());
                 editor.commit();
                 Preference backgroundPref = this
                         .findPreference("backgroundpref");