Skip to content

I
InstiApp
Commit c4df8def authored by Sajal Narang's avatar Sajal Narang
Browse files
Options

Fix quick links design

parent 46a48720
Hide whitespace changes
Inline Side-by-side
Showing with 165 additions and 221 deletions
app/src/main/java/app/insti/MainActivity.java
View file @ c4df8def
package app.insti; package app.insti;
import android.Manifest;
import android.app.Activity; import android.app.Activity;
import android.content.Intent; import android.content.Intent;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.os.Bundle; import android.os.Bundle;
import android.support.design.widget.NavigationView; import android.support.design.widget.NavigationView;
import android.support.v4.app.ActivityCompat;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentTransaction; import android.support.v4.app.FragmentTransaction;
import android.support.v4.content.ContextCompat;
import android.support.v4.view.GravityCompat; import android.support.v4.view.GravityCompat;
import android.support.v4.widget.DrawerLayout; import android.support.v4.widget.DrawerLayout;
import android.support.v7.app.ActionBarDrawerToggle; import android.support.v7.app.ActionBarDrawerToggle;
...@@ -42,7 +39,7 @@ import app.insti.fragment.NewsFragment; ...@@ -42,7 +39,7 @@ import app.insti.fragment.NewsFragment;
import app.insti.fragment.NotificationsFragment; import app.insti.fragment.NotificationsFragment;
import app.insti.fragment.PlacementBlogFragment; import app.insti.fragment.PlacementBlogFragment;
import app.insti.fragment.ProfileFragment; import app.insti.fragment.ProfileFragment;
import app.insti.fragment.QLinksFragment; import app.insti.fragment.QuickLinksFragment;
import app.insti.fragment.SettingsFragment; import app.insti.fragment.SettingsFragment;
import app.insti.fragment.TrainingBlogFragment; import app.insti.fragment.TrainingBlogFragment;
...@@ -258,8 +255,8 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On ...@@ -258,8 +255,8 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
updateFragment(calendarFragment); updateFragment(calendarFragment);
break; break;
case R.id.nav_qlinks: case R.id.nav_qlinks:
QLinksFragment qLinksFragment = new QLinksFragment(); QuickLinksFragment quickLinksFragment = new QuickLinksFragment();
updateFragment(qLinksFragment); updateFragment(quickLinksFragment);
break; break;
case R.id.nav_map: case R.id.nav_map:
MapFragment mapFragment = new MapFragment(); MapFragment mapFragment = new MapFragment();
......
app/src/main/java/app/insti/fragment/MessMenuFragment.java
View file @ c4df8def
...@@ -153,7 +153,7 @@ public class MessMenuFragment extends BaseFragment { ...@@ -153,7 +153,7 @@ public class MessMenuFragment extends BaseFragment {
/* Sort by day starting today /* Sort by day starting today
* This could have been done in a much simpler way with Java 8 :( * This could have been done in a much simpler way with Java 8 :(
* Don't try to fix this */ * Don't try to fix this */
final List<MessMenu> sortedMenus = new ArrayList(); final List<MessMenu> sortedMenus = new ArrayList<>();
final Calendar calendar = Calendar.getInstance(Locale.UK); final Calendar calendar = Calendar.getInstance(Locale.UK);
int today = calendar.get(Calendar.DAY_OF_WEEK) - 2; int today = calendar.get(Calendar.DAY_OF_WEEK) - 2;
if (today == -1) { today = 6; } if (today == -1) { today = 6; }
......
app/src/main/java/app/insti/fragment/QLinksFragment.java → app/src/main/java/app/insti/fragment/QuickLinksFragment.java
View file @ c4df8def
...@@ -3,19 +3,17 @@ package app.insti.fragment; ...@@ -3,19 +3,17 @@ package app.insti.fragment;
import android.content.Intent; import android.content.Intent;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.support.v7.widget.Toolbar; import android.support.v7.widget.Toolbar;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.Button;
import android.widget.TextView; import android.widget.TextView;
import app.insti.R; import app.insti.R;
public class QLinksFragment extends BaseFragment { public class QuickLinksFragment extends BaseFragment {
public QLinksFragment() { public QuickLinksFragment() {
// Required empty public constructor // Required empty public constructor
} }
...@@ -73,8 +71,7 @@ public class QLinksFragment extends BaseFragment { ...@@ -73,8 +71,7 @@ public class QLinksFragment extends BaseFragment {
} }
@Override @Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.fragment_qlinks, container, false); return inflater.inflate(R.layout.fragment_quick_links, container, false);
return view;
} }
public void goToUrl (String url) { public void goToUrl (String url) {
......
app/src/main/res/layout/fragment_qlinks.xml deleted 100644 → 0
View file @ 46a48720
<?xml version="1.0" encoding="utf-8"?>
<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="app.insti.fragment.QLinksFragment">
<ScrollView
android:layout_width="fill_parent"
android:layout_height="wrap_content">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical"
android:layout_marginLeft="12dp">
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text=" CMS"
android:textSize="25sp"
android:fontFamily="sans-serif-light" />
<TextView
android:id="@+id/button_CMS"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="CMS"
android:textSize="@dimen/quick_links_size" />
<TextView
android:id="@+id/button_CMSMaint"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="CMS - Maintainance"
android:textSize="@dimen/quick_links_size" />
<TextView
android:id="@+id/button_CMSNet"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="CMS - Network"
android:textSize="@dimen/quick_links_size" />
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text=" Academics"
android:textSize="25sp"
android:layout_marginTop="14dp"
android:fontFamily="sans-serif-light" />
<TextView
android:id="@+id/button_ASC"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="ASC"
android:textSize="@dimen/quick_links_size" />
<TextView
android:id="@+id/button_ASCExt"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="External ASC"
android:textSize="@dimen/quick_links_size" />
<TextView
android:id="@+id/button_Moodle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Moodle"
android:textSize="@dimen/quick_links_size" />
<TextView
android:id="@+id/button_Internship"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Internship Login"
android:textSize="@dimen/quick_links_size" />
<TextView
android:id="@+id/button_Placement"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Placement Login"
android:textSize="@dimen/quick_links_size" />
<TextView
android:id="@+id/button_Library"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Central Library"
android:textSize="@dimen/quick_links_size" />
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text=" Calendar"
android:textSize="25sp"
android:layout_marginTop="14dp"
android:fontFamily="sans-serif-light" />
<TextView
android:id="@+id/button_Acad_calendar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Academic Calendar"
android:textSize="@dimen/quick_links_size" />
<TextView
android:id="@+id/button_Acad_timetable"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Academic Timetable"
android:textSize="@dimen/quick_links_size" />
<TextView
android:id="@+id/button_Holidays"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Holidays List"
android:textSize="@dimen/quick_links_size" />
<TextView
android:id="@+id/button_Circulars"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Circulars"
android:textSize="@dimen/quick_links_size" />
<TextView
android:id="@+id/button_Courselist"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="CMS Maintainance"
android:textSize="@dimen/quick_links_size" />
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text=" Services"
android:textSize="25sp"
android:layout_marginTop="14dp"
android:fontFamily="sans-serif-light" />
<TextView
android:id="@+id/button_GPO"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="GPO"
android:textSize="@dimen/quick_links_size" />
<TextView
android:id="@+id/button_CAMP"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="CAMP"
android:textSize="@dimen/quick_links_size" />
<TextView
android:id="@+id/button_MSStore"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Microsoft Store"
android:textSize="@dimen/quick_links_size" />
<TextView
android:id="@+id/button_BigHomeCloud"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="BigHome Cloud"
android:textSize="@dimen/quick_links_size" />
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text=" Miscellaneous"
android:textSize="25sp"
android:layout_marginTop="14dp"
android:fontFamily="sans-serif-light" />
<TextView
android:id="@+id/button_Intercom"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Intercom Extensions"
android:textSize="@dimen/quick_links_size" />
<TextView
android:id="@+id/button_Hospital"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Hospital"
android:textSize="@dimen/quick_links_size" />
<TextView
android:id="@+id/button_VPN"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="VPN Guide"
android:textSize="@dimen/quick_links_size" />
</LinearLayout>
</ScrollView>
</FrameLayout>
app/src/main/res/layout/fragment_quick_links.xml 0 → 100644
View file @ c4df8def
<?xml version="1.0" encoding="utf-8"?>
<ScrollView 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="app.insti.fragment.QuickLinksFragment">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="8dp">
<TextView
style="@style/QuickLinksHeading"
android:text="CMS" />
<TextView
android:id="@+id/button_CMS"
style="@style/QuickLink"
android:text="CMS" />
<TextView
android:id="@+id/button_CMSMaint"
style="@style/QuickLink"
android:text="CMS - Maintainance" />
<TextView
android:id="@+id/button_CMSNet"
style="@style/QuickLink"
android:text="CMS - Network" />
<TextView
style="@style/QuickLinksHeading"
android:text="Academics" />
<TextView
android:id="@+id/button_ASC"
style="@style/QuickLink"
android:text="ASC" />
<TextView
android:id="@+id/button_ASCExt"
style="@style/QuickLink"
android:text="External ASC" />
<TextView
android:id="@+id/button_Moodle"
style="@style/QuickLink"
android:text="Moodle" />
<TextView
android:id="@+id/button_Internship"
style="@style/QuickLink"
android:text="Internship Login" />
<TextView
android:id="@+id/button_Placement"
style="@style/QuickLink"
android:text="Placement Login" />
<TextView
android:id="@+id/button_Library"
style="@style/QuickLink"
android:text="Central Library" />
<TextView
style="@style/QuickLinksHeading"
android:text="Calendar" />
<TextView
android:id="@+id/button_Acad_calendar"
style="@style/QuickLink"
android:text="Academic Calendar" />
<TextView
android:id="@+id/button_Acad_timetable"
style="@style/QuickLink"
android:text="Academic Timetable" />
<TextView
android:id="@+id/button_Holidays"
style="@style/QuickLink"
android:text="Holidays List" />
<TextView
android:id="@+id/button_Circulars"
style="@style/QuickLink"
android:text="Circulars" />
<TextView
android:id="@+id/button_Courselist"
style="@style/QuickLink"
android:text="CMS Maintainance" />
<TextView
style="@style/QuickLinksHeading"
android:text="Services" />
<TextView
android:id="@+id/button_GPO"
style="@style/QuickLink"
android:text="GPO" />
<TextView
android:id="@+id/button_CAMP"
style="@style/QuickLink"
android:text="CAMP" />
<TextView
android:id="@+id/button_MSStore"
style="@style/QuickLink"
android:text="Microsoft Store" />
<TextView
android:id="@+id/button_BigHomeCloud"
style="@style/QuickLink"
android:text="BigHome Cloud" />
<TextView
style="@style/QuickLinksHeading"
android:text="Miscellaneous" />
<TextView
android:id="@+id/button_Intercom"
style="@style/QuickLink"
android:text="Intercom Extensions" />
<TextView
android:id="@+id/button_Hospital"
style="@style/QuickLink"
android:text="Hospital" />
<TextView
android:id="@+id/button_VPN"
style="@style/QuickLink"
android:text="VPN Guide" />
</LinearLayout>
</ScrollView>
app/src/main/res/values/dimens.xml
View file @ c4df8def
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
<dimen name="nav_header_vertical_spacing">8dp</dimen> <dimen name="nav_header_vertical_spacing">8dp</dimen>
<dimen name="nav_header_height">176dp</dimen> <dimen name="nav_header_height">176dp</dimen>
<dimen name="fab_margin">16dp</dimen> <dimen name="fab_margin">16dp</dimen>
<dimen name="quick_links_size">18sp</dimen>
<dimen name="links_margin_start">8dp</dimen> <dimen name="links_margin_start">8dp</dimen>
<!-- Map --> <!-- Map -->
......
app/src/main/res/values/styles.xml
View file @ c4df8def
...@@ -17,4 +17,22 @@ ...@@ -17,4 +17,22 @@
<style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" /> <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
<style name="QuickLinksHeading">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:paddingTop">8dp</item>
<item name="android:paddingBottom">8dp</item>
<item name="android:textColor">@android:color/black</item>
<item name="android:textSize">36sp</item>
</style>
<style name="QuickLink">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:paddingLeft">8dp</item>
<item name="android:paddingBottom">4dp</item>
<item name="android:textColor">@android:color/black</item>
<item name="android:textSize">18sp</item>
</style>
</resources> </resources>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment