From 43edbd062ded6d87790859f6393bb0795b666f4d Mon Sep 17 00:00:00 2001
From: mcasper3 <mikecasper395@gmail.com>
Date: Sat, 27 Feb 2016 17:23:36 -0600
Subject: [PATCH 1/2] changed to channel name

---
 .../java/com/swagoverflow/androidclient/models/Episode.java    | 3 ++-
 .../main/java/com/swagoverflow/androidclient/models/Game.java  | 3 ++-
 .../AndroidClient/app/src/main/res/layout/activity_login.xml   | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

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
index 9cfd69d..40c3aac 100644
--- 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
index b2b881e..487ee95 100644
--- 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
index 8425154..ffb5c18 100644
--- 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="threeMuchSwag@swagoverflow.com"
                     android:singleLine="true" />
 
             </android.support.design.widget.TextInputLayout>

From c52c9f05ec6a9ea437e5a23aeb1902104348f7bc Mon Sep 17 00:00:00 2001
From: mcasper3 <mikecasper395@gmail.com>
Date: Sat, 27 Feb 2016 17:30:32 -0600
Subject: [PATCH 2/2] final changes maybe

---
 .../adapters/EventListAdapter.java            |  2 ++
 .../src/main/res/layout/activity_login.xml    |  2 +-
 .../app/src/main/res/layout/layout_event.xml  | 20 +++++++++----------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/android/AndroidClient/app/src/main/java/com/swagoverflow/androidclient/adapters/EventListAdapter.java b/android/AndroidClient/app/src/main/java/com/swagoverflow/androidclient/adapters/EventListAdapter.java
index 6bb581c..4c18fa9 100644
--- a/android/AndroidClient/app/src/main/java/com/swagoverflow/androidclient/adapters/EventListAdapter.java
+++ b/android/AndroidClient/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/res/layout/activity_login.xml b/android/AndroidClient/app/src/main/res/layout/activity_login.xml
index ffb5c18..e2bf7c2 100644
--- 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="threeMuchSwag@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
index ad92b4c..a292a8b 100644
--- 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>
\ No newline at end of file