switching between activities now has a pretty transition

ErikOwen · Feb 20, 2014 · 61eaebc · 61eaebc
1 parent 4cb0ea2
commit 61eaebc
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 2 deletions.
diff --git a/res/anim/slide_in_left.xml b/res/anim/slide_in_left.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+    android:fromXDelta="100%p" android:toXDelta="0%p"
+    android:duration="@android:integer/config_longAnimTime"/>
diff --git a/res/anim/slide_in_right.xml b/res/anim/slide_in_right.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+    android:fromXDelta="-100%p" android:toXDelta="0%p"
+    android:duration="@android:integer/config_longAnimTime"/>
diff --git a/res/anim/slide_out_left.xml b/res/anim/slide_out_left.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+    android:fromXDelta="0%p" android:toXDelta="-100%p"
+    android:duration="@android:integer/config_longAnimTime"/>
diff --git a/res/anim/slide_out_right.xml b/res/anim/slide_out_right.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+    android:fromXDelta="0%p" android:toXDelta="100%p"
+    android:duration="@android:integer/config_longAnimTime"/>
diff --git a/res/layout/note_hub.xml b/res/layout/note_hub.xml
@@ -30,6 +30,7 @@
 			    android:layout_gravity="center"
 			    android:textColor="@color/white"
 			    android:layout_weight=".65" />
+
 			<RelativeLayout 
 			    android:layout_width="0dp"
     		    android:layout_height="wrap_content"

diff --git a/src/com/spinninggangstaz/stickyspeech/EditNote.java b/src/com/spinninggangstaz/stickyspeech/EditNote.java
@@ -65,15 +65,17 @@ public void onClick(View view) {
 				NoteDB.saveNotes();
 
 				Intent returnToNoteHubActivity = new Intent(EditNote.this, NoteHubActivity.class);
-				setResult(1, returnToNoteHubActivity);        
+				setResult(1, returnToNoteHubActivity);
+				overridePendingTransition(R.anim.slide_in_right, R.anim.slide_out_right);
 				finish();
 			}
 		});
     }
 
     protected void returnWithoutSaving() {
 		Intent returnToNoteHubActivity = new Intent(EditNote.this, NoteHubActivity.class);
-		setResult(55, returnToNoteHubActivity);        
+		setResult(55, returnToNoteHubActivity);
+		overridePendingTransition(R.anim.slide_in_right, R.anim.slide_out_right);
 		finish();
     }
 }
diff --git a/src/com/spinninggangstaz/stickyspeech/NoteHubActivity.java b/src/com/spinninggangstaz/stickyspeech/NoteHubActivity.java
@@ -151,6 +151,7 @@ protected void onListItemClick(ListView l, View v, int position, long id) {
 		 editNoteActivity.putExtra("noteIndex", position);
 
 		 startActivityForResult(editNoteActivity, 1);
+		 overridePendingTransition(R.anim.slide_in_left, R.anim.slide_out_left);
 
      }
 
@@ -167,6 +168,7 @@ else if(requestCode == 1 && resultCode == 55) {
 	protected void goToNewNote() {
 	    Intent startNewNoteActivity = new Intent(NoteHubActivity.this, TakeNote.class);
 		startActivity(startNewNoteActivity);
+		overridePendingTransition(R.anim.slide_in_right, R.anim.slide_out_right);
 	 }
 
     private class NoteAdapter extends ArrayAdapter<Note> {

diff --git a/src/com/spinninggangstaz/stickyspeech/TakeNote.java b/src/com/spinninggangstaz/stickyspeech/TakeNote.java
@@ -134,6 +134,7 @@ public void onClick(View view) {
 
 				Intent startNoteHubActivity = new Intent(TakeNote.this, NoteHubActivity.class);
 				startActivity(startNoteHubActivity);
+				overridePendingTransition(R.anim.slide_in_left, R.anim.slide_out_left);
 			}
 		});
 	}
@@ -164,6 +165,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data)
     protected void gotoNoteHub() {
     	Intent startNoteHubActivity = new Intent(TakeNote.this, NoteHubActivity.class);
 		startActivity(startNoteHubActivity);
+		overridePendingTransition(R.anim.slide_in_left, R.anim.slide_out_left);
     }
 
 }