From e349f9010067d7cdc34fd050a39b30aa2e9bd838 Mon Sep 17 00:00:00 2001
From: Camil Staps
Date: Wed, 10 Jun 2015 20:19:25 +0200
Subject: Cleanup; about dialogue

---
 app/src/main/res/menu/home_screen.xml   |  6 ++---
 app/src/main/res/values/strings.xml     |  8 +++++++
 app/src/main/res/xml/pref_data_sync.xml | 39 ---------------------------------
 app/src/main/res/xml/pref_headers.xml   | 24 --------------------
 app/src/main/res/xml/pref_main.xml      | 20 -----------------
 5 files changed, 11 insertions(+), 86 deletions(-)
 delete mode 100644 app/src/main/res/xml/pref_data_sync.xml
 delete mode 100644 app/src/main/res/xml/pref_headers.xml
 delete mode 100644 app/src/main/res/xml/pref_main.xml

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/menu/home_screen.xml b/app/src/main/res/menu/home_screen.xml
index 8ffd091..f28278e 100644
--- a/app/src/main/res/menu/home_screen.xml
+++ b/app/src/main/res/menu/home_screen.xml
@@ -23,10 +23,10 @@
     tools:context="org.rssin.android.HomeScreenActivity">
 
     <item
-        android:id="@+id/action_settings"
-        android:title="@string/action_settings"
+        android:id="@+id/action_info"
+        android:title="@string/action_info"
         android:orderInCategory="100"
         app:showAsAction="ifRoom"
-        android:icon="@drawable/ic_action_action_settings" />
+        android:icon="@drawable/ic_action_action_info_outline" />
 
 </menu>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index baaf0f2..b979926 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -18,12 +18,20 @@
 -->
 <resources>
     <string name="app_name">RSSin</string>
+    <string name="app_info"><![CDATA[
+        <h1>RSSin</h1>
+        <em>Clever RSS reader for Android</em>
+        <p>Copyright &copy; Randy Wanga, Jos Craaijo, Joep Bernards, Camil Staps</p>
+        <p>This project is free, open source software licensed under GPLv2. For more information and the full license text, visit <a href="https://github.com/camilstaps/RSSin">https://github.com/camilstaps/RSSin</a>.</p>
+        <p>Articles loaded from external sources remain under the original copyright.</p>
+    ]]></string>
 
     <string name="action_import_feed">Open in RRSin</string>
 
     <string name="action_settings">Settings</string>
     <string name="action_filters">Filters</string>
     <string name="action_feeds">Feeds</string>
+    <string name="action_info">About RSSin</string>
 
     <string name="button_ok">OK</string>
     <string name="button_apply">Apply</string>
diff --git a/app/src/main/res/xml/pref_data_sync.xml b/app/src/main/res/xml/pref_data_sync.xml
deleted file mode 100644
index 3a53dc7..0000000
--- a/app/src/main/res/xml/pref_data_sync.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<!--
-    RSSin - Clever RSS reader for Android
-    Copyright (C) 2015 Randy Wanga, Jos Craaijo, Joep Bernards, Camil Staps
-    
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by 
-    the Free Software Foundation; either version 2 of the License, or 
-    (at your option) any later version.
-    
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of 
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-    
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
--->
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <!-- NOTE: Hide buttons to simplify the UI. Users can touch outside the dialog to
-         dismiss it. -->
-    <!-- NOTE: ListPreference's summary should be set to its value by the activity code. -->
-    <ListPreference
-        android:key="sync_frequency"
-        android:title="@string/pref_title_sync_frequency"
-        android:entries="@array/pref_sync_frequency_titles"
-        android:entryValues="@array/pref_sync_frequency_values"
-        android:defaultValue="180"
-        android:negativeButtonText="@null"
-        android:positiveButtonText="@null" />
-
-    <!-- This preference simply launches an intent when selected. Use this UI sparingly, per
-         design guidelines. -->
-    <Preference android:title="@string/pref_title_system_sync_settings">
-        <intent android:action="android.settings.SYNC_SETTINGS" />
-    </Preference>
-
-</PreferenceScreen>
diff --git a/app/src/main/res/xml/pref_headers.xml b/app/src/main/res/xml/pref_headers.xml
deleted file mode 100644
index 96dc4bb..0000000
--- a/app/src/main/res/xml/pref_headers.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-    RSSin - Clever RSS reader for Android
-    Copyright (C) 2015 Randy Wanga, Jos Craaijo, Joep Bernards, Camil Staps
-    
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by 
-    the Free Software Foundation; either version 2 of the License, or 
-    (at your option) any later version.
-    
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of 
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-    
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
--->
-<preference-headers xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <header android:fragment="org.rssin.android.SettingsActivity$DataSyncPreferenceFragment"
-        android:title="@string/pref_header_data_sync" />
-
-</preference-headers>
diff --git a/app/src/main/res/xml/pref_main.xml b/app/src/main/res/xml/pref_main.xml
deleted file mode 100644
index efff7cd..0000000
--- a/app/src/main/res/xml/pref_main.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<!--
-    RSSin - Clever RSS reader for Android
-    Copyright (C) 2015 Randy Wanga, Jos Craaijo, Joep Bernards, Camil Staps
-    
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by 
-    the Free Software Foundation; either version 2 of the License, or 
-    (at your option) any later version.
-    
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of 
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-    
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
--->
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-</PreferenceScreen>
\ No newline at end of file
-- 
cgit v1.2.3