diff options
Diffstat (limited to 'app/src/main/java')
3 files changed, 50 insertions, 28 deletions
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..3b06ff9 --- /dev/null +++ b/app/src/main/java/org/rssin/android/FilterSettingsActivity.java @@ -0,0 +1,16 @@ +package org.rssin.android; + +import android.support.v7.app.ActionBarActivity; +import android.os.Bundle; + +import org.rssin.rssin.R; + +public class FilterSettingsActivity extends ActionBarActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_filter_settings); + } + +} diff --git a/app/src/main/java/org/rssin/android/FiltersActivity.java b/app/src/main/java/org/rssin/android/FiltersActivity.java index 254020f..54a380f 100644 --- a/app/src/main/java/org/rssin/android/FiltersActivity.java +++ b/app/src/main/java/org/rssin/android/FiltersActivity.java @@ -2,6 +2,7 @@ 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; @@ -10,6 +11,7 @@ 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; @@ -25,12 +27,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) { @@ -45,8 +53,8 @@ public class FiltersActivity extends ActionBarActivity { 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.activity_filters_item, filters.getFilters()); + filtersView.setAdapter(adapter); try { filters.save(this); @@ -54,29 +62,27 @@ public class FiltersActivity extends ActionBarActivity { Toast.makeText(this, "Couldn't save filters.", Toast.LENGTH_SHORT).show(); Log.e("FILTER", "IOException", ex); } - } + 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; + } + }; - @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; - } - - 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); |