Refactored. Updated help page.

Author: codefupanda

AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.codefupanda.genie"
     android:versionCode="1"
-    android:versionName="0.1-beta" >
+    android:versionName="1.0-beta" >
 
     <uses-sdk
         android:minSdkVersion="9"
@@ -28,11 +28,6 @@
             android:label="@string/what_can_i_do_for_you" >
         </activity>
 
-        <activity
-            android:name="com.codefupanda.genie.SettingsActivity"
-            android:label="@string/action_settings" >
-        </activity>
-        
  		<activity
             android:name="com.codefupanda.genie.WelcomeActivity"
             android:theme="@android:style/Theme.NoTitleBar.Fullscreen">

res/values/strings.xml

@@ -23,7 +23,6 @@
     <string name="delete_wish_success">Deleted Wish!</string>
     <string name="delete">Delete</string>
     <string name="are_u_sure_delete">Delete?</string>
-    
     <string name="add_new_category">New Category</string>
     <string name="create">Create</string>
     <string name="create_category_successful">Created category</string>
@@ -35,15 +34,25 @@
     <string name="genie_intro">        Genie records your wishes.\n
         \tWishes do come true!</string>
     <string name="helpText">
-	<![CDATA[
-        The first step in realizing your dreams is to record them.<br/>
-        <b>Genie</b> helps you record your wishes!<br/>
-        <br/>
-        Genie let\'s you categories your wishes.<br/>
-        Either select from the defualt categories or create your own category.<br/>
-        <br/>
-        Make a <b>Wish</b>!<br/>
-        <br/>]]>
+		<![CDATA[
+		        The first step in realizing your dreams is to record all your wishes.<br/>
+		<b>Genie</b> does exactly that!<br/>
+		<br/>
+		Genie let\'s you categories your wishes.<br/>
+		Either select from the defualt categories or create your own.<br/>
+		<br/>
+		
+		A very simple and easy to use UI with following features: 
+		<ol>
+		<li>Add new wish with category, description and deadline.</li>
+		<li>Pre-created categories to choose from.</li>
+		<li>Create new Category.</li>
+		<li>Edit wishes.</li>
+		<li>Swipe right to delete wishes.</li>
+		</ol>
+		
+		Make a <b>Wish</b> and Genie will fulfill them all!<br/>
+		<br/>]]>
     </string>
 
 </resources>

src/com/codefupanda/genie/MainActivity.java

@@ -87,7 +87,7 @@ protected void onCreate(Bundle savedInstanceState) {
 		// on swipe listener
 		expandableListView.setOnTouchListener(new OnSwipeTouchListener(this) {
 			@Override
-			public void onSwipeRight(View view, MotionEvent e1) {
+			public boolean onSwipeRight(View view, MotionEvent e1, MotionEvent e2) {
 				int pos = expandableListView.pointToPosition((int) e1.getX(),
 						(int) e1.getY());
 				View llView = expandableListView.getChildAt(pos);
@@ -105,13 +105,15 @@ public void onSwipeRight(View view, MotionEvent e1) {
 								.toString()));
 					}
 				}
-				super.onSwipeRight(view, e1);
+				// true because we have consumed this event
+				return true;
 			}
 
 			private void areYouSure(final int wishId) {
 				final Dialog dialog = new Dialog(MainActivity.this);
 				View view = getLayoutInflater().inflate(R.layout.wish_delete_dialog, null);
 				dialog.setContentView(view);
+				dialog.setTitle(R.string.delete);
 
 				Button okButton = (Button) view.findViewById(R.id.ok);
 				okButton.setOnClickListener(new OnClickListener() {
@@ -149,6 +151,7 @@ private void deleteWish(final int wishId) {
 			@Override
 			public boolean onChildClick(ExpandableListView parent, View v,
 					final int groupPosition, final int childPosition, long id) {
+				
 				final Dialog dialog = new Dialog(MainActivity.this);
 				View view = getLayoutInflater().inflate(R.layout.description_view_dialog, null);
 				dialog.setContentView(view);
@@ -195,7 +198,7 @@ public void onClick(View view) {
 				});
 
 				dialog.show();
-				return false;
+				return true;
 			}
 		});
 	}
@@ -257,13 +260,6 @@ public boolean onOptionsItemSelected(MenuItem item) {
 			case R.id.action_new:
 				startActivity(new Intent(getApplicationContext(), AddActivity.class));
 				return true;
-			// open settings activity
-				/*
-	        case R.id.action_settings:
-	        	startActivity(new Intent(getApplicationContext(), SettingsActivity.class));
-	            return true;
-	           	*/
-	         // open help activity
 	        case R.id.action_help:
 	        	startActivity(new Intent(getApplicationContext(), HelpActivity.class));
 	            return true;

src/com/codefupanda/genie/SettingsActivity.java

@@ -36,55 +36,64 @@ private final class GestureListener extends SimpleOnGestureListener {
 
 		@Override
 		public boolean onDown(MotionEvent e) {
-			return true;
+			return false;
 		}
 
 		@Override
 		public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX,
 				float velocityY) {
+			boolean result = false;
 			float diffY = e2.getY() - e1.getY();
 			float diffX = e2.getX() - e1.getX();
 
 			if (Math.abs(diffX) > Math.abs(diffY)) {
 				if (Math.abs(diffX) > Constants.SWIPE_THRESHOLD
 						&& Math.abs(velocityX) > Constants.SWIPE_VELOCITY_THRESHOLD) {
 					if (diffX > 0) {
-						onSwipeRight(view, e1);
+						result = onSwipeRight(view, e1, e2);
 					} else {
-						onSwipeLeft(view);
+						result = onSwipeLeft(view, e1, e2);
 					}
 				}
 			} else {
 				if (Math.abs(diffY) > Constants.SWIPE_THRESHOLD
 						&& Math.abs(velocityY) > Constants.SWIPE_VELOCITY_THRESHOLD) {
 					if (diffY > 0) {
-						onSwipeDown(view);
+						result = onSwipeDown(view, e1, e2);
 					} else {
-						onSwipeUp(view);
+						result = onSwipeUp(view, e1, e2);
 					}
 				}
 			}
-			return false;
+			return result;
 		}
 	}
 
 	/**
 	 * Override this function for right swipe.
 	 */
-	public void onSwipeRight(View view, MotionEvent e1) {}
+	public boolean onSwipeRight(View view, MotionEvent e1, MotionEvent e2) {
+		return false;
+	}
 
 	/**
 	 * Override this function for left swipe.
 	 */
-	public void onSwipeLeft(View view) {}
+	public boolean onSwipeLeft(View view, MotionEvent e1, MotionEvent e2) {
+		return false;
+	}
 
 	/**
 	 * Override this function for up swipe.
 	 */
-	public void onSwipeUp(View view) {}
+	public boolean onSwipeUp(View view, MotionEvent e1, MotionEvent e2) {
+		return false;
+	}
 
 	/**
 	 * Override this function for down swipe.
 	 */
-	public void onSwipeDown(View view) {}
+	public boolean onSwipeDown(View view, MotionEvent e1, MotionEvent e2) {
+		return false;
+	}
 }