From 6e4dac4f333e02e624c5b7a1d579c2c7b2888d89 Mon Sep 17 00:00:00 2001 From: Size43 Date: Wed, 10 Jun 2015 11:08:28 +0200 Subject: Removed hardcoded strings & only one TrainingCase is stored per Article. --- app/src/main/res/values/strings.xml | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'app/src/main/res/values') diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1a279c7..3b3a884 100755 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -65,4 +65,9 @@ Unknown author Published on: + All feeds + START + FILTERS (EDIT) + FEEDS (EDIT) + Feedback saved. -- cgit v1.2.3 From fef7df0f36e8871a6e2bd36030d5b68a85e91f0e Mon Sep 17 00:00:00 2001 From: Size43 Date: Wed, 10 Jun 2015 11:53:29 +0200 Subject: Fixed all hardcoded strings --- README.md | 2 -- app/src/main/java/org/rssin/android/FeedSorterTrainer.java | 3 ++- app/src/main/java/org/rssin/android/FeedsActivity.java | 4 ++-- app/src/main/java/org/rssin/android/FilterSettingsActivity.java | 4 ++-- app/src/main/java/org/rssin/android/HomeScreenActivity.java | 2 +- .../java/org/rssin/android/NavigationDrawerManageFeedsFragment.java | 4 ++-- .../java/org/rssin/android/NavigationDrawerManageFiltersFragment.java | 4 ++-- app/src/main/res/values/strings.xml | 4 ++++ 8 files changed, 15 insertions(+), 12 deletions(-) (limited to 'app/src/main/res/values') diff --git a/README.md b/README.md index 7cd6f2c..5afc936 100644 --- a/README.md +++ b/README.md @@ -8,8 +8,6 @@ Copyright © 2015 Randy Wanga, Jos Craaijo, Joep Bernards, Camil Staps. All (see also the @todo markings throughout the source code) ## High priority -* Walk through all java to check for hardcoded strings -* Don't train both like and dislike * Test deleting feeds * Test settings button * Make "start" not clickable diff --git a/app/src/main/java/org/rssin/android/FeedSorterTrainer.java b/app/src/main/java/org/rssin/android/FeedSorterTrainer.java index 1f88a3e..987ed45 100755 --- a/app/src/main/java/org/rssin/android/FeedSorterTrainer.java +++ b/app/src/main/java/org/rssin/android/FeedSorterTrainer.java @@ -14,8 +14,8 @@ public class FeedSorterTrainer implements Runnable { @Override public void run() { + Log.d("FeedSorterTrainer", "Training starting..."); for (int i = 0; i < 50; i++) { - Log.d("FeedSorterTrainer", "Training: round " + i); sorterProvider.getFeedSorter().train(); try { Thread.sleep(10); @@ -24,6 +24,7 @@ public class FeedSorterTrainer implements Runnable { } } + Log.d("FeedSorterTrainer", "Training stopping..."); sorterProvider.save(); } } diff --git a/app/src/main/java/org/rssin/android/FeedsActivity.java b/app/src/main/java/org/rssin/android/FeedsActivity.java index 4a69af9..32f256a 100755 --- a/app/src/main/java/org/rssin/android/FeedsActivity.java +++ b/app/src/main/java/org/rssin/android/FeedsActivity.java @@ -105,8 +105,8 @@ public class FeedsActivity extends ActionBarActivity { AlertDialog.Builder alert = new AlertDialog.Builder(this); - alert.setTitle("Add feed"); - alert.setMessage("URL:"); + alert.setTitle(getString(R.string.feeds_activity_add_feed)); + alert.setMessage(getString(R.string.feeds_activity_url)); final EditText input = new EditText(this); input.setFocusable(true); diff --git a/app/src/main/java/org/rssin/android/FilterSettingsActivity.java b/app/src/main/java/org/rssin/android/FilterSettingsActivity.java index 931a86c..3041859 100755 --- a/app/src/main/java/org/rssin/android/FilterSettingsActivity.java +++ b/app/src/main/java/org/rssin/android/FilterSettingsActivity.java @@ -182,8 +182,8 @@ public class FilterSettingsActivity extends ActionBarActivity { AlertDialog.Builder alert = new AlertDialog.Builder(this); - alert.setTitle("Title"); - alert.setMessage("New title:"); + alert.setTitle(getString(R.string.filter_settings_title)); + alert.setMessage(getString(R.string.filter_settings_new_title)); final EditText input = new EditText(this); input.setText(filter.getTitle()); diff --git a/app/src/main/java/org/rssin/android/HomeScreenActivity.java b/app/src/main/java/org/rssin/android/HomeScreenActivity.java index 378ac18..f33411b 100755 --- a/app/src/main/java/org/rssin/android/HomeScreenActivity.java +++ b/app/src/main/java/org/rssin/android/HomeScreenActivity.java @@ -41,7 +41,7 @@ public class HomeScreenActivity extends ActionBarActivity implements NavigationD fragmentManager.beginTransaction() .replace(R.id.container, currentFragment = initialFragment) .commit(); - mTitle = "All feeds"; + mTitle = getString(R.string.navigation_drawer_all_feeds); } private Fragment currentFragment; diff --git a/app/src/main/java/org/rssin/android/NavigationDrawerManageFeedsFragment.java b/app/src/main/java/org/rssin/android/NavigationDrawerManageFeedsFragment.java index c768a3b..e239588 100755 --- a/app/src/main/java/org/rssin/android/NavigationDrawerManageFeedsFragment.java +++ b/app/src/main/java/org/rssin/android/NavigationDrawerManageFeedsFragment.java @@ -119,8 +119,8 @@ public class NavigationDrawerManageFeedsFragment extends Fragment { AlertDialog.Builder alert = new AlertDialog.Builder(context); - alert.setTitle("Add feed"); - alert.setMessage("URL:"); + alert.setTitle(getString(R.string.feeds_activity_add_feed)); + alert.setMessage(getString(R.string.feeds_activity_url)); final EditText input = new EditText(context); input.setFocusable(true); diff --git a/app/src/main/java/org/rssin/android/NavigationDrawerManageFiltersFragment.java b/app/src/main/java/org/rssin/android/NavigationDrawerManageFiltersFragment.java index 405d7be..42be75f 100755 --- a/app/src/main/java/org/rssin/android/NavigationDrawerManageFiltersFragment.java +++ b/app/src/main/java/org/rssin/android/NavigationDrawerManageFiltersFragment.java @@ -115,8 +115,8 @@ public class NavigationDrawerManageFiltersFragment extends Fragment { AlertDialog.Builder alert = new AlertDialog.Builder(rootView.getContext()); - alert.setTitle("Add filter"); - alert.setMessage("Title:"); + alert.setTitle(getString(R.string.filters_action_add)); + alert.setMessage(getString(R.string.filter_settings_title)); final EditText input = new EditText(rootView.getContext()); input.setFocusable(true); diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3b3a884..591a878 100755 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -70,4 +70,8 @@ FILTERS (EDIT) FEEDS (EDIT) Feedback saved. + Add feed + URL: + Title + New title: -- cgit v1.2.3 From 3617197cf2b010ce59691e4a263ce5f7e2c18b25 Mon Sep 17 00:00:00 2001 From: Size43 Date: Wed, 10 Jun 2015 12:19:22 +0200 Subject: Added icons, changed filter title edittext to singleline, fixed feed settings crash --- README.md | 2 -- app/src/main/java/org/rssin/android/FeedsActivity.java | 2 +- .../java/org/rssin/android/FilterSettingsActivity.java | 1 + .../java/org/rssin/android/NavigationDrawerAdapter.java | 5 +++-- .../main/res/drawable-hdpi/ic_action_action_delete.png | Bin 0 -> 239 bytes .../main/res/drawable-hdpi/ic_action_action_settings.png | Bin 0 -> 654 bytes .../res/drawable-hdpi/ic_action_editor_border_color.png | Bin 0 -> 410 bytes .../main/res/drawable-mdpi/ic_action_action_delete.png | Bin 0 -> 190 bytes .../main/res/drawable-mdpi/ic_action_action_settings.png | Bin 0 -> 399 bytes .../res/drawable-mdpi/ic_action_editor_border_color.png | Bin 0 -> 262 bytes .../main/res/drawable-xhdpi/ic_action_action_delete.png | Bin 0 -> 306 bytes .../res/drawable-xhdpi/ic_action_action_settings.png | Bin 0 -> 903 bytes .../res/drawable-xhdpi/ic_action_editor_border_color.png | Bin 0 -> 489 bytes .../main/res/drawable-xxhdpi/ic_action_action_delete.png | Bin 0 -> 444 bytes .../res/drawable-xxhdpi/ic_action_action_settings.png | Bin 0 -> 1289 bytes .../drawable-xxhdpi/ic_action_editor_border_color.png | Bin 0 -> 678 bytes .../res/drawable-xxxhdpi/ic_action_action_delete.png | Bin 0 -> 659 bytes .../res/drawable-xxxhdpi/ic_action_action_settings.png | Bin 0 -> 2029 bytes .../drawable-xxxhdpi/ic_action_editor_border_color.png | Bin 0 -> 940 bytes app/src/main/res/menu/global.xml | 2 +- app/src/main/res/menu/home_screen.xml | 2 +- app/src/main/res/menu/menu_article.xml | 2 +- app/src/main/res/menu/menu_filter.xml | 2 +- app/src/main/res/menu/menu_filter_settings.xml | 6 ++++-- app/src/main/res/menu/menu_unified_inbox.xml | 11 ----------- app/src/main/res/values/strings.xml | 1 + 26 files changed, 14 insertions(+), 22 deletions(-) create mode 100755 app/src/main/res/drawable-hdpi/ic_action_action_delete.png create mode 100755 app/src/main/res/drawable-hdpi/ic_action_action_settings.png create mode 100755 app/src/main/res/drawable-hdpi/ic_action_editor_border_color.png create mode 100755 app/src/main/res/drawable-mdpi/ic_action_action_delete.png create mode 100755 app/src/main/res/drawable-mdpi/ic_action_action_settings.png create mode 100755 app/src/main/res/drawable-mdpi/ic_action_editor_border_color.png create mode 100755 app/src/main/res/drawable-xhdpi/ic_action_action_delete.png create mode 100755 app/src/main/res/drawable-xhdpi/ic_action_action_settings.png create mode 100755 app/src/main/res/drawable-xhdpi/ic_action_editor_border_color.png create mode 100755 app/src/main/res/drawable-xxhdpi/ic_action_action_delete.png create mode 100755 app/src/main/res/drawable-xxhdpi/ic_action_action_settings.png create mode 100755 app/src/main/res/drawable-xxhdpi/ic_action_editor_border_color.png create mode 100755 app/src/main/res/drawable-xxxhdpi/ic_action_action_delete.png create mode 100755 app/src/main/res/drawable-xxxhdpi/ic_action_action_settings.png create mode 100755 app/src/main/res/drawable-xxxhdpi/ic_action_editor_border_color.png mode change 100644 => 100755 app/src/main/res/menu/menu_filter_settings.xml delete mode 100644 app/src/main/res/menu/menu_unified_inbox.xml (limited to 'app/src/main/res/values') diff --git a/README.md b/README.md index 5afc936..c6fc667 100644 --- a/README.md +++ b/README.md @@ -9,8 +9,6 @@ Copyright © 2015 Randy Wanga, Jos Craaijo, Joep Bernards, Camil Staps. All ## High priority * Test deleting feeds -* Test settings button -* Make "start" not clickable * Titles & alignment "edit" ## Normal priority diff --git a/app/src/main/java/org/rssin/android/FeedsActivity.java b/app/src/main/java/org/rssin/android/FeedsActivity.java index 32f256a..87edab0 100755 --- a/app/src/main/java/org/rssin/android/FeedsActivity.java +++ b/app/src/main/java/org/rssin/android/FeedsActivity.java @@ -45,7 +45,7 @@ public class FeedsActivity extends ActionBarActivity { Intent intent = getIntent(); String ac = intent.getAction(); - if (ac.equals(Intent.ACTION_VIEW)) { + if (ac != null && ac.equals(Intent.ACTION_VIEW)) { //open with startUri = intent.getData().toString(); openAddDialog(); diff --git a/app/src/main/java/org/rssin/android/FilterSettingsActivity.java b/app/src/main/java/org/rssin/android/FilterSettingsActivity.java index 3041859..a38c7bc 100755 --- a/app/src/main/java/org/rssin/android/FilterSettingsActivity.java +++ b/app/src/main/java/org/rssin/android/FilterSettingsActivity.java @@ -187,6 +187,7 @@ public class FilterSettingsActivity extends ActionBarActivity { final EditText input = new EditText(this); input.setText(filter.getTitle()); + input.setSingleLine(true); input.setFocusable(true); input.requestFocus(); diff --git a/app/src/main/java/org/rssin/android/NavigationDrawerAdapter.java b/app/src/main/java/org/rssin/android/NavigationDrawerAdapter.java index 2a24342..8f0a068 100755 --- a/app/src/main/java/org/rssin/android/NavigationDrawerAdapter.java +++ b/app/src/main/java/org/rssin/android/NavigationDrawerAdapter.java @@ -57,12 +57,13 @@ class NavigationDrawerAdapter implements ListAdapter { @Override public boolean areAllItemsEnabled() { - return true; + return false; } @Override public boolean isEnabled(int position) { - return true; + // Position 0 is always "Start" + return position != 0; } private List observers = new ArrayList<>(); diff --git a/app/src/main/res/drawable-hdpi/ic_action_action_delete.png b/app/src/main/res/drawable-hdpi/ic_action_action_delete.png new file mode 100755 index 0000000..9449c35 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_action_action_delete.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_action_action_settings.png b/app/src/main/res/drawable-hdpi/ic_action_action_settings.png new file mode 100755 index 0000000..116e9a0 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_action_action_settings.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_action_editor_border_color.png b/app/src/main/res/drawable-hdpi/ic_action_editor_border_color.png new file mode 100755 index 0000000..b044320 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_action_editor_border_color.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_action_action_delete.png b/app/src/main/res/drawable-mdpi/ic_action_action_delete.png new file mode 100755 index 0000000..eb03dce Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_action_action_delete.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_action_action_settings.png b/app/src/main/res/drawable-mdpi/ic_action_action_settings.png new file mode 100755 index 0000000..1a8017b Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_action_action_settings.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_action_editor_border_color.png b/app/src/main/res/drawable-mdpi/ic_action_editor_border_color.png new file mode 100755 index 0000000..6216372 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_action_editor_border_color.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_action_action_delete.png b/app/src/main/res/drawable-xhdpi/ic_action_action_delete.png new file mode 100755 index 0000000..a0b397e Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_action_action_delete.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_action_action_settings.png b/app/src/main/res/drawable-xhdpi/ic_action_action_settings.png new file mode 100755 index 0000000..b764d9c Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_action_action_settings.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_action_editor_border_color.png b/app/src/main/res/drawable-xhdpi/ic_action_editor_border_color.png new file mode 100755 index 0000000..a754a2d Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_action_editor_border_color.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_action_delete.png b/app/src/main/res/drawable-xxhdpi/ic_action_action_delete.png new file mode 100755 index 0000000..c1fbf46 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_action_action_delete.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_action_settings.png b/app/src/main/res/drawable-xxhdpi/ic_action_action_settings.png new file mode 100755 index 0000000..a68f6f9 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_action_action_settings.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_editor_border_color.png b/app/src/main/res/drawable-xxhdpi/ic_action_editor_border_color.png new file mode 100755 index 0000000..ef5e602 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_action_editor_border_color.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_action_delete.png b/app/src/main/res/drawable-xxxhdpi/ic_action_action_delete.png new file mode 100755 index 0000000..d152354 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_action_action_delete.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_action_settings.png b/app/src/main/res/drawable-xxxhdpi/ic_action_action_settings.png new file mode 100755 index 0000000..f18ff96 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_action_action_settings.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_editor_border_color.png b/app/src/main/res/drawable-xxxhdpi/ic_action_editor_border_color.png new file mode 100755 index 0000000..a57ae9b Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_action_editor_border_color.png differ diff --git a/app/src/main/res/menu/global.xml b/app/src/main/res/menu/global.xml index 86959a3..c4ae1a3 100755 --- a/app/src/main/res/menu/global.xml +++ b/app/src/main/res/menu/global.xml @@ -1,5 +1,5 @@ + android:orderInCategory="100" app:showAsAction="ifRoom" android:icon="@drawable/ic_action_action_settings" /> \ No newline at end of file diff --git a/app/src/main/res/menu/home_screen.xml b/app/src/main/res/menu/home_screen.xml index a894d92..bf901df 100755 --- a/app/src/main/res/menu/home_screen.xml +++ b/app/src/main/res/menu/home_screen.xml @@ -3,5 +3,5 @@ xmlns:tools="http://schemas.android.com/tools" tools:context="org.rssin.android.HomeScreenActivity"> + android:orderInCategory="100" app:showAsAction="ifRoom" android:icon="@drawable/ic_action_action_settings" /> diff --git a/app/src/main/res/menu/menu_article.xml b/app/src/main/res/menu/menu_article.xml index 064831b..80ef7a7 100755 --- a/app/src/main/res/menu/menu_article.xml +++ b/app/src/main/res/menu/menu_article.xml @@ -19,7 +19,7 @@ diff --git a/app/src/main/res/menu/menu_filter.xml b/app/src/main/res/menu/menu_filter.xml index 86cfe5d..5822314 100755 --- a/app/src/main/res/menu/menu_filter.xml +++ b/app/src/main/res/menu/menu_filter.xml @@ -2,5 +2,5 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" tools:context="org.rssin.android.HomeScreenActivity"> + android:orderInCategory="100" app:showAsAction="ifRoom" android:icon="@drawable/ic_action_action_settings" /> diff --git a/app/src/main/res/menu/menu_filter_settings.xml b/app/src/main/res/menu/menu_filter_settings.xml old mode 100644 new mode 100755 index 655ee84..a914ad8 --- a/app/src/main/res/menu/menu_filter_settings.xml +++ b/app/src/main/res/menu/menu_filter_settings.xml @@ -8,11 +8,13 @@ + app:showAsAction="ifRoom" + android:icon="@drawable/ic_action_editor_border_color"/> + app:showAsAction="ifRoom" + android:icon="@drawable/ic_action_action_delete"/> diff --git a/app/src/main/res/menu/menu_unified_inbox.xml b/app/src/main/res/menu/menu_unified_inbox.xml deleted file mode 100644 index 021ceb5..0000000 --- a/app/src/main/res/menu/menu_unified_inbox.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 591a878..df130b3 100755 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -74,4 +74,5 @@ URL: Title New title: + Share -- cgit v1.2.3 From ed6446af455fe0749fabd0b39f1e2c1b25623e06 Mon Sep 17 00:00:00 2001 From: Size43 Date: Wed, 10 Jun 2015 13:00:11 +0200 Subject: Aligned (EDIT) to the right --- README.md | 3 +-- .../org/rssin/android/NavigationDrawerAdapter.java | 24 ++++++++++++++-------- .../res/layout/separator_navigation_drawer.xml | 16 +++++++++++++-- app/src/main/res/values/strings.xml | 5 +++-- 4 files changed, 34 insertions(+), 14 deletions(-) (limited to 'app/src/main/res/values') diff --git a/README.md b/README.md index c6fc667..b31a843 100644 --- a/README.md +++ b/README.md @@ -8,13 +8,12 @@ Copyright © 2015 Randy Wanga, Jos Craaijo, Joep Bernards, Camil Staps. All (see also the @todo markings throughout the source code) ## High priority -* Test deleting feeds -* Titles & alignment "edit" ## Normal priority * Background sync & notifications * Add tutorial (e.g.: at first startup, walk user through creating first filter) * Swipe left & right for (dis)like +* Extract feed title from feed ## Low priority * Readability plugin to view whole article diff --git a/app/src/main/java/org/rssin/android/NavigationDrawerAdapter.java b/app/src/main/java/org/rssin/android/NavigationDrawerAdapter.java index 8f0a068..973f7ab 100755 --- a/app/src/main/java/org/rssin/android/NavigationDrawerAdapter.java +++ b/app/src/main/java/org/rssin/android/NavigationDrawerAdapter.java @@ -33,16 +33,16 @@ class NavigationDrawerAdapter implements ListAdapter { public void updateMenu(Context context) throws IOException { menuItems.clear(); - menuItems.add(new MenuSection(context.getString(R.string.navigation_drawer_start))); + menuItems.add(new MenuSection(context.getString(R.string.navigation_drawer_start), "")); menuItems.add(new MenuUnifiedInbox(context)); - menuItems.add(new ManageFiltersSection(context.getString(R.string.navigation_drawer_edit_filters))); + menuItems.add(new ManageFiltersSection(context.getString(R.string.navigation_drawer_edit_filters), context.getString(R.string.navigation_drawer_edit_text))); for(Filter f : FiltersList.getInstance(context).getFilters()) { menuItems.add(new MenuFilterItem(f)); } - menuItems.add(new ManageFeedsSection(context.getString(R.string.navigation_drawer_edit_feeds))); + menuItems.add(new ManageFeedsSection(context.getString(R.string.navigation_drawer_edit_feeds), context.getString(R.string.navigation_drawer_edit_text))); for(Feed f : FeedsList.getInstance(context).getFeeds()) { @@ -117,6 +117,7 @@ class NavigationDrawerAdapter implements ListAdapter { if (type == ITEM_VIEW_TYPE_SEPARATOR) { final MenuSection section = (MenuSection) getItem(position); ((TextView) convertView.findViewById(R.id.separator_navigation_drawer_text)).setText(section.getText()); + ((TextView) convertView.findViewById(R.id.separator_navigation_drawer_edit)).setText(section.getRightText()); } else { final MenuItem video = (MenuItem) getItem(position); ((TextView) convertView.findViewById(R.id.item_navigation_drawer_text)).setText(video.getText()); @@ -261,22 +262,29 @@ class NavigationDrawerAdapter implements ListAdapter { class MenuSection extends MenuItem { - public MenuSection(String text) + private String rightText; + + public MenuSection(String text, String rightText) { super(text); + this.rightText = rightText; } @Override public int getItemViewType() { return ITEM_VIEW_TYPE_SEPARATOR; } + + public String getRightText() { + return rightText; + } } class ManageFiltersSection extends MenuSection { - public ManageFiltersSection(String text) + public ManageFiltersSection(String text, String rightText) { - super(text); + super(text, rightText); } @Override @@ -292,9 +300,9 @@ class NavigationDrawerAdapter implements ListAdapter { class ManageFeedsSection extends MenuSection { - public ManageFeedsSection(String text) + public ManageFeedsSection(String text, String rightText) { - super(text); + super(text, rightText); } @Override diff --git a/app/src/main/res/layout/separator_navigation_drawer.xml b/app/src/main/res/layout/separator_navigation_drawer.xml index 81a9d0a..a3031a0 100755 --- a/app/src/main/res/layout/separator_navigation_drawer.xml +++ b/app/src/main/res/layout/separator_navigation_drawer.xml @@ -10,7 +10,7 @@ android:layout_marginTop="0dp" android:background="#252525" > - - + + + All feeds START - FILTERS (EDIT) - FEEDS (EDIT) + FILTERS + FEEDS Feedback saved. Add feed URL: Title New title: Share + (EDIT) -- cgit v1.2.3