big change here

update icons and remove unused ones
theme picker accessible from menu
make menu scrollable
add option to disable auto keyboard on focus

hovernote/app/src/main/AndroidManifest.xml

@@ -120,11 +120,6 @@
         <activity
             android:name=".ThemePickerActivity"
             android:label="@string/title_activity_theme_picker" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
         </activity>
     </application>
 

hovernote/app/src/main/java/com/mjlim/hovernote/ColorFilterTabWidget.java

@@ -78,13 +78,16 @@ public class ColorFilterTabWidget extends TabWidget {
 			TextView label = (TextView)v.findViewById(R.id.tabTitle);
 			Drawable background = v.getBackground();
 
-			if (i == index)
+			if (label != null)
 			{
-				label.setTextColor(activeTextColor);
-			}
-			else
-			{
-				label.setTextColor(inactiveTextColor);
+				if (i == index)
+				{
+					label.setTextColor(activeTextColor);
+				}
+				else
+				{
+					label.setTextColor(inactiveTextColor);
+				}
 			}
 		}
 

hovernote/app/src/main/java/com/mjlim/hovernote/ContextMenuOption.java

@@ -55,7 +55,7 @@ public class ContextMenuOption extends LinearLayout implements OnFocusChangeList
 
 	private void init(AttributeSet attrs){
 		TypedArray a = getContext().obtainStyledAttributes(attrs, R.styleable.ContextMenuOption);
-		cmicon.setImageResource(a.getResourceId(R.styleable.ContextMenuOption_optionImage, R.drawable.hnicon64));
+		cmicon.setImageResource(a.getResourceId(R.styleable.ContextMenuOption_optionImage, R.drawable.hovernote_white));
 		cmicon.setColorFilter(iconColor, PorterDuff.Mode.MULTIPLY);
 		cmtext.setText(a.getString(R.styleable.ContextMenuOption_optionText));
 		a.recycle();

hovernote/app/src/main/java/com/mjlim/hovernote/FilePickerFileArrayAdapter.java

@@ -58,7 +58,7 @@ public class FilePickerFileArrayAdapter extends ArrayAdapter {
 				}else if(o.getType() == FilePickerOption.FileType.FOLDER){
 					icon.setImageResource(R.drawable.foldericon);
 				}else if(o.getType() == FilePickerOption.FileType.RECENT){
-					icon.setImageResource(R.drawable.hnicon64);
+					icon.setImageResource(R.drawable.hovernote_white);
 				}else if(o.getType() == FilePickerOption.FileType.DBXFILE){
 					icon.setImageResource(R.drawable.dropbox_white48);
 				}

hovernote/app/src/main/java/com/mjlim/hovernote/HoverNoteService.java

@@ -308,7 +308,7 @@ public class HoverNoteService extends Service {
 			public void run() {
 				fOView.focusEditor();
 			}
-			
+
 		}, 400);
 			Log.v("focus", "focusing new note");
 		//}

hovernote/app/src/main/java/com/mjlim/hovernote/HoverNoteView.java

@@ -67,6 +67,7 @@ public class HoverNoteView extends LinearLayout implements NoteWindowInterface,
 	// global configuration
 	public static boolean autosaveOnUnfocus = false;
 	public static boolean autohideControls = false;
+	public static boolean autoKeyboard = false;
 	// end global configuration
 	private SuperCoolEditText ed;
 	public TextViewUndoRedo undoredo;
@@ -283,7 +284,7 @@ public class HoverNoteView extends LinearLayout implements NoteWindowInterface,
 		ed.setOnFocusChangeListener(new OnFocusChangeListener() {
 			
 			public void onFocusChange(View v, boolean hasFocus){
-				if (hasFocus && !isIconified()){
+				if (hasFocus && !isIconified() && HoverNoteView.autoKeyboard){
 					
 				ed.post(new Runnable() {
 					
@@ -359,8 +360,11 @@ public class HoverNoteView extends LinearLayout implements NoteWindowInterface,
 		saveDialog.setOnTouchListener(null);
 		
     	this.postInvalidate();//redraw
-    	
-    	this.focusEditor();
+
+		if (HoverNoteView.autoKeyboard)
+		{
+			this.focusEditor();
+		}
 	}
 	
 	public void unfocus(){	
@@ -994,6 +998,15 @@ public class HoverNoteView extends LinearLayout implements NoteWindowInterface,
 		this.minimize();
 		context.getApplicationContext().startActivity(chooser);
 	}
+
+	public void showThemePicker(){
+		// creates an intent to load theme picker
+		Intent intent = new Intent(context, ThemePickerActivity.class);
+		intent.putExtra(ThemePickerActivity.NOTEID_EXTRA, recentId);
+		intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+		this.minimize();
+		context.getApplicationContext().startActivity(intent);
+	}
 	
 	protected SuperCoolEditText getEditText(){
 		return ed;
@@ -1423,7 +1436,7 @@ public class HoverNoteView extends LinearLayout implements NoteWindowInterface,
 	public void focusEditor(){
 //		this.focus();
 		
-		if(this.focused) // if we're not focused, this might have been scheduled by the service after the user switched out of the note
+		if(this.focused && HoverNoteView.autoKeyboard) // if we're not focused, this might have been scheduled by the service after the user switched out of the note
 		{
 			ed.clearFocus();
 			

hovernote/app/src/main/java/com/mjlim/hovernote/OpenFileWindow.java

@@ -111,7 +111,7 @@ public class OpenFileWindow extends FloatingModalWindow implements OnKeyListener
 		
 	}
 
-	private View getTabIndicator(TabHost tabHost, String title)
+	protected static View getTabIndicator(TabHost tabHost, String title)
 	{
 		View view = LayoutInflater.from(tabHost.getContext()).inflate(R.layout.tab_indicator, null);
 		TextView tv = (TextView)view.findViewById(R.id.tabTitle);

hovernote/app/src/main/java/com/mjlim/hovernote/RecentsDatabase.java

@@ -182,6 +182,9 @@ public class RecentsDatabase {
 	}
 
 	public List<FilePickerOption> getRecentFileOptions(){
+		return getRecentFileOptions(-1);
+	}
+	public List<FilePickerOption> getRecentFileOptions(long requestedId){
 		List<FilePickerOption>files = new ArrayList<FilePickerOption>();
 		
 		DateFormat dateFormat = android.text.format.DateFormat.getDateFormat(context.getApplicationContext());
@@ -190,7 +193,16 @@ public class RecentsDatabase {
 		String[] columns = {DatabaseOpenHelper.KEY_ID, DatabaseOpenHelper.KEY_TYPE, DatabaseOpenHelper.KEY_DATA, DatabaseOpenHelper.KEY_DATESTAMP};
 //		String where = DatabaseOpenHelper.KEY_TYPE + " = ? AND " + DatabaseOpenHelper.KEY_DATA + " = ?";
 //		String[] whereargs = {TYPE_FILE, DatabaseUtils.sqlEscapeString(path)};
-		Cursor result = db.query(false, DatabaseOpenHelper.RECENT_TABLE_NAME, columns, null, null, null, null, DatabaseOpenHelper.KEY_DATESTAMP + " DESC", null);
+		String where = null;
+		String[] whereargs = null;
+
+		if (requestedId >= 0)
+		{
+			where = DatabaseOpenHelper.KEY_ID + " = ?";
+			String idString = String.valueOf(requestedId);
+			whereargs = new String[] { idString };
+		}
+		Cursor result = db.query(false, DatabaseOpenHelper.RECENT_TABLE_NAME, columns, where, whereargs, null, null, DatabaseOpenHelper.KEY_DATESTAMP + " DESC", null);
 		
 		while(result.moveToNext()){
 			long id = result.getLong(0);

hovernote/app/src/main/java/com/mjlim/hovernote/SaveFileWindow.java

@@ -78,12 +78,12 @@ public class SaveFileWindow extends FloatingModalWindow implements OnKeyListener
 		
 		TabHost.TabSpec spec = tabhost.newTabSpec("FILE");
 	    spec.setContent(R.id.filePicker);
-	    spec.setIndicator("Local Files");
+		spec.setIndicator(OpenFileWindow.getTabIndicator(tabhost, "Local Files"));
 	    tabhost.addTab(spec);
 	    
 	    spec = tabhost.newTabSpec("DROPBOX");
 	    spec.setContent(R.id.dropboxFilePicker1);
-	    spec.setIndicator("Dropbox");
+		spec.setIndicator(OpenFileWindow.getTabIndicator(tabhost, "Dropbox"));
 	    tabhost.addTab(spec);
 
 		

hovernote/app/src/main/java/com/mjlim/hovernote/SettingsDialog.java

@@ -33,7 +33,7 @@ public class SettingsDialog extends LinearLayout implements OnSeekBarChangeListe
 	
 	SeekBar seekTransparencyBar, seekFontSize;
 	Button btnDefaultFont, btnMonoFont, btnSerifFont, aboutButton, emailButton, settingsEraseRecent;
-	CheckBox chkNotifClose, chkAutosave, chkAutohideControls, settingsConfirmRecent, chkAutoBullet, chkPersistentNotification;
+	CheckBox chkNotifClose, chkAutosave, chkAutohideControls, settingsConfirmRecent, chkAutoBullet, chkPersistentNotification, chkAutoKeyboard;
 	MLImageButton facebookButton;
 	Spinner spinnerFontChoices;
 	TextView fontSample;
@@ -58,7 +58,8 @@ public class SettingsDialog extends LinearLayout implements OnSeekBarChangeListe
 			chkAutohideControls = (CheckBox)findViewById(R.id.chkAutohideControls);
 			chkAutoBullet = (CheckBox)findViewById(R.id.chkAutoBullet);
 			chkPersistentNotification = (CheckBox)findViewById(R.id.chkPersistentNotification);
-			
+			chkAutoKeyboard = (CheckBox)findViewById(R.id.chkAutoKeyboard);
+
 			btnDefaultFont = (Button)findViewById(R.id.btnDefaultFont);
 			btnMonoFont = (Button)findViewById(R.id.btnMonoFont);
 			btnSerifFont = (Button)findViewById(R.id.btnSerifFont);
@@ -79,6 +80,7 @@ public class SettingsDialog extends LinearLayout implements OnSeekBarChangeListe
 			chkAutohideControls.setOnCheckedChangeListener(this);
 			chkAutoBullet.setOnCheckedChangeListener(this);
 			chkPersistentNotification.setOnCheckedChangeListener(this);
+			chkAutoKeyboard.setOnCheckedChangeListener(this);
 			seekFontSize.setOnSeekBarChangeListener(this);
 			
 			btnDefaultFont.setOnClickListener(this);
@@ -165,6 +167,7 @@ public class SettingsDialog extends LinearLayout implements OnSeekBarChangeListe
 		chkAutosave.setChecked(sm.getAutosave());
 		chkAutohideControls.setChecked(sm.getAutohideControls());
 		chkAutoBullet.setChecked(sm.getAutoBullet());
+		chkAutoKeyboard.setChecked(sm.getAutoKeyboard());
 		chkPersistentNotification.setChecked(sm.isPersistentNotification());
 	}
 	
@@ -243,6 +246,8 @@ public class SettingsDialog extends LinearLayout implements OnSeekBarChangeListe
 			}
 		}else if(v== chkAutoBullet){
 			sm.setAutoBullet(value);
+		}else if(v== chkAutoKeyboard){
+			sm.setAutoKeyboard(value);
 		}else if(v== chkPersistentNotification){
 			sm.setPersistentNotification(value);
 		}

hovernote/app/src/main/java/com/mjlim/hovernote/SettingsManager.java

@@ -23,6 +23,7 @@ public class SettingsManager {
 		this.setAutosave(settings.getBoolean("autosaveOnUnfocus", false));
 		this.setAutohideControls(settings.getBoolean("autohideControls", false));
 		this.setAutoBullet(settings.getBoolean("autoBullet", true));
+		this.setAutoKeyboard(settings.getBoolean("autoKeyboard", true));
 		this.setPersistentNotification(settings.getBoolean("persistentNotification", false));
 		this.setLastChangelog(settings.getString("lastChangelogVersion", "x"));
 	}
@@ -34,6 +35,7 @@ public class SettingsManager {
 		editor.putBoolean("autosaveOnUnfocus", HoverNoteView.autosaveOnUnfocus);
 		editor.putBoolean("autohideControls", HoverNoteView.autohideControls);
         editor.putBoolean("autoBullet", getAutoBullet());
+		editor.putBoolean("autoKeyboard", getAutoKeyboard());
 		editor.putFloat("fontSize", fontSize);
 		editor.putInt("fontFace", fontFace);
 		editor.putBoolean("persistentNotification", persistentNotification);
@@ -93,7 +95,14 @@ public class SettingsManager {
 	public boolean getAutoBullet(){
 		return SuperCoolEditText.autoBullet;
 	}
-	
+
+	public void setAutoKeyboard(boolean in){
+		HoverNoteView.autoKeyboard = in;
+	}
+	public boolean getAutoKeyboard(){
+		return HoverNoteView.autoKeyboard;
+	}
+
 	public boolean isPersistentNotification() {
 		return persistentNotification;
 	}

hovernote/app/src/main/java/com/mjlim/hovernote/ThemePickerActivity.java

@@ -17,10 +17,12 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import java.util.List;
 
 public class ThemePickerActivity extends FragmentActivity {
+	public static final String NOTEID_EXTRA = "noteid";
 
 	/**
 	 * The {@link android.support.v4.view.PagerAdapter} that will provide
@@ -46,6 +48,10 @@ public class ThemePickerActivity extends FragmentActivity {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.activity_theme_picker);
 
+		Intent intent = getIntent();
+
+		long recentId = intent.getLongExtra(NOTEID_EXTRA, -1);
+
 
 		// Create the adapter that will return a fragment for each of the three
 		// primary sections of the activity.
@@ -56,7 +62,7 @@ public class ThemePickerActivity extends FragmentActivity {
 		mViewPager.setAdapter(mSectionsPagerAdapter);
 
 		recentsDb = new RecentsDatabase(getApplicationContext());
-		recentFiles = recentsDb.getRecentFileOptions();
+		recentFiles = recentsDb.getRecentFileOptions(recentId); // get recent note that sent us here or just the last one
 		recentsDb.closeDB();
 	}
 
@@ -191,6 +197,12 @@ public class ThemePickerActivity extends FragmentActivity {
 					RecentsDatabase recentsDb = new RecentsDatabase(this.getActivity().getApplicationContext());
 					recentsDb.putExtra(recentFile.getId(), Themes.RECENTDB_EXTRA_THEME_KEY, thisTheme.getKey());
 					recentsDb.closeDB();
+					Activity a = this.getActivity();
+					a.finish(); // go away
+				}
+				else
+				{
+					Toast.makeText(this.getActivity().getApplicationContext(), "Sorry, couldn't assign theme to this note.", Toast.LENGTH_SHORT).show();
 				}
 
 			}
@@ -199,7 +211,6 @@ public class ThemePickerActivity extends FragmentActivity {
 				Themes.SetTheme(this.getActivity().getApplicationContext(), thisTheme.getKey());
 
 				Activity a = this.getActivity();
-				Intent i = new Intent(a, HoverNoteService.class);
 				a.finish(); // go away
 			}
 		}

hovernote/app/src/main/java/com/mjlim/hovernote/contextmenu.java

@@ -38,7 +38,7 @@ import android.widget.LinearLayout;
 
 public class contextmenu extends FloatingModalWindow implements OnClickListener{
 
-	View bClose, bShare, bSave, bSaveAs, bOpen, bSettings, bEditToolbar;
+	View bClose, bShare, bSave, bSaveAs, bOpen, bSettings, bEditToolbar, bThemes;
 	
 	public contextmenu(Context context, HoverNoteView ov, WindowManager wm, int x, int y) {
 		super(context, ov, wm, x, y);
@@ -54,6 +54,7 @@ public class contextmenu extends FloatingModalWindow implements OnClickListener{
 		bOpen = findViewById(R.id.bOpen);
 		bSettings = findViewById(R.id.bSettings);
 		bEditToolbar = findViewById(R.id.bEditToolbar);
+		bThemes = findViewById(R.id.bThemes);
 
 		// Assign listeners
 
@@ -65,7 +66,8 @@ public class contextmenu extends FloatingModalWindow implements OnClickListener{
 		bOpen.setOnClickListener(this);
 		bSettings.setOnClickListener(this);
 		bEditToolbar.setOnClickListener(this);
-		
+		bThemes.setOnClickListener(this);
+
 		// all need to send key events to the window
 		bClose.setOnKeyListener(this);
 		bShare.setOnKeyListener(this);
@@ -74,6 +76,7 @@ public class contextmenu extends FloatingModalWindow implements OnClickListener{
 		bOpen.setOnKeyListener(this);
 		bSettings.setOnKeyListener(this);
 		bEditToolbar.setOnKeyListener(this);
+		bThemes.setOnKeyListener(this);
 
 		this.invalidate();
 		wm.addView(this, winparams); // make it visible
@@ -112,7 +115,12 @@ public class contextmenu extends FloatingModalWindow implements OnClickListener{
 		}else if(v==bEditToolbar){
 			this.dismiss();
 			noteView.toggleEditToolbar();
+		}else if(v==bThemes)
+		{
+			this.dismiss();
+			noteView.showThemePicker();
 		}
+
 		
 	}
 

hovernote/app/src/main/res/drawable/activerectangle.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<nine-patch
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/windowactive"
-    android:dither="false" />

hovernote/app/src/main/res/drawable/inactiverectangle.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<nine-patch
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/windowinactive"
-    android:dither="false" />

hovernote/app/src/main/res/layout/contextmenu.xml

@@ -7,74 +7,98 @@
     android:focusable="true"
     android:focusableInTouchMode="true"
     android:orientation="vertical" >
-
-<!--    <com.mjlim.hovernote.ContextMenuOption
-        android:id="@+id/contextMenuOption1"
+    <ScrollView
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        hn:optionText="hello world"
-        hn:optionImage="@drawable/copy_white48" >
-    </com.mjlim.hovernote.ContextMenuOption> -->
+        android:layout_height="wrap_content">
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:clickable="true"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:orientation="vertical" >
 
-    <com.mjlim.hovernote.ContextMenuOption
-        android:id="@+id/bEditToolbar"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        hn:optionImage="@drawable/edit_white48"
-        hn:optionText="Edit Toolbar" />
+            <!--    <com.mjlim.hovernote.ContextMenuOption
+                    android:id="@+id/contextMenuOption1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    hn:optionText="hello world"
+                    hn:optionImage="@drawable/copy_white48" >
+                </com.mjlim.hovernote.ContextMenuOption> -->
 
-    <View style="@style/menuseparator" />
-
-        <com.mjlim.hovernote.ContextMenuOption
-        android:id="@+id/bOpen"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        hn:optionImage="@drawable/openaction"
-        hn:optionText="Open" />
-        
             <com.mjlim.hovernote.ContextMenuOption
-        android:id="@+id/bSave"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        hn:optionImage="@drawable/saveaction"
-        hn:optionText="Save" />
-            
-            
-    <com.mjlim.hovernote.ContextMenuOption
-        android:id="@+id/bSaveAs"
-        android:layout_height="match_parent"
-        android:layout_width="match_parent"
-        android:layout_weight="1"
-        hn:optionImage="@drawable/saveas"
-        hn:optionText="Save As..." />
+                android:id="@+id/bEditToolbar"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                hn:optionImage="@drawable/edit"
+                hn:optionText="Edit Toolbar" />
 
-    <com.mjlim.hovernote.ContextMenuOption
-        android:id="@+id/bShare"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        hn:optionImage="@drawable/share_white48"
-        hn:optionText="Share" />
+            <View style="@style/menuseparator" />
 
-    <View style="@style/menuseparator" />
+            <com.mjlim.hovernote.ContextMenuOption
+                android:id="@+id/bOpen"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                hn:optionImage="@drawable/openaction"
+                hn:optionText="Open" />
 
-    <com.mjlim.hovernote.ContextMenuOption
-        android:id="@+id/bSettings"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        hn:optionImage="@drawable/settings_white48" 
-        hn:optionText="Settings"/>
+            <com.mjlim.hovernote.ContextMenuOption
+                android:id="@+id/bSave"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                hn:optionImage="@drawable/save"
+                hn:optionText="Save" />
 
-    <com.mjlim.hovernote.ContextMenuOption
-        android:id="@+id/bClose"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        hn:optionImage="@drawable/close_white48"
-        hn:optionText="Close" />
+
+            <com.mjlim.hovernote.ContextMenuOption
+                android:id="@+id/bSaveAs"
+                android:layout_height="match_parent"
+                android:layout_width="match_parent"
+                android:layout_weight="1"
+                hn:optionImage="@drawable/save_as"
+                hn:optionText="Save As..." />
+
+            <com.mjlim.hovernote.ContextMenuOption
+                android:id="@+id/bShare"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                hn:optionImage="@drawable/share"
+                hn:optionText="Share" />
+
+            <View style="@style/menuseparator" />
+
+            <com.mjlim.hovernote.ContextMenuOption
+                android:id="@+id/bSettings"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                hn:optionImage="@drawable/settings"
+                hn:optionText="Settings"/>
+
+            <com.mjlim.hovernote.ContextMenuOption
+                android:id="@+id/bThemes"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                hn:optionImage="@drawable/palette"
+                hn:optionText="Themes"/>
+
+            <com.mjlim.hovernote.ContextMenuOption
+                android:id="@+id/bClose"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                hn:optionImage="@drawable/close"
+                hn:optionText="Close" />
+
+
+            </LinearLayout>
+
+
+    </ScrollView>
 
 </LinearLayout>

hovernote/app/src/main/res/layout/contextmenuitem.xml

@@ -11,7 +11,7 @@
         android:id="@+id/cmicon"
         android:layout_width="32dp"
         android:layout_height="32dp"
-        android:src="@drawable/hnicon64" />
+        android:src="@drawable/hovernote_white" />
 
     <TextView
         android:id="@+id/cmtext"

hovernote/app/src/main/res/layout/filepicker.xml

@@ -67,7 +67,7 @@
             android:padding="5dp"
             android:layout_weight="0"
             hn:filterColor="?attr/dialogImageButtonColor"
-            android:src="@drawable/close_white48" />
+            android:src="@drawable/close" />
 
 
         <CheckBox

hovernote/app/src/main/res/layout/filepickeritem.xml

@@ -19,7 +19,7 @@
             android:layout_height="48dp"
             android:paddingRight="5dp"
             hn:filterColor="?attr/filePickerIconColor"
-            android:src="@drawable/hnicon64" />
+            android:src="@drawable/hovernote_white" />
 
 
         <LinearLayout

hovernote/app/src/main/res/layout/overlay.xml

@@ -78,7 +78,7 @@
                 android:layout_width="42dp"
                 android:layout_height="match_parent"
                 android:padding="5dp"
-                android:src="@drawable/minimize_white48" />
+                android:src="@drawable/minimize" />
         </com.mjlim.hovernote.ColorFilterLinearLayout>
 
         <com.mjlim.hovernote.EditToolbar

hovernote/app/src/main/res/layout/savedialog.xml

@@ -3,6 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
+    android:visibility="gone"
     android:padding="5dp" >
 
     <ScrollView
@@ -74,7 +75,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="0"
-                    android:src="@drawable/saveaction" />
+                    android:src="@drawable/save" />
             </LinearLayout>
         </LinearLayout>
 

hovernote/app/src/main/res/layout/savefilewindow.xml

@@ -34,11 +34,12 @@
                     android:paddingRight="10dp"
                     />
 
-                <TabWidget
+                <com.mjlim.hovernote.ColorFilterTabWidget
                     android:id="@android:id/tabs"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content" >
-                </TabWidget>
+                    android:layout_height="wrap_content"
+                    style="@style/tabStyle" >
+                </com.mjlim.hovernote.ColorFilterTabWidget>
             </com.mjlim.hovernote.ColorFilterLinearLayout>
 
             <LinearLayout

hovernote/app/src/main/res/layout/settingsdialog.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:hn="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical" >
@@ -80,6 +81,7 @@
                     android:layout_width="48dp"
                     android:layout_height="48dp"
                     android:layout_weight="0"
+                    hn:filterColor="#FFFFFF"
                     android:src="@drawable/f_logo" />
             </LinearLayout>
 
@@ -87,22 +89,19 @@
                 android:id="@+id/chkNotifClose"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/notifAfterClose"
-                android:textColor="@color/fileTextColor"  />
+                android:text="@string/notifAfterClose" />
 
             <CheckBox
                 android:id="@+id/chkAutosave"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/autosaveUnfocus"
-                android:textColor="@color/fileTextColor"  />
+                android:text="@string/autosaveUnfocus"/>
 
             <CheckBox
                 android:id="@+id/chkAutohideControls"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/autohideControls" 
-                android:textColor="@color/fileTextColor" />
+                android:text="@string/autohideControls"  />
 
 
 
@@ -110,16 +109,19 @@
                 android:id="@+id/chkAutoBullet"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/autonumberandbullet"
-                android:textColor="@color/fileTextColor"  />
+                android:text="@string/autonumberandbullet"/>
 
 
             <CheckBox
                 android:id="@+id/chkPersistentNotification"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/persistNotif" 
-                android:textColor="@color/fileTextColor" />
+                android:text="@string/persistNotif"/>
+            <CheckBox
+                android:id="@+id/chkAutoKeyboard"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/autokeyboard_setting" />
 
             <TextView
                 android:id="@+id/textView1"

hovernote/app/src/main/res/layout/theme_preview_window.xml

@@ -83,7 +83,7 @@
                 hn:filterColor="?attr/titleBarIconColor"
                 android:layout_height="match_parent"
                 android:padding="5dp"
-                android:src="@drawable/minimize_white48" />
+                android:src="@drawable/minimize" />
         </com.mjlim.hovernote.ColorFilterLinearLayout>
 
 

hovernote/app/src/main/res/values/strings.xml

@@ -66,7 +66,7 @@
     <string name="dbSetupButton">Connect Dropbox</string>
     <string name="bUndo">Undo</string>
     <string name="bRedo">Redo</string>
-    <string name="dbxDisclaimer">hovernote\'s Dropbox support is still in progress. There may still be bugs, but I find it to be stable enough for regular everyday use. If you encounter any problems please email me through the button in Settings. Also note that at this time, once you\'ve linked your Dropbox account to hovernote you cannot unlink it. This will be implemented in a future release, but for now if this is an issue for you, don\'t connect your Dropbox account.</string>
+    <string name="dbxDisclaimer">By linking hovernote to your Dropbox account, you will be able to save and load notes in a App subfolder within your Dropbox.\n\nNote you will not be able to unlink your Dropbox account from hovernote once you have linked it. This is not yet implemented.</string>
     <string name="changelog_title">Changelog</string>
     <string name="changelog_loading">Loading Changelog...</string>
     <string name="chglogLoadInBrowser">Load in Browser</string>
@@ -76,5 +76,6 @@
     <string name="title_section2">Section 2</string>
     <string name="title_section3">Section 3</string>
     <string name="action_settings">Settings</string>
+    <string name="autokeyboard_setting">Automatically show keyboard when note is active</string>
 
 </resources>

hovernote/app/src/main/res/values/theme.xml

@@ -401,20 +401,28 @@
 
     <style name="tabStyle">
         <item name="filterBackgroundColor">?attr/windowActiveColor</item>
+        <item name="android:gravity">center</item>
+        <item name="android:layout_marginTop">5dp</item>
+        <item name="android:layout_height">wrap_content</item>
     </style>
 	<style name="tabBackground">
         <item name="android:background">@drawable/tab_indicator</item>
         <item name="android:layout_width">0dip</item>
         <item name="android:layout_weight">1</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:gravity">center</item>
         <item name="android:minWidth">80dip</item>
 	</style>
     <style name="tabText">
         <!--<item name="android:textColor">@color/tab_text</item>-->
-        <item name="android:textSize">14sp</item>
-        <item name="android:textStyle">bold</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textSize">12sp</item>
+        <item name="android:gravity">center</item>
         <item name="android:ellipsize">marquee</item>
-        <item name="android:paddingLeft">20dp</item>
-        <item name="android:paddingRight">20dp</item>
+        <item name="android:paddingLeft">10dp</item>
+        <item name="android:paddingRight">10dp</item>
+        <item name="android:paddingTop">8dp</item>
+        <item name="android:paddingBottom">8dp</item>
         <item name="android:maxLines">2</item>
     </style>