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
0af74842
Commit
0af74842
authored
Jul 02, 2018
by
Sajal Narang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Check role before enabling Create Event FAB, fix #47
parent
f8652c82
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
25 additions
and
4 deletions
+25
-4
app/src/main/java/app/insti/MainActivity.java
app/src/main/java/app/insti/MainActivity.java
+6
-0
app/src/main/java/app/insti/fragment/CalendarFragment.java
app/src/main/java/app/insti/fragment/CalendarFragment.java
+3
-0
app/src/main/java/app/insti/fragment/FeedFragment.java
app/src/main/java/app/insti/fragment/FeedFragment.java
+5
-0
app/src/main/java/app/insti/fragment/MyEventsFragment.java
app/src/main/java/app/insti/fragment/MyEventsFragment.java
+5
-0
app/src/main/res/layout/fragment_calendar.xml
app/src/main/res/layout/fragment_calendar.xml
+2
-2
app/src/main/res/layout/fragment_feed.xml
app/src/main/res/layout/fragment_feed.xml
+2
-1
app/src/main/res/layout/fragment_my_events.xml
app/src/main/res/layout/fragment_my_events.xml
+2
-1
No files found.
app/src/main/java/app/insti/MainActivity.java
View file @
0af74842
...
...
@@ -333,4 +333,10 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
}
}
}
public
boolean
createEventAccess
()
{
if
(
currentUser
==
null
||
currentUser
.
getUserRoles
()
==
null
||
currentUser
.
getUserRoles
().
size
()
==
0
)
return
false
;
return
true
;
}
}
app/src/main/java/app/insti/fragment/CalendarFragment.java
View file @
0af74842
...
...
@@ -87,6 +87,9 @@ public class CalendarFragment extends BaseFragment {
((
MainActivity
)
getActivity
()).
updateFragment
(
addEventFragment
);
}
});
if
(((
MainActivity
)
getActivity
()).
createEventAccess
())
{
fab
.
setVisibility
(
View
.
VISIBLE
);
}
updateEvents
();
return
view
;
...
...
app/src/main/java/app/insti/fragment/FeedFragment.java
View file @
0af74842
...
...
@@ -22,6 +22,7 @@ import java.util.List;
import
app.insti.ActivityBuffer
;
import
app.insti.Constants
;
import
app.insti.ItemClickListener
;
import
app.insti.MainActivity
;
import
app.insti.R
;
import
app.insti.adapter.FeedAdapter
;
import
app.insti.api.RetrofitInterface
;
...
...
@@ -85,6 +86,10 @@ public class FeedFragment extends BaseFragment {
public
void
onStart
()
{
super
.
onStart
();
if
(((
MainActivity
)
getActivity
()).
createEventAccess
())
{
fab
.
setVisibility
(
View
.
VISIBLE
);
}
appDatabase
=
AppDatabase
.
getAppDatabase
(
getContext
());
new
showEventsFromDB
().
execute
();
...
...
app/src/main/java/app/insti/fragment/MyEventsFragment.java
View file @
0af74842
...
...
@@ -22,6 +22,7 @@ import java.util.List;
import
app.insti.ActivityBuffer
;
import
app.insti.Constants
;
import
app.insti.ItemClickListener
;
import
app.insti.MainActivity
;
import
app.insti.R
;
import
app.insti.adapter.FeedAdapter
;
import
app.insti.data.AppDatabase
;
...
...
@@ -66,6 +67,10 @@ public class MyEventsFragment extends BaseFragment {
public
void
onStart
()
{
super
.
onStart
();
if
(((
MainActivity
)
getActivity
()).
createEventAccess
())
{
fab
.
setVisibility
(
View
.
VISIBLE
);
}
appDatabase
=
AppDatabase
.
getAppDatabase
(
getContext
());
new
showEvents
().
execute
();
...
...
app/src/main/res/layout/fragment_calendar.xml
View file @
0af74842
...
...
@@ -18,7 +18,6 @@
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
>
<!-- TODO: Update blank fragment layout -->
<View
android:layout_width=
"match_parent"
android:layout_height=
"60dp"
...
...
@@ -72,7 +71,8 @@
android:layout_alignParentRight=
"true"
android:layout_margin=
"16dp"
android:src=
"@android:drawable/ic_input_add"
android:tint=
"@android:color/black"
/>
android:tint=
"@android:color/black"
android:visibility=
"invisible"
/>
<RelativeLayout
android:id=
"@+id/loadingPanel"
...
...
app/src/main/res/layout/fragment_feed.xml
View file @
0af74842
...
...
@@ -25,7 +25,8 @@
android:layout_alignParentRight=
"true"
android:layout_margin=
"16dp"
android:src=
"@android:drawable/ic_input_add"
android:tint=
"@android:color/black"
/>
android:tint=
"@android:color/black"
android:visibility=
"invisible"
/>
<RelativeLayout
android:id=
"@+id/loadingPanel"
...
...
app/src/main/res/layout/fragment_my_events.xml
View file @
0af74842
...
...
@@ -26,5 +26,6 @@
android:layout_alignParentRight=
"true"
android:layout_margin=
"16dp"
android:src=
"@android:drawable/ic_input_add"
android:tint=
"@android:color/black"
/>
android:tint=
"@android:color/black"
android:visibility=
"invisible"
/>
</RelativeLayout>
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