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
92af05f3
Commit
92af05f3
authored
Jul 14, 2018
by
Sajal Narang
Committed by
GitHub
Jul 14, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into patch1
parents
55868978
8f48523b
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
5 deletions
+6
-5
app/src/main/java/app/insti/MainActivity.java
app/src/main/java/app/insti/MainActivity.java
+2
-1
app/src/main/java/app/insti/fragment/QLinksFragment.java
app/src/main/java/app/insti/fragment/QLinksFragment.java
+1
-1
app/src/main/res/layout/fragment_qlinks.xml
app/src/main/res/layout/fragment_qlinks.xml
+3
-3
No files found.
app/src/main/java/app/insti/MainActivity.java
View file @
92af05f3
...
@@ -65,7 +65,6 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
...
@@ -65,7 +65,6 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
}
}
setContentView
(
R
.
layout
.
activity_main
);
setContentView
(
R
.
layout
.
activity_main
);
session
=
new
SessionManager
(
getApplicationContext
());
session
=
new
SessionManager
(
getApplicationContext
());
session
.
checkLogin
();
Toolbar
toolbar
=
(
Toolbar
)
findViewById
(
R
.
id
.
toolbar
);
Toolbar
toolbar
=
(
Toolbar
)
findViewById
(
R
.
id
.
toolbar
);
setSupportActionBar
(
toolbar
);
setSupportActionBar
(
toolbar
);
...
@@ -345,4 +344,6 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
...
@@ -345,4 +344,6 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
return
false
;
return
false
;
return
true
;
return
true
;
}
}
}
}
app/src/main/java/app/insti/fragment/QLinksFragment.java
View file @
92af05f3
...
@@ -34,7 +34,7 @@ public class QLinksFragment extends BaseFragment {
...
@@ -34,7 +34,7 @@ public class QLinksFragment extends BaseFragment {
TextView
Intern
=
getActivity
().
findViewById
(
R
.
id
.
button_Internship
);
TextView
Intern
=
getActivity
().
findViewById
(
R
.
id
.
button_Internship
);
TextView
Placement
=
getActivity
().
findViewById
(
R
.
id
.
button_Placement
);
TextView
Placement
=
getActivity
().
findViewById
(
R
.
id
.
button_Placement
);
TextView
Library
=
getActivity
().
findViewById
(
R
.
id
.
button_Library
);
TextView
Library
=
getActivity
().
findViewById
(
R
.
id
.
button_Library
);
TextView
AcadCal
=
getActivity
().
findViewById
(
R
.
id
.
button_Acad_calend
e
r
);
TextView
AcadCal
=
getActivity
().
findViewById
(
R
.
id
.
button_Acad_calend
a
r
);
TextView
AcadTime
=
getActivity
().
findViewById
(
R
.
id
.
button_Acad_timetable
);
TextView
AcadTime
=
getActivity
().
findViewById
(
R
.
id
.
button_Acad_timetable
);
TextView
Holidays
=
getActivity
().
findViewById
(
R
.
id
.
button_Holidays
);
TextView
Holidays
=
getActivity
().
findViewById
(
R
.
id
.
button_Holidays
);
TextView
Circulars
=
getActivity
().
findViewById
(
R
.
id
.
button_Circulars
);
TextView
Circulars
=
getActivity
().
findViewById
(
R
.
id
.
button_Circulars
);
...
...
app/src/main/res/layout/fragment_qlinks.xml
View file @
92af05f3
...
@@ -96,16 +96,16 @@
...
@@ -96,16 +96,16 @@
<TextView
<TextView
android:layout_width=
"fill_parent"
android:layout_width=
"fill_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
" Calend
e
r"
android:text=
" Calend
a
r"
android:textSize=
"25sp"
android:textSize=
"25sp"
android:layout_marginTop=
"14dp"
android:layout_marginTop=
"14dp"
android:fontFamily=
"sans-serif-light"
/>
android:fontFamily=
"sans-serif-light"
/>
<TextView
<TextView
android:id=
"@+id/button_Acad_calend
e
r"
android:id=
"@+id/button_Acad_calend
a
r"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"Academic Calend
e
r"
android:text=
"Academic Calend
a
r"
android:textSize=
"@dimen/quick_links_size"
/>
android:textSize=
"@dimen/quick_links_size"
/>
<TextView
<TextView
...
...
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