Animated setup screens, added back buttom from login screen.

PaitoAnderson · Nov 2, 2013 · 88c7cdd · 88c7cdd
1 parent b169e79
commit 88c7cdd
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 4 deletions.
diff --git a/Skrumaz/src/main/java/com/skrumaz/app/Login.java b/Skrumaz/src/main/java/com/skrumaz/app/Login.java
@@ -1,5 +1,6 @@
 package com.skrumaz.app;
 
+import android.app.ActionBar;
 import android.app.Activity;
 import android.app.ProgressDialog;
 import android.content.Intent;
@@ -10,6 +11,7 @@
 import android.util.Base64;
 import android.util.Log;
 import android.view.KeyEvent;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.inputmethod.EditorInfo;
 import android.widget.Button;
@@ -90,13 +92,31 @@ public void onClick(View v) {
                 new GetUser().execute();
             };
         });
+
+        // Add back button icon
+        ActionBar actionbar = getActionBar();
+        actionbar.setDisplayHomeAsUpEnabled(true);
+        actionbar.setTitle("Login");
     }
 
     @Override
     public void onBackPressed() {
+        returnToWelcome();
+    }
+
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case android.R.id.home:
+                returnToWelcome();
+                return true;
+        }
+        return false;
+    }
+
+    private void returnToWelcome() {
         // Sent to Welcome
-        Intent welcome = new Intent(getApplicationContext(), Welcome.class);
-        startActivity(welcome);
+        startActivity(new Intent(getApplicationContext(), Welcome.class));
+        overridePendingTransition(android.R.anim.slide_in_left, android.R.anim.fade_out);
         finish(); // Remove Activity from Stack
     }
 

diff --git a/Skrumaz/src/main/java/com/skrumaz/app/Welcome.java b/Skrumaz/src/main/java/com/skrumaz/app/Welcome.java
@@ -48,8 +48,8 @@ protected void SetService(Service service) {
         Preferences.setService(getBaseContext(), service);
 
         // Sent to Login
-        Intent login = new Intent(getApplicationContext(), Login.class);
-        startActivity(login);
+        startActivity(new Intent(getApplicationContext(), Login.class));
+        overridePendingTransition(R.anim.slide_in_right, android.R.anim.fade_out);
         finish(); // Remove Activity from Stack
     }
 }
diff --git a/Skrumaz/src/main/res/anim/slide_in_right.xml b/Skrumaz/src/main/res/anim/slide_in_right.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate android:fromXDelta="50%p" android:toXDelta="0"
+        android:duration="@android:integer/config_mediumAnimTime"/>
+    <alpha android:fromAlpha="0.0" android:toAlpha="1.0"
+        android:duration="@android:integer/config_mediumAnimTime" />
+</set>