Modified card layout

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Apr 10 15:27:10 PDT 2013
+#Fri Dec 27 19:13:22 GMT+05:30 2013
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.9-all.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.9-bin.zip

app/build.gradle → katana/build.gradle

@@ -3,7 +3,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.7.+'
+        classpath 'com.android.tools.build:gradle:0+'
     }
 }
 apply plugin: 'android'

app/app.iml → katana/katana.iml

@@ -17,7 +17,7 @@
     </facet>
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
-        <option name="GRADLE_PROJECT_PATH" value=":app" />
+        <option name="GRADLE_PROJECT_PATH" value=":katana" />
       </configuration>
     </facet>
   </component>

app/src/main/java/org/techniche/technothlon/katana/tcd/TCDContent.java → katana/src/main/java/org/techniche/technothlon/katana/tcd/TCDContent.java

@@ -289,6 +289,7 @@ public TCDQuestion(String uniqueId, String id, int color, String title, String q
             } catch (ParseException e) {
                 e.printStackTrace();
             }
+            sdf = new SimpleDateFormat("yyyy-MM-dd");
             assert this.date != null;
             this.dateString = sdf.format(this.date);
             this.status = getStatus();
@@ -313,11 +314,8 @@ private int getBackground(int color) {
 
         public String getStatus() {
             if (ret) return status;
-            long seconds = ((new Date()).getTime() - date.getTime()) / 1000;
-            if (seconds < 0) {
-                ret = true;
-                status = dateString;
-            } else if (seconds < 60) status = "about " + seconds + " seconds ago";
+            long seconds = Math.abs(((new Date()).getTime() - date.getTime()) / 1000);
+            if (seconds < 60) status = "about " + seconds + " seconds ago";
             else if (seconds < 3600) status = "about " + (seconds / 60) + " minutes ago";
             else if (seconds < 86400) status = "about " + (seconds / 3600) + " hours ago";
             else if (seconds < 172800) status = "yesterday";

app/src/main/res/layout/item_list_single.xml → katana/src/main/res/layout/item_list_single.xml

@@ -31,19 +31,24 @@
             android:layout_height="wrap_content"
             android:text="A Japanese ship was en route to the open sea. The Japanese captain went for a shower removing his diamond ring and Rolex watch on the table. When he returned, his valuables were missing. \n A Japanese ship was en route to the open sea. The Japanese captain went for a shower removing his diamond ring and Rolex watch on the table. When he returned, his valuables were missing."
             android:id="@+id/tcd_question"
-            android:textColor="@color/tcd_color_content_text"
+            android:textColor="@color/tcd_color_card_text"
             android:textAppearance="?android:attr/textAppearanceMedium"
+            android:maxLines="6"
             android:layout_marginTop="@dimen/default_gap"
             android:layout_below="@+id/tcd_title"
             android:layout_alignParentLeft="true"
-            android:layout_alignParentStart="true"
-            android:ellipsize="end"
-
-            android:layout_alignRight="@+id/tcd_title"
-            android:layout_alignEnd="@+id/tcd_title"
-            android:layout_above="@+id/tcd_status"
-            android:paddingBottom="8dp"/>
+            android:layout_alignParentRight="true"
+            android:layout_above="@+id/tcd_status" />
 
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:text="..."
+            android:textColor="@color/tcd_color_content_text"
+            android:id="@+id/textView"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentBottom="true"/>
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -52,10 +57,7 @@
             android:id="@+id/tcd_status"
             android:textColor="@color/tcd_color_status_text"
             android:layout_alignParentBottom="true"
-            android:layout_alignLeft="@+id/tcd_question"
-            android:layout_alignStart="@+id/tcd_question"
-            android:layout_alignRight="@+id/tcd_question"
-            android:layout_alignEnd="@+id/tcd_question"/>
+            android:layout_alignParentRight="true"/>
     </RelativeLayout>
 
     <TextView
@@ -73,4 +75,5 @@
         android:layout_marginLeft="@dimen/activity_horizontal_margin"
         />
 
-</RelativeLayout>
+</RelativeLayout>
+    <!--TODO remove placeholder strings-->

app/src/main/res/values/colors.xml → katana/src/main/res/values/colors.xml

@@ -9,5 +9,6 @@
     <color name="tcd_color_title_text">#003442</color>
     <color name="tcd_color_content_text">#000000</color>
     <color name="tcd_color_status_text">#aaa</color>
+    <color name="tcd_color_card_text">#444</color>
 
 </resources>

settings.gradle

@@ -1 +1 @@
-include ':app'
+include 'katana'

technothlon-android-app.iml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/build/classes/main" />
+    <output-test url="file://$MODULE_DIR$/build/classes/test" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/build" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
+