Commit c39136bd authored by Varun Patil's avatar Varun Patil

Implement Edit Event with WebView

parent 6c4d043c
......@@ -6,6 +6,7 @@ import android.net.Uri;
import android.os.Bundle;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentTransaction;
import android.support.v7.widget.Toolbar;
import android.view.LayoutInflater;
import android.view.MotionEvent;
import android.view.View;
......@@ -50,7 +51,9 @@ public class AddEventFragment extends BaseFragment {
container.removeAllViews();
View view = inflater.inflate(R.layout.fragment_add_event, container, false);
String host = "10.0.2.2:4200";
String host = "insti.app";
Toolbar toolbar = getActivity().findViewById(R.id.toolbar);
toolbar.setTitle(getArguments().containsKey("id") ? "Update Event" : "Add Event");
if (savedInstanceState == null) {
WebView webView = view.findViewById(R.id.add_event_webview);
......@@ -69,9 +72,9 @@ public class AddEventFragment extends BaseFragment {
cookieManager.setCookie(host, cookieString);
CookieSyncManager.getInstance().sync();
String url = "http://" + host + "/add-event?sandbox=true";
String url = "https://" + host + "/add-event?sandbox=true";
if (getArguments().containsKey("id")) {
url = "http://" + host + "/edit-event/" + getArguments().getString("id") + "?sandbox=true";
url = "https://" + host + "/edit-event/" + getArguments().getString("id") + "?sandbox=true";
}
webView.loadUrl(url);
......
......@@ -93,8 +93,7 @@ public class CalendarFragment extends BaseFragment {
}
});
if (((MainActivity)getActivity()).createEventAccess()) {
/* TODO: Uncomment the following line when Add Event is completed */
// fab.setVisibility(View.VISIBLE);
fab.setVisibility(View.VISIBLE);
}
updateEvents();
......
......@@ -12,6 +12,7 @@ import android.graphics.Rect;
import android.net.Uri;
import android.os.AsyncTask;
import android.os.Bundle;
import android.support.design.widget.FloatingActionButton;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentTransaction;
import android.support.v7.widget.LinearLayoutManager;
......@@ -228,6 +229,19 @@ public class EventFragment extends BackHandledFragment {
}
});
mShortAnimationDuration = getResources().getInteger(android.R.integer.config_shortAnimTime);
FloatingActionButton fab = (FloatingActionButton) getView().findViewById(R.id.edit_fab);
fab.setVisibility(View.VISIBLE);
fab.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
AddEventFragment addEventFragment = new AddEventFragment();
Bundle bundle = new Bundle();
bundle.putString("id", event.getEventID());
addEventFragment.setArguments(bundle);
((MainActivity) getActivity()).updateFragment(addEventFragment);
}
});
}
void setFollowButtonColors(int status) {
......
......@@ -77,11 +77,7 @@ public class FeedFragment extends BaseFragment {
AddEventFragment addEventFragment = new AddEventFragment();
Bundle bundle = new Bundle();
addEventFragment.setArguments(bundle);
FragmentTransaction ft = getChildFragmentManager().beginTransaction();
ft.setCustomAnimations(R.anim.slide_in_left, R.anim.slide_out_left, R.anim.slide_in_right, R.anim.slide_out_right);
ft.replace(R.id.relative_layout, addEventFragment, addEventFragment.getTag());
ft.addToBackStack(addEventFragment.getTag());
ft.commit();
((MainActivity) getActivity()).updateFragment(addEventFragment);
}
});
return view;
......
......@@ -58,11 +58,7 @@ public class MyEventsFragment extends BaseFragment {
@Override
public void onClick(View v) {
AddEventFragment addEventFragment = new AddEventFragment();
addEventFragment.setArguments(getArguments());
FragmentTransaction ft = getChildFragmentManager().beginTransaction();
ft.replace(R.id.relative_layout, addEventFragment);
ft.addToBackStack("addEvent");
ft.commit();
((MainActivity) getActivity()).updateFragment(addEventFragment);
}
});
return view;
......@@ -73,8 +69,7 @@ public class MyEventsFragment extends BaseFragment {
super.onStart();
if (((MainActivity)getActivity()).createEventAccess()) {
/* TODO: Uncomment the following line when Add Event is completed */
// fab.setVisibility(View.VISIBLE);
fab.setVisibility(View.VISIBLE);
}
appDatabase = AppDatabase.getAppDatabase(getContext());
......
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
</vector>
......@@ -6,6 +6,10 @@
android:layout_height="match_parent"
tools:context="app.insti.fragment.EventFragment">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
......@@ -213,6 +217,18 @@
</LinearLayout>
<android.support.design.widget.FloatingActionButton
android:id="@+id/edit_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_edit_black_24dp"
android:tint="@android:color/black"
android:visibility="gone" />
</RelativeLayout>
<app.insti.TouchImageView
android:id="@+id/expanded_image_event"
android:layout_width="match_parent"
......
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