Updated layouts

app/src/main/java/com/github/hiiyl/mmuhub/LoginActivity.java

@@ -144,6 +144,7 @@ public void onResponse(String response) {
                 editor.putString("faculty", faculty);
                 editor.putString("sync_interval", "60");
                 editor.putBoolean("sync_enabled", true);
+                editor.putBoolean("notifications_enabled", true);
                 editor.apply();
                 MMUSyncAdapter.syncImmediately(LoginActivity.this);
                 Intent intent = new Intent(mContext, MMLSActivity.class);

app/src/main/java/com/github/hiiyl/mmuhub/Utility.java

@@ -141,4 +141,8 @@ public static boolean isNetworksAvailable(Context context) {
         snackBar.show();
         return false;
     }
+    public static boolean getNotificationsEnabled(Context context) {
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+        return prefs.getBoolean("notifications_enabled", true);
+    }
 }

app/src/main/java/com/github/hiiyl/mmuhub/sync/MMUSyncAdapter.java

@@ -2,7 +2,6 @@
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
-import android.app.AlertDialog;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.AbstractThreadedSyncAdapter;
@@ -23,7 +22,6 @@
 import android.support.v4.app.NotificationCompat;
 import android.support.v4.app.TaskStackBuilder;
 import android.util.Log;
-import android.view.View;
 
 import com.android.volley.AuthFailureError;
 import com.android.volley.DefaultRetryPolicy;
@@ -33,7 +31,6 @@
 import com.android.volley.Response;
 import com.android.volley.VolleyError;
 import com.android.volley.toolbox.StringRequest;
-import com.gc.materialdesign.widgets.SnackBar;
 import com.github.hiiyl.mmuhub.AnnouncementDetailActivity;
 import com.github.hiiyl.mmuhub.BulletinActivity;
 import com.github.hiiyl.mmuhub.MySingleton;
@@ -251,7 +248,8 @@ public void run() {
                                                             MMUContract.AnnouncementEntry.TABLE_NAME, new String[] {MMUContract.AnnouncementEntry.COLUMN_POSTED_DATE},
                                                             null, null, null, null, MMUContract.AnnouncementEntry.COLUMN_POSTED_DATE + " DESC ", "1"
                                                             );
-                                                    if(posted_date_cursor.moveToFirst()) {
+
+                                                    if(Utility.getNotificationsEnabled(context) && posted_date_cursor.moveToFirst()) {
                                                         String latest_posted_date = posted_date_cursor.getString(posted_date_cursor.getColumnIndex(MMUContract.AnnouncementEntry.COLUMN_POSTED_DATE));
                                                         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
                                                         Log.d("POSTED_DATE", posted_date_cursor.getString(posted_date_cursor.getColumnIndex(MMUContract.AnnouncementEntry.COLUMN_POSTED_DATE)));
@@ -371,10 +369,7 @@ public void run() {
 
                         @Override
                         public void onErrorResponse(VolleyError error) {
-//                    mSwipeRefreshLayout.setRefreshing(false);
                             NetworkResponse networkResponse = error.networkResponse;
-                            AlertDialog.Builder alertDialogBuilder;
-                            AlertDialog alertDialog;
                             if (networkResponse != null && networkResponse.data != null) {
                                 switch (networkResponse.statusCode) {
                                     case 400:
@@ -459,14 +454,8 @@ public Map<String, String> getHeaders() throws AuthFailureError {
         sync_queue.add(sr);
     }
     public void updateBulletin(final Context context) {
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
         Log.d("UPDATE Bulletin", "UPDATING BULLETIN");
-        final String subject_url, subject_name;
-        final Context mContext = context;
-        final MMUDbHelper mOpenHelper = new MMUDbHelper(mContext);
-        Cursor cursor = MySingleton.getInstance(context).getDatabase().query(MMUContract.BulletinEntry.TABLE_NAME, null, null, null, null, null, null);
         String url = "https://mmu-api.co/bulletin_api";
-//        mSwipeRefreshLayout.setRefreshing(true);
         StringRequest sr = new StringRequest(Request.Method.GET, url, new Response.Listener<String>() {
             @Override
             public void onResponse(String response) {
@@ -493,48 +482,15 @@ public void onResponse(String response) {
                             MySingleton.getInstance(context).getDatabase().insert(MMUContract.BulletinEntry.TABLE_NAME, null, bulletinValues);
                         }
                     }
-//                    mSwipeRefreshLayout.setRefreshing(false);
                     EventBus.getDefault().post(new DownloadCompleteEvent(BulletinActivity.BulletinFragment.BULLETIN_SYNC_COMPLETE));
-
-
                 } catch (JSONException exception) {
-
+                    exception.printStackTrace();
                 }
             }
         }, new Response.ErrorListener() {
             String json = null;
             @Override
             public void onErrorResponse(VolleyError error) {
-                Log.d("WOW", "ITS DEAD JIM");
-                NetworkResponse networkResponse = error.networkResponse;
-                if (networkResponse != null && networkResponse.data != null) {
-                    switch (networkResponse.statusCode) {
-                        case 400:
-                            SnackBar snackbar = new SnackBar((android.app.Activity) context, "Wrong Username or Password");
-                            snackbar.show();
-
-                            break;
-                        default:
-                            SnackBar new_snackbar = new SnackBar((android.app.Activity) context, "Internal Server Error",
-                                    "Retry", new View.OnClickListener() {
-                                @Override
-                                public void onClick(View v) {
-                                    updateBulletin(context);
-                                }
-                            });
-                            new_snackbar.show();
-                    }
-                    //Additional cases
-                } else {
-                    SnackBar snackbar = new SnackBar((android.app.Activity) context, "No Internet Connection",
-                            "Retry", new View.OnClickListener() {
-                        @Override
-                        public void onClick(View v) {
-                            updateBulletin(context);
-                        }
-                    });
-                    snackbar.show();
-                }
             }
         });
         sr.setRetryPolicy(new DefaultRetryPolicy(

app/src/main/res/layout/activity_bulletin.xml

@@ -14,7 +14,7 @@
         android:layout_gravity="start" >
 
         <ListView android:id="@+id/left_drawer"
-            android:layout_width="240dp"
+            android:layout_width="280dp"
             android:layout_height="match_parent"
             android:layout_gravity="start"
             android:choiceMode="singleChoice"
@@ -24,7 +24,7 @@
             android:clipToPadding="false"
             android:background="#FFF"/>
         <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-            android:layout_width="240dp"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_alignParentBottom="true"
             android:background="@color/background_material_light">

app/src/main/res/layout/activity_login.xml

@@ -30,15 +30,6 @@
             android:singleLine="true"
             android:imeOptions="actionNext"
             android:hint="Student ID"/>
-        <!--<EditText-->
-            <!--android:layout_width="match_parent"-->
-            <!--android:layout_height="wrap_content"-->
-            <!---->
-            <!--android:layout_margin="10dp"-->
-            <!--android:gravity="center"-->
-            <!--android:singleLine="true"-->
-            <!--android:imeOptions="actionNext"-->
-            <!--android:hint="Student ID"/>-->
         <!--<TextView-->
         <!--android:layout_width="wrap_content"-->
         <!--android:layout_height="wrap_content"-->
@@ -52,14 +43,6 @@
             <!--android:imeOptions="actionNext"-->
             <!--android:singleLine="true"-->
             <!--android:password="true"/>-->
-        <!--<EditText-->
-            <!--android:layout_width="match_parent"-->
-            <!--android:layout_height="wrap_content"-->
-            <!--android:id = "@+id/icems_pass_field"-->
-            <!--android:hint="ICEMS Password"-->
-            <!--android:imeOptions="actionNext"-->
-            <!--android:singleLine="true"-->
-            <!--android:password="true"/>-->
         <com.rengwuxian.materialedittext.MaterialEditText
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -71,16 +54,6 @@
             android:imeOptions="actionDone"
             android:hint="MMLS Password"
             android:inputType="textPassword"/>
-        <!--<EditText-->
-            <!--android:layout_width="match_parent"-->
-            <!--android:layout_height="wrap_content"-->
-            <!--android:id = "@+id/mmls_pass_field"-->
-            <!--android:hint="MMLS Password"-->
-            <!--android:layout_margin="10dp"-->
-            <!--android:gravity="center"-->
-            <!--android:singleLine="true"-->
-            <!--android:imeOptions="actionDone"-->
-            <!--android:password="true"/>-->
         <com.gc.materialdesign.views.ButtonRectangle
             android:id="@+id/loginBtn"
             android:layout_margin="24dp"

app/src/main/res/layout/activity_mmls.xml

@@ -46,17 +46,16 @@
         android:layout_gravity="start" >
 
     <ListView android:id="@+id/left_drawer"
-            android:layout_width="240dp"
+            android:layout_width="280dp"
             android:layout_height="match_parent"
             android:layout_gravity="start"
             android:choiceMode="singleChoice"
             android:divider="@android:color/transparent"
             android:dividerHeight="0dp"
-            android:paddingBottom="50dp"
             android:clipToPadding="false"
             android:background="#FFF"/>
         <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-            android:layout_width="240dp"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_alignParentBottom="true"
             android:background="@color/background_material_light">

app/src/main/res/layout/fragment_announcement_detail.xml

@@ -25,9 +25,10 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:visibility="invisible"
+            android:visibility="gone"
             android:id="@+id/announcement_detail_download_layout"
             android:background="@drawable/download_shape"
+            android:layout_marginBottom="20dp"
             android:padding="20dp" >
             <TextView
                 android:layout_width="wrap_content"

app/src/main/res/values-v21/styles.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="MMLSTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <item name="android:actionBarStyle">@style/ThemeActionBar</item>
+        <item name="android:windowActionBarOverlay">true</item>
+        <item name="android:windowContentOverlay">@null</item>
+
+        <item name="android:colorPrimary">@color/skyblue</item>
+        <item name="android:colorPrimaryDark">@color/skyblue_darker</item>
+
+        <!-- Support library compatibility -->
+        <item name="background">@null</item>
+        <item name="actionBarStyle">@style/ThemeActionBar</item>
+        <item name="windowActionBarOverlay">true</item>
+    </style>
+</resources>

app/src/main/res/values/colors.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="skyblue">#ff64c2f4</color>
+    <color name="skyblue_darker">#0f8dd2</color>
     <color name="white">#fff</color>
     <color name="light_gray">#d3d3d3</color>
 </resources>

app/src/main/res/values/strings.xml

@@ -56,4 +56,5 @@
     <string name="sync_interval_list_preference">Sync Interval</string>
     <string name="summary_sync_interval_list_preference">Adjust interval between syncs</string>
     <string name="sync_interval">sync interval</string>
+    <string name="notifications_category">Notifications</string>
 </resources>

app/src/main/res/xml/preferences.xml

@@ -16,6 +16,12 @@
             android:entries="@array/entries_sync_interval_list_preference"
             android:entryValues="@array/entryvalues_sync_interval_list_list_preference"
             android:dialogTitle="@string/dialog_title_list_preference" />
-
     </PreferenceCategory>
+    <PreferenceCategory
+        android:title="@string/notifications_category">
+        <CheckBoxPreference
+            android:key="notifications_enabled"
+            android:title="Enable Notifications"
+            android:summary="Enable MMLS Announcement Notifications" />
+        </PreferenceCategory>
 </PreferenceScreen>