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
555043d2
Commit
555043d2
authored
Jul 20, 2019
by
Varun Patil
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Show offered achievements in event
parent
c61457f3
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
113 additions
and
4 deletions
+113
-4
app/src/main/java/app/insti/adapter/CardAdapter.java
app/src/main/java/app/insti/adapter/CardAdapter.java
+1
-1
app/src/main/java/app/insti/api/model/Event.java
app/src/main/java/app/insti/api/model/Event.java
+11
-0
app/src/main/java/app/insti/api/model/OfferedAchievement.java
...src/main/java/app/insti/api/model/OfferedAchievement.java
+92
-0
app/src/main/java/app/insti/fragment/EventFragment.java
app/src/main/java/app/insti/fragment/EventFragment.java
+9
-3
No files found.
app/src/main/java/app/insti/adapter/CardAdapter.java
View file @
555043d2
...
...
@@ -105,7 +105,7 @@ public abstract class CardAdapter<T extends CardInterface> extends RecyclerView.
// Build basic request
RequestCreator
requestCreator
;
if
(
t
.
getAvatarUrl
()
!=
null
)
if
(
t
.
getAvatarUrl
()
!=
null
&&
!
t
.
getAvatarUrl
().
equals
(
""
)
)
requestCreator
=
Picasso
.
get
().
load
(
Utils
.
resizeImageUrl
(
t
.
getAvatarUrl
()));
else
if
(
getAvatarPlaceholder
(
t
)
!=
0
)
{
requestCreator
=
Picasso
.
get
().
load
(
getAvatarPlaceholder
(
t
));
...
...
app/src/main/java/app/insti/api/model/Event.java
View file @
555043d2
...
...
@@ -64,6 +64,9 @@ public class Event implements CardInterface {
@SerializedName
(
"user_ues"
)
private
int
eventUserUes
;
@SerializedName
(
"offered_achievements"
)
private
List
<
OfferedAchievement
>
eventOfferedAchievements
;
private
boolean
eventBigImage
=
false
;
public
Event
(
@NonNull
String
eventID
)
{
...
...
@@ -215,6 +218,14 @@ public class Event implements CardInterface {
this
.
eventBigImage
=
eventBigImage
;
}
public
List
<
OfferedAchievement
>
getEventOfferedAchievements
()
{
return
eventOfferedAchievements
;
}
public
void
setEventOfferedAchievements
(
List
<
OfferedAchievement
>
eventOfferedAchievements
)
{
this
.
eventOfferedAchievements
=
eventOfferedAchievements
;
}
@Override
public
boolean
equals
(
Object
o
)
{
if
(
this
==
o
)
return
true
;
...
...
app/src/main/java/app/insti/api/model/OfferedAchievement.java
0 → 100644
View file @
555043d2
package
app.insti.api.model
;
import
androidx.annotation.NonNull
;
import
com.google.gson.annotations.SerializedName
;
import
java.util.Objects
;
import
app.insti.interfaces.CardInterface
;
public
class
OfferedAchievement
implements
CardInterface
{
@NonNull
()
@SerializedName
(
"id"
)
private
String
achievementID
;
@SerializedName
(
"title"
)
private
String
achievementTitle
;
@SerializedName
(
"description"
)
private
String
achievementDescription
;
@SerializedName
(
"body"
)
private
String
achievementBodyId
;
@SerializedName
(
"event"
)
private
String
achievementEventId
;
@NonNull
public
String
getAchievementID
()
{
return
achievementID
;
}
public
void
setAchievementID
(
@NonNull
String
achievementID
)
{
this
.
achievementID
=
achievementID
;
}
public
String
getAchievementTitle
()
{
return
achievementTitle
;
}
public
void
setAchievementTitle
(
String
achievementTitle
)
{
this
.
achievementTitle
=
achievementTitle
;
}
public
String
getAchievementDescription
()
{
return
achievementDescription
;
}
public
void
setAchievementDescription
(
String
achievementDescription
)
{
this
.
achievementDescription
=
achievementDescription
;
}
public
String
getAchievementBodyId
()
{
return
achievementBodyId
;
}
public
void
setAchievementBodyId
(
String
achievementBodyId
)
{
this
.
achievementBodyId
=
achievementBodyId
;
}
public
String
getAchievementEventId
()
{
return
achievementEventId
;
}
public
void
setAchievementEventId
(
String
achievementEventId
)
{
this
.
achievementEventId
=
achievementEventId
;
}
@Override
public
boolean
equals
(
Object
o
)
{
if
(
this
==
o
)
return
true
;
if
(
o
==
null
||
getClass
()
!=
o
.
getClass
())
return
false
;
OfferedAchievement
achievement
=
(
OfferedAchievement
)
o
;
return
Objects
.
equals
(
achievementID
,
achievement
.
achievementID
);
}
public
long
getId
()
{
return
getAchievementID
().
hashCode
();
}
public
String
getTitle
()
{
return
getAchievementTitle
();
}
public
String
getSubtitle
()
{
return
getAchievementDescription
();
}
public
String
getAvatarUrl
()
{
return
null
;
}
}
app/src/main/java/app/insti/fragment/EventFragment.java
View file @
555043d2
...
...
@@ -49,6 +49,7 @@ import com.squareup.picasso.Picasso;
import
java.sql.Timestamp
;
import
java.text.SimpleDateFormat
;
import
java.util.ArrayList
;
import
java.util.Date
;
import
java.util.List
;
...
...
@@ -58,11 +59,13 @@ import app.insti.ShareURLMaker;
import
app.insti.Utils
;
import
app.insti.activity.MainActivity
;
import
app.insti.adapter.BodyAdapter
;
import
app.insti.adapter.GenericAdapter
;
import
app.insti.api.EmptyCallback
;
import
app.insti.api.RetrofitInterface
;
import
app.insti.api.model.Body
;
import
app.insti.api.model.Event
;
import
app.insti.api.model.Venue
;
import
app.insti.interfaces.CardInterface
;
import
retrofit2.Call
;
import
retrofit2.Callback
;
import
retrofit2.Response
;
...
...
@@ -212,6 +215,8 @@ public class EventFragment extends BackHandledFragment implements TransitionTarg
}
private
void
inflateViews
(
final
Event
event
)
{
if
(
getActivity
()
==
null
||
getView
()
==
null
)
return
;
eventPicture
=
(
ImageView
)
getActivity
().
findViewById
(
R
.
id
.
event_picture_2
);
final
TextView
eventTitle
=
(
TextView
)
getActivity
().
findViewById
(
R
.
id
.
event_page_title
);
final
TextView
eventDate
=
(
TextView
)
getActivity
().
findViewById
(
R
.
id
.
event_page_date
);
...
...
@@ -241,10 +246,11 @@ public class EventFragment extends BackHandledFragment implements TransitionTarg
}
Markwon
.
setMarkdown
(
eventDescription
,
event
.
getEventDescription
());
final
List
<
Body
>
bodyList
=
event
.
getEventBodies
();
final
List
<
CardInterface
>
cardList
=
new
ArrayList
<>(
event
.
getEventOfferedAchievements
());
cardList
.
addAll
(
event
.
getEventBodies
());
final
RecyclerView
bodyRecyclerView
=
getActivity
().
findViewById
(
R
.
id
.
body_card_recycler_view
);
BodyAdapter
bodyAdapter
=
new
BodyAdapter
(
body
List
,
this
);
bodyRecyclerView
.
setAdapter
(
body
Adapter
);
GenericAdapter
genericAdapter
=
new
GenericAdapter
(
card
List
,
this
);
bodyRecyclerView
.
setAdapter
(
generic
Adapter
);
bodyRecyclerView
.
setLayoutManager
(
new
LinearLayoutManager
(
getContext
()));
// Common
...
...
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