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
b6f3c51b
Commit
b6f3c51b
authored
May 27, 2017
by
Sajal Narang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add CalendarFragment
parent
77164182
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
74 additions
and
19 deletions
+74
-19
app/build.gradle
app/build.gradle
+2
-1
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/MainActivity.java
...c/main/java/in/ac/iitb/gymkhana/iitbapp/MainActivity.java
+19
-6
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragments/CalendarFragment.java
.../ac/iitb/gymkhana/iitbapp/fragments/CalendarFragment.java
+30
-0
app/src/main/res/layout/content_main.xml
app/src/main/res/layout/content_main.xml
+7
-12
app/src/main/res/layout/fragment_calendar.xml
app/src/main/res/layout/fragment_calendar.xml
+13
-0
app/src/main/res/values/strings.xml
app/src/main/res/values/strings.xml
+3
-0
No files found.
app/build.gradle
View file @
b6f3c51b
...
...
@@ -27,5 +27,6 @@ dependencies {
compile
'com.android.support:appcompat-v7:25.3.1'
testCompile
'junit:junit:4.12'
compile
'com.android.support:design:25.3.1'
compile
'com.android.support.constraint:constraint-layout:1.0.0-beta4'
compile
'com.android.support.constraint:constraint-layout:1.0.2'
compile
'com.android.support:support-v4:25.3.1'
}
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/MainActivity.java
View file @
b6f3c51b
...
...
@@ -2,9 +2,11 @@ package in.ac.iitb.gymkhana.iitbapp;
import
android.os.Bundle
;
import
android.support.design.widget.FloatingActionButton
;
import
android.support.design.widget.Snackbar
;
import
android.view.View
;
import
android.support.design.widget.NavigationView
;
import
android.support.design.widget.Snackbar
;
import
android.support.v4.app.Fragment
;
import
android.support.v4.app.FragmentManager
;
import
android.support.v4.app.FragmentTransaction
;
import
android.support.v4.view.GravityCompat
;
import
android.support.v4.widget.DrawerLayout
;
import
android.support.v7.app.ActionBarDrawerToggle
;
...
...
@@ -12,6 +14,9 @@ import android.support.v7.app.AppCompatActivity;
import
android.support.v7.widget.Toolbar
;
import
android.view.Menu
;
import
android.view.MenuItem
;
import
android.view.View
;
import
in.ac.iitb.gymkhana.iitbapp.fragments.CalendarFragment
;
public
class
MainActivity
extends
AppCompatActivity
implements
NavigationView
.
OnNavigationItemSelectedListener
{
...
...
@@ -91,12 +96,13 @@ public class MainActivity extends AppCompatActivity
}
else
if
(
id
==
R
.
id
.
nav_gc_rankings
)
{
}
else
if
(
id
==
R
.
id
.
nav_calendar
)
{
CalendarFragment
calendarFragment
=
new
CalendarFragment
();
updateFragment
(
calendarFragment
);
}
else
if
(
id
==
R
.
id
.
nav_cms
)
{
}
else
if
(
id
==
R
.
id
.
nav_cms
)
{
}
else
if
(
id
==
R
.
id
.
nav_timetable
)
{
}
else
if
(
id
==
R
.
id
.
nav_timetable
)
{
}
else
if
(
id
==
R
.
id
.
nav_map
)
{
}
else
if
(
id
==
R
.
id
.
nav_map
)
{
}
...
...
@@ -104,4 +110,11 @@ public class MainActivity extends AppCompatActivity
drawer
.
closeDrawer
(
GravityCompat
.
START
);
return
true
;
}
private
void
updateFragment
(
Fragment
fragment
)
{
FragmentManager
manager
=
getSupportFragmentManager
();
FragmentTransaction
transaction
=
manager
.
beginTransaction
();
transaction
.
replace
(
R
.
id
.
constraintlayout_for_fragment
,
fragment
,
fragment
.
getTag
());
transaction
.
commit
();
}
}
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragments/CalendarFragment.java
0 → 100644
View file @
b6f3c51b
package
in.ac.iitb.gymkhana.iitbapp.fragments
;
import
android.os.Bundle
;
import
android.support.v4.app.Fragment
;
import
android.view.LayoutInflater
;
import
android.view.View
;
import
android.view.ViewGroup
;
import
in.ac.iitb.gymkhana.iitbapp.R
;
/**
* A simple {@link Fragment} subclass.
*/
public
class
CalendarFragment
extends
Fragment
{
public
CalendarFragment
()
{
// Required empty public constructor
}
@Override
public
View
onCreateView
(
LayoutInflater
inflater
,
ViewGroup
container
,
Bundle
savedInstanceState
)
{
// Inflate the layout for this fragment
return
inflater
.
inflate
(
R
.
layout
.
fragment_calendar
,
container
,
false
);
}
}
app/src/main/res/layout/content_main.xml
View file @
b6f3c51b
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
<android.support.constraint.ConstraintLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:tools=
"http://schemas.android.com/tools"
android:layout_width=
"match_parent"
xmlns:tools=
"http://schemas.android.com/tools"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
app:layout_behavior=
"@string/appbar_scrolling_view_behavior"
tools:context=
"in.ac.iitb.gymkhana.iitbapp.MainActivity"
tools:showIn=
"@layout/app_bar_main"
>
<TextView
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"Hello World!"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
/>
</android.support.constraint.ConstraintLayout>
android:id=
"@+id/constraintlayout_for_fragment"
app:layout_behavior=
"@string/appbar_scrolling_view_behavior"
tools:context=
"in.ac.iitb.gymkhana.iitbapp.MainActivity"
tools:showIn=
"@layout/app_bar_main"
/>
app/src/main/res/layout/fragment_calendar.xml
0 → 100644
View file @
b6f3c51b
<FrameLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:tools=
"http://schemas.android.com/tools"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
tools:context=
"in.ac.iitb.gymkhana.iitbapp.fragments.CalendarFragment"
>
<!-- TODO: Update blank fragment layout -->
<TextView
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:text=
"@string/hello_blank_fragment"
/>
</FrameLayout>
app/src/main/res/values/strings.xml
View file @
b6f3c51b
...
...
@@ -5,4 +5,7 @@
<string
name=
"navigation_drawer_close"
>
Close navigation drawer
</string>
<string
name=
"action_settings"
>
Settings
</string>
<!-- TODO: Remove or change this placeholder text -->
<string
name=
"hello_blank_fragment"
>
Hello blank fragment
</string>
</resources>
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