[#7]Added UploadEditActivity.

UploadListActivity can now go to UploadEditActivity.
leedongwei · Jun 25, 2014 · a62eefd · a62eefd
1 parent 73daaa6
commit a62eefd
Show file tree

Hide file tree

Showing 5 changed files with 195 additions and 1 deletion.
diff --git a/Android/CRIMP/AndroidManifest.xml b/Android/CRIMP/AndroidManifest.xml
@@ -68,6 +68,18 @@
             android:launchMode="singleTask" >
         </activity>
 
+        <activity
+            android:name="com.nusclimb.live.crimp.activity.UploadEditActivity"
+            android:label="@string/app_name"
+            android:parentActivityName="com.nusclimb.live.crimp.activity.UploadListActivity" 
+            android:screenOrientation="portrait"
+            android:excludeFromRecents="true"
+            android:launchMode="singleTop" >
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="com.nusclimb.live.crimp.activity.UploadListActivity" />
+        </activity>
+
     </application>
 
 </manifest>
diff --git a/Android/CRIMP/res/layout/activity_uploadedit.xml b/Android/CRIMP/res/layout/activity_uploadedit.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent" 
+    android:layout_height="match_parent" >
+
+    <Button android:id="@+id/uploadedit_drop"
+	    android:layout_width="fill_parent"
+	    android:layout_height="wrap_content" 
+	    android:layout_alignParentBottom="true"
+	    android:text="@string/UI_cancel_task" 
+	    android:onClick="cancel" />
+
+	<Button android:id="@+id/uploadedit_save"
+	    android:layout_width="fill_parent"
+	    android:layout_height="wrap_content"
+		android:layout_above="@id/uploadedit_drop"
+	    android:text="@string/UI_save"
+	    android:onClick="save" />
+
+	<ScrollView
+	    android:layout_width="fill_parent"
+		android:layout_height="fill_parent"
+		android:layout_above="@id/uploadedit_save">
+
+		<TableLayout 
+		    android:paddingLeft="10dp"
+			android:paddingRight="10dp"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+		    android:stretchColumns="1" 
+		    android:shrinkColumns="1" >
+
+		    <TableRow>
+				<TextView
+		            android:text="@string/UI_dl_url" />
+		        <EditText android:id="@+id/edit_dl_url"
+		            android:layout_height="wrap_content"
+		            android:inputType="textMultiLine|textUri" />
+		    </TableRow>
+
+		    <TableRow>
+		        <TextView
+		            android:text="@string/UI_ul_url"/>
+		        <EditText android:id="@+id/edit_ul_url"
+		            android:layout_height="wrap_content"
+		            android:inputType="textMultiLine|textUri" />
+		    </TableRow>
+
+		    <TableRow>
+		        <TextView
+		            android:text="@string/UI_j_name"/>
+		        <EditText android:id="@+id/edit_j_name"
+		            android:layout_height="wrap_content"
+		            android:inputType="textMultiLine|text" />
+		    </TableRow>
+
+		    <TableRow>
+		        <TextView
+		            android:text="@string/UI_auth_code"/>
+		        <EditText android:id="@+id/edit_auth_code"
+		            android:layout_height="wrap_content"
+		            android:inputType="textMultiLine|text" />
+		    </TableRow>
+
+		    <TableRow>
+		        <TextView
+		            android:text="@string/UI_r_id"/>
+		        <EditText android:id="@+id/edit_r_id"
+		            android:layout_height="wrap_content"
+		            android:inputType="textMultiLine|text" />
+		    </TableRow>
+
+		    <TableRow>
+		        <TextView
+		            android:text="@string/UI_c_id"/>
+		        <EditText android:id="@+id/edit_c_id"
+		            android:layout_height="wrap_content"
+		            android:inputType="textMultiLine|text" />
+		    </TableRow>
+
+		    <TableRow>
+		        <TextView
+		            android:text="@string/UI_score_append"/>
+		        <EditText android:id="@+id/edit_current_score"
+		            android:layout_height="wrap_content"
+		            android:inputType="textMultiLine|text" />"
+		    </TableRow>
+
+		</TableLayout>
+
+	</ScrollView>
+
+</RelativeLayout>
diff --git a/Android/CRIMP/res/values/strings.xml b/Android/CRIMP/res/values/strings.xml
@@ -28,13 +28,29 @@
     <string name="UI_pause">Resume uploads</string>
     <string name="UI_no_pending_uploads">No pending uploads</string>
     <string name="UI_pending_uploads">CRIMP pending uploads</string>
+    <string name="UI_cancel_task">Cancel task</string>
+    <string name="UI_save">Save</string>
+    <string name="UI_dl_url">D/L URL</string>
+    <string name="UI_ul_url">U/L URL</string>
+    <string name="UI_j_name">j_name</string>
+    <string name="UI_auth_code">auth_code</string>
+    <string name="UI_c_id">c_id</string>
+    <string name="UI_r_id">r_id</string>
+    <string name="UI_score_append">Score to append</string>
 
     <!-- Intent Key -->
     <string name="intent_username">.username</string>
     <string name="intent_round">.round</string>
     <string name="intent_route">.route</string>
     <string name="intent_climber_id">.climber_id</string>
     <string name="intent_climber_name">.climber_name</string>
+    <string name="intent_dl_url">.downloadUrl</string>
+    <string name="intent_ul_url">.uploadUrl</string>
+    <string name="intent_j_name">.jName</string>
+    <string name="intent_auth_code">.authCode</string>
+    <string name="intent_r_id">.rId</string>
+    <string name="intent_c_id">.cId</string>
+    <string name="intent_score_append">.appendScore</string>
 
     <!-- Persistent Storage Keys -->
     <string name="store_queue_count">queue_count</string>

diff --git a/Android/CRIMP/src/com/nusclimb/live/crimp/activity/UploadEditActivity.java b/Android/CRIMP/src/com/nusclimb/live/crimp/activity/UploadEditActivity.java
@@ -0,0 +1,48 @@
+package com.nusclimb.live.crimp.activity;
+
+import com.nusclimb.live.crimp.R;
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.EditText;
+
+public class UploadEditActivity extends Activity{
+	private String downloadUrl, uploadUrl, j_name, auth_code, r_id, c_id, appendScore;
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+
+		setContentView(R.layout.activity_uploadedit);
+
+		// Read intent
+		String packageName = getString(R.string.package_name);
+		Intent intent = getIntent();
+		downloadUrl = intent.getStringExtra(packageName + getString(R.string.intent_dl_url));
+		uploadUrl = intent.getStringExtra(packageName + getString(R.string.intent_ul_url));
+		j_name = intent.getStringExtra(packageName + getString(R.string.intent_j_name));
+		auth_code = intent.getStringExtra(packageName + getString(R.string.intent_auth_code));
+		r_id = intent.getStringExtra(packageName + getString(R.string.intent_r_id));
+		c_id = intent.getStringExtra(packageName + getString(R.string.intent_c_id));
+		appendScore = intent.getStringExtra(packageName + getString(R.string.intent_score_append));
+
+		// Update UI
+		((EditText) findViewById(R.id.edit_dl_url)).setText(downloadUrl);
+		((EditText) findViewById(R.id.edit_ul_url)).setText(uploadUrl);
+		((EditText) findViewById(R.id.edit_j_name)).setText(j_name);
+		((EditText) findViewById(R.id.edit_auth_code)).setText(auth_code);
+		((EditText) findViewById(R.id.edit_r_id)).setText(r_id);
+		((EditText) findViewById(R.id.edit_c_id)).setText(c_id);
+		((EditText) findViewById(R.id.edit_current_score)).setText(appendScore);
+	}
+
+	public void save(View view){
+
+	}
+
+	public void cancel(View view){
+
+	}
+
+}
diff --git a/Android/CRIMP/src/com/nusclimb/live/crimp/activity/UploadListActivity.java b/Android/CRIMP/src/com/nusclimb/live/crimp/activity/UploadListActivity.java
@@ -9,6 +9,7 @@
 import com.nusclimb.live.crimp.UploadTaskAdapter;
 
 import android.app.ListActivity;
+import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
@@ -66,6 +67,30 @@ public void resume(View view){
 
 	@Override
 	protected void onListItemClick (ListView l, View v, int position, long id){
-
+		// Only react to first item.
+		if(position == 0){
+			QueueObject element = (QueueObject) getListAdapter().getItem(position);
+
+			String packageName = getString(R.string.package_name);
+
+			// Preparing to start QRScanActivity
+			Intent intent = new Intent(this, UploadEditActivity.class);
+			intent.putExtra(packageName + getString(R.string.intent_dl_url),
+					element.getRequest().getBaseUrl());
+			intent.putExtra(packageName + getString(R.string.intent_ul_url), 
+					element.getSubmit().getBaseUrl());
+			intent.putExtra(packageName + getString(R.string.intent_j_name), 
+					element.getSubmit().getUploadContent().getJ_name());
+			intent.putExtra(packageName + getString(R.string.intent_auth_code),
+					element.getSubmit().getUploadContent().getAuth_code());
+			intent.putExtra(packageName + getString(R.string.intent_r_id), 
+					element.getSubmit().getUploadContent().getR_id());
+			intent.putExtra(packageName + getString(R.string.intent_c_id), 
+					element.getSubmit().getUploadContent().getC_id());
+			intent.putExtra(packageName + getString(R.string.intent_score_append), 
+					element.getSubmit().getUploadContent().getCurrentScore());
+
+			startActivity(intent);
+		}
 	}
 }