Initial Commit

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

app/src/main/java/com/example/manan/enhancedurdureader/Fragments/MagazinesFragment.java

@@ -1,11 +1,10 @@
 package com.example.manan.enhancedurdureader.Fragments;
 
-import android.app.Activity;
 import android.app.ProgressDialog;
 import android.content.Intent;
 import android.os.AsyncTask;
-import android.support.v4.app.Fragment;
 import android.os.Bundle;
+import android.support.v4.app.Fragment;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -17,9 +16,7 @@ import android.widget.TextSwitcher;
 import android.widget.TextView;
 import android.widget.ViewSwitcher;
 
-import com.bumptech.glide.Glide;
 import com.example.manan.enhancedurdureader.Activities.ArticleReadingActivity;
-import com.example.manan.enhancedurdureader.Activities.SegmentedBookReaderActivity;
 import com.example.manan.enhancedurdureader.Adapters.ArticleAdapter;
 import com.example.manan.enhancedurdureader.Adapters.MagazineAdapter;
 import com.example.manan.enhancedurdureader.ApplicationEntities.Article;
@@ -118,6 +115,7 @@ public class MagazinesFragment extends Fragment {
             public void onScrolledToPosition(int position) {
                 articleTextSwitcher.setText(articles.get(position % articles.size()).getArticleTitle());
             }
+
             @Override
             public void onScrolling() {
                 articleTextSwitcher.setText("");
@@ -156,6 +154,7 @@ public class MagazinesFragment extends Fragment {
 
         Integer vtCount;
         ArrayList<Article> articles;
+
         @Override
         protected String doInBackground(Integer... params) {
             int position = params[0];
@@ -165,8 +164,7 @@ public class MagazinesFragment extends Fragment {
                 articles = db.getMagazineArticles(0);
             else if (magID == 2)
                 articles = db.getAllArticles();
-            else
-            {
+            else {
                 articles = db.getMagazineArticles(magazines.get(position % magazines.size()).get_id());
             }
             if (articles.size() > 0) {
@@ -195,11 +193,11 @@ public class MagazinesFragment extends Fragment {
         }
 
         @Override
-        protected void onProgressUpdate(Void... values) {}
+        protected void onProgressUpdate(Void... values) {
+        }
     }
 
-    public void UpdateMagazine()
-    {
+    public void UpdateMagazine() {
         LoadMagazines();
         magazineAdapter = new MagazineAdapter(getContext());
         magazineAdapter.setData(magazines);
@@ -209,15 +207,14 @@ public class MagazinesFragment extends Fragment {
         //magazineAdapter.notifyDataSetChanged();
         //magazinesCoverFlow.setAdapter(magazineAdapter);
     }
-    void LoadMagazines()
-    {
+
+    void LoadMagazines() {
         magazines = db.getAllMagzines();
     }
-    void LoadArticles()
-    {
+
+    void LoadArticles() {
         articles = db.getAllArticles();
-        if(articles.size()<=0)
-        {
+        if (articles.size() <= 0) {
             Article art = new Article();
             art.set_id(100);
             art.setArticleBody("This is our fyp");
@@ -228,5 +225,4 @@ public class MagazinesFragment extends Fragment {
     }
 
 
-
 }

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

@@ -1,8 +1,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle"
     android:layout_height="0dp"
-    android:layout_width="0dp"
-    >
+    android:layout_width="0dp">
     <corners
         android:radius="2dp"
         android:topRightRadius="0dp"

build.gradle

@@ -9,7 +9,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.2'
+        classpath 'com.android.tools.build:gradle:2.3.2'
 
 
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Dec 28 10:00:20 PST 2015
+#Fri May 26 03:41:00 PDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip