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/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..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 @@ 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"> + + - \ No newline at end of file