diff options
author | Size43 | 2015-06-04 16:14:05 +0200 |
---|---|---|
committer | Size43 | 2015-06-04 16:14:05 +0200 |
commit | cd80be88f66ca67d4ef5ccf36faa1ba34cb67937 (patch) | |
tree | cfe1d22cbef7e0be93fb0231f47d089fe950fc1f /app/src/main/java | |
parent | Adding Feeds/Filters directly from the hamburger menu (diff) | |
parent | Merge branch 'master' into app (diff) |
Merge branch 'master' of http://github.com/camilstaps/RSSin
Diffstat (limited to 'app/src/main/java')
3 files changed, 139 insertions, 6 deletions
diff --git a/app/src/main/java/org/rssin/android/FeedItemAdapter.java b/app/src/main/java/org/rssin/android/FeedItemAdapter.java index de1766a..9090439 100755 --- a/app/src/main/java/org/rssin/android/FeedItemAdapter.java +++ b/app/src/main/java/org/rssin/android/FeedItemAdapter.java @@ -38,6 +38,7 @@ class FeedItemAdapter extends RecyclerView.Adapter<FeedItemAdapter.FeedItemHolde SortedFeedItemContainer item = feedItems.get(position);
holder.title.setText(item.getFeeditem().getTitle());
holder.summary.setText(Html.fromHtml(item.getFeeditem().getDescription()));
+ holder.date.setText(item.getFeeditem().getPubDate().toString());
holder.item = item;
}
@@ -53,12 +54,14 @@ class FeedItemAdapter extends RecyclerView.Adapter<FeedItemAdapter.FeedItemHolde static class FeedItemHolder extends RecyclerView.ViewHolder {
TextView title;
TextView summary;
+ TextView date;
SortedFeedItemContainer item;
public FeedItemHolder(final View itemView) {
super(itemView);
title = (TextView) itemView.findViewById(R.id.feeditem_title);
summary = (TextView) itemView.findViewById(R.id.feeditem_summary);
+ date = (TextView) itemView.findViewById(R.id.feeditem_date);
itemView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
diff --git a/app/src/main/java/org/rssin/android/FirstTimeBoot.java b/app/src/main/java/org/rssin/android/FirstTimeBoot.java new file mode 100644 index 0000000..7374fff --- /dev/null +++ b/app/src/main/java/org/rssin/android/FirstTimeBoot.java @@ -0,0 +1,120 @@ +package org.rssin.android; + +/** + * Created by Randy on 4-6-2015. + */ + +import android.app.Activity; +import android.content.Context; +import android.content.Intent; +import android.os.Bundle; +import android.support.v4.view.PagerAdapter; +import android.support.v4.view.ViewPager; +import android.util.Log; +import android.view.LayoutInflater; +import android.view.View; +import android.view.View.OnClickListener; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import org.rssin.rssin.R; + +public class FirstTimeBoot extends Activity { + + private static final int MAX_VIEWS = 5; + + ViewPager mViewPager; + + @Override + protected void onCreate(Bundle savedInstanceState) { + + super.onCreate(savedInstanceState); + setContentView(R.layout.walkthrough_activity); + mViewPager = (ViewPager) findViewById(R.id.view_pager); + mViewPager.setAdapter(new WalkthroughPagerAdapter()); + mViewPager.setOnPageChangeListener(new WalkthroughPageChangeListener()); + } + + + class WalkthroughPagerAdapter extends PagerAdapter { + + @Override + public int getCount() { + return MAX_VIEWS; + } + + @Override + public boolean isViewFromObject(View view, Object object) { + return view == (View) object; + } + + @Override + public Object instantiateItem(View container, int position) { + Log.e("walkthrough", "instantiateItem(" + position + ");"); + LayoutInflater inflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE); + View imageViewContainer = inflater.inflate(R.layout.walkthrough_single_view, null); + ImageView imageView = (ImageView) imageViewContainer.findViewById(R.id.image_view); + + switch (position) { + case 0: + //imageView.setImageResource(R.drawable.image1); + break; + + case 1: + // imageView.setImageResource(R.drawable.image2); + break; + + case 2: + // imageView.setImageResource(R.drawable.image3); + break; + + case 3: + // imageView.setImageResource(R.drawable.image4); + break; + + case 4: + // imageView.setImageResource(R.drawable.image5); + break; + } + + ((ViewPager) container).addView(imageViewContainer, 0); + return imageViewContainer; + } + + @Override + public void destroyItem(ViewGroup container, int position, Object object) { + ((ViewPager) container).removeView((View) object); + } + } + + + class WalkthroughPageChangeListener implements ViewPager.OnPageChangeListener { + + @Override + public void onPageScrollStateChanged(int arg0) { + + } + + @Override + public void onPageScrolled(int arg0, float arg1, int arg2) { + + } + + @Override + public void onPageSelected(int position) { + // Here is where you should show change the view of page indicator + switch (position) { + + case MAX_VIEWS - 1: + break; + + default: + + } + + } + + } +} + diff --git a/app/src/main/java/org/rssin/android/SharedPreferencesStorageProvider.java b/app/src/main/java/org/rssin/android/SharedPreferencesStorageProvider.java index 4c23fa9..2818a08 100755 --- a/app/src/main/java/org/rssin/android/SharedPreferencesStorageProvider.java +++ b/app/src/main/java/org/rssin/android/SharedPreferencesStorageProvider.java @@ -7,6 +7,7 @@ import android.util.Log; import org.rssin.rssin.Feed; import org.rssin.rssin.Filter; +import org.rssin.rssin.R; import org.rssin.storage.FeedStorageProvider; import org.rssin.storage.FilterStorageProvider; import org.rssin.storage.Storable; @@ -17,6 +18,7 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import java.net.MalformedURLException; import java.util.ArrayList; import java.util.HashSet; import java.util.List; @@ -76,8 +78,6 @@ class SharedPreferencesStorageProvider implements StorageProvider, FilterStorage .edit() .putString(element.getClass().getName(), base64) .apply(); - - Log.v("SPSP", "Store to " + key.toString() + ":\n" + base64); } @Override @@ -88,7 +88,6 @@ class SharedPreferencesStorageProvider implements StorageProvider, FilterStorage } ObjectInputStream ois = new ObjectInputStream(new ByteArrayInputStream(Base64.decode(serialized.getBytes(), Base64.DEFAULT))); Object obj = ois.readObject(); - Log.v("SPSP", "Fetch " + className.toString() + " from " + key.toString() + ": " + obj.toString()); return (Storable) className.cast(obj); } @@ -116,10 +115,8 @@ class SharedPreferencesStorageProvider implements StorageProvider, FilterStorage .getStringSet("filters", new HashSet<String>()); List<Filter> filters = new ArrayList<>(); for (String name : names) { - Log.v("SPSP", "allFilters: " + name); Filter filter = getFilter(name); if (filter != null) { - Log.v("SPSP", "allFilters: not null, returning"); filters.add(filter); } } @@ -137,7 +134,7 @@ class SharedPreferencesStorageProvider implements StorageProvider, FilterStorage try { return (Filter) fetch(key.toString(), Filter.class); } catch (Exception e) { - Log.w("SPSP", "Fetch filter " + key.toString(), e); + Log.w("SPSP", "Fetch filter failed: " + key.toString(), e); return null; } } @@ -171,6 +168,19 @@ class SharedPreferencesStorageProvider implements StorageProvider, FilterStorage @Override public List<Feed> allFeeds() { Set<String> names = context.getSharedPreferences(ADMIN_PREF_KEY, Context.MODE_PRIVATE).getStringSet("feeds", new HashSet<String>()); + if (names.isEmpty() && !context.getSharedPreferences(ADMIN_PREF_KEY, Context.MODE_PRIVATE).getBoolean("firstload", false)) { + String[] feedsList = context.getResources().getStringArray(R.array.default_feeds); + for (String url : feedsList) { + try { + Feed f = new Feed(url); + f.store(this); + } catch (Exception e) { + Log.w("SPSP", "Couldn't add " + url, e); + } + } + context.getSharedPreferences(ADMIN_PREF_KEY, Context.MODE_PRIVATE).edit().putBoolean("firstload", true).apply(); + names = context.getSharedPreferences(ADMIN_PREF_KEY, Context.MODE_PRIVATE).getStringSet("feeds", new HashSet<String>()); + } List<Feed> feeds = new ArrayList<>(); for (String name : names) { Feed feed = getFeed(name); |