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
cf659451
Commit
cf659451
authored
Sep 30, 2018
by
Sajal Narang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove My Events
parent
97399efb
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
0 additions
and
201 deletions
+0
-201
app/src/main/java/app/insti/activity/MainActivity.java
app/src/main/java/app/insti/activity/MainActivity.java
+0
-9
app/src/main/java/app/insti/fragment/MyEventsFragment.java
app/src/main/java/app/insti/fragment/MyEventsFragment.java
+0
-142
app/src/main/res/layout/fragment_my_events.xml
app/src/main/res/layout/fragment_my_events.xml
+0
-44
app/src/main/res/menu/activity_main_drawer.xml
app/src/main/res/menu/activity_main_drawer.xml
+0
-6
No files found.
app/src/main/java/app/insti/activity/MainActivity.java
View file @
cf659451
...
@@ -58,7 +58,6 @@ import app.insti.fragment.ExploreFragment;
...
@@ -58,7 +58,6 @@ import app.insti.fragment.ExploreFragment;
import
app.insti.fragment.FeedFragment
;
import
app.insti.fragment.FeedFragment
;
import
app.insti.fragment.MapFragment
;
import
app.insti.fragment.MapFragment
;
import
app.insti.fragment.MessMenuFragment
;
import
app.insti.fragment.MessMenuFragment
;
import
app.insti.fragment.MyEventsFragment
;
import
app.insti.fragment.NewsFragment
;
import
app.insti.fragment.NewsFragment
;
import
app.insti.fragment.NotificationsFragment
;
import
app.insti.fragment.NotificationsFragment
;
import
app.insti.fragment.PlacementBlogFragment
;
import
app.insti.fragment.PlacementBlogFragment
;
...
@@ -438,14 +437,6 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
...
@@ -438,14 +437,6 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
feedFragment
=
new
FeedFragment
();
feedFragment
=
new
FeedFragment
();
updateFragment
(
feedFragment
);
updateFragment
(
feedFragment
);
break
;
break
;
case
R
.
id
.
nav_my_events
:
if
(
session
.
isLoggedIn
())
{
MyEventsFragment
myeventsFragment
=
new
MyEventsFragment
();
updateFragment
(
myeventsFragment
);
}
else
{
Toast
.
makeText
(
this
,
Constants
.
LOGIN_MESSAGE
,
Toast
.
LENGTH_LONG
).
show
();
}
break
;
case
R
.
id
.
nav_explore
:
case
R
.
id
.
nav_explore
:
updateFragment
(
ExploreFragment
.
newInstance
());
updateFragment
(
ExploreFragment
.
newInstance
());
...
...
app/src/main/java/app/insti/fragment/MyEventsFragment.java
deleted
100644 → 0
View file @
97399efb
package
app.insti.fragment
;
import
android.app.Activity
;
import
android.os.Bundle
;
import
android.support.design.widget.FloatingActionButton
;
import
android.support.v4.app.Fragment
;
import
android.support.v4.app.FragmentManager
;
import
android.support.v4.app.FragmentTransaction
;
import
android.support.v4.widget.SwipeRefreshLayout
;
import
android.support.v7.widget.LinearLayoutManager
;
import
android.support.v7.widget.RecyclerView
;
import
android.support.v7.widget.Toolbar
;
import
android.view.LayoutInflater
;
import
android.view.View
;
import
android.view.ViewGroup
;
import
com.google.gson.Gson
;
import
java.util.List
;
import
app.insti.ActivityBuffer
;
import
app.insti.Constants
;
import
app.insti.ItemClickListener
;
import
app.insti.R
;
import
app.insti.activity.MainActivity
;
import
app.insti.adapter.FeedAdapter
;
import
app.insti.api.RetrofitInterface
;
import
app.insti.api.model.Event
;
import
app.insti.api.model.User
;
import
retrofit2.Call
;
import
retrofit2.Callback
;
import
retrofit2.Response
;
/**
* A simple {@link Fragment} subclass.
*/
public
class
MyEventsFragment
extends
BaseFragment
{
private
RecyclerView
myEventsFeedRecyclerView
;
private
SwipeRefreshLayout
myEventsFeedSwipeRefreshLayout
;
private
FloatingActionButton
fab
;
public
MyEventsFragment
()
{
// Required empty public constructor
}
@Override
public
View
onCreateView
(
LayoutInflater
inflater
,
ViewGroup
container
,
Bundle
savedInstanceState
)
{
View
view
=
inflater
.
inflate
(
R
.
layout
.
fragment_my_events
,
container
,
false
);
Toolbar
toolbar
=
getActivity
().
findViewById
(
R
.
id
.
toolbar
);
toolbar
.
setTitle
(
"My Events"
);
fab
=
(
FloatingActionButton
)
view
.
findViewById
(
R
.
id
.
fab
);
fab
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
@Override
public
void
onClick
(
View
v
)
{
AddEventFragment
addEventFragment
=
new
AddEventFragment
();
((
MainActivity
)
getActivity
()).
updateFragment
(
addEventFragment
);
}
});
return
view
;
}
@Override
public
void
onStart
()
{
super
.
onStart
();
if
(((
MainActivity
)
getActivity
()).
createEventAccess
())
{
fab
.
setVisibility
(
View
.
VISIBLE
);
}
updateOnRefresh
();
myEventsFeedSwipeRefreshLayout
=
getActivity
().
findViewById
(
R
.
id
.
my_events_feed_swipe_refresh_layout
);
myEventsFeedSwipeRefreshLayout
.
setOnRefreshListener
(
new
SwipeRefreshLayout
.
OnRefreshListener
()
{
@Override
public
void
onRefresh
()
{
updateOnRefresh
();
myEventsFeedSwipeRefreshLayout
.
setRefreshing
(
false
);
}
});
}
private
void
updateOnRefresh
()
{
RetrofitInterface
retrofitInterface
=
((
MainActivity
)
getActivity
()).
getRetrofitInterface
();
retrofitInterface
.
getUserMe
(((
MainActivity
)
getActivity
()).
getSessionIDHeader
()).
enqueue
(
new
Callback
<
User
>()
{
@Override
public
void
onResponse
(
Call
<
User
>
call
,
Response
<
User
>
response
)
{
if
(
response
.
isSuccessful
())
{
User
user
=
response
.
body
();
List
<
Event
>
events
=
user
.
getUserGoingEvents
();
events
.
addAll
(
user
.
getUserInterestedEvents
());
displayEvents
(
events
);
}
}
@Override
public
void
onFailure
(
Call
<
User
>
call
,
Throwable
t
)
{}
});
}
private
void
displayEvents
(
final
List
<
Event
>
events
)
{
/* Check if already destroyed */
if
(
getActivity
()
==
null
||
getView
()
==
null
)
return
;
final
FeedAdapter
feedAdapter
=
new
FeedAdapter
(
events
,
new
ItemClickListener
()
{
@Override
public
void
onItemClick
(
View
v
,
int
position
)
{
String
eventJson
=
new
Gson
().
toJson
(
events
.
get
(
position
));
Bundle
bundle
=
getArguments
();
if
(
bundle
==
null
)
bundle
=
new
Bundle
();
bundle
.
putString
(
Constants
.
EVENT_JSON
,
eventJson
);
EventFragment
eventFragment
=
new
EventFragment
();
eventFragment
.
setArguments
(
bundle
);
FragmentManager
manager
=
getActivity
().
getSupportFragmentManager
();
FragmentTransaction
transaction
=
manager
.
beginTransaction
();
transaction
.
setCustomAnimations
(
R
.
anim
.
slide_in_left
,
R
.
anim
.
slide_out_left
,
R
.
anim
.
slide_in_right
,
R
.
anim
.
slide_out_right
);
transaction
.
replace
(
R
.
id
.
framelayout_for_fragment
,
eventFragment
,
eventFragment
.
getTag
());
transaction
.
addToBackStack
(
eventFragment
.
getTag
()).
commit
();
}
});
getActivityBuffer
().
safely
(
new
ActivityBuffer
.
IRunnable
()
{
@Override
public
void
run
(
Activity
pActivity
)
{
try
{
myEventsFeedRecyclerView
=
getActivity
().
findViewById
(
R
.
id
.
my_events_feed_recycler_view
);
myEventsFeedRecyclerView
.
setAdapter
(
feedAdapter
);
myEventsFeedRecyclerView
.
setLayoutManager
(
new
LinearLayoutManager
(
getContext
()));
}
catch
(
NullPointerException
e
)
{
e
.
printStackTrace
();
}
}
});
getActivity
().
findViewById
(
R
.
id
.
loadingPanel
).
setVisibility
(
View
.
GONE
);
}
}
\ No newline at end of file
app/src/main/res/layout/fragment_my_events.xml
deleted
100644 → 0
View file @
97399efb
<RelativeLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:tools=
"http://schemas.android.com/tools"
android:id=
"@+id/relative_layout"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
>
<android.support.v4.widget.SwipeRefreshLayout
android:id=
"@+id/my_events_feed_swipe_refresh_layout"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
tools:context=
"app.insti.fragment.MyEventsFragment"
>
<android.support.v7.widget.RecyclerView
android:id=
"@+id/my_events_feed_recycler_view"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:paddingTop=
"8dp"
/>
</android.support.v4.widget.SwipeRefreshLayout>
<android.support.design.widget.FloatingActionButton
android:id=
"@+id/fab"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentBottom=
"true"
android:layout_alignParentRight=
"true"
android:layout_margin=
"16dp"
android:src=
"@drawable/ic_add_black_24dp"
android:tint=
"@android:color/black"
android:visibility=
"gone"
/>
<RelativeLayout
android:id=
"@+id/loadingPanel"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:gravity=
"center"
>
<ProgressBar
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:indeterminate=
"true"
android:theme=
"@style/BlueAccent"
/>
</RelativeLayout>
</RelativeLayout>
app/src/main/res/menu/activity_main_drawer.xml
View file @
cf659451
...
@@ -3,7 +3,6 @@
...
@@ -3,7 +3,6 @@
xmlns:tools=
"http://schemas.android.com/tools"
xmlns:tools=
"http://schemas.android.com/tools"
tools:showIn=
"navigation_view"
>
tools:showIn=
"navigation_view"
>
<!--TODO Update icons-->
<group
android:checkableBehavior=
"single"
>
<group
android:checkableBehavior=
"single"
>
<item
<item
android:id=
"@+id/nav_feed"
android:id=
"@+id/nav_feed"
...
@@ -14,11 +13,6 @@
...
@@ -14,11 +13,6 @@
android:icon=
"@drawable/baseline_rss_feed_black_48"
android:icon=
"@drawable/baseline_rss_feed_black_48"
android:title=
"News"
/>
android:title=
"News"
/>
<item
android:id=
"@+id/nav_my_events"
android:icon=
"@drawable/ic_event"
android:title=
"My Events"
/>
<item
<item
android:id=
"@+id/nav_explore"
android:id=
"@+id/nav_explore"
android:icon=
"@drawable/ic_search_black_24dp"
android:icon=
"@drawable/ic_search_black_24dp"
...
...
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