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
e384e958
Commit
e384e958
authored
Aug 19, 2018
by
Sajal Narang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename ProfileFragment to UserFragment
parent
ed39340d
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
21 additions
and
24 deletions
+21
-24
app/src/main/java/app/insti/activity/MainActivity.java
app/src/main/java/app/insti/activity/MainActivity.java
+8
-11
app/src/main/java/app/insti/fragment/BodyFragment.java
app/src/main/java/app/insti/fragment/BodyFragment.java
+4
-4
app/src/main/java/app/insti/fragment/ExploreFragment.java
app/src/main/java/app/insti/fragment/ExploreFragment.java
+1
-1
app/src/main/java/app/insti/fragment/SettingsFragment.java
app/src/main/java/app/insti/fragment/SettingsFragment.java
+2
-2
app/src/main/java/app/insti/fragment/UserFragment.java
app/src/main/java/app/insti/fragment/UserFragment.java
+5
-5
app/src/main/res/layout/fragment_user.xml
app/src/main/res/layout/fragment_user.xml
+1
-1
No files found.
app/src/main/java/app/insti/activity/MainActivity.java
View file @
e384e958
...
...
@@ -37,9 +37,6 @@ import com.google.firebase.iid.InstanceIdResult;
import
com.google.gson.JsonObject
;
import
com.squareup.picasso.Picasso
;
import
org.json.JSONException
;
import
org.json.JSONObject
;
import
app.insti.Constants
;
import
app.insti.R
;
import
app.insti.SessionManager
;
...
...
@@ -61,7 +58,7 @@ import app.insti.fragment.MyEventsFragment;
import
app.insti.fragment.NewsFragment
;
import
app.insti.fragment.NotificationsFragment
;
import
app.insti.fragment.PlacementBlogFragment
;
import
app.insti.fragment.
Profile
Fragment
;
import
app.insti.fragment.
User
Fragment
;
import
app.insti.fragment.QuickLinksFragment
;
import
app.insti.fragment.SettingsFragment
;
import
app.insti.fragment.TrainingBlogFragment
;
...
...
@@ -227,8 +224,8 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
updateFragment
(
bodyFragment
);
break
;
case
"user"
:
ProfileFragment
profileFragment
=
Profile
Fragment
.
newInstance
(
getID
(
appLinkData
));
updateFragment
(
profile
Fragment
);
UserFragment
userFragment
=
User
Fragment
.
newInstance
(
getID
(
appLinkData
));
updateFragment
(
user
Fragment
);
break
;
case
"event"
:
RetrofitInterface
retrofitInterface
=
ServiceGenerator
.
createService
(
RetrofitInterface
.
class
);
...
...
@@ -331,9 +328,9 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
public
void
onClick
(
View
view
)
{
Bundle
bundle
=
new
Bundle
();
bundle
.
putString
(
Constants
.
USER_ID
,
currentUser
.
getUserID
());
ProfileFragment
profileFragment
=
new
Profile
Fragment
();
profile
Fragment
.
setArguments
(
bundle
);
updateFragment
(
profile
Fragment
);
UserFragment
userFragment
=
new
User
Fragment
();
user
Fragment
.
setArguments
(
bundle
);
updateFragment
(
user
Fragment
);
DrawerLayout
drawer
=
findViewById
(
R
.
id
.
drawer_layout
);
drawer
.
closeDrawer
(
GravityCompat
.
START
);
}
...
...
@@ -480,8 +477,8 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
FragmentTransaction
transaction
=
manager
.
beginTransaction
();
/* Animate only for
Profile
Fragment */
if
(
fragment
instanceof
Profile
Fragment
)
{
/* Animate only for
User
Fragment */
if
(
fragment
instanceof
User
Fragment
)
{
transaction
.
setCustomAnimations
(
R
.
anim
.
slide_in_left
,
R
.
anim
.
slide_out_left
,
R
.
anim
.
slide_in_right
,
R
.
anim
.
slide_out_right
);
}
...
...
app/src/main/java/app/insti/fragment/BodyFragment.java
View file @
e384e958
...
...
@@ -324,12 +324,12 @@ public class BodyFragment extends BackHandledFragment {
User
user
=
users
.
get
(
position
);
Bundle
bundle
=
new
Bundle
();
bundle
.
putString
(
Constants
.
USER_ID
,
user
.
getUserID
());
ProfileFragment
profileFragment
=
new
Profile
Fragment
();
profile
Fragment
.
setArguments
(
bundle
);
UserFragment
userFragment
=
new
User
Fragment
();
user
Fragment
.
setArguments
(
bundle
);
FragmentTransaction
ft
=
getActivity
().
getSupportFragmentManager
().
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
.
framelayout_for_fragment
,
profileFragment
,
profile
Fragment
.
getTag
());
ft
.
addToBackStack
(
profile
Fragment
.
getTag
());
ft
.
replace
(
R
.
id
.
framelayout_for_fragment
,
userFragment
,
user
Fragment
.
getTag
());
ft
.
addToBackStack
(
user
Fragment
.
getTag
());
ft
.
commit
();
}
});
...
...
app/src/main/java/app/insti/fragment/ExploreFragment.java
View file @
e384e958
...
...
@@ -212,7 +212,7 @@ public class ExploreFragment extends Fragment {
User
user
=
users
.
get
(
position
);
Bundle
bundle
=
new
Bundle
();
bundle
.
putString
(
Constants
.
USER_ID
,
user
.
getUserID
());
updateFragment
(
new
Profile
Fragment
(),
bundle
);
updateFragment
(
new
User
Fragment
(),
bundle
);
}
});
usersRecyclerView
.
setAdapter
(
userAdapter
);
...
...
app/src/main/java/app/insti/fragment/SettingsFragment.java
View file @
e384e958
...
...
@@ -92,8 +92,8 @@ public class SettingsFragment extends Fragment {
getView
().
findViewById
(
R
.
id
.
role_card_layout
).
setOnClickListener
(
new
View
.
OnClickListener
()
{
@Override
public
void
onClick
(
View
v
)
{
ProfileFragment
profileFragment
=
Profile
Fragment
.
newInstance
(
user
.
getUserID
());
((
MainActivity
)
getActivity
()).
updateFragment
(
profile
Fragment
);
UserFragment
userFragment
=
User
Fragment
.
newInstance
(
user
.
getUserID
());
((
MainActivity
)
getActivity
()).
updateFragment
(
user
Fragment
);
}
});
}
...
...
app/src/main/java/app/insti/fragment/
Profile
Fragment.java
→
app/src/main/java/app/insti/fragment/
User
Fragment.java
View file @
e384e958
...
...
@@ -47,7 +47,7 @@ import retrofit2.Response;
/**
* A simple {@link Fragment} subclass.
*/
public
class
Profile
Fragment
extends
BackHandledFragment
{
public
class
User
Fragment
extends
BackHandledFragment
{
private
User
user
;
// Hold a reference to the current animator,
...
...
@@ -64,12 +64,12 @@ public class ProfileFragment extends BackHandledFragment {
private
float
startScaleFinal
;
private
ImageView
userProfilePictureImageView
;
public
Profile
Fragment
()
{
public
User
Fragment
()
{
// Required empty public constructor
}
public
static
Profile
Fragment
newInstance
(
String
userID
)
{
ProfileFragment
fragment
=
new
Profile
Fragment
();
public
static
User
Fragment
newInstance
(
String
userID
)
{
UserFragment
fragment
=
new
User
Fragment
();
Bundle
args
=
new
Bundle
();
args
.
putString
(
Constants
.
USER_ID
,
userID
);
fragment
.
setArguments
(
args
);
...
...
@@ -80,7 +80,7 @@ public class ProfileFragment extends BackHandledFragment {
public
View
onCreateView
(
LayoutInflater
inflater
,
ViewGroup
container
,
Bundle
savedInstanceState
)
{
// Inflate the layout for this fragment
return
inflater
.
inflate
(
R
.
layout
.
fragment_
profile
,
container
,
false
);
return
inflater
.
inflate
(
R
.
layout
.
fragment_
user
,
container
,
false
);
}
@Override
...
...
app/src/main/res/layout/fragment_
profile
.xml
→
app/src/main/res/layout/fragment_
user
.xml
View file @
e384e958
...
...
@@ -8,7 +8,7 @@
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:orientation=
"vertical"
tools:context=
"app.insti.fragment.
Profile
Fragment"
>
tools:context=
"app.insti.fragment.
User
Fragment"
>
<LinearLayout
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