diff options
Diffstat (limited to 'app/src')
16 files changed, 368 insertions, 55 deletions
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 912bd7b..26e53db 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -28,6 +28,10 @@ android:name="android.support.PARENT_ACTIVITY" android:value="org.rssin.android.UnifiedInboxActivity" /> </activity> + <activity + android:name="org.rssin.android.FilterSettingsActivity" + android:label="@string/title_activity_filter_settings" > + </activity> </application> </manifest> diff --git a/app/src/main/java/org/rssin/android/FilterSettingsActivity.java b/app/src/main/java/org/rssin/android/FilterSettingsActivity.java new file mode 100644 index 0000000..b2d4ed9 --- /dev/null +++ b/app/src/main/java/org/rssin/android/FilterSettingsActivity.java @@ -0,0 +1,168 @@ +package org.rssin.android; + +import android.app.Activity; +import android.app.AlertDialog; +import android.app.Dialog; +import android.app.DialogFragment; +import android.content.Context; +import android.content.DialogInterface; +import android.content.Intent; +import android.support.annotation.Nullable; +import android.support.v7.app.ActionBarActivity; +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ArrayAdapter; +import android.widget.ListView; +import android.widget.TextView; + +import org.rssin.rssin.Feed; +import org.rssin.rssin.Filter; +import org.rssin.rssin.Keyword; +import org.rssin.rssin.R; + +import java.util.List; + +public class FilterSettingsActivity extends ActionBarActivity { + + private Filter filter; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_filter_settings); + + Intent intent = getIntent(); + filter = (Filter) intent.getSerializableExtra("filter"); + + ((TextView) findViewById(R.id.filter_settings_title)).setText(filter.getTitle()); + ((TextView) findViewById(R.id.filter_settings_keywords)).setText(filter.getKeywordsAsString()); + + final FeedAdapter fAdapter = new FeedAdapter(this, R.layout.item_filter_settings_feed, filter.getFeeds()); + ((ListView) findViewById(R.id.filter_settings_feeds_list)).setAdapter(fAdapter); + } + + public void openKeywordsDialog(View v) { + (new KeywordsDialogFragment()).show(getFragmentManager(), ""); + } + + public class KeywordsDialogFragment extends DialogFragment { + @Override + public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) { + return inflater.inflate(R.layout.fragment_filter_settings_keywords, container); + } + + @Override + public void onActivityCreated(Bundle savedInstanceState) { + super.onActivityCreated(savedInstanceState); + + final KeywordAdapter kAdapter = new KeywordAdapter(getActivity(), R.layout.item_filter_settings_keyword, filter.getKeywords()); + ((ListView) getActivity().findViewById(R.id.filter_settings_feeds_list)).setAdapter(kAdapter); + } + + @Override + public Dialog onCreateDialog(Bundle savedInstanceState) { + AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); + builder.setMessage("Hello world") + .setPositiveButton("Yes", new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + // FIRE ZE MISSILES! + } + }) + .setNegativeButton("Cancel", new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + // User cancelled the dialog + } + }); + // Create the AlertDialog object and return it + return builder.create(); + } + } + + private static class FeedAdapter extends ArrayAdapter<Feed> { + + Context context; + int layoutResourceId; + List<Feed> feeds; + + public FeedAdapter(Context context, int resource, List<Feed> objects) { + super(context, resource, objects); + this.context = context; + layoutResourceId = resource; + feeds = objects; + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + View row = convertView; + FeedHolder holder = null; + + if (row == null) { + LayoutInflater inflater = ((Activity) context).getLayoutInflater(); + row = inflater.inflate(layoutResourceId, parent, false); + + holder = new FeedHolder(); + holder.title = (TextView) row.findViewById(R.id.filter_settings_feed_item_title); + holder.url = (TextView) row.findViewById(R.id.filter_settings_feed_item_url); + + row.setTag(holder); + } else { + holder = (FeedHolder) row.getTag(); + } + + Feed feed = feeds.get(position); + holder.title.setText(feed.getTitle()); + holder.url.setText(feed.getURL().toString()); + + return row; + } + + private static class FeedHolder { + TextView title; + TextView url; + } + } + + private static class KeywordAdapter extends ArrayAdapter<Keyword> { + + Context context; + int layoutResourceId; + List<Keyword> keywords; + + public KeywordAdapter(Context context, int resource, List<Keyword> objects) { + super(context, resource, objects); + this.context = context; + layoutResourceId = resource; + keywords = objects; + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + View row = convertView; + KeywordHolder holder = null; + + if (row == null) { + LayoutInflater inflater = ((Activity) context).getLayoutInflater(); + row = inflater.inflate(layoutResourceId, parent, false); + + holder = new KeywordHolder(); + holder.title = (TextView) row.findViewById(R.id.filter_settings_keyword_item_title); + + row.setTag(holder); + } else { + holder = (KeywordHolder) row.getTag(); + } + + Keyword keyword = keywords.get(position); + holder.title.setText(keyword.getKeyword()); + + return row; + } + + private static class KeywordHolder { + TextView title; + } + } + +} diff --git a/app/src/main/java/org/rssin/android/FiltersActivity.java b/app/src/main/java/org/rssin/android/FiltersActivity.java index 254020f..6b1a3d7 100644 --- a/app/src/main/java/org/rssin/android/FiltersActivity.java +++ b/app/src/main/java/org/rssin/android/FiltersActivity.java @@ -2,21 +2,20 @@ package org.rssin.android; import android.app.Activity; import android.content.Context; +import android.content.Intent; import android.support.v7.app.ActionBarActivity; import android.os.Bundle; import android.util.Log; import android.view.LayoutInflater; -import android.view.Menu; -import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; +import android.widget.AdapterView; import android.widget.ArrayAdapter; import android.widget.ListView; import android.widget.TextView; import android.widget.Toast; import org.rssin.rssin.Filter; -import org.rssin.rssin.Keyword; import org.rssin.rssin.R; import java.io.IOException; @@ -25,12 +24,18 @@ import java.util.List; public class FiltersActivity extends ActionBarActivity { private FiltersList filters; + private ListView filtersView; + + private AdapterView.OnItemClickListener onFilterClickListener; + private AdapterView.OnItemLongClickListener onFilterLongClickListener; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_filters); + filtersView = (ListView) findViewById(R.id.filters_list); + try { filters = new FiltersList(this); } catch (IOException ex) { @@ -40,13 +45,8 @@ public class FiltersActivity extends ActionBarActivity { filters = new FiltersList(); } - Filter filter = new Filter("Hello world"); - filter.getKeywords().add(new Keyword("Keyword test")); - filter.getKeywords().add(new Keyword("Keyword test 2")); - filters.getFilters().add(filter); - - FilterAdapter adapter = new FilterAdapter(this, R.layout.activity_filters_item, filters.getFilters()); - ((ListView) findViewById(R.id.filters_list)).setAdapter(adapter); + final FilterAdapter adapter = new FilterAdapter(this, R.layout.item_filter, filters.getFilters()); + filtersView.setAdapter(adapter); try { filters.save(this); @@ -54,29 +54,27 @@ public class FiltersActivity extends ActionBarActivity { Toast.makeText(this, "Couldn't save filters.", Toast.LENGTH_SHORT).show(); Log.e("FILTER", "IOException", ex); } - } - - - @Override - public boolean onCreateOptionsMenu(Menu menu) { - // Inflate the menu; this adds items to the action bar if it is present. - getMenuInflater().inflate(R.menu.menu_filters, menu); - return true; - } - @Override - public boolean onOptionsItemSelected(MenuItem item) { - // Handle action bar item clicks here. The action bar will - // automatically handle clicks on the Home/Up button, so long - // as you specify a parent activity in AndroidManifest.xml. - int id = item.getItemId(); - - //noinspection SimplifiableIfStatement - if (id == R.id.action_settings) { - return true; - } + onFilterClickListener = new AdapterView.OnItemClickListener() { + @Override + public void onItemClick(AdapterView<?> parent, View view, int position, long id) { + Filter item = (Filter) parent.getItemAtPosition(position); + // @Todo open filter + } + }; + onFilterLongClickListener = new AdapterView.OnItemLongClickListener() { + @Override + public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id) { + Filter item = (Filter) parent.getItemAtPosition(position); + Intent intent = new Intent(getApplicationContext(), FilterSettingsActivity.class); + intent.putExtra("filter", item); + startActivity(intent); + return true; + } + }; - return super.onOptionsItemSelected(item); + filtersView.setOnItemClickListener(onFilterClickListener); + filtersView.setOnItemLongClickListener(onFilterLongClickListener); } private static class FilterAdapter extends ArrayAdapter<Filter> { diff --git a/app/src/main/java/org/rssin/android/UnifiedInboxActivity.java b/app/src/main/java/org/rssin/android/UnifiedInboxActivity.java index dbe1c89..6335406 100644 --- a/app/src/main/java/org/rssin/android/UnifiedInboxActivity.java +++ b/app/src/main/java/org/rssin/android/UnifiedInboxActivity.java @@ -15,12 +15,8 @@ public class UnifiedInboxActivity extends ActionBarActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_unified_inbox); - - Intent intent = new Intent(this, FiltersActivity.class); - startActivity(intent); } - @Override public boolean onCreateOptionsMenu(Menu menu) { // Inflate the menu; this adds items to the action bar if it is present. @@ -37,7 +33,11 @@ public class UnifiedInboxActivity extends ActionBarActivity { //noinspection SimplifiableIfStatement if (id == R.id.action_settings) { - return true; + Intent intent = new Intent(this, SettingsActivity.class); + startActivity(intent); + } else if (id == R.id.action_filters) { + Intent intent = new Intent(this, FiltersActivity.class); + startActivity(intent); } return super.onOptionsItemSelected(item); diff --git a/app/src/main/java/org/rssin/rssin/Feed.java b/app/src/main/java/org/rssin/rssin/Feed.java new file mode 100644 index 0000000..1dcb4d8 --- /dev/null +++ b/app/src/main/java/org/rssin/rssin/Feed.java @@ -0,0 +1,54 @@ +package org.rssin.rssin; + +import java.net.MalformedURLException; +import java.net.URL; + +/** + * Created by camilstaps on 20-5-15. + */ +public class Feed { + + private String title; + private URL url; + + public Feed(URL url) { + this.url = url; + this.title = url.toString(); + } + + public Feed(String url) throws MalformedURLException { + this.url = new URL(url); + this.title = url; + } + + public Feed(URL url, String title) { + this.url = url; + this.title = title; + } + + public Feed(String url, String title) throws MalformedURLException { + this.url = new URL(url); + this.title = title; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public URL getURL() { + return url; + } + + public void setURL(URL url) { + this.url = url; + } + + public void setURL(String url) throws MalformedURLException { + this.url = new URL(url); + } + +} diff --git a/app/src/main/java/org/rssin/rssin/Filter.java b/app/src/main/java/org/rssin/rssin/Filter.java index 1cffe1a..a5a4cd9 100644 --- a/app/src/main/java/org/rssin/rssin/Filter.java +++ b/app/src/main/java/org/rssin/rssin/Filter.java @@ -2,8 +2,6 @@ package org.rssin.rssin; import android.text.TextUtils; -import org.rssin.rss.Feed; - import java.io.Serializable; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/res/layout/activity_filter_settings.xml b/app/src/main/res/layout/activity_filter_settings.xml new file mode 100644 index 0000000..4f3b177 --- /dev/null +++ b/app/src/main/res/layout/activity_filter_settings.xml @@ -0,0 +1,46 @@ +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + tools:context="org.rssin.android.FilterSettingsActivity" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:paddingLeft="@dimen/activity_horizontal_margin" + android:paddingRight="@dimen/activity_horizontal_margin" + android:paddingTop="@dimen/activity_vertical_margin" + android:paddingBottom="@dimen/activity_vertical_margin" + android:orientation="vertical"> + + <TextView + android:id="@+id/filter_settings_title" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textSize="22sp" /> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingTop="6dp" + android:paddingBottom="6dp" + android:orientation="horizontal"> + + <Button + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/filter_settings_edit_keywords" + android:onClick="openKeywordsDialog"/> + + <TextView + android:id="@+id/filter_settings_keywords" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:scrollbars="horizontal" + android:maxLines="1"/> + + </LinearLayout> + + <ListView + android:id="@+id/filter_settings_feeds_list" + android:layout_width="match_parent" + android:layout_height="match_parent"></ListView> + +</LinearLayout> diff --git a/app/src/main/res/layout/activity_filters.xml b/app/src/main/res/layout/activity_filters.xml index 521a319..700e939 100644 --- a/app/src/main/res/layout/activity_filters.xml +++ b/app/src/main/res/layout/activity_filters.xml @@ -1,9 +1,12 @@ -<RelativeLayout 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" android:paddingLeft="@dimen/activity_horizontal_margin" - android:paddingRight="@dimen/activity_horizontal_margin" - android:paddingTop="@dimen/activity_vertical_margin" - android:paddingBottom="@dimen/activity_vertical_margin" +<RelativeLayout + 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" + android:paddingLeft="0dp" + android:paddingRight="0dp" + android:paddingTop="0dp" + android:paddingBottom="0dp" tools:context="org.rssin.android.FiltersActivity"> <ListView diff --git a/app/src/main/res/layout/activity_unified_inbox.xml b/app/src/main/res/layout/activity_unified_inbox.xml index 1f25ce7..5c56465 100644 --- a/app/src/main/res/layout/activity_unified_inbox.xml +++ b/app/src/main/res/layout/activity_unified_inbox.xml @@ -5,7 +5,4 @@ android:paddingTop="@dimen/activity_vertical_margin" android:paddingBottom="@dimen/activity_vertical_margin" tools:context=".UnifiedInboxActivity"> - <TextView android:text="@string/hello_world" android:layout_width="wrap_content" - android:layout_height="wrap_content" /> - </RelativeLayout> diff --git a/app/src/main/res/layout/fragment_filter_settings_keywords.xml b/app/src/main/res/layout/fragment_filter_settings_keywords.xml new file mode 100644 index 0000000..418129e --- /dev/null +++ b/app/src/main/res/layout/fragment_filter_settings_keywords.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <ListView + android:id="@+id/filter_settings_keywords_list" + android:layout_width="match_parent" + android:layout_height="match_parent"></ListView> + +</LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/activity_filters_item.xml b/app/src/main/res/layout/item_filter.xml index 99fbb19..99fbb19 100644 --- a/app/src/main/res/layout/activity_filters_item.xml +++ b/app/src/main/res/layout/item_filter.xml diff --git a/app/src/main/res/layout/item_filter_settings_feed.xml b/app/src/main/res/layout/item_filter_settings_feed.xml new file mode 100644 index 0000000..7512330 --- /dev/null +++ b/app/src/main/res/layout/item_filter_settings_feed.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:layout_width="fill_parent" + android:layout_height="fill_parent"> + + <TextView android:id="@+id/filter_settings_feed_item_title" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:textSize="22sp" + android:padding="10dp"/> + + <TextView android:id="@+id/filter_settings_feed_item_url" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:padding="10dp"/> + +</LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/item_filter_settings_keyword.xml b/app/src/main/res/layout/item_filter_settings_keyword.xml new file mode 100644 index 0000000..ad9a231 --- /dev/null +++ b/app/src/main/res/layout/item_filter_settings_keyword.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:layout_width="fill_parent" + android:layout_height="fill_parent"> + + <TextView android:id="@+id/filter_settings_keyword_item_title" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:padding="10dp"/> + +</LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/menu/menu_filters.xml b/app/src/main/res/menu/menu_filters.xml deleted file mode 100644 index 0f6a87f..0000000 --- a/app/src/main/res/menu/menu_filters.xml +++ /dev/null @@ -1,7 +0,0 @@ -<menu xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - xmlns:tools="http://schemas.android.com/tools" - tools:context="org.rssin.android.FiltersActivity"> - <item android:id="@+id/action_settings" android:title="@string/action_settings" - android:orderInCategory="100" app:showAsAction="never" /> -</menu> diff --git a/app/src/main/res/menu/menu_unified_inbox.xml b/app/src/main/res/menu/menu_unified_inbox.xml index 2c72c6d..2800171 100644 --- a/app/src/main/res/menu/menu_unified_inbox.xml +++ b/app/src/main/res/menu/menu_unified_inbox.xml @@ -1,6 +1,9 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" tools:context=".UnifiedInboxActivity"> + <item android:id="@+id/action_settings" android:title="@string/action_settings" android:orderInCategory="100" app:showAsAction="never" /> + <item android:id="@+id/action_filters" android:title="@string/action_filters" + android:orderInCategory="100" app:showAsAction="never" /> </menu> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e3e9d33..7bd62cc 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,7 +1,11 @@ <resources> <string name="app_name">RSSin</string> - <string name="hello_world">Hello world!</string> <string name="action_settings">Settings</string> + <string name="action_filters">Filters</string> + <string name="title_activity_filters">Filters</string> + <string name="title_activity_filter_settings">Filter Settings</string> + + <string name="filter_settings_edit_keywords">Edit</string> </resources> |