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
5d931e66
Commit
5d931e66
authored
Jul 20, 2019
by
Varun Patil
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix offer image
parent
f23c4afa
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
3 deletions
+11
-3
app/src/main/java/app/insti/adapter/GenericAdapter.java
app/src/main/java/app/insti/adapter/GenericAdapter.java
+0
-2
app/src/main/java/app/insti/api/model/OfferedAchievement.java
...src/main/java/app/insti/api/model/OfferedAchievement.java
+6
-1
app/src/main/java/app/insti/fragment/EventFragment.java
app/src/main/java/app/insti/fragment/EventFragment.java
+4
-0
app/src/main/java/app/insti/fragment/WebViewFragment.java
app/src/main/java/app/insti/fragment/WebViewFragment.java
+1
-0
No files found.
app/src/main/java/app/insti/adapter/GenericAdapter.java
View file @
5d931e66
...
@@ -58,8 +58,6 @@ public class GenericAdapter extends CardAdapter<CardInterface> {
...
@@ -58,8 +58,6 @@ public class GenericAdapter extends CardAdapter<CardInterface> {
public
int
getAvatarPlaceholder
(
CardInterface
cardInterface
)
{
public
int
getAvatarPlaceholder
(
CardInterface
cardInterface
)
{
if
(
cardInterface
instanceof
User
)
{
if
(
cardInterface
instanceof
User
)
{
return
R
.
drawable
.
user_placeholder
;
return
R
.
drawable
.
user_placeholder
;
}
else
if
(
cardInterface
instanceof
OfferedAchievement
)
{
return
R
.
drawable
.
ic_done_all_black_256dp
;
}
}
return
Utils
.
isDarkTheme
?
R
.
drawable
.
lotus_placeholder_dark
:
R
.
drawable
.
lotus_placeholder
;
return
Utils
.
isDarkTheme
?
R
.
drawable
.
lotus_placeholder_dark
:
R
.
drawable
.
lotus_placeholder
;
}
}
...
...
app/src/main/java/app/insti/api/model/OfferedAchievement.java
View file @
5d931e66
...
@@ -6,6 +6,7 @@ import com.google.gson.annotations.SerializedName;
...
@@ -6,6 +6,7 @@ import com.google.gson.annotations.SerializedName;
import
java.util.Objects
;
import
java.util.Objects
;
import
app.insti.Utils
;
import
app.insti.interfaces.CardInterface
;
import
app.insti.interfaces.CardInterface
;
public
class
OfferedAchievement
implements
CardInterface
{
public
class
OfferedAchievement
implements
CardInterface
{
...
@@ -25,6 +26,9 @@ public class OfferedAchievement implements CardInterface {
...
@@ -25,6 +26,9 @@ public class OfferedAchievement implements CardInterface {
@SerializedName
(
"event"
)
@SerializedName
(
"event"
)
private
String
achievementEventId
;
private
String
achievementEventId
;
@SerializedName
(
"generic"
)
private
String
achievementGeneric
;
@NonNull
@NonNull
public
String
getAchievementID
()
{
public
String
getAchievementID
()
{
return
achievementID
;
return
achievementID
;
...
@@ -87,6 +91,7 @@ public class OfferedAchievement implements CardInterface {
...
@@ -87,6 +91,7 @@ public class OfferedAchievement implements CardInterface {
}
}
public
String
getAvatarUrl
()
{
public
String
getAvatarUrl
()
{
return
null
;
return
String
.
format
(
"https://insti.app/assets/achievements/%s%s.png"
,
achievementGeneric
,
Utils
.
isDarkTheme
?
"_dark"
:
""
);
}
}
}
}
app/src/main/java/app/insti/fragment/EventFragment.java
View file @
5d931e66
...
@@ -191,6 +191,8 @@ public class EventFragment extends BackHandledFragment implements TransitionTarg
...
@@ -191,6 +191,8 @@ public class EventFragment extends BackHandledFragment implements TransitionTarg
* Set appbar to have an offset
* Set appbar to have an offset
*/
*/
private
void
setAppBarOffset
(
int
offsetPx
)
{
private
void
setAppBarOffset
(
int
offsetPx
)
{
if
(
getView
()
==
null
||
getActivity
()
==
null
)
return
;
AppBarLayout
mAppBarLayout
=
getView
().
findViewById
(
R
.
id
.
appBar
);
AppBarLayout
mAppBarLayout
=
getView
().
findViewById
(
R
.
id
.
appBar
);
CoordinatorLayout
mCoordinatorLayour
=
getView
().
findViewById
(
R
.
id
.
coordinator
);
CoordinatorLayout
mCoordinatorLayour
=
getView
().
findViewById
(
R
.
id
.
coordinator
);
CoordinatorLayout
.
LayoutParams
params
=
(
CoordinatorLayout
.
LayoutParams
)
mAppBarLayout
.
getLayoutParams
();
CoordinatorLayout
.
LayoutParams
params
=
(
CoordinatorLayout
.
LayoutParams
)
mAppBarLayout
.
getLayoutParams
();
...
@@ -200,6 +202,8 @@ public class EventFragment extends BackHandledFragment implements TransitionTarg
...
@@ -200,6 +202,8 @@ public class EventFragment extends BackHandledFragment implements TransitionTarg
}
}
private
void
refreshEvent
(
Event
min_event
)
{
private
void
refreshEvent
(
Event
min_event
)
{
if
(
getView
()
==
null
||
getActivity
()
==
null
)
return
;
RetrofitInterface
retrofitInterface
=
Utils
.
getRetrofitInterface
();
RetrofitInterface
retrofitInterface
=
Utils
.
getRetrofitInterface
();
retrofitInterface
.
getEvent
(
Utils
.
getSessionIDHeader
(),
min_event
.
getEventID
()).
enqueue
(
new
EmptyCallback
<
Event
>()
{
retrofitInterface
.
getEvent
(
Utils
.
getSessionIDHeader
(),
min_event
.
getEventID
()).
enqueue
(
new
EmptyCallback
<
Event
>()
{
@Override
@Override
...
...
app/src/main/java/app/insti/fragment/WebViewFragment.java
View file @
5d931e66
...
@@ -143,6 +143,7 @@ public class WebViewFragment extends BaseFragment {
...
@@ -143,6 +143,7 @@ public class WebViewFragment extends BaseFragment {
public
void
onStop
()
{
public
void
onStop
()
{
if
(
mCameraSource
!=
null
)
{
if
(
mCameraSource
!=
null
)
{
mCameraSource
.
release
();
mCameraSource
.
release
();
mCameraSource
=
null
;
}
}
super
.
onStop
();
super
.
onStop
();
}
}
...
...
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