Skip to content

Commit 452b790

Browse files
AkshayCHDiamareebjamal
authored andcommitted
feat: Add session type in SessionTrackActivity (fossasia#2336) (fossasia#2337)
1 parent d1cfec5 commit 452b790

File tree

2 files changed

+43
-18
lines changed

2 files changed

+43
-18
lines changed

android/app/src/main/java/org/fossasia/openevent/core/track/session/SessionViewHolder.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import org.fossasia.openevent.core.bookmark.BookmarkStatus;
2525
import org.fossasia.openevent.core.bookmark.OnBookmarkSelectedListener;
2626
import org.fossasia.openevent.data.Session;
27+
import org.fossasia.openevent.data.SessionType;
2728
import org.fossasia.openevent.data.Speaker;
2829
import org.fossasia.openevent.data.Track;
2930
import org.fossasia.openevent.data.repository.RealmDataRepository;
@@ -85,6 +86,9 @@ public class SessionViewHolder extends RecyclerView.ViewHolder {
8586
@BindView(R.id.session_status)
8687
TextView sessionStatus;
8788

89+
@BindView(R.id.subtitle)
90+
TextView subtitle;
91+
8892
private Session session;
8993
private Context context;
9094
private OnBookmarkSelectedListener onBookmarkSelectedListener;
@@ -118,6 +122,13 @@ public void bindSession(int type, int colorInTracks, RealmDataRepository realmRe
118122
sessionSubtitle.setText(sessionSubTitle);
119123
}
120124

125+
SessionType sessionType = session.getSessionType();
126+
127+
if (sessionType != null) {
128+
subtitle.setVisibility(View.VISIBLE);
129+
subtitle.setText(sessionType.getName());
130+
}
131+
121132
sessionStatus.setVisibility(View.GONE);
122133

123134
setSessionStatus();

android/app/src/main/res/layout/tracksactvity_item.xml

Lines changed: 32 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -24,29 +24,43 @@
2424
android:layout_height="wrap_content"
2525
android:layout_marginBottom="@dimen/layout_margin_medium"
2626
android:background="@color/color_primary"
27-
android:orientation="horizontal"
27+
android:orientation="vertical"
2828
android:padding="@dimen/padding_medium">
2929

30+
<LinearLayout
31+
android:layout_width="match_parent"
32+
android:layout_height="wrap_content">
33+
34+
<TextView
35+
android:id="@+id/session_title"
36+
android:layout_width="0dp"
37+
android:layout_height="wrap_content"
38+
android:layout_weight="1"
39+
android:padding="@dimen/padding_medium"
40+
android:textColor="@color/white"
41+
android:textSize="@dimen/heading_text_size"
42+
tools:text="Session Title" />
43+
44+
<ImageView
45+
android:id="@+id/session_bookmark_status"
46+
android:layout_width="wrap_content"
47+
android:layout_height="wrap_content"
48+
android:layout_gravity="end"
49+
android:background="?attr/selectableItemBackgroundBorderless"
50+
android:contentDescription="@string/session_bookmark_status"
51+
android:padding="@dimen/padding_medium"
52+
app:srcCompat="@drawable/ic_bookmark_border_white_24dp" />
53+
54+
</LinearLayout>
55+
3056
<TextView
31-
android:id="@+id/session_title"
32-
android:layout_width="0dp"
33-
android:layout_height="wrap_content"
34-
android:layout_weight="1"
35-
android:padding="@dimen/padding_medium"
36-
android:textColor="@color/white"
37-
android:textSize="@dimen/heading_text_size"
38-
tools:text="Session Title" />
39-
40-
<ImageView
41-
android:id="@+id/session_bookmark_status"
57+
android:id="@+id/subtitle"
4258
android:layout_width="wrap_content"
4359
android:layout_height="wrap_content"
44-
android:layout_gravity="end"
45-
android:background="?attr/selectableItemBackgroundBorderless"
46-
android:contentDescription="@string/session_bookmark_status"
47-
android:padding="@dimen/padding_medium"
48-
app:srcCompat="@drawable/ic_bookmark_border_white_24dp" />
49-
60+
android:layout_marginStart="@dimen/layout_margin_medium"
61+
android:layout_marginLeft="@dimen/layout_margin_medium"
62+
android:textSize="@dimen/text_size_medium"
63+
tools:text="Type"/>
5064

5165
</LinearLayout>
5266

0 commit comments

Comments
 (0)