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
9b5e97d6
Commit
9b5e97d6
authored
Oct 01, 2018
by
Varun Patil
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename Helpers to Utils
parent
e39640f0
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
14 additions
and
20 deletions
+14
-20
app/src/main/java/app/insti/InstiAppFirebaseMessagingService.java
...main/java/app/insti/InstiAppFirebaseMessagingService.java
+1
-1
app/src/main/java/app/insti/Utils.java
app/src/main/java/app/insti/Utils.java
+1
-1
app/src/main/java/app/insti/adapter/BodyAdapter.java
app/src/main/java/app/insti/adapter/BodyAdapter.java
+2
-2
app/src/main/java/app/insti/adapter/FeedAdapter.java
app/src/main/java/app/insti/adapter/FeedAdapter.java
+3
-6
app/src/main/java/app/insti/adapter/NotificationsAdapter.java
...src/main/java/app/insti/adapter/NotificationsAdapter.java
+3
-4
app/src/main/java/app/insti/fragment/BodyFragment.java
app/src/main/java/app/insti/fragment/BodyFragment.java
+2
-3
app/src/main/java/app/insti/fragment/EventFragment.java
app/src/main/java/app/insti/fragment/EventFragment.java
+2
-3
No files found.
app/src/main/java/app/insti/InstiAppFirebaseMessagingService.java
View file @
9b5e97d6
...
...
@@ -138,7 +138,7 @@ public class InstiAppFirebaseMessagingService extends FirebaseMessagingService {
Bitmap
largeIcon
=
null
;
if
(
largeIconUrl
!=
null
)
{
largeIcon
=
getCroppedBitmap
(
Picasso
.
get
().
load
(
Helper
s
.
resizeImageUrl
(
largeIconUrl
)).
get
(),
200
);
Picasso
.
get
().
load
(
Util
s
.
resizeImageUrl
(
largeIconUrl
)).
get
(),
200
);
}
bitmaps
=
new
Bitmap
[]{
image
,
largeIcon
};
}
catch
(
IOException
e
)
{
...
...
app/src/main/java/app/insti/
Helper
s.java
→
app/src/main/java/app/insti/
Util
s.java
View file @
9b5e97d6
...
...
@@ -7,7 +7,7 @@ import com.squareup.picasso.Picasso;
import
java.time.Instant
;
public
final
class
Helper
s
{
public
final
class
Util
s
{
public
static
final
void
loadImageWithPlaceholder
(
final
ImageView
imageView
,
final
String
url
)
{
Picasso
.
get
()
.
load
(
resizeImageUrl
(
url
))
...
...
app/src/main/java/app/insti/adapter/BodyAdapter.java
View file @
9b5e97d6
...
...
@@ -17,7 +17,7 @@ import com.squareup.picasso.Picasso;
import
java.util.List
;
import
app.insti.Constants
;
import
app.insti.
Helper
s
;
import
app.insti.
Util
s
;
import
app.insti.R
;
import
app.insti.api.model.Body
;
import
app.insti.fragment.BodyFragment
;
...
...
@@ -73,7 +73,7 @@ public class BodyAdapter extends RecyclerView.Adapter<BodyAdapter.ViewHolder> {
holder
.
name
.
setText
(
body
.
getBodyName
());
holder
.
description
.
setText
(
body
.
getBodyShortDescription
());
Picasso
.
get
().
load
(
Helper
s
.
resizeImageUrl
(
body
.
getBodyImageURL
())
Util
s
.
resizeImageUrl
(
body
.
getBodyImageURL
())
).
into
(
holder
.
image
);
}
...
...
app/src/main/java/app/insti/adapter/FeedAdapter.java
View file @
9b5e97d6
package
app.insti.adapter
;
import
android.app.Activity
;
import
android.content.Context
;
import
android.os.Bundle
;
import
android.support.v4.app.Fragment
;
...
...
@@ -24,10 +23,8 @@ import java.util.Calendar;
import
app.insti.Constants
;
import
app.insti.Helpers
;
import
app.insti.activity.MainActivity
;
import
app.insti.Utils
;
import
app.insti.fragment.EventFragment
;
import
app.insti.interfaces.ItemClickListener
;
import
app.insti.R
;
import
app.insti.api.model.Event
;
import
app.insti.api.model.Venue
;
...
...
@@ -134,10 +131,10 @@ public class FeedAdapter extends RecyclerView.Adapter<FeedAdapter.ViewHolder> {
if
(
currentEvent
.
isEventBigImage
())
{
viewHolder
.
eventBigPicture
.
setVisibility
(
View
.
VISIBLE
);
viewHolder
.
eventPicture
.
setVisibility
(
View
.
GONE
);
Helper
s
.
loadImageWithPlaceholder
(
viewHolder
.
eventBigPicture
,
currentEvent
.
getEventImageURL
());
Util
s
.
loadImageWithPlaceholder
(
viewHolder
.
eventBigPicture
,
currentEvent
.
getEventImageURL
());
}
else
{
Picasso
.
get
().
load
(
Helper
s
.
resizeImageUrl
(
currentEvent
.
getEventImageURL
())
Util
s
.
resizeImageUrl
(
currentEvent
.
getEventImageURL
())
).
into
(
viewHolder
.
eventPicture
);
}
}
...
...
app/src/main/java/app/insti/adapter/NotificationsAdapter.java
View file @
9b5e97d6
...
...
@@ -13,8 +13,7 @@ import com.squareup.picasso.Picasso;
import
java.util.List
;
import
app.insti.Constants
;
import
app.insti.Helpers
;
import
app.insti.Utils
;
import
app.insti.interfaces.ItemClickListener
;
import
app.insti.R
;
import
app.insti.api.model.Event
;
...
...
@@ -56,13 +55,13 @@ public class NotificationsAdapter extends RecyclerView.Adapter<NotificationsAdap
if
(
appNotification
.
getNotificationActorType
().
contains
(
"event"
))
{
Event
event
=
gson
.
fromJson
(
gson
.
toJson
(
appNotification
.
getNotificationActor
()),
Event
.
class
);
Picasso
.
get
().
load
(
Helper
s
.
resizeImageUrl
(
event
.
getEventImageURL
())
Util
s
.
resizeImageUrl
(
event
.
getEventImageURL
())
).
into
(
viewholder
.
notificationPicture
);
viewholder
.
notificationTitle
.
setText
(
event
.
getEventName
());
}
else
if
(
appNotification
.
getNotificationActorType
().
contains
(
"newsentry"
))
{
NewsArticle
article
=
gson
.
fromJson
(
gson
.
toJson
(
appNotification
.
getNotificationActor
()),
NewsArticle
.
class
);
Picasso
.
get
().
load
(
Helper
s
.
resizeImageUrl
(
article
.
getBody
().
getBodyImageURL
())
Util
s
.
resizeImageUrl
(
article
.
getBody
().
getBodyImageURL
())
).
into
(
viewholder
.
notificationPicture
);
viewholder
.
notificationTitle
.
setText
(
article
.
getTitle
());
}
else
if
(
appNotification
.
getNotificationActorType
().
contains
(
"blogentry"
))
{
...
...
app/src/main/java/app/insti/fragment/BodyFragment.java
View file @
9b5e97d6
...
...
@@ -29,13 +29,12 @@ import android.widget.TextView;
import
android.widget.Toast
;
import
com.google.gson.Gson
;
import
com.squareup.picasso.Picasso
;
import
java.util.ArrayList
;
import
java.util.List
;
import
app.insti.Constants
;
import
app.insti.
Helper
s
;
import
app.insti.
Util
s
;
import
app.insti.R
;
import
app.insti.ShareURLMaker
;
import
app.insti.activity.MainActivity
;
...
...
@@ -199,7 +198,7 @@ public class BodyFragment extends BackHandledFragment {
/* Set body information */
bodyName
.
setText
(
body
.
getBodyName
());
Helper
s
.
loadImageWithPlaceholder
(
bodyPicture
,
body
.
getBodyImageURL
());
Util
s
.
loadImageWithPlaceholder
(
bodyPicture
,
body
.
getBodyImageURL
());
bodyPicture
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
@Override
...
...
app/src/main/java/app/insti/fragment/EventFragment.java
View file @
9b5e97d6
...
...
@@ -33,7 +33,6 @@ import android.widget.TextView;
import
android.widget.Toast
;
import
com.google.gson.Gson
;
import
com.squareup.picasso.Picasso
;
import
java.sql.Timestamp
;
import
java.text.SimpleDateFormat
;
...
...
@@ -41,7 +40,7 @@ import java.util.Date;
import
java.util.List
;
import
app.insti.Constants
;
import
app.insti.
Helper
s
;
import
app.insti.
Util
s
;
import
app.insti.R
;
import
app.insti.ShareURLMaker
;
import
app.insti.activity.MainActivity
;
...
...
@@ -153,7 +152,7 @@ public class EventFragment extends BackHandledFragment {
webEventButton
=
getActivity
().
findViewById
(
R
.
id
.
web_event_button
);
shareEventButton
=
getActivity
().
findViewById
(
R
.
id
.
share_event_button
);
Helper
s
.
loadImageWithPlaceholder
(
eventPicture
,
event
.
getEventImageURL
());
Util
s
.
loadImageWithPlaceholder
(
eventPicture
,
event
.
getEventImageURL
());
eventTitle
.
setText
(
event
.
getEventName
());
Markwon
.
setMarkdown
(
eventDescription
,
event
.
getEventDescription
());
...
...
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