Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Android #18

Merged
merged 2 commits into from
Feb 27, 2016
Merged

Android #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
43edbd0
changed to channel name
mcasper3 Feb 27, 2016
c52c9f0
final changes maybe
mcasper3 Feb 27, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ...oidClient/app/src/main/java/com/swagoverflow/androidclient/adapters/EventListAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 2 additions & 1 deletion android/AndroidClient/app/src/main/java/com/swagoverflow/androidclient/models/Episode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -17,7 +18,7 @@ public Date getDate() {
}

public String getChannel() {
return channel_number;
return channel_name;
}

public String getVideoUrl() {
Expand Down
3 changes: 2 additions & 1 deletion android/AndroidClient/app/src/main/java/com/swagoverflow/androidclient/models/Game.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -18,7 +19,7 @@ public Date getDate() {
}

public String getChannel() {
return channel_number;
return channel_name;
}

public String getVideoUrl() {
Expand Down
2 changes: 1 addition & 1 deletion android/AndroidClient/app/src/main/res/layout/activity_login.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
20 changes: 9 additions & 11 deletions android/AndroidClient/app/src/main/res/layout/layout_event.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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>