- merge points earned and points possible columns, also adding weight

- show category weight
quickhac · Jan 26, 2014 · 0c6fa80 · 0c6fa80
1 parent a43db27
commit 0c6fa80
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 49 deletions.
diff --git a/res/layout/card_category.xml b/res/layout/card_category.xml
@@ -29,16 +29,40 @@
             android:layout_marginLeft="8dip"
             android:layout_weight="90"
             android:orientation="vertical" >
-
-            <TextView
-                android:id="@+id/title"
-                android:layout_width="wrap_content"
+
+            <RelativeLayout
+                android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="8dip"
-                android:fontFamily="sans-serif-light"
-                android:text="@string/card_title"
-                android:textColor="#33B6EA"
-                android:textSize="24sp" />
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="8dip"
+                    android:layout_marginRight="4dip"
+                    android:layout_toLeftOf="@+id/weight"
+                    android:layout_alignParentLeft="true"
+                    android:ellipsize="end"
+                    android:singleLine="true"
+                    android:fontFamily="sans-serif-light"
+                    android:text="@string/card_title"
+                    android:textColor="#33B6EA"
+                    android:textSize="24sp" />
+
+                <TextView
+                    android:id="@+id/weight"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="8dip"
+                    android:layout_gravity="right"
+                    android:layout_alignParentRight="true"
+                    android:gravity="right"
+                    android:fontFamily="sans-serif-light"
+                    android:text="@string/card_title"
+                    android:textColor="#33B6EA"
+                    android:textSize="24sp" />
+            </RelativeLayout>
 
             <LinearLayout
                 android:layout_width="fill_parent"
@@ -71,21 +95,11 @@
                             android:textSize="16sp"
                             android:textStyle="bold" />
 
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginRight="15dp"
-                            android:gravity="center_horizontal"
-                            android:text="@string/points_earned"
-                            android:textColor="#787878"
-                            android:textSize="16sp"
-                            android:textStyle="bold" />
-
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:gravity="right"
-                            android:text="@string/points_possible"
+                            android:text="@string/grade"
                             android:textColor="#787878"
                             android:textSize="16sp"
                             android:textStyle="bold" />

diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -16,8 +16,6 @@
     <string name="hint_id">Student ID</string>
     <string name="action_signout">Sign out</string>
     <string name="assignment">ASSIGNMENT</string>
-    <string name="points_earned">EARNED</string>
-    <string name="points_possible">POSSIBLE</string>
     <string name="cycle1">Cycle 1</string>
     <string name="cycle2">Cycle 2</string>
     <string name="cycle3">Cycle 3</string>
@@ -68,6 +66,7 @@
     <string name="silver">#BDC3C7</string>
     <string name="concrete">#95A5A6</string>
     <string name="asbestos">#7F8C8D</string>
+    <string name="grade">GRADE</string>
 
 
 </resources>
diff --git a/src/com/patil/quickhac/CategoryCard.java b/src/com/patil/quickhac/CategoryCard.java
@@ -13,6 +13,7 @@
 import com.patil.quickhac.R;
 import com.quickhac.common.data.Assignment;
 import com.quickhac.common.data.Category;
+import com.quickhac.common.util.Numeric;
 
 public class CategoryCard extends RecyclableCard {
 
@@ -23,15 +24,20 @@ public CategoryCard(String title, String description, String color,
 
 	@Override
 	protected void applyTo(View convertView) {
+		Category category = (Category) getData();
+
 		TableLayout layout = (TableLayout) convertView
 				.findViewById(R.id.gradeTable);
 		((TextView) convertView.findViewById(R.id.title)).setText(titlePlay);
 		((TextView) convertView.findViewById(R.id.title)).setTextColor(Color
 				.parseColor(titleColor));
 		((TextView) convertView.findViewById(R.id.average)).setText("Average: "
 				+ description);
+		((TextView) convertView.findViewById(R.id.weight)).setText(
+				Numeric.doubleToPrettyString(category.weight) + "%");
+		((TextView) convertView.findViewById(R.id.weight)).setTextColor(Color
+				.parseColor(titleColor));
 
-		Category category = (Category) getData();
 		for (int i = 0; i < category.assignments.length; i++) {
 			Assignment assignment = category.assignments[i];
 			TableRow row = new TableRow(convertView.getContext());
@@ -43,40 +49,19 @@ protected void applyTo(View convertView) {
 
 			TextView name = new TextView(convertView.getContext());
 			TextView grade = new TextView(convertView.getContext());
-			TextView possible = new TextView(convertView.getContext());
 
 			name.setText(assignment.title);
-
-			if (assignment.ptsEarned != null) {
-				double ptsEarned = assignment.ptsEarned;
-				if ((int) ptsEarned == ptsEarned) {
-					grade.setText(String.valueOf((int) ptsEarned));
-				} else {
-					grade.setText(String.valueOf(ptsEarned));
-				}
-			} else {
-				grade.setText("-");
-			}
-
-			if ((int) assignment.ptsPossible == assignment.ptsPossible) {
-				possible.setText(String.valueOf((int) assignment.ptsPossible));
-			} else {
-				possible.setText(String.valueOf(assignment.ptsPossible));
-			}
+			grade.setText(assignment.pointsString());
 
 			name.setTextSize(16);
 			name.setPadding(10, 0, 0, 0);
 
-			grade.setGravity(Gravity.CENTER_HORIZONTAL);
+			grade.setGravity(Gravity.RIGHT);
 			grade.setTextSize(16);
-
-			possible.setGravity(Gravity.RIGHT);
-			possible.setTextSize(16);
-			possible.setPadding(0, 0, 10, 0);
+			grade.setPadding(0, 0, 10, 0);
 
 			row.addView(name);
 			row.addView(grade);
-			row.addView(possible);
 			layout.addView(row);
 		}
 

diff --git a/src/com/patil/quickhac/MainActivity.java b/src/com/patil/quickhac/MainActivity.java
@@ -65,7 +65,7 @@
 import com.quickhac.common.data.ClassGrades;
 import com.quickhac.common.data.Course;
 import com.quickhac.common.data.Cycle;
-import com.quickhac.common.data.DisambiguationChoice;
+import com.quickhac.common.data.StudentInfo;
 import com.quickhac.common.data.Semester;
 import com.quickhac.common.districts.GradeSpeedDistrict;
 import com.quickhac.common.districts.impl.Austin;
@@ -988,7 +988,7 @@ public void onFailure(Exception e) {
 
 				@Override
 				public void onRequiresDisambiguation(String response,
-						DisambiguationChoice[] students, ASPNETPageState state) {
+						StudentInfo[] students, ASPNETPageState state) {
 					setStatus("SUCCESS");
 					retriever.disambiguate(id, state, disambiguateHandler);
 				}