From: Petru Trimbitas <l3asketballplayer@yahoo.com>
Date: Tue, 28 May 2013 16:10:43 +0000 (+0300)
Subject: Add login screen
X-Git-Url: http://git.ieval.ro/?p=unical.git;a=commitdiff_plain;h=8188ed471408a64ef058aa1222b5ee715211bd22

Add login screen
---

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index bb15f71..9d72139 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -23,6 +23,7 @@
         </activity>
         <meta-data android:name="com.facebook.sdk.ApplicationId" android:value="@string/app_id"/>
         <activity android:name="com.facebook.LoginActivity"></activity>
+        <activity android:name="loginActivity"></activity>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/res/layout/login.xml b/res/layout/login.xml
index d629a53..0a9ac61 100644
--- a/res/layout/login.xml
+++ b/res/layout/login.xml
@@ -5,9 +5,60 @@
     android:orientation="vertical" >
 
     <TextView
-        android:id="@+id/welcome"
-        android:layout_width="122dp"
+        android:id="@+id/textView1"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="TextView" />
+        android:text="Log in"
+        android:textAlignment="center"
+        android:textAppearance="?android:attr/textAppearanceLarge" />
 
-</LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="0.00" >
+
+        <TextView
+            android:id="@+id/textView2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="User:"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+        <EditText
+            android:id="@+id/editText1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:ems="10" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+
+        <TextView
+            android:id="@+id/textView3"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Pass:"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+        <EditText
+            android:id="@+id/editText2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.62"
+            android:ems="10"
+            android:inputType="textPassword" >
+
+            <requestFocus />
+        </EditText>
+    </LinearLayout>
+
+    <Button
+        android:id="@+id/button1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Log In" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/menu/options.xml b/res/menu/options.xml
new file mode 100644
index 0000000..04f173f
--- /dev/null
+++ b/res/menu/options.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:id="@+id/item1" android:title="New Event" android:visible="true"></item>
+    
+
+</menu>
diff --git a/src/ro/ieval/unical/Utils.java b/src/ro/ieval/unical/Utils.java
new file mode 100644
index 0000000..4976605
--- /dev/null
+++ b/src/ro/ieval/unical/Utils.java
@@ -0,0 +1,8 @@
+package ro.ieval.unical;
+
+public class Utils {
+	public static boolean loginSuccess(String user, String pass) {
+		// TODO Auto-generated method stub
+		return true;
+	}
+}
diff --git a/src/ro/ieval/unical/loginActivity.java b/src/ro/ieval/unical/loginActivity.java
new file mode 100644
index 0000000..a4ac90b
--- /dev/null
+++ b/src/ro/ieval/unical/loginActivity.java
@@ -0,0 +1,31 @@
+package ro.ieval.unical;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+
+public class loginActivity extends Activity {
+	
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.login);
+		
+		final EditText user=(EditText) findViewById(R.id.editText1);
+		final EditText pass=(EditText) findViewById(R.id.editText2);
+		final Button logIn=(Button) findViewById(R.id.button1);
+	
+		logIn.setOnClickListener(new View.OnClickListener() {
+			
+			@Override
+			public void onClick(View v) {
+				// TODO Auto-generated method stub
+				if(Utils.loginSuccess(user.getText().toString(),pass.getText().toString())) {
+					setContentView(R.layout.eventview);
+				}
+			}
+		});
+	}
+}
diff --git a/src/ro/ieval/unical/mainActivity.java b/src/ro/ieval/unical/mainActivity.java
index 8faac66..e65b571 100644
--- a/src/ro/ieval/unical/mainActivity.java
+++ b/src/ro/ieval/unical/mainActivity.java
@@ -15,10 +15,14 @@ import ro.ieval.unical.R;
 import com.google.gson.Gson;
 
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.graphics.Color;
 import android.os.Bundle;
 import android.os.Handler;
+import android.preference.PreferenceManager;
 import android.util.Base64;
+import android.view.View;
+import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
 
@@ -27,69 +31,19 @@ import com.facebook.*;
 import com.facebook.model.*;
 
 public class mainActivity extends android.app.Activity {
-	Event[] getEventList() {
-		Event events[];
-		URL hostUrlJson;
-		InputStreamReader in;
-		try {
-			hostUrlJson=new URL(Constants.searchUrl);
-			HttpsURLConnection calConnection = (HttpsURLConnection) hostUrlJson.openConnection();
-			calConnection.setDoOutput(true);
-			calConnection.setUseCaches(false);
-			calConnection.setRequestProperty("Authorization", "Basic "+Base64.encodeToString( (Constants.user+':'+Constants.password).getBytes(), Base64.NO_WRAP));
-			//calConnection.setRequestMethod("POST");
-			//calConnection.setDoInput(true);
-			//calConnection.connect();
-
-			final PrintWriter ps=new PrintWriter(calConnection.getOutputStream());
-			ps.print("{}");
-			ps.close();
-
-			in = new InputStreamReader(calConnection.getInputStream());
-			Gson gson=new Gson();
-			events=gson.fromJson(in,Event[].class);
-			in.close();
-
-			return events;
-		} catch (MalformedURLException e) {
-			// TODO Auto-generated catch block
-			System.err.println("catch1");
-			e.printStackTrace();
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			System.err.println("catch2");
-			e.printStackTrace();
-		}
-		throw new AssertionError();
-	}
 	
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		// All Begins here :)
 		// And here it began the olympic app that does olympic thing
-		super.onCreate(savedInstanceState);
-		setContentView(R.layout.login);
 		
-		/*setContentView(R.layout.eventview);
-		final TextView eventTitle= (TextView) findViewById(R.id.eventTitle);
-		final TextView date=(TextView) findViewById(R.id.date);
-		final TextView description=(TextView) findViewById(R.id.description);
-
-		final Handler h=new Handler();
-		new Thread(new Runnable() {
-			public void run() {
-				final Event events[]=getEventList();
-				h.post(new Runnable() {
-					public void run() {
-						// aici incepe
-						
-						eventTitle.setText(events[0].title);
-						date.setText((new Date(events[0].date)).toString());
-						description.setText(events[0].description);
-						DatabaseInteract db=new DatabaseInteract(mainActivity.this);
-					}
-				});
-			}
-		}).start();*/
+		//log in
+		super.onCreate(savedInstanceState);
+		final SharedPreferences prefs=PreferenceManager.getDefaultSharedPreferences(this);
+		if(prefs.getBoolean("FirstTime", true)) {
+			prefs.edit().putBoolean("FirstTime", false).commit();
+			Intent i=new Intent(this,loginActivity.class);
+			startActivity(i);
+		}
 	}
 }