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
0ea14304
Commit
0ea14304
authored
Jan 04, 2019
by
Varun Patil
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Restore update body button
parent
6f80442b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
26 deletions
+18
-26
app/src/main/java/app/insti/fragment/BodyFragmentNew.java
app/src/main/java/app/insti/fragment/BodyFragmentNew.java
+8
-26
app/src/main/res/layout/fragment_body_fragment_new.xml
app/src/main/res/layout/fragment_body_fragment_new.xml
+10
-0
No files found.
app/src/main/java/app/insti/fragment/BodyFragmentNew.java
View file @
0ea14304
...
@@ -2,18 +2,11 @@ package app.insti.fragment;
...
@@ -2,18 +2,11 @@ package app.insti.fragment;
import
android.animation.Animator
;
import
android.animation.Animator
;
import
android.animation.AnimatorListenerAdapter
;
import
android.animation.AnimatorSet
;
import
android.animation.ObjectAnimator
;
import
android.content.Intent
;
import
android.graphics.Color
;
import
android.graphics.Point
;
import
android.graphics.Rect
;
import
android.graphics.Rect
;
import
android.net.Uri
;
import
android.os.Bundle
;
import
android.os.Bundle
;
import
android.support.annotation.NonNull
;
import
android.support.design.widget.FloatingActionButton
;
import
android.support.design.widget.FloatingActionButton
;
import
android.support.v4.app.Fragment
;
import
android.support.v4.app.Fragment
;
import
android.support.v4.widget.NestedScrollView
;
import
android.support.v4.widget.SwipeRefreshLayout
;
import
android.support.v4.widget.SwipeRefreshLayout
;
import
android.support.v7.widget.LinearLayoutManager
;
import
android.support.v7.widget.LinearLayoutManager
;
import
android.support.v7.widget.RecyclerView
;
import
android.support.v7.widget.RecyclerView
;
...
@@ -21,12 +14,7 @@ import android.support.v7.widget.Toolbar;
...
@@ -21,12 +14,7 @@ import android.support.v7.widget.Toolbar;
import
android.view.LayoutInflater
;
import
android.view.LayoutInflater
;
import
android.view.View
;
import
android.view.View
;
import
android.view.ViewGroup
;
import
android.view.ViewGroup
;
import
android.view.animation.DecelerateInterpolator
;
import
android.widget.Button
;
import
android.widget.ImageButton
;
import
android.widget.ImageView
;
import
android.widget.ImageView
;
import
android.widget.TextView
;
import
android.widget.Toast
;
import
com.google.gson.Gson
;
import
com.google.gson.Gson
;
import
com.squareup.picasso.Picasso
;
import
com.squareup.picasso.Picasso
;
...
@@ -36,16 +24,11 @@ import java.util.List;
...
@@ -36,16 +24,11 @@ import java.util.List;
import
app.insti.Constants
;
import
app.insti.Constants
;
import
app.insti.R
;
import
app.insti.R
;
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.FeedAdapter
;
import
app.insti.adapter.GenericAdapter
;
import
app.insti.adapter.GenericAdapter
;
import
app.insti.adapter.UserAdapter
;
import
app.insti.api.RetrofitInterface
;
import
app.insti.api.RetrofitInterface
;
import
app.insti.api.model.Body
;
import
app.insti.api.model.Body
;
import
app.insti.api.model.Event
;
import
app.insti.api.model.Role
;
import
app.insti.api.model.Role
;
import
app.insti.api.model.User
;
import
app.insti.api.model.User
;
import
app.insti.interfaces.CardInterface
;
import
app.insti.interfaces.CardInterface
;
...
@@ -54,7 +37,6 @@ import app.insti.utils.TitleCard;
...
@@ -54,7 +37,6 @@ import app.insti.utils.TitleCard;
import
retrofit2.Call
;
import
retrofit2.Call
;
import
retrofit2.Callback
;
import
retrofit2.Callback
;
import
retrofit2.Response
;
import
retrofit2.Response
;
import
ru.noties.markwon.Markwon
;
/**
/**
* A simple {@link Fragment} subclass.
* A simple {@link Fragment} subclass.
...
@@ -219,22 +201,22 @@ public class BodyFragmentNew extends BackHandledFragment implements TransitionTa
...
@@ -219,22 +201,22 @@ public class BodyFragmentNew extends BackHandledFragment implements TransitionTa
addWithTitleCard
(
cards
,
body
.
getBodyChildren
(),
"Organizations"
);
addWithTitleCard
(
cards
,
body
.
getBodyChildren
(),
"Organizations"
);
addWithTitleCard
(
cards
,
body
.
getBodyParents
(),
"Part of"
);
addWithTitleCard
(
cards
,
body
.
getBodyParents
(),
"Part of"
);
RecyclerView
recyclerView
=
(
RecyclerView
)
getActivity
().
findViewById
(
R
.
id
.
body_recycler_view
);
final
RecyclerView
recyclerView
=
(
RecyclerView
)
getActivity
().
findViewById
(
R
.
id
.
body_recycler_view
);
GenericAdapter
genericAdapter
=
new
GenericAdapter
(
cards
,
this
);
GenericAdapter
genericAdapter
=
new
GenericAdapter
(
cards
,
this
);
recyclerView
.
setAdapter
(
genericAdapter
);
recyclerView
.
setAdapter
(
genericAdapter
);
recyclerView
.
setLayoutManager
(
new
LinearLayoutManager
(
getContext
()));
recyclerView
.
setLayoutManager
(
new
LinearLayoutManager
(
getContext
()));
getActivity
().
findViewById
(
R
.
id
.
loadingPanel
).
setVisibility
(
View
.
GONE
);
getActivity
().
findViewById
(
R
.
id
.
loadingPanel
).
setVisibility
(
View
.
GONE
);
/* Show update button if role
/* Show update button if role
*/
if
(((
MainActivity
)
getActivity
()).
editBodyAccess
(
body
))
{
if
(((
MainActivity
)
getActivity
()).
editBodyAccess
(
body
))
{
final
FloatingActionButton
fab
=
(
FloatingActionButton
)
getView
().
findViewById
(
R
.
id
.
edit_fab
);
final
FloatingActionButton
fab
=
(
FloatingActionButton
)
getView
().
findViewById
(
R
.
id
.
edit_fab
);
fab
.
show
();
fab
.
show
();
NestedScrollView nsv = (NestedScrollView) getView().findViewById(R.id.body_scrollview);
recyclerView
.
addOnScrollListener
(
new
RecyclerView
.
OnScrollListener
()
{
nsv.setOnScrollChangeListener(new NestedScrollView.OnScrollChangeListener() {
@Override
@Override
public void onScrollChange(NestedScrollView v, int scrollX, int scrollY, int oldScrollX, int oldScrollY) {
public
void
onScrolled
(
@NonNull
RecyclerView
recyclerView
,
int
dx
,
int
dy
)
{
if (scrollY > oldScrollY) fab.hide();
super
.
onScrolled
(
recyclerView
,
dx
,
dy
);
if
(
dy
>
0
)
fab
.
hide
();
else
fab
.
show
();
else
fab
.
show
();
}
}
});
});
...
@@ -249,7 +231,7 @@ public class BodyFragmentNew extends BackHandledFragment implements TransitionTa
...
@@ -249,7 +231,7 @@ public class BodyFragmentNew extends BackHandledFragment implements TransitionTa
((
MainActivity
)
getActivity
()).
updateFragment
(
addEventFragment
);
((
MainActivity
)
getActivity
()).
updateFragment
(
addEventFragment
);
}
}
});
});
}
*/
}
}
}
private
<
R
extends
CardInterface
>
void
addWithTitleCard
(
List
<
CardInterface
>
cards
,
List
<
R
>
cardsToAdd
,
String
title
)
{
private
<
R
extends
CardInterface
>
void
addWithTitleCard
(
List
<
CardInterface
>
cards
,
List
<
R
>
cardsToAdd
,
String
title
)
{
...
...
app/src/main/res/layout/fragment_body_fragment_new.xml
View file @
0ea14304
...
@@ -56,6 +56,16 @@
...
@@ -56,6 +56,16 @@
</android.support.design.widget.CoordinatorLayout>
</android.support.design.widget.CoordinatorLayout>
<android.support.design.widget.FloatingActionButton
android:id=
"@+id/edit_fab"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_margin=
"16dp"
android:src=
"@drawable/ic_edit_black_24dp"
android:tint=
"@android:color/black"
android:visibility=
"visible"
android:layout_gravity=
"end|bottom"
/>
<RelativeLayout
<RelativeLayout
android:id=
"@+id/loadingPanel"
android:id=
"@+id/loadingPanel"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
...
...
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