Merge pull request #70 from Etuldan/experimental

1.10.1 Experimental to Stable

README.md

@@ -52,7 +52,7 @@ Table des matières
 
 ### Résumé
 spaRSS est un lecteur de flux RSS qui permet la lecture d'article complet sans avoir à ouvrir un navigateur externe.  
-Tout le contenu de vos site d'actualités préféré sera disponible directement dans l'application, sans avoir besoin d'être connecté à Internet au moment de la consultation.  
+Tout le contenu de vos sites d'actualités préférés sera disponible directement dans l'application, sans avoir besoin d'être connecté à Internet au moment de la consultation.  
 Il ne se synchronise pas avec les lecteurs RSS en ligne.
 
 ### Fonctionnalités
@@ -112,4 +112,4 @@ spaRSS est un fork de [Flym](https://github.com/FredJul/Flym)
 GitHub project: https://github.com/Etuldan/spaRSS  
 PlayStore: https://play.google.com/store/apps/details?id=net.etuldan.sparss  
 F-Droid: https://f-droid.org/repository/browse/?fdid=net.etuldan.sparss.floss  
-Το spaRSS είναι ένα "fork" του [Flym](https://github.com/FredJul/Flym)
+Το spaRSS είναι ένα "fork" του [Flym](https://github.com/FredJul/Flym)

mobile/build.gradle

@@ -9,8 +9,8 @@ android {
         applicationId "net.etuldan.sparss"
         minSdkVersion 15
         targetSdkVersion 21
-        versionCode 60
-        versionName "1.10.0"
+        versionCode 62
+        versionName "1.10.1"
     }
 
     compileOptions {

mobile/src/main/AndroidManifest.xml

@@ -76,7 +76,7 @@
         </activity>
         <activity
             android:name=".activity.EditFeedActivity"
-            android:windowSoftInputMode="adjustResize">
+            android:windowSoftInputMode="stateHidden">
             <intent-filter>
                 <action android:name="android.intent.action.EDIT"/>
                 <category android:name="android.intent.category.DEFAULT"/>

mobile/src/main/java/net/etuldan/sparss/activity/EditFeedActivity.java

@@ -255,6 +255,7 @@ protected void onCreate(Bundle savedInstanceState) {
         mTabHost.setup();
         mTabHost.addTab(mTabHost.newTabSpec("feedTab").setIndicator(getString(R.string.tab_feed_title)).setContent(R.id.feed_tab));
         mTabHost.addTab(mTabHost.newTabSpec("filtersTab").setIndicator(getString(R.string.tab_filters_title)).setContent(R.id.filters_tab));
+        mTabHost.addTab(mTabHost.newTabSpec("advancedTab").setIndicator(getString(R.string.tab_advanced_title)).setContent(R.id.advanced_tab));
 
         mTabHost.setOnTabChangedListener(new TabHost.OnTabChangeListener() {
             @Override

mobile/src/main/java/net/etuldan/sparss/activity/HomeActivity.java

@@ -132,6 +132,13 @@ public void run() {
             }
         });
 
+        mLeftDrawer.setBackgroundColor(getResources().getColor(R.color.dark_theme_color_primary));
+        mDrawerList.setBackgroundColor(getResources().getColor(R.color.dark_background));
+        if (PrefUtils.getBoolean(PrefUtils.LIGHT_THEME, true)) {
+            mLeftDrawer.setBackgroundColor(getResources().getColor(R.color.light_theme_color_primary));
+            mDrawerList.setBackgroundColor(getResources().getColor(R.color.light_background));
+        }
+
         mDrawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);
         if (mDrawerLayout != null) {
             mDrawerLayout.setDrawerShadow(R.drawable.drawer_shadow, GravityCompat.START);
@@ -196,6 +203,13 @@ protected void onPause() {
 
     @Override
     public void finish() {
+        if (mDrawerLayout != null) {
+            if(mDrawerLayout.isDrawerOpen(mLeftDrawer)) {
+                mDrawerLayout.closeDrawer(mLeftDrawer);
+                return;
+            }
+        }
+
         if (mCanQuit) {
             super.finish();
             return;
@@ -377,15 +391,15 @@ public void onClick(DialogInterface dialog, int which) {
         switch (mCurrentDrawerPos) {
             case SEARCH_DRAWER_POSITION:
                 getSupportActionBar().setTitle(android.R.string.search_go);
-                getSupportActionBar().setIcon(R.drawable.action_search);
+                getSupportActionBar().setIcon(R.drawable.ic_search);
                 break;
             case 0:
                 getSupportActionBar().setTitle(R.string.all);
                 getSupportActionBar().setIcon(R.drawable.ic_statusbar_rss);
                 break;
             case 1:
                 getSupportActionBar().setTitle(R.string.favorites);
-                getSupportActionBar().setIcon(R.drawable.rating_important);
+                getSupportActionBar().setIcon(R.drawable.ic_star);
                 break;
             default:
                 getSupportActionBar().setTitle(mTitle);

mobile/src/main/java/net/etuldan/sparss/adapter/DrawerAdapter.java

@@ -23,7 +23,6 @@
 import android.content.Context;
 import android.database.Cursor;
 import android.graphics.Bitmap;
-import android.graphics.Color;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -35,6 +34,7 @@
 import net.etuldan.sparss.R;
 import net.etuldan.sparss.provider.FeedData;
 import net.etuldan.sparss.provider.FeedData.EntryColumns;
+import net.etuldan.sparss.utils.PrefUtils;
 import net.etuldan.sparss.utils.StringUtils;
 import net.etuldan.sparss.utils.UiUtils;
 
@@ -52,8 +52,8 @@ public class DrawerAdapter extends BaseAdapter {
     private static final int POS_ERROR = 6;
     private static final int POS_UNREAD = 7;
 
-    private static final int NORMAL_TEXT_COLOR = Color.parseColor("#EEEEEE");
-    private static final int GROUP_TEXT_COLOR = Color.parseColor("#BBBBBB");
+    //private static final int NORMAL_TEXT_COLOR = Color.parseColor("#EEEEEE");
+    //private static final int GROUP_TEXT_COLOR = Color.parseColor("#BBBBBB");
 
     private static final String COLON = MainApplication.getContext().getString(R.string.colon);
 
@@ -102,7 +102,10 @@ public View getView(int position, View convertView, ViewGroup parent) {
         // default init
         holder.iconView.setImageDrawable(null);
         holder.titleTxt.setText("");
-        holder.titleTxt.setTextColor(NORMAL_TEXT_COLOR);
+        holder.titleTxt.setTextColor(mContext.getResources().getColor(R.color.dark_text));
+        if (PrefUtils.getBoolean(PrefUtils.LIGHT_THEME, true)) {
+            holder.titleTxt.setTextColor(mContext.getResources().getColor(R.color.light_text));
+        }
         holder.titleTxt.setAllCaps(false);
         holder.stateTxt.setVisibility(View.GONE);
         holder.unreadTxt.setText("");
@@ -111,7 +114,11 @@ public View getView(int position, View convertView, ViewGroup parent) {
 
         if (position == 0 || position == 1) {
             holder.titleTxt.setText(position == 0 ? R.string.all : R.string.favorites);
-            holder.iconView.setImageResource(position == 0 ? R.drawable.ic_statusbar_rss : R.drawable.rating_important);
+            holder.iconView.setImageResource(position == 0 ? R.drawable.ic_statusbar_rss : R.drawable.ic_star);
+            holder.iconView.setColorFilter(mContext.getResources().getColor(R.color.dark_text));
+            if (PrefUtils.getBoolean(PrefUtils.LIGHT_THEME, true)) {
+                holder.iconView.setColorFilter(mContext.getResources().getColor(R.color.light_text));
+            }
 
             int unread = position == 0 ? mAllUnreadNumber : mFavoritesNumber;
             if (unread != 0) {
@@ -122,7 +129,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
             holder.titleTxt.setText((mFeedsCursor.isNull(POS_NAME) ? mFeedsCursor.getString(POS_URL) : mFeedsCursor.getString(POS_NAME)));
 
             if (mFeedsCursor.getInt(POS_IS_GROUP) == 1) {
-                holder.titleTxt.setTextColor(GROUP_TEXT_COLOR);
+                holder.titleTxt.setTextColor(mContext.getResources().getColor(R.color.group_text));
                 holder.titleTxt.setAllCaps(true);
                 holder.separator.setVisibility(View.VISIBLE);
             } else {

mobile/src/main/java/net/etuldan/sparss/adapter/FeedsCursorAdapter.java

@@ -83,9 +83,9 @@ protected void bindGroupView(View view, Context context, Cursor cursor, boolean
             textView.setText(cursor.getString(mNamePos));
 
             if (isExpanded)
-                indicatorImage.setImageResource(R.drawable.group_expanded);
+                indicatorImage.setImageResource(R.drawable.ic_keyboard_arrow_down);
             else
-                indicatorImage.setImageResource(R.drawable.group_collapsed);
+                indicatorImage.setImageResource(R.drawable.ic_keyboard_arrow_right);
         } else {
             bindChildView(view, context, cursor);
             indicatorImage.setVisibility(View.GONE);

mobile/src/main/java/net/etuldan/sparss/fragment/EntriesListFragment.java

@@ -185,7 +185,6 @@ public View inflateView(LayoutInflater inflater, ViewGroup container, Bundle sav
         }
 
         mListView = (ListView) rootView.findViewById(android.R.id.list);
-        mListView.setFastScrollEnabled(true);
         mListView.setOnTouchListener(new SwipeGestureListener(mListView.getContext()));
 
         if (PrefUtils.getBoolean(PrefUtils.DISPLAY_TIP, true)) {
@@ -196,7 +195,7 @@ public View inflateView(LayoutInflater inflater, ViewGroup container, Bundle sav
             header.setText(R.string.tip_sentence);
             header.setGravity(Gravity.CENTER_VERTICAL);
             header.setCompoundDrawablePadding(UiUtils.dpToPixel(5));
-            header.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_action_about, 0, R.drawable.ic_action_cancel, 0);
+            header.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_info_outline, 0, R.drawable.ic_cancel, 0);
             header.setClickable(true);
             header.setOnClickListener(new View.OnClickListener() {
                 @Override
@@ -303,7 +302,11 @@ public void onListItemClick(ListView listView, View view, int position, long id)
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         menu.clear(); // This is needed to remove a bug on Android 4.0.3
 
-        inflater.inflate(R.menu.entry_list, menu);
+        if (PrefUtils.getBoolean(PrefUtils.MARK_AS_READ, true)) {
+            inflater.inflate(R.menu.entry_list, menu);
+        } else {
+            inflater.inflate(R.menu.entry_list_without_markasread, menu);
+        }
 
         if (EntryColumns.FAVORITES_CONTENT_URI.equals(mUri)) {
             menu.findItem(R.id.menu_refresh).setVisible(false);

mobile/src/main/java/net/etuldan/sparss/fragment/EntryFragment.java

@@ -193,7 +193,7 @@ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
 
         if (mFavorite) {
             MenuItem item = menu.findItem(R.id.menu_star);
-            item.setTitle(R.string.menu_unstar).setIcon(R.drawable.rating_important);
+            item.setTitle(R.string.menu_unstar).setIcon(R.drawable.ic_star);
         }
 
         super.onCreateOptionsMenu(menu, inflater);
@@ -209,9 +209,9 @@ public boolean onOptionsItemSelected(MenuItem item) {
                     mFavorite = !mFavorite;
 
                     if (mFavorite) {
-                        item.setTitle(R.string.menu_unstar).setIcon(R.drawable.rating_important);
+                        item.setTitle(R.string.menu_unstar).setIcon(R.drawable.ic_star);
                     } else {
-                        item.setTitle(R.string.menu_star).setIcon(R.drawable.rating_not_important);
+                        item.setTitle(R.string.menu_star).setIcon(R.drawable.ic_star_border);
                     }
 
                     final Uri uri = ContentUris.withAppendedId(mBaseUri, mEntriesIds[mCurrentPagerPos]);

mobile/src/main/java/net/etuldan/sparss/utils/PrefUtils.java

@@ -49,6 +49,7 @@ public class PrefUtils {
     public static final String PRELOAD_IMAGE_MODE = "preload_image_mode";
     public static final String DISPLAY_OLDEST_FIRST = "display_oldest_first";
     public static final String DISPLAY_ENTRIES_FULLSCREEN = "display_entries_fullscreen";
+    public static final String MARK_AS_READ = "display_mark_as_read";
 
     public static final String PROXY_ENABLED = "proxy.enabled";
     public static final String PROXY_PORT = "proxy.port";

mobile/src/main/java/net/etuldan/sparss/view/EntryView.java

@@ -75,7 +75,7 @@ public class EntryView extends WebView {
 
     private static final String TEXT_HTML = "text/html";
     private static final String HTML_IMG_REGEX = "(?i)<[/]?[ ]?img(.|\n)*?>";
-    private static final String BACKGROUND_COLOR = PrefUtils.getBoolean(PrefUtils.LIGHT_THEME, true) ? "#f6f6f6" : "#181b1f";
+    private static final String BACKGROUND_COLOR = PrefUtils.getBoolean(PrefUtils.LIGHT_THEME, true) ? "#f6f6f6" : "#000000";
     private static final String QUOTE_BACKGROUND_COLOR = PrefUtils.getBoolean(PrefUtils.LIGHT_THEME, true) ? "#e6e6e6" : "#383b3f";
     private static final String QUOTE_LEFT_COLOR = PrefUtils.getBoolean(PrefUtils.LIGHT_THEME, true) ? "#a6a6a6" : "#686b6f";
     private static final String TEXT_COLOR = PrefUtils.getBoolean(PrefUtils.LIGHT_THEME, true) ? "#000000" : "#C0C0C0";
@@ -86,8 +86,8 @@ public class EntryView extends WebView {
             + "body {max-width: 100%; margin: 0.3cm; font-family: sans-serif-light; color: " + TEXT_COLOR + "; background-color:" + BACKGROUND_COLOR + "; line-height: 150%} "
             + "* {max-width: 100%; word-break: break-word}"
             + "h1, h2 {font-weight: normal; line-height: 130%} "
-            + "h1 {font-size: 170%; margin-bottom: 0.1em} "
-            + "h2 {font-size: 140%} "
+            + "h1 {font-size: 140%; margin-bottom: 0.1em} "
+            + "h2 {font-size: 120%} "
             + "a {color: #0099CC}"
             + "h1 a {color: inherit; text-decoration: none}"
             + "img {height: auto} "