Commit 2e58bb49 authored by Varun Patil's avatar Varun Patil

Rename add event to webview

parent c5cee30e
...@@ -67,5 +67,6 @@ dependencies { ...@@ -67,5 +67,6 @@ dependencies {
implementation "me.leolin:ShortcutBadger:$shortcutBadgerVersion" implementation "me.leolin:ShortcutBadger:$shortcutBadgerVersion"
implementation "com.github.prolificinteractive:material-calendarview:${materialCalendarViewVersion}" implementation "com.github.prolificinteractive:material-calendarview:${materialCalendarViewVersion}"
implementation "com.jakewharton.threetenabp:threetenabp:${threetenBPVersion}" implementation "com.jakewharton.threetenabp:threetenabp:${threetenBPVersion}"
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
} }
apply plugin: 'com.google.gms.google-services' apply plugin: 'com.google.gms.google-services'
...@@ -249,11 +249,11 @@ public class BodyFragment extends BackHandledFragment implements TransitionTarge ...@@ -249,11 +249,11 @@ public class BodyFragment extends BackHandledFragment implements TransitionTarge
fab.setOnClickListener(new View.OnClickListener() { fab.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
AddEventFragment addEventFragment = new AddEventFragment(); WebViewFragment webViewFragment = new WebViewFragment();
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putString("bodyId", body.getBodyID()); bundle.putString("bodyId", body.getBodyID());
addEventFragment.setArguments(bundle); webViewFragment.setArguments(bundle);
((MainActivity) getActivity()).updateFragment(addEventFragment); ((MainActivity) getActivity()).updateFragment(webViewFragment);
} }
}); });
} }
......
...@@ -139,8 +139,8 @@ public class CalendarFragment extends BaseFragment { ...@@ -139,8 +139,8 @@ public class CalendarFragment extends BaseFragment {
public void onClick(View v) { public void onClick(View v) {
CalendarDay day = ((MaterialCalendarView) view.findViewById(R.id.simpleCalendarView)).getSelectedDate(); CalendarDay day = ((MaterialCalendarView) view.findViewById(R.id.simpleCalendarView)).getSelectedDate();
String date = day.getYear() + "-" + day.getMonth() + "-" + day.getDay(); String date = day.getYear() + "-" + day.getMonth() + "-" + day.getDay();
AddEventFragment addEventFragment = (new AddEventFragment()).withDate(date); WebViewFragment webViewFragment = (new WebViewFragment()).withDate(date);
((MainActivity) getActivity()).updateFragment(addEventFragment); ((MainActivity) getActivity()).updateFragment(webViewFragment);
} }
}); });
} }
......
...@@ -58,11 +58,9 @@ import app.insti.R; ...@@ -58,11 +58,9 @@ import app.insti.R;
import app.insti.ShareURLMaker; import app.insti.ShareURLMaker;
import app.insti.Utils; import app.insti.Utils;
import app.insti.activity.MainActivity; import app.insti.activity.MainActivity;
import app.insti.adapter.BodyAdapter;
import app.insti.adapter.GenericAdapter; import app.insti.adapter.GenericAdapter;
import app.insti.api.EmptyCallback; import app.insti.api.EmptyCallback;
import app.insti.api.RetrofitInterface; import app.insti.api.RetrofitInterface;
import app.insti.api.model.Body;
import app.insti.api.model.Event; import app.insti.api.model.Event;
import app.insti.api.model.Venue; import app.insti.api.model.Venue;
import app.insti.interfaces.CardInterface; import app.insti.interfaces.CardInterface;
...@@ -357,11 +355,11 @@ public class EventFragment extends BackHandledFragment implements TransitionTarg ...@@ -357,11 +355,11 @@ public class EventFragment extends BackHandledFragment implements TransitionTarg
} }
fab.setOnClickListener(v -> { fab.setOnClickListener(v -> {
AddEventFragment addEventFragment = new AddEventFragment(); WebViewFragment webViewFragment = new WebViewFragment();
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putString("id", event.getEventID()); bundle.putString("id", event.getEventID());
addEventFragment.setArguments(bundle); webViewFragment.setArguments(bundle);
((MainActivity) getActivity()).updateFragment(addEventFragment); ((MainActivity) getActivity()).updateFragment(webViewFragment);
}); });
} }
......
...@@ -131,10 +131,10 @@ public class FeedFragment extends BaseFragment { ...@@ -131,10 +131,10 @@ public class FeedFragment extends BaseFragment {
fab.setOnClickListener(new View.OnClickListener() { fab.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
AddEventFragment addEventFragment = new AddEventFragment(); WebViewFragment webViewFragment = new WebViewFragment();
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
addEventFragment.setArguments(bundle); webViewFragment.setArguments(bundle);
((MainActivity) getActivity()).updateFragment(addEventFragment); ((MainActivity) getActivity()).updateFragment(webViewFragment);
} }
}); });
feedRecyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() { feedRecyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
......
...@@ -37,16 +37,16 @@ import retrofit2.Callback; ...@@ -37,16 +37,16 @@ import retrofit2.Callback;
import retrofit2.Response; import retrofit2.Response;
public class AddEventFragment extends BaseFragment { public class WebViewFragment extends BaseFragment {
public ValueCallback<Uri[]> uploadMessage; public ValueCallback<Uri[]> uploadMessage;
private ProgressDialog progressDialog; private ProgressDialog progressDialog;
private String query = ""; private String query = "";
public AddEventFragment() { public WebViewFragment() {
// Required empty public constructor // Required empty public constructor
} }
public AddEventFragment withDate(String date) { public WebViewFragment withDate(String date) {
query += "&date=" + date; query += "&date=" + date;
return this; return this;
} }
...@@ -60,7 +60,7 @@ public class AddEventFragment extends BaseFragment { ...@@ -60,7 +60,7 @@ public class AddEventFragment extends BaseFragment {
public View onCreateView(LayoutInflater inflater, ViewGroup container, public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) { Bundle savedInstanceState) {
container.removeAllViews(); container.removeAllViews();
View view = inflater.inflate(R.layout.fragment_add_event, container, false); View view = inflater.inflate(R.layout.fragment_webview, container, false);
/* Show progress dialog */ /* Show progress dialog */
progressDialog = new ProgressDialog(getContext()); progressDialog = new ProgressDialog(getContext());
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
tools:context="app.insti.fragment.AddEventFragment"> tools:context="app.insti.fragment.WebViewFragment">
<WebView <WebView
android:id="@+id/add_event_webview" android:id="@+id/add_event_webview"
......
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