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
22f514b2
Commit
22f514b2
authored
Feb 05, 2019
by
Varun Patil
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix up MessMenuFragment to not make too many calls
parent
f2eb5a4c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
30 additions
and
28 deletions
+30
-28
app/src/main/java/app/insti/fragment/MessMenuFragment.java
app/src/main/java/app/insti/fragment/MessMenuFragment.java
+30
-28
No files found.
app/src/main/java/app/insti/fragment/MessMenuFragment.java
View file @
22f514b2
package
app.insti.fragment
;
package
app.insti.fragment
;
import
android.app.Activity
;
import
android.os.Bundle
;
import
android.os.Bundle
;
import
android.support.v4.app.Fragment
;
import
android.support.v4.app.Fragment
;
import
android.support.v4.widget.SwipeRefreshLayout
;
import
android.support.v4.widget.SwipeRefreshLayout
;
...
@@ -20,7 +19,6 @@ import java.util.Calendar;
...
@@ -20,7 +19,6 @@ import java.util.Calendar;
import
java.util.List
;
import
java.util.List
;
import
java.util.Locale
;
import
java.util.Locale
;
import
app.insti.ActivityBuffer
;
import
app.insti.Constants
;
import
app.insti.Constants
;
import
app.insti.R
;
import
app.insti.R
;
import
app.insti.Utils
;
import
app.insti.Utils
;
...
@@ -37,8 +35,8 @@ import retrofit2.Response;
...
@@ -37,8 +35,8 @@ import retrofit2.Response;
*/
*/
public
class
MessMenuFragment
extends
BaseFragment
{
public
class
MessMenuFragment
extends
BaseFragment
{
private
List
<
HostelMessMenu
>
instituteMessMenu
=
null
;
private
MessMenuAdapter
messMenuAdapter
;
private
MessMenuAdapter
messMenuAdapter
;
private
RecyclerView
messMenuRecyclerView
;
private
SwipeRefreshLayout
messMenuSwipeRefreshLayout
;
private
SwipeRefreshLayout
messMenuSwipeRefreshLayout
;
private
String
hostel
;
private
String
hostel
;
...
@@ -61,9 +59,8 @@ public class MessMenuFragment extends BaseFragment {
...
@@ -61,9 +59,8 @@ public class MessMenuFragment extends BaseFragment {
Toolbar
toolbar
=
getActivity
().
findViewById
(
R
.
id
.
toolbar
);
Toolbar
toolbar
=
getActivity
().
findViewById
(
R
.
id
.
toolbar
);
toolbar
.
setTitle
(
"Mess Menu"
);
toolbar
.
setTitle
(
"Mess Menu"
);
Utils
.
setSelectedMenuItem
(
getActivity
(),
R
.
id
.
nav_mess_menu
);
Utils
.
setSelectedMenuItem
(
getActivity
(),
R
.
id
.
nav_mess_menu
);
setupAdapter
();
hostel
=
(
String
)
getArguments
().
get
(
Constants
.
USER_HOSTEL
);
hostel
=
(
String
)
getArguments
().
get
(
Constants
.
USER_HOSTEL
);
displayMenu
(
hostel
);
messMenuSwipeRefreshLayout
=
getActivity
().
findViewById
(
R
.
id
.
mess_menu_swipe_refresh_layout
);
messMenuSwipeRefreshLayout
=
getActivity
().
findViewById
(
R
.
id
.
mess_menu_swipe_refresh_layout
);
messMenuSwipeRefreshLayout
.
setOnRefreshListener
(
new
SwipeRefreshLayout
.
OnRefreshListener
()
{
messMenuSwipeRefreshLayout
.
setOnRefreshListener
(
new
SwipeRefreshLayout
.
OnRefreshListener
()
{
...
@@ -104,7 +101,13 @@ public class MessMenuFragment extends BaseFragment {
...
@@ -104,7 +101,13 @@ public class MessMenuFragment extends BaseFragment {
}
}
private
void
displayMenu
(
final
String
hostel
)
{
private
void
displayMenu
(
final
String
hostel
)
{
updateMessMenu
(
hostel
);
if
(
instituteMessMenu
!=
null
)
{
HostelMessMenu
hostelMessMenu
=
findMessMenu
(
instituteMessMenu
,
hostel
);
if
(
hostelMessMenu
!=
null
)
displayMessMenu
(
hostelMessMenu
);
}
else
{
updateMessMenu
(
hostel
);
}
}
}
private
void
updateMessMenu
(
final
String
hostel
)
{
private
void
updateMessMenu
(
final
String
hostel
)
{
...
@@ -113,10 +116,10 @@ public class MessMenuFragment extends BaseFragment {
...
@@ -113,10 +116,10 @@ public class MessMenuFragment extends BaseFragment {
@Override
@Override
public
void
onResponse
(
Call
<
List
<
HostelMessMenu
>>
call
,
Response
<
List
<
HostelMessMenu
>>
response
)
{
public
void
onResponse
(
Call
<
List
<
HostelMessMenu
>>
call
,
Response
<
List
<
HostelMessMenu
>>
response
)
{
if
(
response
.
isSuccessful
())
{
if
(
response
.
isSuccessful
())
{
List
<
HostelMessMenu
>
instituteMessMenu
=
response
.
body
()
;
if
(
getActivity
()
==
null
||
getView
()
==
null
||
response
.
body
()
==
null
)
return
;
HostelMessMenu
hostelMessMenu
=
findMessMenu
(
instituteMessMenu
,
hostel
);
i
f
(
hostelMessMenu
!=
null
)
i
nstituteMessMenu
=
response
.
body
();
displayMessMenu
(
hostelMessMenu
);
displayMenu
(
hostel
);
}
}
//Server Error
//Server Error
messMenuSwipeRefreshLayout
.
setRefreshing
(
false
);
messMenuSwipeRefreshLayout
.
setRefreshing
(
false
);
...
@@ -155,6 +158,7 @@ public class MessMenuFragment extends BaseFragment {
...
@@ -155,6 +158,7 @@ public class MessMenuFragment extends BaseFragment {
today
=
6
;
today
=
6
;
}
}
/* Sort by day */
for
(
int
i
=
0
;
i
<
7
;
i
++)
{
for
(
int
i
=
0
;
i
<
7
;
i
++)
{
final
int
day
=
(
today
+
i
)
%
7
+
1
;
final
int
day
=
(
today
+
i
)
%
7
+
1
;
for
(
MessMenu
menu
:
messMenus
)
{
for
(
MessMenu
menu
:
messMenus
)
{
...
@@ -164,24 +168,22 @@ public class MessMenuFragment extends BaseFragment {
...
@@ -164,24 +168,22 @@ public class MessMenuFragment extends BaseFragment {
}
}
}
}
getActivityBuffer
().
safely
(
new
ActivityBuffer
.
IRunnable
()
{
/* Display */
@Override
notifyChange
(
sortedMenus
);
public
void
run
(
Activity
pActivity
)
{
try
{
if
(
messMenuAdapter
==
null
)
{
messMenuAdapter
=
new
MessMenuAdapter
(
sortedMenus
);
messMenuRecyclerView
=
getActivity
().
findViewById
(
R
.
id
.
mess_menu_recycler_view
);
messMenuRecyclerView
.
setAdapter
(
messMenuAdapter
);
messMenuRecyclerView
.
setLayoutManager
(
new
LinearLayoutManager
(
getContext
()));
}
else
{
messMenuAdapter
.
setMenu
(
sortedMenus
);
messMenuAdapter
.
notifyDataSetChanged
();
}
}
catch
(
NullPointerException
e
)
{
e
.
printStackTrace
();
}
}
});
getActivity
().
findViewById
(
R
.
id
.
loadingPanel
).
setVisibility
(
View
.
GONE
);
getActivity
().
findViewById
(
R
.
id
.
loadingPanel
).
setVisibility
(
View
.
GONE
);
}
}
private
void
setupAdapter
()
{
if
(
messMenuAdapter
==
null
)
{
messMenuAdapter
=
new
MessMenuAdapter
(
new
ArrayList
<
MessMenu
>());
}
RecyclerView
messMenuRecyclerView
=
getActivity
().
findViewById
(
R
.
id
.
mess_menu_recycler_view
);
messMenuRecyclerView
.
setAdapter
(
messMenuAdapter
);
messMenuRecyclerView
.
setLayoutManager
(
new
LinearLayoutManager
(
getContext
()));
}
private
void
notifyChange
(
final
List
<
MessMenu
>
menus
)
{
messMenuAdapter
.
setMenu
(
menus
);
messMenuAdapter
.
notifyDataSetChanged
();
}
}
}
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