Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
I
InstiApp
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
RAHUL SHARMA
InstiApp
Commits
62e21c5e
Commit
62e21c5e
authored
Mar 29, 2018
by
Sajal Narang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add ScrollView in EventFragment, fix minor bugs, fix #81
parent
38eaca6a
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
30 additions
and
21 deletions
+30
-21
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/adapter/FeedAdapter.java
...java/in/ac/iitb/gymkhana/iitbapp/adapter/FeedAdapter.java
+7
-5
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragment/FeedFragment.java
...va/in/ac/iitb/gymkhana/iitbapp/fragment/FeedFragment.java
+7
-3
app/src/main/res/layout/fragment_event.xml
app/src/main/res/layout/fragment_event.xml
+16
-13
No files found.
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/adapter/FeedAdapter.java
View file @
62e21c5e
...
...
@@ -53,12 +53,14 @@ public class FeedAdapter extends RecyclerView.Adapter<FeedAdapter.ViewHolder> {
viewHolder
.
eventTitle
.
setText
(
currentEvent
.
getEventName
());
// viewHolder.eventDetails.setText(currentEvent.getEventDescription());
Timestamp
timestamp
=
currentEvent
.
getEventStartTime
();
if
(
timestamp
!=
null
)
{
Date
Date
=
new
Date
(
timestamp
.
getTime
());
SimpleDateFormat
simpleDateFormatDate
=
new
SimpleDateFormat
(
"dd MMM"
);
SimpleDateFormat
simpleDateFormatTime
=
new
SimpleDateFormat
(
"HH:mm a"
);
viewHolder
.
eventDate
.
setText
(
simpleDateFormatDate
.
format
(
Date
));
viewHolder
.
eventTime
.
setText
(
simpleDateFormatTime
.
format
(
Date
));
}
StringBuilder
eventVenueName
=
new
StringBuilder
();
for
(
Venue
venue
:
currentEvent
.
getEventVenues
())
{
eventVenueName
.
append
(
", "
).
append
(
venue
.
getVenueName
());
...
...
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragment/FeedFragment.java
View file @
62e21c5e
...
...
@@ -134,9 +134,13 @@ public class FeedFragment extends BaseFragment {
getActivityBuffer
().
safely
(
new
ActivityBuffer
.
IRunnable
()
{
@Override
public
void
run
(
Activity
pActivity
)
{
try
{
feedRecyclerView
=
getActivity
().
findViewById
(
R
.
id
.
feed_recycler_view
);
feedRecyclerView
.
setAdapter
(
feedAdapter
);
feedRecyclerView
.
setLayoutManager
(
new
LinearLayoutManager
(
getContext
()));
}
catch
(
NullPointerException
e
)
{
e
.
printStackTrace
();
}
}
});
}
...
...
app/src/main/res/layout/fragment_event.xml
View file @
62e21c5e
...
...
@@ -29,8 +29,8 @@
android:layout_height=
"wrap_content"
android:layout_gravity=
"center_vertical"
android:layout_marginBottom=
"12dp"
android:layout_margin
Lef
t=
"16dp"
android:layout_margin
Right
=
"16dp"
android:layout_margin
Star
t=
"16dp"
android:layout_margin
End
=
"16dp"
android:layout_marginTop=
"12dp"
android:layout_weight=
"3"
android:orientation=
"vertical"
>
...
...
@@ -150,21 +150,24 @@
<View
android:layout_width=
"match_parent"
android:layout_height=
"1dp"
android:layout_marginBottom=
"6dp"
android:layout_marginLeft=
"6dp"
android:layout_marginRight=
"6dp"
android:layout_marginLeft=
"8dp"
android:layout_marginRight=
"8dp"
android:background=
"#aaa"
>
</View>
<ScrollView
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
>
<TextView
android:id=
"@+id/event_page_description"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"8dp"
android:layout_marginRight=
"8dp"
android:layout_marginTop=
"8dp"
android:layout_marginEnd=
"8dp"
android:layout_marginStart=
"8dp"
android:textColor=
"#777"
android:textSize=
"16sp"
/>
</ScrollView>
</LinearLayout>
</LinearLayout>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment