Commit 0af74842 authored by Sajal Narang's avatar Sajal Narang

Check role before enabling Create Event FAB, fix #47

parent f8652c82
...@@ -333,4 +333,10 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On ...@@ -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;
}
} }
...@@ -87,6 +87,9 @@ public class CalendarFragment extends BaseFragment { ...@@ -87,6 +87,9 @@ public class CalendarFragment extends BaseFragment {
((MainActivity) getActivity()).updateFragment(addEventFragment); ((MainActivity) getActivity()).updateFragment(addEventFragment);
} }
}); });
if (((MainActivity)getActivity()).createEventAccess()) {
fab.setVisibility(View.VISIBLE);
}
updateEvents(); updateEvents();
return view; return view;
......
...@@ -22,6 +22,7 @@ import java.util.List; ...@@ -22,6 +22,7 @@ import java.util.List;
import app.insti.ActivityBuffer; import app.insti.ActivityBuffer;
import app.insti.Constants; import app.insti.Constants;
import app.insti.ItemClickListener; import app.insti.ItemClickListener;
import app.insti.MainActivity;
import app.insti.R; import app.insti.R;
import app.insti.adapter.FeedAdapter; import app.insti.adapter.FeedAdapter;
import app.insti.api.RetrofitInterface; import app.insti.api.RetrofitInterface;
...@@ -85,6 +86,10 @@ public class FeedFragment extends BaseFragment { ...@@ -85,6 +86,10 @@ public class FeedFragment extends BaseFragment {
public void onStart() { public void onStart() {
super.onStart(); super.onStart();
if (((MainActivity)getActivity()).createEventAccess()) {
fab.setVisibility(View.VISIBLE);
}
appDatabase = AppDatabase.getAppDatabase(getContext()); appDatabase = AppDatabase.getAppDatabase(getContext());
new showEventsFromDB().execute(); new showEventsFromDB().execute();
......
...@@ -22,6 +22,7 @@ import java.util.List; ...@@ -22,6 +22,7 @@ import java.util.List;
import app.insti.ActivityBuffer; import app.insti.ActivityBuffer;
import app.insti.Constants; import app.insti.Constants;
import app.insti.ItemClickListener; import app.insti.ItemClickListener;
import app.insti.MainActivity;
import app.insti.R; import app.insti.R;
import app.insti.adapter.FeedAdapter; import app.insti.adapter.FeedAdapter;
import app.insti.data.AppDatabase; import app.insti.data.AppDatabase;
...@@ -66,6 +67,10 @@ public class MyEventsFragment extends BaseFragment { ...@@ -66,6 +67,10 @@ public class MyEventsFragment extends BaseFragment {
public void onStart() { public void onStart() {
super.onStart(); super.onStart();
if (((MainActivity)getActivity()).createEventAccess()) {
fab.setVisibility(View.VISIBLE);
}
appDatabase = AppDatabase.getAppDatabase(getContext()); appDatabase = AppDatabase.getAppDatabase(getContext());
new showEvents().execute(); new showEvents().execute();
......
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<!-- TODO: Update blank fragment layout -->
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="60dp" android:layout_height="60dp"
...@@ -72,7 +71,8 @@ ...@@ -72,7 +71,8 @@
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_margin="16dp" android:layout_margin="16dp"
android:src="@android:drawable/ic_input_add" android:src="@android:drawable/ic_input_add"
android:tint="@android:color/black" /> android:tint="@android:color/black"
android:visibility="invisible" />
<RelativeLayout <RelativeLayout
android:id="@+id/loadingPanel" android:id="@+id/loadingPanel"
......
...@@ -25,7 +25,8 @@ ...@@ -25,7 +25,8 @@
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_margin="16dp" android:layout_margin="16dp"
android:src="@android:drawable/ic_input_add" android:src="@android:drawable/ic_input_add"
android:tint="@android:color/black" /> android:tint="@android:color/black"
android:visibility="invisible" />
<RelativeLayout <RelativeLayout
android:id="@+id/loadingPanel" android:id="@+id/loadingPanel"
......
...@@ -26,5 +26,6 @@ ...@@ -26,5 +26,6 @@
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_margin="16dp" android:layout_margin="16dp"
android:src="@android:drawable/ic_input_add" android:src="@android:drawable/ic_input_add"
android:tint="@android:color/black" /> android:tint="@android:color/black"
android:visibility="invisible" />
</RelativeLayout> </RelativeLayout>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment