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
2e58bb49
Commit
2e58bb49
authored
Jul 20, 2019
by
Varun Patil
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename add event to webview
parent
c5cee30e
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
17 additions
and
18 deletions
+17
-18
app/build.gradle
app/build.gradle
+1
-0
app/src/main/java/app/insti/fragment/BodyFragment.java
app/src/main/java/app/insti/fragment/BodyFragment.java
+3
-3
app/src/main/java/app/insti/fragment/CalendarFragment.java
app/src/main/java/app/insti/fragment/CalendarFragment.java
+2
-2
app/src/main/java/app/insti/fragment/EventFragment.java
app/src/main/java/app/insti/fragment/EventFragment.java
+3
-5
app/src/main/java/app/insti/fragment/FeedFragment.java
app/src/main/java/app/insti/fragment/FeedFragment.java
+3
-3
app/src/main/java/app/insti/fragment/WebViewFragment.java
app/src/main/java/app/insti/fragment/WebViewFragment.java
+4
-4
app/src/main/res/layout/fragment_webview.xml
app/src/main/res/layout/fragment_webview.xml
+1
-1
No files found.
app/build.gradle
View file @
2e58bb49
...
...
@@ -67,5 +67,6 @@ dependencies {
implementation
"me.leolin:ShortcutBadger:$shortcutBadgerVersion"
implementation
"com.github.prolificinteractive:material-calendarview:${materialCalendarViewVersion}"
implementation
"com.jakewharton.threetenabp:threetenabp:${threetenBPVersion}"
implementation
'androidx.legacy:legacy-support-v4:1.0.0'
}
apply
plugin:
'com.google.gms.google-services'
app/src/main/java/app/insti/fragment/BodyFragment.java
View file @
2e58bb49
...
...
@@ -249,11 +249,11 @@ public class BodyFragment extends BackHandledFragment implements TransitionTarge
fab
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
@Override
public
void
onClick
(
View
v
)
{
AddEventFragment
addEventFragment
=
new
AddEvent
Fragment
();
WebViewFragment
webViewFragment
=
new
WebView
Fragment
();
Bundle
bundle
=
new
Bundle
();
bundle
.
putString
(
"bodyId"
,
body
.
getBodyID
());
addEvent
Fragment
.
setArguments
(
bundle
);
((
MainActivity
)
getActivity
()).
updateFragment
(
addEvent
Fragment
);
webView
Fragment
.
setArguments
(
bundle
);
((
MainActivity
)
getActivity
()).
updateFragment
(
webView
Fragment
);
}
});
}
...
...
app/src/main/java/app/insti/fragment/CalendarFragment.java
View file @
2e58bb49
...
...
@@ -139,8 +139,8 @@ public class CalendarFragment extends BaseFragment {
public
void
onClick
(
View
v
)
{
CalendarDay
day
=
((
MaterialCalendarView
)
view
.
findViewById
(
R
.
id
.
simpleCalendarView
)).
getSelectedDate
();
String
date
=
day
.
getYear
()
+
"-"
+
day
.
getMonth
()
+
"-"
+
day
.
getDay
();
AddEventFragment
addEventFragment
=
(
new
AddEvent
Fragment
()).
withDate
(
date
);
((
MainActivity
)
getActivity
()).
updateFragment
(
addEvent
Fragment
);
WebViewFragment
webViewFragment
=
(
new
WebView
Fragment
()).
withDate
(
date
);
((
MainActivity
)
getActivity
()).
updateFragment
(
webView
Fragment
);
}
});
}
...
...
app/src/main/java/app/insti/fragment/EventFragment.java
View file @
2e58bb49
...
...
@@ -58,11 +58,9 @@ import app.insti.R;
import
app.insti.ShareURLMaker
;
import
app.insti.Utils
;
import
app.insti.activity.MainActivity
;
import
app.insti.adapter.BodyAdapter
;
import
app.insti.adapter.GenericAdapter
;
import
app.insti.api.EmptyCallback
;
import
app.insti.api.RetrofitInterface
;
import
app.insti.api.model.Body
;
import
app.insti.api.model.Event
;
import
app.insti.api.model.Venue
;
import
app.insti.interfaces.CardInterface
;
...
...
@@ -357,11 +355,11 @@ public class EventFragment extends BackHandledFragment implements TransitionTarg
}
fab
.
setOnClickListener
(
v
->
{
AddEventFragment
addEventFragment
=
new
AddEvent
Fragment
();
WebViewFragment
webViewFragment
=
new
WebView
Fragment
();
Bundle
bundle
=
new
Bundle
();
bundle
.
putString
(
"id"
,
event
.
getEventID
());
addEvent
Fragment
.
setArguments
(
bundle
);
((
MainActivity
)
getActivity
()).
updateFragment
(
addEvent
Fragment
);
webView
Fragment
.
setArguments
(
bundle
);
((
MainActivity
)
getActivity
()).
updateFragment
(
webView
Fragment
);
});
}
...
...
app/src/main/java/app/insti/fragment/FeedFragment.java
View file @
2e58bb49
...
...
@@ -131,10 +131,10 @@ public class FeedFragment extends BaseFragment {
fab
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
@Override
public
void
onClick
(
View
v
)
{
AddEventFragment
addEventFragment
=
new
AddEvent
Fragment
();
WebViewFragment
webViewFragment
=
new
WebView
Fragment
();
Bundle
bundle
=
new
Bundle
();
addEvent
Fragment
.
setArguments
(
bundle
);
((
MainActivity
)
getActivity
()).
updateFragment
(
addEvent
Fragment
);
webView
Fragment
.
setArguments
(
bundle
);
((
MainActivity
)
getActivity
()).
updateFragment
(
webView
Fragment
);
}
});
feedRecyclerView
.
addOnScrollListener
(
new
RecyclerView
.
OnScrollListener
()
{
...
...
app/src/main/java/app/insti/fragment/
AddEvent
Fragment.java
→
app/src/main/java/app/insti/fragment/
WebView
Fragment.java
View file @
2e58bb49
...
...
@@ -37,16 +37,16 @@ import retrofit2.Callback;
import
retrofit2.Response
;
public
class
AddEvent
Fragment
extends
BaseFragment
{
public
class
WebView
Fragment
extends
BaseFragment
{
public
ValueCallback
<
Uri
[]>
uploadMessage
;
private
ProgressDialog
progressDialog
;
private
String
query
=
""
;
public
AddEvent
Fragment
()
{
public
WebView
Fragment
()
{
// Required empty public constructor
}
public
AddEvent
Fragment
withDate
(
String
date
)
{
public
WebView
Fragment
withDate
(
String
date
)
{
query
+=
"&date="
+
date
;
return
this
;
}
...
...
@@ -60,7 +60,7 @@ public class AddEventFragment extends BaseFragment {
public
View
onCreateView
(
LayoutInflater
inflater
,
ViewGroup
container
,
Bundle
savedInstanceState
)
{
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 */
progressDialog
=
new
ProgressDialog
(
getContext
());
...
...
app/src/main/res/layout/fragment_
add_event
.xml
→
app/src/main/res/layout/fragment_
webview
.xml
View file @
2e58bb49
...
...
@@ -3,7 +3,7 @@
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:orientation=
"vertical"
tools:context=
"app.insti.fragment.
AddEvent
Fragment"
>
tools:context=
"app.insti.fragment.
WebView
Fragment"
>
<WebView
android:id=
"@+id/add_event_webview"
...
...
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