Merge pull request #18 from CSGHackathon/android

Android
ChrisWhitehill · Feb 27, 2016 · 4396eb5 · 4396eb5
2 parents 9915528 + c52c9f0
commit 4396eb5
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 14 deletions.
diff --git a/...oidClient/app/src/main/java/com/swagoverflow/androidclient/adapters/EventListAdapter.java b/...oidClient/app/src/main/java/com/swagoverflow/androidclient/adapters/EventListAdapter.java
@@ -113,6 +113,8 @@ public View getView(int position, View v, ViewGroup parent) {
             channel.setText(episode.getChannel());
         } else {
             view.setMinimumHeight(Utility.convertDpToPx(context.getWindowManager().getDefaultDisplay(), 10));
+            date.setVisibility(View.GONE);
+            name.setVisibility(View.GONE);
         }
 
         return view;

diff --git a/android/AndroidClient/app/src/main/java/com/swagoverflow/androidclient/models/Episode.java b/android/AndroidClient/app/src/main/java/com/swagoverflow/androidclient/models/Episode.java
@@ -9,6 +9,7 @@ public class Episode {
     private Show show;
     private Date date;
     private String channel_number;
+    private String channel_name;
     private String video_url;
     private String thumbnail_url;
 
@@ -17,7 +18,7 @@ public Date getDate() {
     }
 
     public String getChannel() {
-        return channel_number;
+        return channel_name;
     }
 
     public String getVideoUrl() {

diff --git a/android/AndroidClient/app/src/main/java/com/swagoverflow/androidclient/models/Game.java b/android/AndroidClient/app/src/main/java/com/swagoverflow/androidclient/models/Game.java
@@ -8,6 +8,7 @@
 public class Game {
     private Date date;
     private String channel_number;
+    private String channel_name;
     private String video_url;
     private String thumbnail_url;
     private Team home_team;
@@ -18,7 +19,7 @@ public Date getDate() {
     }
 
     public String getChannel() {
-        return channel_number;
+        return channel_name;
     }
 
     public String getVideoUrl() {

diff --git a/android/AndroidClient/app/src/main/res/layout/activity_login.xml b/android/AndroidClient/app/src/main/res/layout/activity_login.xml
@@ -39,7 +39,7 @@
                 <AutoCompleteTextView android:id="@+id/email" android:layout_width="match_parent"
                     android:layout_height="wrap_content" android:hint="@string/prompt_email"
                     android:inputType="textEmailAddress" android:maxLines="1"
-                    android:text="tooMuchSwag@swagoverflow.com"
+                    android:text="3MuchSwag@swagoverflow.com"
                     android:singleLine="true" />
 
             </android.support.design.widget.TextInputLayout>

diff --git a/android/AndroidClient/app/src/main/res/layout/layout_event.xml b/android/AndroidClient/app/src/main/res/layout/layout_event.xml
@@ -21,17 +21,25 @@
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
         android:layout_toRightOf="@+id/thumbnail"
-        android:layout_toLeftOf="@+id/channel"
         android:layout_marginTop="16dp"
         android:layout_marginBottom="16dp"
+        android:layout_marginRight="16dp"
         android:layout_gravity="center_horizontal">
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textStyle="bold"
             android:id="@+id/name" />
 
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:id="@+id/channel" />
+
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -40,14 +48,4 @@
             android:id="@+id/date" />
     </LinearLayout>
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:id="@+id/channel" />
 </RelativeLayout>