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
b1a5cc1f
Commit
b1a5cc1f
authored
Jul 06, 2018
by
Yash Khemchandani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Toolbar now shows different titles for different fragments
parent
6beeaf54
Changes
16
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
69 additions
and
0 deletions
+69
-0
app/src/main/java/app/insti/fragment/AboutFragment.java
app/src/main/java/app/insti/fragment/AboutFragment.java
+5
-0
app/src/main/java/app/insti/fragment/AddEventFragment.java
app/src/main/java/app/insti/fragment/AddEventFragment.java
+4
-0
app/src/main/java/app/insti/fragment/BodyFragment.java
app/src/main/java/app/insti/fragment/BodyFragment.java
+4
-0
app/src/main/java/app/insti/fragment/CalendarFragment.java
app/src/main/java/app/insti/fragment/CalendarFragment.java
+5
-0
app/src/main/java/app/insti/fragment/EventFragment.java
app/src/main/java/app/insti/fragment/EventFragment.java
+4
-0
app/src/main/java/app/insti/fragment/FeedFragment.java
app/src/main/java/app/insti/fragment/FeedFragment.java
+4
-0
app/src/main/java/app/insti/fragment/MapFragment.java
app/src/main/java/app/insti/fragment/MapFragment.java
+5
-0
app/src/main/java/app/insti/fragment/MessMenuFragment.java
app/src/main/java/app/insti/fragment/MessMenuFragment.java
+4
-0
app/src/main/java/app/insti/fragment/MyEventsFragment.java
app/src/main/java/app/insti/fragment/MyEventsFragment.java
+4
-0
app/src/main/java/app/insti/fragment/NewsFragment.java
app/src/main/java/app/insti/fragment/NewsFragment.java
+4
-0
app/src/main/java/app/insti/fragment/NotificationsFragment.java
...c/main/java/app/insti/fragment/NotificationsFragment.java
+4
-0
app/src/main/java/app/insti/fragment/PlacementBlogFragment.java
...c/main/java/app/insti/fragment/PlacementBlogFragment.java
+4
-0
app/src/main/java/app/insti/fragment/ProfileFragment.java
app/src/main/java/app/insti/fragment/ProfileFragment.java
+5
-0
app/src/main/java/app/insti/fragment/QLinksFragment.java
app/src/main/java/app/insti/fragment/QLinksFragment.java
+5
-0
app/src/main/java/app/insti/fragment/SettingsFragment.java
app/src/main/java/app/insti/fragment/SettingsFragment.java
+4
-0
app/src/main/java/app/insti/fragment/TrainingBlogFragment.java
...rc/main/java/app/insti/fragment/TrainingBlogFragment.java
+4
-0
No files found.
app/src/main/java/app/insti/fragment/AboutFragment.java
View file @
b1a5cc1f
...
...
@@ -3,6 +3,7 @@ package app.insti.fragment;
import
android.os.Bundle
;
import
android.support.v4.app.Fragment
;
import
android.support.v7.widget.Toolbar
;
import
android.view.LayoutInflater
;
import
android.view.View
;
import
android.view.ViewGroup
;
...
...
@@ -35,6 +36,10 @@ public class AboutFragment extends BaseFragment {
@Override
public
void
onStart
()
{
super
.
onStart
();
Toolbar
toolbar
=
getActivity
().
findViewById
(
R
.
id
.
toolbar
);
toolbar
.
setTitle
(
"About"
);
CircleImageView
varunimg
=
getActivity
().
findViewById
(
R
.
id
.
varunimg
);
CircleImageView
sajalimg
=
getActivity
().
findViewById
(
R
.
id
.
sajalimg
);
CircleImageView
nihalimg
=
getActivity
().
findViewById
(
R
.
id
.
nihalimg
);
...
...
app/src/main/java/app/insti/fragment/AddEventFragment.java
View file @
b1a5cc1f
...
...
@@ -15,6 +15,7 @@ import android.provider.MediaStore;
import
android.support.v4.app.ActivityCompat
;
import
android.support.v4.content.ContextCompat
;
import
android.support.v4.widget.ImageViewCompat
;
import
android.support.v7.widget.Toolbar
;
import
android.util.Base64
;
import
android.util.Log
;
import
android.view.LayoutInflater
;
...
...
@@ -132,6 +133,9 @@ public class AddEventFragment extends BaseFragment {
view
=
inflater
.
inflate
(
R
.
layout
.
fragment_add_event
,
container
,
false
);
ButterKnife
.
bind
(
this
,
view
);
Toolbar
toolbar
=
getActivity
().
findViewById
(
R
.
id
.
toolbar
);
toolbar
.
setTitle
(
"Add Event"
);
eventPictureImageView
=
view
.
findViewById
(
R
.
id
.
ib_eventImage
);
progressDialog
=
new
ProgressDialog
(
getContext
());
...
...
app/src/main/java/app/insti/fragment/BodyFragment.java
View file @
b1a5cc1f
...
...
@@ -10,6 +10,7 @@ import android.support.v4.app.FragmentTransaction;
import
android.support.v4.widget.SwipeRefreshLayout
;
import
android.support.v7.widget.LinearLayoutManager
;
import
android.support.v7.widget.RecyclerView
;
import
android.support.v7.widget.Toolbar
;
import
android.view.LayoutInflater
;
import
android.view.View
;
import
android.view.ViewGroup
;
...
...
@@ -105,6 +106,9 @@ public class BodyFragment extends Fragment {
updateBody
();
}
});
Toolbar
toolbar
=
getActivity
().
findViewById
(
R
.
id
.
toolbar
);
toolbar
.
setTitle
(
min_body
.
getBodyName
());
}
private
void
updateBody
()
{
...
...
app/src/main/java/app/insti/fragment/CalendarFragment.java
View file @
b1a5cc1f
...
...
@@ -7,6 +7,7 @@ import android.support.v4.app.Fragment;
import
android.support.v4.app.FragmentTransaction
;
import
android.support.v7.widget.LinearLayoutManager
;
import
android.support.v7.widget.RecyclerView
;
import
android.support.v7.widget.Toolbar
;
import
android.view.LayoutInflater
;
import
android.view.View
;
import
android.view.ViewGroup
;
...
...
@@ -61,6 +62,10 @@ public class CalendarFragment extends BaseFragment {
view
=
inflater
.
inflate
(
R
.
layout
.
fragment_calendar
,
container
,
false
);
fab
=
(
FloatingActionButton
)
view
.
findViewById
(
R
.
id
.
fab
);
Toolbar
toolbar
=
getActivity
().
findViewById
(
R
.
id
.
toolbar
);
toolbar
.
setTitle
(
"Calendar"
);
final
CalendarView
simpleCalendarView
=
(
CalendarView
)
view
.
findViewById
(
R
.
id
.
simpleCalendarView
);
// get the reference of CalendarView
simpleCalendarView
.
setFirstDayOfWeek
(
1
);
// set Sunday as the first day of the week
...
...
app/src/main/java/app/insti/fragment/EventFragment.java
View file @
b1a5cc1f
...
...
@@ -9,6 +9,7 @@ import android.support.v4.app.Fragment;
import
android.support.v4.app.FragmentTransaction
;
import
android.support.v7.widget.LinearLayoutManager
;
import
android.support.v7.widget.RecyclerView
;
import
android.support.v7.widget.Toolbar
;
import
android.util.Log
;
import
android.view.LayoutInflater
;
import
android.view.View
;
...
...
@@ -82,6 +83,9 @@ public class EventFragment extends BaseFragment {
Log
.
d
(
TAG
,
"onStart: "
+
eventJson
);
event
=
new
Gson
().
fromJson
(
eventJson
,
Event
.
class
);
inflateViews
(
event
);
Toolbar
toolbar
=
getActivity
().
findViewById
(
R
.
id
.
toolbar
);
toolbar
.
setTitle
(
event
.
getEventName
());
}
private
void
inflateViews
(
final
Event
event
)
{
...
...
app/src/main/java/app/insti/fragment/FeedFragment.java
View file @
b1a5cc1f
...
...
@@ -11,6 +11,7 @@ import android.support.v4.app.FragmentTransaction;
import
android.support.v4.widget.SwipeRefreshLayout
;
import
android.support.v7.widget.LinearLayoutManager
;
import
android.support.v7.widget.RecyclerView
;
import
android.support.v7.widget.Toolbar
;
import
android.view.LayoutInflater
;
import
android.view.View
;
import
android.view.ViewGroup
;
...
...
@@ -57,6 +58,9 @@ public class FeedFragment extends BaseFragment {
View
view
=
inflater
.
inflate
(
R
.
layout
.
fragment_feed
,
container
,
false
);
Toolbar
toolbar
=
getActivity
().
findViewById
(
R
.
id
.
toolbar
);
toolbar
.
setTitle
(
"Feed"
);
fab
=
(
FloatingActionButton
)
view
.
findViewById
(
R
.
id
.
fab
);
feedSwipeRefreshLayout
=
view
.
findViewById
(
R
.
id
.
feed_swipe_refresh_layout
);
...
...
app/src/main/java/app/insti/fragment/MapFragment.java
View file @
b1a5cc1f
...
...
@@ -16,6 +16,7 @@ import android.os.Bundle;
import
android.support.design.widget.FloatingActionButton
;
import
android.support.v4.app.ActivityCompat
;
import
android.support.v4.content.ContextCompat
;
import
android.support.v7.widget.Toolbar
;
import
android.util.Log
;
import
android.view.LayoutInflater
;
import
android.view.View
;
...
...
@@ -77,6 +78,10 @@ public class MapFragment extends BaseFragment implements OnMapReadyCallback, Loc
@Override
public
void
onStart
()
{
super
.
onStart
();
Toolbar
toolbar
=
getActivity
().
findViewById
(
R
.
id
.
toolbar
);
toolbar
.
setTitle
(
"Map"
);
locationButton
=
(
FloatingActionButton
)
getActivity
().
findViewById
(
R
.
id
.
location_button
);
locationButton
.
setImageResource
(
R
.
drawable
.
ic_my_location_black_24dp
);
locationButton
.
getDrawable
().
setColorFilter
(
ContextCompat
.
getColor
(
getContext
(),
R
.
color
.
colorPrimaryDark
),
PorterDuff
.
Mode
.
SRC_IN
);
...
...
app/src/main/java/app/insti/fragment/MessMenuFragment.java
View file @
b1a5cc1f
...
...
@@ -8,6 +8,7 @@ import android.support.v4.app.Fragment;
import
android.support.v4.widget.SwipeRefreshLayout
;
import
android.support.v7.widget.LinearLayoutManager
;
import
android.support.v7.widget.RecyclerView
;
import
android.support.v7.widget.Toolbar
;
import
android.view.LayoutInflater
;
import
android.view.View
;
import
android.view.ViewGroup
;
...
...
@@ -60,6 +61,9 @@ public class MessMenuFragment extends BaseFragment {
public
void
onStart
()
{
super
.
onStart
();
Toolbar
toolbar
=
getActivity
().
findViewById
(
R
.
id
.
toolbar
);
toolbar
.
setTitle
(
"Mess Menu"
);
final
String
hostel
=
(
String
)
getArguments
().
get
(
Constants
.
USER_HOSTEL
);
displayMenu
(
hostel
);
...
...
app/src/main/java/app/insti/fragment/MyEventsFragment.java
View file @
b1a5cc1f
...
...
@@ -11,6 +11,7 @@ import android.support.v4.app.FragmentTransaction;
import
android.support.v4.widget.SwipeRefreshLayout
;
import
android.support.v7.widget.LinearLayoutManager
;
import
android.support.v7.widget.RecyclerView
;
import
android.support.v7.widget.Toolbar
;
import
android.view.LayoutInflater
;
import
android.view.View
;
import
android.view.ViewGroup
;
...
...
@@ -48,6 +49,9 @@ public class MyEventsFragment extends BaseFragment {
Bundle
savedInstanceState
)
{
View
view
=
inflater
.
inflate
(
R
.
layout
.
fragment_my_events
,
container
,
false
);
Toolbar
toolbar
=
getActivity
().
findViewById
(
R
.
id
.
toolbar
);
toolbar
.
setTitle
(
"My Events"
);
fab
=
(
FloatingActionButton
)
view
.
findViewById
(
R
.
id
.
fab
);
fab
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
...
...
app/src/main/java/app/insti/fragment/NewsFragment.java
View file @
b1a5cc1f
...
...
@@ -10,6 +10,7 @@ import android.support.v4.app.Fragment;
import
android.support.v4.widget.SwipeRefreshLayout
;
import
android.support.v7.widget.LinearLayoutManager
;
import
android.support.v7.widget.RecyclerView
;
import
android.support.v7.widget.Toolbar
;
import
android.view.LayoutInflater
;
import
android.view.View
;
import
android.view.ViewGroup
;
...
...
@@ -55,6 +56,9 @@ public class NewsFragment extends BaseFragment {
public
void
onStart
()
{
super
.
onStart
();
Toolbar
toolbar
=
getActivity
().
findViewById
(
R
.
id
.
toolbar
);
toolbar
.
setTitle
(
"News"
);
appDatabase
=
AppDatabase
.
getAppDatabase
(
getContext
());
new
NewsFragment
.
showNewsFromDB
().
execute
();
...
...
app/src/main/java/app/insti/fragment/NotificationsFragment.java
View file @
b1a5cc1f
...
...
@@ -5,6 +5,7 @@ import android.os.Bundle;
import
android.support.v4.app.Fragment
;
import
android.support.v7.widget.LinearLayoutManager
;
import
android.support.v7.widget.RecyclerView
;
import
android.support.v7.widget.Toolbar
;
import
android.view.LayoutInflater
;
import
android.view.View
;
import
android.view.ViewGroup
;
...
...
@@ -43,6 +44,9 @@ public class NotificationsFragment extends BaseFragment {
public
void
onStart
()
{
super
.
onStart
();
Toolbar
toolbar
=
getActivity
().
findViewById
(
R
.
id
.
toolbar
);
toolbar
.
setTitle
(
"Notifications"
);
Bundle
bundle
=
getArguments
();
String
notificationsResponseJson
=
bundle
.
getString
(
Constants
.
NOTIFICATIONS_RESPONSE_JSON
);
NotificationsResponse
notificationsResponse
=
new
Gson
().
fromJson
(
notificationsResponseJson
,
NotificationsResponse
.
class
);
...
...
app/src/main/java/app/insti/fragment/PlacementBlogFragment.java
View file @
b1a5cc1f
...
...
@@ -10,6 +10,7 @@ import android.support.v4.app.Fragment;
import
android.support.v4.widget.SwipeRefreshLayout
;
import
android.support.v7.widget.LinearLayoutManager
;
import
android.support.v7.widget.RecyclerView
;
import
android.support.v7.widget.Toolbar
;
import
android.view.LayoutInflater
;
import
android.view.View
;
import
android.view.ViewGroup
;
...
...
@@ -56,6 +57,9 @@ public class PlacementBlogFragment extends BaseFragment {
public
void
onStart
()
{
super
.
onStart
();
Toolbar
toolbar
=
getActivity
().
findViewById
(
R
.
id
.
toolbar
);
toolbar
.
setTitle
(
"Placement Blog"
);
appDatabase
=
AppDatabase
.
getAppDatabase
(
getContext
());
new
PlacementBlogFragment
.
showPlacementBlogFromDB
().
execute
();
...
...
app/src/main/java/app/insti/fragment/ProfileFragment.java
View file @
b1a5cc1f
...
...
@@ -8,6 +8,7 @@ import android.support.v4.app.FragmentTransaction;
import
android.support.v4.view.ViewPager
;
import
android.support.v7.widget.LinearLayoutManager
;
import
android.support.v7.widget.RecyclerView
;
import
android.support.v7.widget.Toolbar
;
import
android.view.LayoutInflater
;
import
android.view.View
;
import
android.view.ViewGroup
;
...
...
@@ -54,6 +55,10 @@ public class ProfileFragment extends BaseFragment {
@Override
public
void
onStart
()
{
super
.
onStart
();
Toolbar
toolbar
=
getActivity
().
findViewById
(
R
.
id
.
toolbar
);
toolbar
.
setTitle
(
"Profile"
);
Bundle
bundle
=
getArguments
();
String
userID
=
bundle
.
getString
(
Constants
.
USER_ID
);
...
...
app/src/main/java/app/insti/fragment/QLinksFragment.java
View file @
b1a5cc1f
...
...
@@ -4,6 +4,7 @@ import android.content.Intent;
import
android.net.Uri
;
import
android.os.Bundle
;
import
android.support.v4.app.Fragment
;
import
android.support.v7.widget.Toolbar
;
import
android.view.LayoutInflater
;
import
android.view.View
;
import
android.view.ViewGroup
;
...
...
@@ -20,6 +21,10 @@ public class QLinksFragment extends BaseFragment {
public
void
onStart
(){
super
.
onStart
();
Toolbar
toolbar
=
getActivity
().
findViewById
(
R
.
id
.
toolbar
);
toolbar
.
setTitle
(
"Quick Links"
);
TextView
CMS
=
getActivity
().
findViewById
(
R
.
id
.
button_CMS
);
TextView
CMSMaint
=
getActivity
().
findViewById
(
R
.
id
.
button_CMSMaint
);
TextView
CMSNet
=
getActivity
().
findViewById
(
R
.
id
.
button_CMSNet
);
...
...
app/src/main/java/app/insti/fragment/SettingsFragment.java
View file @
b1a5cc1f
...
...
@@ -7,6 +7,7 @@ import android.os.Bundle;
import
android.support.v4.app.Fragment
;
import
android.support.v4.app.FragmentManager
;
import
android.support.v4.app.FragmentTransaction
;
import
android.support.v7.widget.Toolbar
;
import
android.view.LayoutInflater
;
import
android.view.View
;
import
android.view.ViewGroup
;
...
...
@@ -47,6 +48,9 @@ public class SettingsFragment extends Fragment {
@Override
public
void
onStart
()
{
super
.
onStart
();
Toolbar
toolbar
=
getActivity
().
findViewById
(
R
.
id
.
toolbar
);
toolbar
.
setTitle
(
"Settings"
);
Bundle
bundle
=
getArguments
();
String
userID
=
bundle
.
getString
(
Constants
.
USER_ID
);
...
...
app/src/main/java/app/insti/fragment/TrainingBlogFragment.java
View file @
b1a5cc1f
...
...
@@ -10,6 +10,7 @@ import android.support.v4.app.Fragment;
import
android.support.v4.widget.SwipeRefreshLayout
;
import
android.support.v7.widget.LinearLayoutManager
;
import
android.support.v7.widget.RecyclerView
;
import
android.support.v7.widget.Toolbar
;
import
android.view.LayoutInflater
;
import
android.view.View
;
import
android.view.ViewGroup
;
...
...
@@ -56,6 +57,9 @@ public class TrainingBlogFragment extends BaseFragment {
public
void
onStart
()
{
super
.
onStart
();
Toolbar
toolbar
=
getActivity
().
findViewById
(
R
.
id
.
toolbar
);
toolbar
.
setTitle
(
"Training Blog"
);
appDatabase
=
AppDatabase
.
getAppDatabase
(
getContext
());
new
TrainingBlogFragment
.
showTrainingBlogFromDB
().
execute
();
...
...
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