Skip to content

I
InstiApp
Commit 84e717b1 authored by Sajal Narang's avatar Sajal Narang
Browse files
Options

Merge branch 'master' of https://github.com/maitreyaverma/InstiApp into maitreyaverma-master

parents e2bad655 b273f42b
Show whitespace changes
Inline Side-by-side
Showing with 38 additions and 19 deletions
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/Constants.java
View file @ 84e717b1
...@@ -19,4 +19,5 @@ public class Constants { ...@@ -19,4 +19,5 @@ public class Constants {
public static final int STATUS_GOING = 2; public static final int STATUS_GOING = 2;
public static final int STATUS_INTERESTED = 1; public static final int STATUS_INTERESTED = 1;
public static final int STATUS_NOT_GOING = 0; public static final int STATUS_NOT_GOING = 0;
public static final String BODY_JSON= "body_json";
} }
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragment/BodyFragment.java
View file @ 84e717b1
...@@ -3,6 +3,7 @@ package in.ac.iitb.gymkhana.iitbapp.fragment; ...@@ -3,6 +3,7 @@ package in.ac.iitb.gymkhana.iitbapp.fragment;
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.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
...@@ -29,13 +30,14 @@ import retrofit2.Response; ...@@ -29,13 +30,14 @@ import retrofit2.Response;
public class BodyFragment extends Fragment { public class BodyFragment extends Fragment {
// TODO: Rename parameter arguments, choose names that match // TODO: Rename parameter arguments, choose names that match
// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
private static final String ARG_BODY = "body";
private AppDatabase appDatabase; private AppDatabase appDatabase;
String TAG = "BodyFragment"; String TAG = "BodyFragment";
// TODO: Rename and change types of parameters // TODO: Rename and change types of parameters
private Body min_body; private Body min_body;
private SwipeRefreshLayout bodySwipeRefreshLayout;
public BodyFragment() { public BodyFragment() {
...@@ -53,7 +55,7 @@ public class BodyFragment extends Fragment { ...@@ -53,7 +55,7 @@ public class BodyFragment extends Fragment {
public static BodyFragment newInstance(Body arg_body) { public static BodyFragment newInstance(Body arg_body) {
BodyFragment fragment = new BodyFragment(); BodyFragment fragment = new BodyFragment();
Bundle args = new Bundle(); Bundle args = new Bundle();
args.putString(ARG_BODY, new Gson().toJson(arg_body)); args.putString(Constants.BODY_JSON, new Gson().toJson(arg_body));
fragment.setArguments(args); fragment.setArguments(args);
return fragment; return fragment;
} }
...@@ -62,7 +64,7 @@ public class BodyFragment extends Fragment { ...@@ -62,7 +64,7 @@ public class BodyFragment extends Fragment {
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
if (getArguments() != null) { if (getArguments() != null) {
min_body = new Gson().fromJson(getArguments().getString(ARG_BODY), Body.class); min_body = new Gson().fromJson(getArguments().getString(Constants.BODY_JSON), Body.class);
} }
} }
...@@ -79,6 +81,13 @@ public class BodyFragment extends Fragment { ...@@ -79,6 +81,13 @@ public class BodyFragment extends Fragment {
} else { } else {
updateBody(); updateBody();
} }
bodySwipeRefreshLayout=getActivity().findViewById(R.id.body_swipe_refresh_layout);
bodySwipeRefreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
@Override
public void onRefresh() {
updateBody();
}
});
} }
private void updateBody() { private void updateBody() {
...@@ -92,11 +101,13 @@ public class BodyFragment extends Fragment { ...@@ -92,11 +101,13 @@ public class BodyFragment extends Fragment {
appDatabase.dbDao().insertBody(body); appDatabase.dbDao().insertBody(body);
displayBody(body); displayBody(body);
bodySwipeRefreshLayout.setRefreshing(false);
} }
} }
@Override @Override
public void onFailure(Call<Body> call, Throwable t) { public void onFailure(Call<Body> call, Throwable t) {
bodySwipeRefreshLayout.setRefreshing(false);
// Network Error // Network Error
} }
}); });
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragment/EventFragment.java
View file @ 84e717b1
...@@ -121,6 +121,8 @@ public class EventFragment extends BaseFragment implements View.OnClickListener ...@@ -121,6 +121,8 @@ public class EventFragment extends BaseFragment implements View.OnClickListener
public void onItemClick(View v, int position) { public void onItemClick(View v, int position) {
Body body = bodyList.get(position); Body body = bodyList.get(position);
BodyFragment bodyFragment = BodyFragment.newInstance(body); BodyFragment bodyFragment = BodyFragment.newInstance(body);
Bundle arguments=getArguments();
arguments.putString(Constants.BODY_JSON,new Gson().toJson(body));
bodyFragment.setArguments(getArguments()); bodyFragment.setArguments(getArguments());
FragmentTransaction ft = getActivity().getSupportFragmentManager().beginTransaction(); FragmentTransaction ft = getActivity().getSupportFragmentManager().beginTransaction();
ft.replace(R.id.framelayout_for_fragment, bodyFragment, bodyFragment.getTag()); ft.replace(R.id.framelayout_for_fragment, bodyFragment, bodyFragment.getTag());
......
app/src/main/res/layout/fragment_body.xml
View file @ 84e717b1
...@@ -4,7 +4,11 @@ ...@@ -4,7 +4,11 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context=".fragment.BodyFragment"> tools:context=".fragment.BodyFragment">
<android.support.v4.widget.SwipeRefreshLayout
android:id="@+id/body_swipe_refresh_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
>
<ScrollView <ScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
...@@ -26,4 +30,5 @@ ...@@ -26,4 +30,5 @@
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>
</android.support.v4.widget.SwipeRefreshLayout>
</FrameLayout> </FrameLayout>
\ No newline at end of file
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