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
924098a5
Commit
924098a5
authored
Jan 04, 2019
by
Varun Patil
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename BodyFragmentNew to BodyFragment
parent
71db08b4
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
269 additions
and
504 deletions
+269
-504
app/src/main/java/app/insti/Utils.java
app/src/main/java/app/insti/Utils.java
+2
-4
app/src/main/java/app/insti/fragment/BodyFragment.java
app/src/main/java/app/insti/fragment/BodyFragment.java
+265
-76
app/src/main/java/app/insti/fragment/BodyFragmentNew.java
app/src/main/java/app/insti/fragment/BodyFragmentNew.java
+0
-421
app/src/main/res/layout/fragment_body.xml
app/src/main/res/layout/fragment_body.xml
+1
-2
app/src/main/res/layout/fragment_body_fragment_new.xml
app/src/main/res/layout/fragment_body_fragment_new.xml
+1
-1
No files found.
app/src/main/java/app/insti/Utils.java
View file @
924098a5
...
@@ -20,7 +20,6 @@ import com.google.gson.Gson;
...
@@ -20,7 +20,6 @@ import com.google.gson.Gson;
import
com.squareup.picasso.Callback
;
import
com.squareup.picasso.Callback
;
import
com.squareup.picasso.Picasso
;
import
com.squareup.picasso.Picasso
;
import
java.lang.reflect.Field
;
import
java.util.HashMap
;
import
java.util.HashMap
;
import
java.util.Map
;
import
java.util.Map
;
...
@@ -31,7 +30,6 @@ import app.insti.api.model.Event;
...
@@ -31,7 +30,6 @@ import app.insti.api.model.Event;
import
app.insti.api.model.Notification
;
import
app.insti.api.model.Notification
;
import
app.insti.api.model.User
;
import
app.insti.api.model.User
;
import
app.insti.fragment.BodyFragment
;
import
app.insti.fragment.BodyFragment
;
import
app.insti.fragment.BodyFragmentNew
;
import
app.insti.fragment.EventFragment
;
import
app.insti.fragment.EventFragment
;
import
app.insti.fragment.TransitionTargetChild
;
import
app.insti.fragment.TransitionTargetChild
;
import
app.insti.fragment.TransitionTargetFragment
;
import
app.insti.fragment.TransitionTargetFragment
;
...
@@ -141,11 +139,11 @@ public final class Utils {
...
@@ -141,11 +139,11 @@ public final class Utils {
.
commit
();
.
commit
();
}
}
public
static
BodyFragment
New
getBodyFragment
(
Body
body
,
boolean
sharedElements
)
{
public
static
BodyFragment
getBodyFragment
(
Body
body
,
boolean
sharedElements
)
{
Bundle
bundle
=
new
Bundle
();
Bundle
bundle
=
new
Bundle
();
bundle
.
putString
(
Constants
.
BODY_JSON
,
new
Gson
().
toJson
(
body
));
bundle
.
putString
(
Constants
.
BODY_JSON
,
new
Gson
().
toJson
(
body
));
bundle
.
putBoolean
(
Constants
.
NO_SHARED_ELEM
,
!
sharedElements
);
bundle
.
putBoolean
(
Constants
.
NO_SHARED_ELEM
,
!
sharedElements
);
BodyFragment
New
bodyFragment
=
new
BodyFragmentNew
();
BodyFragment
bodyFragment
=
new
BodyFragment
();
bodyFragment
.
setArguments
(
bundle
);
bodyFragment
.
setArguments
(
bundle
);
return
bodyFragment
;
return
bodyFragment
;
}
}
...
...
app/src/main/java/app/insti/fragment/BodyFragment.java
View file @
924098a5
This diff is collapsed.
Click to expand it.
app/src/main/java/app/insti/fragment/BodyFragmentNew.java
deleted
100644 → 0
View file @
71db08b4
This diff is collapsed.
Click to expand it.
app/src/main/res/layout/fragment_body.xml
View file @
924098a5
...
@@ -5,8 +5,7 @@
...
@@ -5,8 +5,7 @@
android:id=
"@+id/container_body"
android:id=
"@+id/container_body"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:orientation=
"vertical"
android:orientation=
"vertical"
>
tools:context=
".fragment.BodyFragment"
>
<android.support.v7.widget.CardView
<android.support.v7.widget.CardView
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
...
...
app/src/main/res/layout/fragment_body_fragment_new.xml
View file @
924098a5
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,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=
".fragment.BodyFragment
New
"
tools:context=
".fragment.BodyFragment"
android:background=
"?attr/themeColor"
>
android:background=
"?attr/themeColor"
>
<android.support.design.widget.CoordinatorLayout
<android.support.design.widget.CoordinatorLayout
...
...
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