Skip to content

I
InstiApp
Commit c39136bd authored by Varun Patil's avatar Varun Patil
Browse files
Options

Implement Edit Event with WebView

parent 6c4d043c
Hide whitespace changes
Inline Side-by-side
Showing with 222 additions and 190 deletions
app/src/main/java/app/insti/fragment/AddEventFragment.java
View file @ c39136bd
...@@ -6,6 +6,7 @@ import android.net.Uri; ...@@ -6,6 +6,7 @@ import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentTransaction; import android.support.v4.app.FragmentTransaction;
import android.support.v7.widget.Toolbar;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.View; import android.view.View;
...@@ -50,7 +51,9 @@ public class AddEventFragment extends BaseFragment { ...@@ -50,7 +51,9 @@ public class AddEventFragment extends BaseFragment {
container.removeAllViews(); container.removeAllViews();
View view = inflater.inflate(R.layout.fragment_add_event, container, false); 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) { if (savedInstanceState == null) {
WebView webView = view.findViewById(R.id.add_event_webview); WebView webView = view.findViewById(R.id.add_event_webview);
...@@ -69,9 +72,9 @@ public class AddEventFragment extends BaseFragment { ...@@ -69,9 +72,9 @@ public class AddEventFragment extends BaseFragment {
cookieManager.setCookie(host, cookieString); cookieManager.setCookie(host, cookieString);
CookieSyncManager.getInstance().sync(); CookieSyncManager.getInstance().sync();
String url = "http://" + host + "/add-event?sandbox=true"; String url = "https://" + host + "/add-event?sandbox=true";
if (getArguments().containsKey("id")) { 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); webView.loadUrl(url);
......
app/src/main/java/app/insti/fragment/CalendarFragment.java
View file @ c39136bd
...@@ -93,8 +93,7 @@ public class CalendarFragment extends BaseFragment { ...@@ -93,8 +93,7 @@ public class CalendarFragment extends BaseFragment {
} }
}); });
if (((MainActivity)getActivity()).createEventAccess()) { if (((MainActivity)getActivity()).createEventAccess()) {
/* TODO: Uncomment the following line when Add Event is completed */ fab.setVisibility(View.VISIBLE);
// fab.setVisibility(View.VISIBLE);
} }
updateEvents(); updateEvents();
......
app/src/main/java/app/insti/fragment/EventFragment.java
View file @ c39136bd
...@@ -12,6 +12,7 @@ import android.graphics.Rect; ...@@ -12,6 +12,7 @@ import android.graphics.Rect;
import android.net.Uri; import android.net.Uri;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.os.Bundle; import android.os.Bundle;
import android.support.design.widget.FloatingActionButton;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentTransaction; import android.support.v4.app.FragmentTransaction;
import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.LinearLayoutManager;
...@@ -228,6 +229,19 @@ public class EventFragment extends BackHandledFragment { ...@@ -228,6 +229,19 @@ public class EventFragment extends BackHandledFragment {
} }
}); });
mShortAnimationDuration = getResources().getInteger(android.R.integer.config_shortAnimTime); 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) { void setFollowButtonColors(int status) {
......
app/src/main/java/app/insti/fragment/FeedFragment.java
View file @ c39136bd
...@@ -77,11 +77,7 @@ public class FeedFragment extends BaseFragment { ...@@ -77,11 +77,7 @@ public class FeedFragment extends BaseFragment {
AddEventFragment addEventFragment = new AddEventFragment(); AddEventFragment addEventFragment = new AddEventFragment();
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
addEventFragment.setArguments(bundle); addEventFragment.setArguments(bundle);
FragmentTransaction ft = getChildFragmentManager().beginTransaction(); ((MainActivity) getActivity()).updateFragment(addEventFragment);
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();
} }
}); });
return view; return view;
......
app/src/main/java/app/insti/fragment/MyEventsFragment.java
View file @ c39136bd
...@@ -58,11 +58,7 @@ public class MyEventsFragment extends BaseFragment { ...@@ -58,11 +58,7 @@ public class MyEventsFragment extends BaseFragment {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
AddEventFragment addEventFragment = new AddEventFragment(); AddEventFragment addEventFragment = new AddEventFragment();
addEventFragment.setArguments(getArguments()); ((MainActivity) getActivity()).updateFragment(addEventFragment);
FragmentTransaction ft = getChildFragmentManager().beginTransaction();
ft.replace(R.id.relative_layout, addEventFragment);
ft.addToBackStack("addEvent");
ft.commit();
} }
}); });
return view; return view;
...@@ -73,8 +69,7 @@ public class MyEventsFragment extends BaseFragment { ...@@ -73,8 +69,7 @@ public class MyEventsFragment extends BaseFragment {
super.onStart(); super.onStart();
if (((MainActivity)getActivity()).createEventAccess()) { 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()); appDatabase = AppDatabase.getAppDatabase(getContext());
......
app/src/main/res/drawable/ic_edit_black_24dp.xml 0 → 100644
View file @ c39136bd
<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>
app/src/main/res/layout/fragment_event.xml
View file @ c39136bd
...@@ -6,212 +6,228 @@ ...@@ -6,212 +6,228 @@
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context="app.insti.fragment.EventFragment"> tools:context="app.insti.fragment.EventFragment">
<LinearLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent">
android:orientation="vertical">
<ScrollView <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout <ScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="wrap_content">
android:layout_weight="1"
android:orientation="vertical">
<ImageView <LinearLayout
android:id="@+id/event_picture_2"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="300dp" android:layout_height="0dp"
android:adjustViewBounds="true" android:layout_weight="1"
android:scaleType="centerCrop" /> android:orientation="vertical">
<android.support.v7.widget.CardView <ImageView
android:layout_width="match_parent" android:id="@+id/event_picture_2"
android:layout_height="wrap_content" android:layout_width="match_parent"
app:cardBackgroundColor="@color/colorPrimary"> android:layout_height="300dp"
android:adjustViewBounds="true"
android:scaleType="centerCrop" />
<LinearLayout <android.support.v7.widget.CardView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" app:cardBackgroundColor="@color/colorPrimary">
android:layout_marginBottom="12dp"
android:layout_marginEnd="16dp"
android:layout_marginStart="16dp"
android:layout_marginTop="12dp"
android:layout_weight="3"
android:orientation="vertical">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal"> android:layout_gravity="center_vertical"
android:layout_marginBottom="12dp"
<TextView android:layout_marginEnd="16dp"
android:id="@+id/event_page_title" android:layout_marginStart="16dp"
android:layout_width="0dp" android:layout_marginTop="12dp"
android:layout_height="wrap_content" android:layout_weight="3"
android:layout_weight="10" android:orientation="vertical">
android:text="Event Title"
android:textColor="#fff" <LinearLayout
android:textSize="21sp" android:layout_width="match_parent"
android:textStyle="bold" />
<ImageButton
android:id="@+id/web_event_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="8dp"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="Event Website"
android:tint="@color/colorWhite"
android:visibility="invisible"
app:srcCompat="@drawable/ic_language_black_24dp" />
<ImageButton
android:id="@+id/navigate_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="8dp"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="Navigate"
android:tint="@color/colorWhite"
app:srcCompat="@drawable/baseline_navigation_24" />
<ImageButton
android:id="@+id/share_event_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:orientation="horizontal">
android:layout_marginStart="8dp"
android:background="?attr/selectableItemBackgroundBorderless" <TextView
android:contentDescription="Share Event" android:id="@+id/event_page_title"
android:src="@drawable/ic_menu_share" android:layout_width="0dp"
android:tint="@color/colorWhite" /> android:layout_height="wrap_content"
</LinearLayout> android:layout_weight="10"
android:text="Event Title"
<LinearLayout android:textColor="#fff"
android:layout_width="wrap_content" android:textSize="21sp"
android:layout_height="wrap_content" android:textStyle="bold" />
android:orientation="horizontal">
<ImageButton
<TextView android:id="@+id/web_event_button"
android:id="@+id/event_page_date" android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="8dp"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="Event Website"
android:tint="@color/colorWhite"
android:visibility="invisible"
app:srcCompat="@drawable/ic_language_black_24dp" />
<ImageButton
android:id="@+id/navigate_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="8dp"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="Navigate"
android:tint="@color/colorWhite"
app:srcCompat="@drawable/baseline_navigation_24" />
<ImageButton
android:id="@+id/share_event_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="8dp"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="Share Event"
android:src="@drawable/ic_menu_share"
android:tint="@color/colorWhite" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="No Date Specified" android:orientation="horizontal">
android:textColor="#fff"
android:textSize="16sp" /> <TextView
android:id="@+id/event_page_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="No Date Specified"
android:textColor="#fff"
android:textSize="16sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=" | "
android:textColor="#fff"
android:textSize="20sp" />
<TextView
android:id="@+id/event_page_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="No Time Specified"
android:textColor="#fff"
android:textSize="16sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=" | "
android:textColor="#fff"
android:textSize="20sp" />
<TextView
android:id="@+id/event_page_venue"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:text="No Venue Specified"
android:textColor="#fff"
android:textSize="16sp" />
</LinearLayout>
<TextView </LinearLayout>
android:layout_width="wrap_content" </android.support.v7.widget.CardView>
android:layout_height="wrap_content"
android:text=" | "
android:textColor="#fff"
android:textSize="20sp" />
<TextView
android:id="@+id/event_page_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="No Time Specified"
android:textColor="#fff"
android:textSize="16sp" />
<TextView <LinearLayout
android:layout_width="wrap_content" style="?android:attr/buttonBarStyle"
android:layout_height="wrap_content" android:layout_width="match_parent"
android:text=" | " android:layout_height="wrap_content"
android:textColor="#fff" android:orientation="horizontal">
android:textSize="20sp" />
<TextView <Button
android:id="@+id/event_page_venue" android:id="@+id/going_button"
android:layout_width="wrap_content" style="?android:attr/buttonBarButtonStyle"
android:layout_height="wrap_content" android:textAllCaps="false"
android:ellipsize="end" android:layout_width="0dp"
android:text="No Venue Specified" android:layout_height="wrap_content"
android:textColor="#fff" android:layout_margin="0dp"
android:textSize="16sp" /> android:layout_weight="1"
</LinearLayout> android:text="GOING"
android:textColor="@color/secondaryTextColor" />
<View
android:layout_width="1dp"
android:layout_height="match_parent"
android:layout_marginBottom="6dp"
android:layout_marginTop="10dp"
android:background="#aaa">
</View>
<Button
android:id="@+id/interested_button"
style="?android:attr/buttonBarButtonStyle"
android:textAllCaps="false"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_margin="0dp"
android:layout_weight="1"
android:text="INTERESTED"
android:textColor="@color/secondaryTextColor" />
</LinearLayout> </LinearLayout>
</android.support.v7.widget.CardView>
<LinearLayout
style="?android:attr/buttonBarStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<Button
android:id="@+id/going_button"
style="?android:attr/buttonBarButtonStyle"
android:textAllCaps="false"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_margin="0dp"
android:layout_weight="1"
android:text="GOING"
android:textColor="@color/secondaryTextColor" />
<View <View
android:layout_width="1dp" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="1dp"
android:layout_marginBottom="6dp" android:layout_marginLeft="8dp"
android:layout_marginTop="10dp" android:layout_marginRight="8dp"
android:background="#aaa"> android:background="#aaa">
</View> </View>
<Button <TextView
android:id="@+id/interested_button" android:id="@+id/event_page_description"
style="?android:attr/buttonBarButtonStyle" android:layout_width="match_parent"
android:textAllCaps="false"
android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="0dp" android:layout_marginBottom="16dp"
android:layout_weight="1" android:layout_marginEnd="10dp"
android:text="INTERESTED" android:layout_marginStart="10dp"
android:textColor="@color/secondaryTextColor" /> android:layout_marginTop="12dp"
android:textColor="#777"
</LinearLayout> android:textSize="16sp" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:background="#aaa">
</View>
<TextView
android:id="@+id/event_page_description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:layout_marginEnd="10dp"
android:layout_marginStart="10dp"
android:layout_marginTop="12dp"
android:textColor="#777"
android:textSize="16sp" />
<android.support.v7.widget.RecyclerView
android:id="@+id/body_card_recycler_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp" />
</LinearLayout> <android.support.v7.widget.RecyclerView
</ScrollView> android:id="@+id/body_card_recycler_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp" />
</LinearLayout> </LinearLayout>
</ScrollView>
</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 <app.insti.TouchImageView
android:id="@+id/expanded_image_event" android:id="@+id/expanded_image_event"
......
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