Skip to content
This repository was archived by the owner on Oct 9, 2020. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,20 @@

import android.content.Context;
import android.content.Intent;
import android.graphics.Color;
import android.graphics.PorterDuff;
import android.support.v7.widget.RecyclerView;
import android.text.Html;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.TextView;

import org.fossasia.openevent.R;
import org.fossasia.openevent.activities.SessionDetailActivity;
import org.fossasia.openevent.activities.TrackSessionsActivity;
import org.fossasia.openevent.data.Session;
import org.fossasia.openevent.data.Track;
import org.fossasia.openevent.dbutils.RealmDataRepository;
Expand Down Expand Up @@ -91,6 +95,18 @@ public void onBindViewHolder(DayScheduleViewHolder holder, int position) {
}
}

final Track sessionTrack = currentSession.getTrack();
int storedColor = Color.parseColor(sessionTrack.getColor());
holder.slotTrack.getBackground().setColorFilter(storedColor, PorterDuff.Mode.SRC_ATOP);
holder.slotTrack.setText(sessionTrack.getName());

holder.slotTrack.setOnClickListener(v -> {
Intent intent = new Intent(context, TrackSessionsActivity.class);
intent.putExtra(ConstantStrings.TRACK, sessionTrack.getName());
intent.putExtra(ConstantStrings.TRACK_ID, sessionTrack.getId());
context.startActivity(intent);
});

if(currentSession.getMicrolocation() != null)
holder.slotLocation.setText(currentSession.getMicrolocation().getName());

Expand Down Expand Up @@ -207,6 +223,9 @@ class DayScheduleViewHolder extends RecyclerView.ViewHolder {
@BindView(R.id.slot_location)
TextView slotLocation;

@BindView(R.id.slot_track)
Button slotTrack;


DayScheduleViewHolder(View itemView) {
super(itemView);
Expand Down
5 changes: 5 additions & 0 deletions android/app/src/main/res/drawable/button_ripple.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?android:colorControlHighlight">
<item android:drawable="@drawable/track_tag_background"/>
</ripple>
7 changes: 7 additions & 0 deletions android/app/src/main/res/drawable/track_tag_background.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?><shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle" >
<corners android:radius="4dp" />
<solid
android:color="@color/track_header_default" />
</shape>
42 changes: 34 additions & 8 deletions android/app/src/main/res/layout/item_schedule.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/content_frame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
Expand Down Expand Up @@ -41,12 +41,9 @@
android:textSize="@dimen/text_size_small"
tools:text="Slot Description" />

<LinearLayout
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingBottom="@dimen/padding_small"
android:paddingTop="@dimen/padding_small">
android:layout_height="wrap_content">

<TextView
android:id="@+id/slot_start_time"
Expand All @@ -58,35 +55,64 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/slot_underscore"
android:layout_toEndOf="@+id/slot_start_time"
android:layout_toRightOf="@+id/slot_start_time"
android:text="@string/time_separator" />

<TextView
android:id="@+id/slot_end_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toEndOf="@+id/slot_underscore"
android:layout_toRightOf="@+id/slot_underscore"
android:textSize="@dimen/text_size_small"
tools:text="1:00" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/slot_comma"
android:layout_toEndOf="@+id/slot_end_time"
android:layout_toRightOf="@+id/slot_end_time"
android:text="@string/delimiter" />

<TextView
android:id="@+id/slot_location"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toEndOf="@+id/slot_comma"
android:layout_toRightOf="@+id/slot_comma"
android:ellipsize="end"
android:maxLines="1"
android:textSize="@dimen/text_size_small"
tools:text="Slot Location" />
</LinearLayout>

<Button
android:layout_width="wrap_content"
android:layout_height="@dimen/track_tag_height"
android:id="@+id/slot_track"
android:textAllCaps="false"
android:gravity="center"
android:layout_marginTop="@dimen/padding_small"
android:paddingLeft="@dimen/padding_small"
android:paddingRight="@dimen/padding_small"
android:textStyle="bold"
android:layout_below="@+id/slot_location"
android:ellipsize="marquee"
android:maxLines="1"
android:background="@drawable/button_ripple"
android:textColor="@color/white"
android:textSize="@dimen/text_size_small"
tools:text="Track" />
</RelativeLayout>

</LinearLayout>

<View
android:layout_width="match_parent"
android:layout_height="0.8dp"
android:layout_marginTop="@dimen/layout_margin_medium"
android:background="?android:attr/listDivider"
android:layout_below="@id/ll_sessionDetails"/>
android:layout_below="@id/ll_sessionDetails" />
</RelativeLayout>
1 change: 1 addition & 0 deletions android/app/src/main/res/values/color.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,5 @@
<color name="black">#000000</color>
<color name="speakers_listview_primary">#de000000</color>
<color name="speakers_listview_secondary">#8a000000</color>
<color name="track_header_default">#546E7A</color>
</resources>
3 changes: 3 additions & 0 deletions android/app/src/main/res/values/dimens.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,7 @@

<!--NavBar-->
<dimen name="nav_bar_width">300dp</dimen>

<!--Track Tag-->
<dimen name="track_tag_height">30dp</dimen>
</resources>