Initial Commit

This commit is contained in:
anas 2017-05-28 02:02:34 -07:00
parent faf8bb20a6
commit 21ea644abc
5 changed files with 36 additions and 35 deletions

6
.idea/vcs.xml generated Normal file
View File

@ -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>

View File

@ -1,11 +1,10 @@
package com.example.manan.enhancedurdureader.Fragments; package com.example.manan.enhancedurdureader.Fragments;
import android.app.Activity;
import android.app.ProgressDialog; import android.app.ProgressDialog;
import android.content.Intent; import android.content.Intent;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.support.v4.app.Fragment;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.view.Gravity; import android.view.Gravity;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
@ -17,9 +16,7 @@ import android.widget.TextSwitcher;
import android.widget.TextView; import android.widget.TextView;
import android.widget.ViewSwitcher; import android.widget.ViewSwitcher;
import com.bumptech.glide.Glide;
import com.example.manan.enhancedurdureader.Activities.ArticleReadingActivity; 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.ArticleAdapter;
import com.example.manan.enhancedurdureader.Adapters.MagazineAdapter; import com.example.manan.enhancedurdureader.Adapters.MagazineAdapter;
import com.example.manan.enhancedurdureader.ApplicationEntities.Article; import com.example.manan.enhancedurdureader.ApplicationEntities.Article;
@ -78,7 +75,7 @@ public class MagazinesFragment extends Fragment {
public View makeView() { public View makeView() {
TextView textView = new TextView(getActivity()); TextView textView = new TextView(getActivity());
textView.setGravity(Gravity.CENTER); textView.setGravity(Gravity.CENTER);
textView.setTextAppearance(getContext(),android.R.style.TextAppearance_Large); textView.setTextAppearance(getContext(), android.R.style.TextAppearance_Large);
return textView; return textView;
} }
@ -94,7 +91,7 @@ public class MagazinesFragment extends Fragment {
public View makeView() { public View makeView() {
TextView textView = new TextView(getActivity()); TextView textView = new TextView(getActivity());
textView.setGravity(Gravity.CENTER); textView.setGravity(Gravity.CENTER);
textView.setTextAppearance(getContext(),android.R.style.TextAppearance_Large); textView.setTextAppearance(getContext(), android.R.style.TextAppearance_Large);
return textView; return textView;
} }
@ -105,7 +102,7 @@ public class MagazinesFragment extends Fragment {
magazinesCoverFlow.setOnScrollPositionListener(new FeatureCoverFlow.OnScrollPositionListener() { magazinesCoverFlow.setOnScrollPositionListener(new FeatureCoverFlow.OnScrollPositionListener() {
@Override @Override
public void onScrolledToPosition(int position) { public void onScrolledToPosition(int position) {
magazineTextSwitcher.setText(magazines.get(position%magazines.size()).getTitleResId()); magazineTextSwitcher.setText(magazines.get(position % magazines.size()).getTitleResId());
} }
@Override @Override
@ -116,8 +113,9 @@ public class MagazinesFragment extends Fragment {
articlesCoverFlow.setOnScrollPositionListener(new FeatureCoverFlow.OnScrollPositionListener() { articlesCoverFlow.setOnScrollPositionListener(new FeatureCoverFlow.OnScrollPositionListener() {
@Override @Override
public void onScrolledToPosition(int position) { public void onScrolledToPosition(int position) {
articleTextSwitcher.setText(articles.get(position%articles.size()).getArticleTitle()); articleTextSwitcher.setText(articles.get(position % articles.size()).getArticleTitle());
} }
@Override @Override
public void onScrolling() { public void onScrolling() {
articleTextSwitcher.setText(""); articleTextSwitcher.setText("");
@ -131,7 +129,7 @@ public class MagazinesFragment extends Fragment {
articleAdapter = new ArticleAdapter(getContext()); articleAdapter = new ArticleAdapter(getContext());
articleAdapter.setData(articles); articleAdapter.setData(articles);
articlesCoverFlow.setAdapter(articleAdapter);*/ articlesCoverFlow.setAdapter(articleAdapter);*/
new SetMagazineArticlesTask().execute(position%magazines.size()); new SetMagazineArticlesTask().execute(position % magazines.size());
} }
}); });
@ -140,7 +138,7 @@ public class MagazinesFragment extends Fragment {
public void onItemClick(AdapterView<?> parent, View view, int position, long id) { public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
Intent readActivity = new Intent(view.getContext(), ArticleReadingActivity.class); Intent readActivity = new Intent(view.getContext(), ArticleReadingActivity.class);
Article a = (Article)articleAdapter.getItem(position%articleAdapter.getCount()); Article a = (Article) articleAdapter.getItem(position % articleAdapter.getCount());
readActivity.putExtra("articleId", a.get_id()); readActivity.putExtra("articleId", a.get_id());
startActivity(readActivity); startActivity(readActivity);
@ -156,20 +154,20 @@ public class MagazinesFragment extends Fragment {
Integer vtCount; Integer vtCount;
ArrayList<Article> articles; ArrayList<Article> articles;
@Override @Override
protected String doInBackground(Integer... params) { protected String doInBackground(Integer... params) {
int position = params[0]; int position = params[0];
int magID = magazines.get(position%magazines.size()).get_id(); int magID = magazines.get(position % magazines.size()).get_id();
if(magID == 1) if (magID == 1)
articles = db.getMagazineArticles(0); articles = db.getMagazineArticles(0);
else if(magID == 2) else if (magID == 2)
articles = db.getAllArticles(); articles = db.getAllArticles();
else else {
{ articles = db.getMagazineArticles(magazines.get(position % magazines.size()).get_id());
articles = db.getMagazineArticles(magazines.get(position%magazines.size()).get_id());
} }
if(articles.size()>0) { if (articles.size() > 0) {
articleAdapter = new ArticleAdapter(getContext()); articleAdapter = new ArticleAdapter(getContext());
articleAdapter.setData(articles); articleAdapter.setData(articles);
} }
@ -180,7 +178,7 @@ public class MagazinesFragment extends Fragment {
protected void onPostExecute(String result) { protected void onPostExecute(String result) {
if (dialog.isShowing()) { if (dialog.isShowing()) {
if(articles.size()>0) if (articles.size() > 0)
articlesCoverFlow.setAdapter(articleAdapter); articlesCoverFlow.setAdapter(articleAdapter);
dialog.dismiss(); dialog.dismiss();
} }
@ -195,13 +193,13 @@ public class MagazinesFragment extends Fragment {
} }
@Override @Override
protected void onProgressUpdate(Void... values) {} protected void onProgressUpdate(Void... values) {
}
} }
public void UpdateMagazine() public void UpdateMagazine() {
{
LoadMagazines(); LoadMagazines();
magazineAdapter= new MagazineAdapter(getContext()); magazineAdapter = new MagazineAdapter(getContext());
magazineAdapter.setData(magazines); magazineAdapter.setData(magazines);
magazinesCoverFlow.setAdapter(magazineAdapter); magazinesCoverFlow.setAdapter(magazineAdapter);
@ -209,15 +207,14 @@ public class MagazinesFragment extends Fragment {
//magazineAdapter.notifyDataSetChanged(); //magazineAdapter.notifyDataSetChanged();
//magazinesCoverFlow.setAdapter(magazineAdapter); //magazinesCoverFlow.setAdapter(magazineAdapter);
} }
void LoadMagazines()
{ void LoadMagazines() {
magazines = db.getAllMagzines(); magazines = db.getAllMagzines();
} }
void LoadArticles()
{ void LoadArticles() {
articles = db.getAllArticles(); articles = db.getAllArticles();
if(articles.size()<=0) if (articles.size() <= 0) {
{
Article art = new Article(); Article art = new Article();
art.set_id(100); art.set_id(100);
art.setArticleBody("This is our fyp"); art.setArticleBody("This is our fyp");
@ -228,5 +225,4 @@ public class MagazinesFragment extends Fragment {
} }
}
}

View File

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

View File

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

View File

@ -1,6 +1,6 @@
#Mon Dec 28 10:00:20 PST 2015 #Fri May 26 03:41:00 PDT 2017
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists 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