summaryrefslogtreecommitdiff
path: root/org.fox.ttrss/src/main
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2015-05-11 02:23:16 +0400
committerAndrew Dolgov <[email protected]>2015-05-11 02:23:16 +0400
commita0fb92e34aaa399517b5ebc95fe6c910d208e1d7 (patch)
tree992b2bdf1b8118341fd978c1f7c3b33815e73d26 /org.fox.ttrss/src/main
parent42a4fd5d3978c7c488e31389b0caa8096649c363 (diff)
actionbar hiding tweaks; bump version
Diffstat (limited to 'org.fox.ttrss/src/main')
-rwxr-xr-xorg.fox.ttrss/src/main/AndroidManifest.xml4
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java13
-rwxr-xr-xorg.fox.ttrss/src/main/res/values/style.xml2
3 files changed, 13 insertions, 6 deletions
diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml
index 0a4b339f..d569cf72 100755
--- a/org.fox.ttrss/src/main/AndroidManifest.xml
+++ b/org.fox.ttrss/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.fox.ttrss"
- android:versionCode="325"
- android:versionName="1.99" >
+ android:versionCode="326"
+ android:versionName="1.100" >
<uses-sdk
android:minSdkVersion="15"
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java
index 4192e481..c66a4d95 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java
@@ -10,7 +10,9 @@ import android.os.Bundle;
import android.os.Handler;
import android.preference.PreferenceManager;
import android.support.v4.app.Fragment;
+import android.support.v7.app.ActionBar;
import android.text.Html;
+import android.util.Log;
import android.util.TypedValue;
import android.view.ContextMenu;
import android.view.ContextMenu.ContextMenuInfo;
@@ -177,11 +179,14 @@ public class ArticleFragment extends Fragment {
scrollView.setOnScrollChangedListener(new NotifyingScrollView.OnScrollChangedListener() {
@Override
public void onScrollChanged(ScrollView who, int l, int t, int oldl, int oldt) {
- if (t > 0 && t > oldt) {
- m_activity.getSupportActionBar().hide();
- } else {
- m_activity.getSupportActionBar().show();
+ ActionBar ab = m_activity.getSupportActionBar();
+
+ if (t >= oldt && t >= ab.getHeight()) {
+ ab.hide();
+ } else if (t <= ab.getHeight() | oldt - t >= 10) {
+ ab.show();
}
+
}
});
}
diff --git a/org.fox.ttrss/src/main/res/values/style.xml b/org.fox.ttrss/src/main/res/values/style.xml
index 982fb1a7..d82b40a8 100755
--- a/org.fox.ttrss/src/main/res/values/style.xml
+++ b/org.fox.ttrss/src/main/res/values/style.xml
@@ -1,6 +1,8 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<style name="LightTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+ <item name="windowActionBarOverlay">true</item>
+
<item name="statusBarHintColor">?colorPrimary</item>
<item name="ttrssHorizontalDivider">@android:drawable/divider_horizontal_bright</item>
<item name="feedlistBackground">#e0e0e0</item>