沉浸模式

linroid · linroid · commit d236e5bb5436 · 2017-01-25T11:40:49.000+08:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -2,6 +2,7 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'kotlin-android-extensions'
+apply plugin: 'com.jakewharton.hugo'
 
 android {
     compileSdkVersion 25
@@ -59,8 +60,6 @@ dependencies {
     testCompile 'junit:junit:4.12'
     // tools
     compile 'com.jakewharton.timber:timber:4.4.0'
-    //    compile 'com.jakewharton:butterknife:8.4.0'
-    //    kapt 'com.jakewharton:butterknife-compiler:8.4.0'
     compile "com.github.hotchemi:permissionsdispatcher:${permissionsdispatcher_version}"
     kapt "com.github.hotchemi:permissionsdispatcher-processor:${permissionsdispatcher_version}"
     compile 'com.jakewharton:kotterknife:0.1.0-SNAPSHOT'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -34,7 +34,7 @@
         <activity
             android:name=".ui.viewer.ImageViewerActivity"
             android:parentActivityName=".ui.gallery.GalleryActivity"
-            android:theme="@style/AppTheme.Viewer">
+            android:theme="@style/AppTheme.Immersive">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".ui.gallery.GalleryActivity"/>
diff --git a/app/src/main/java/com/linroid/rxshell/RxShell.java b/app/src/main/java/com/linroid/rxshell/RxShell.java
@@ -4,6 +4,7 @@
 import android.content.SharedPreferences;
 import android.os.HandlerThread;
 import android.support.annotation.CheckResult;
+import android.util.Log;
 
 import com.linroid.rxshell.exception.ShellExecuteErrorException;
 import com.linroid.rxshell.exception.ShellTerminateException;
@@ -22,7 +23,6 @@
 import rx.Subscriber;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
-import timber.log.Timber;
 
 /**
  * @author linroid <linroid@gmail.com>
@@ -109,7 +109,7 @@ public void onError(String output) {
         }).doOnNext(new Action1<String>() {
             @Override
             public void call(String s) {
-                Timber.i("read line: %s", s);
+                Log.v(TAG, "read line: " + s);
             }
         });
     }
@@ -164,7 +164,7 @@ public <T> Observable<T> create(Observable.OnSubscribe<T> source) {
 
     @CheckResult
     public Observable<Boolean> installBinary(@NotNull final Context context, @NotNull final InputStream stream, @NotNull final String binaryName, final float version) {
-        Timber.i("install binary: %s", binaryName);
+        Log.i(TAG, "install binary: " + binaryName);
         return create(new Observable.OnSubscribe<Boolean>() {
             @Override
             public void call(Subscriber<? super Boolean> subscriber) {
@@ -189,7 +189,7 @@ public void call(Subscriber<? super Boolean> subscriber) {
                         subscriber.onNext(binaryFile.setExecutable(true));
                         subscriber.onCompleted();
                     } catch (IOException e) {
-                        Timber.e(e, "error when install binary %s", binaryName);
+                        Log.e(TAG, "error when install binary " + binaryName, e);
                         subscriber.onError(e);
                     } finally {
                         IOUtils.closeQuietly(sink);
diff --git a/app/src/main/kotlin/com/linroid/viewit/ui/BaseActivity.kt b/app/src/main/kotlin/com/linroid/viewit/ui/BaseActivity.kt
@@ -5,6 +5,7 @@ import android.support.annotation.CallSuper
 import android.support.annotation.LayoutRes
 import android.support.v4.app.NavUtils
 import android.support.v7.widget.Toolbar
+import android.view.MenuItem
 import com.linroid.viewit.R
 import com.trello.rxlifecycle.components.support.RxAppCompatActivity
 
@@ -31,4 +32,13 @@ abstract class BaseActivity : RxAppCompatActivity() {
 
     @LayoutRes
     abstract fun provideContentLayoutId(): Int
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        if (item.itemId == android.R.id.home) {
+            finish()
+            return true
+        }
+
+        return super.onOptionsItemSelected(item)
+    }
 }
diff --git a/app/src/main/kotlin/com/linroid/viewit/ui/ImmersiveActivity.kt b/app/src/main/kotlin/com/linroid/viewit/ui/ImmersiveActivity.kt
@@ -0,0 +1,112 @@
+package com.linroid.viewit.ui
+
+import android.os.Build
+import android.os.Bundle
+import android.view.MotionEvent
+import android.view.View
+import android.view.View.*
+import hugo.weaving.DebugLog
+import timber.log.Timber
+
+/**
+ * 沉浸模式的 Activity
+ * 如果继承这个 Activity，主题需要使用 @style/AppTheme.Immersive
+ *
+ * @author linroid <linroid@gmail.com>
+ * @since 25/01/2017
+ */
+abstract class ImmersiveActivity : BaseActivity() {
+    /**
+     * the number of milliseconds to wait after
+     * user interaction before hiding the system UI.
+     */
+    private val AUTO_HIDE_DELAY_MILLIS = 3000L
+
+    private val ACTION_BAR_HIDE_DELAY_MILLIS = 300L
+
+    private lateinit var decorView: View
+
+    private val delayHideCallback = Runnable { hide() }
+    private val delayHideActionBarCallback = Runnable { supportActionBar?.hide() }
+
+    @DebugLog
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        decorView = window.decorView;
+        decorView.setOnSystemUiVisibilityChangeListener {
+            Timber.v("height changed:${decorView.height}, visibility:$it")
+        }
+        setImmersiveMode()
+    }
+
+    private fun setImmersiveMode() {
+        var uiOptions = decorView.systemUiVisibility
+        if (Build.VERSION.SDK_INT >= 19) {
+            uiOptions = uiOptions or SYSTEM_UI_FLAG_IMMERSIVE_STICKY
+        }
+        uiOptions = uiOptions or SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+        uiOptions = uiOptions or SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
+//        uiOptions = uiOptions or SYSTEM_UI_FLAG_LOW_PROFILE
+        decorView.systemUiVisibility = uiOptions
+        delayHide()
+    }
+
+    @DebugLog
+    override fun onWindowFocusChanged(hasFocus: Boolean) {
+        super.onWindowFocusChanged(hasFocus)
+    }
+
+    @DebugLog
+    override fun dispatchTouchEvent(ev: MotionEvent): Boolean {
+        if (ev.actionMasked == MotionEvent.ACTION_DOWN) {
+            if (componentsHidden()) {
+                show();
+                return true
+            }
+        }
+        delayHide()
+        return super.dispatchTouchEvent(ev)
+    }
+
+    fun toggle() {
+        if (componentsHidden()) {
+            show()
+        } else {
+            hide()
+        }
+    }
+
+    fun delayHide() {
+        decorView.removeCallbacks(delayHideCallback)
+        decorView.postDelayed(delayHideCallback, AUTO_HIDE_DELAY_MILLIS)
+    }
+
+    protected fun componentsHidden(): Boolean {
+        return supportActionBar?.isShowing?.not() ?: true
+    }
+
+    @DebugLog
+    private fun hide() {
+        var uiOptions = decorView.systemUiVisibility
+        uiOptions = uiOptions or SYSTEM_UI_FLAG_HIDE_NAVIGATION
+        uiOptions = uiOptions or SYSTEM_UI_FLAG_FULLSCREEN
+        decorView.systemUiVisibility = uiOptions
+        decorView.postDelayed(delayHideActionBarCallback, ACTION_BAR_HIDE_DELAY_MILLIS)
+        shouldHideComponents()
+    }
+
+    @DebugLog
+    private fun show() {
+        var uiOptions = decorView.systemUiVisibility
+        uiOptions = uiOptions and SYSTEM_UI_FLAG_HIDE_NAVIGATION.inv()
+        uiOptions = uiOptions and SYSTEM_UI_FLAG_FULLSCREEN.inv()
+        decorView.systemUiVisibility = uiOptions
+        supportActionBar?.show()
+        decorView.removeCallbacks(delayHideActionBarCallback)
+        shouldShowComponents()
+        delayHide()
+    }
+
+    abstract protected fun shouldHideComponents()
+    abstract protected fun shouldShowComponents()
+}
diff --git a/app/src/main/kotlin/com/linroid/viewit/ui/gallery/GalleryActivity.kt b/app/src/main/kotlin/com/linroid/viewit/ui/gallery/GalleryActivity.kt
@@ -56,7 +56,8 @@ class GalleryActivity : BaseActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        appInfo = intent.getParcelableExtra(ARG_APP_INFO)
+        val arguments = intent.extras
+        appInfo = arguments.getParcelable(ARG_APP_INFO)
         appName = packageManager.getApplicationLabel(appInfo);
         supportActionBar?.title = appName
         DaggerGalleryGraph.builder()
diff --git a/app/src/main/kotlin/com/linroid/viewit/ui/viewer/ImageViewerActivity.kt b/app/src/main/kotlin/com/linroid/viewit/ui/viewer/ImageViewerActivity.kt
@@ -5,6 +5,7 @@ import android.content.pm.ApplicationInfo
 import android.os.Bundle
 import android.os.PersistableBundle
 import android.support.v4.view.ViewPager
+import android.view.Menu
 import butterknife.bindView
 import com.linroid.viewit.App
 import com.linroid.viewit.R
@@ -13,6 +14,7 @@ import com.linroid.viewit.ioc.DaggerViewerGraph
 import com.linroid.viewit.ioc.ViewerGraph
 import com.linroid.viewit.ioc.module.ViewerModule
 import com.linroid.viewit.ui.BaseActivity
+import com.linroid.viewit.ui.ImmersiveActivity
 import com.linroid.viewit.utils.ARG_APP_INFO
 import com.linroid.viewit.utils.ARG_POSITION
 import rx.Observable
@@ -23,7 +25,8 @@ import javax.inject.Inject
  * @author linroid <linroid@gmail.com>
  * @since 08/01/2017
  */
-class ImageViewerActivity() : BaseActivity() {
+class ImageViewerActivity() : ImmersiveActivity() {
+
     @Inject lateinit var observable: Observable<Image>
 
     lateinit private var appInfo: ApplicationInfo
@@ -44,7 +47,6 @@ class ImageViewerActivity() : BaseActivity() {
 
     override fun provideContentLayoutId(): Int = R.layout.activity_image_viewer
 
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         val arguments: Bundle = savedInstanceState ?: intent.extras
@@ -65,19 +67,30 @@ class ImageViewerActivity() : BaseActivity() {
             override fun onPageSelected(position: Int) {
                 this@ImageViewerActivity.position = position
             }
-
         })
         observable.observeOn(AndroidSchedulers.mainThread()).toList().subscribe({
             adapter = ImageViewerPagerAdapter(supportFragmentManager, it.size)
             viewPager.offscreenPageLimit = 2
             viewPager.adapter = adapter
             viewPager.currentItem = position
         })
+        supportActionBar?.setDisplayShowTitleEnabled(false)
     }
 
     override fun onSaveInstanceState(outState: Bundle?, outPersistentState: PersistableBundle?) {
         super.onSaveInstanceState(outState, outPersistentState)
         outState?.putInt(ARG_POSITION, position)
         outState?.putParcelable(ARG_APP_INFO, appInfo)
     }
+
+    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+        menuInflater.inflate(R.menu.menu_image_viewer, menu)
+        return super.onCreateOptionsMenu(menu)
+    }
+
+    override fun shouldHideComponents() {
+    }
+
+    override fun shouldShowComponents() {
+    }
 }
diff --git a/app/src/main/kotlin/com/linroid/viewit/widget/InsetsFrameLayout.kt b/app/src/main/kotlin/com/linroid/viewit/widget/InsetsFrameLayout.kt
@@ -0,0 +1,36 @@
+package com.linroid.viewit.widget
+
+import android.content.Context
+import android.support.v4.view.ViewCompat
+import android.util.AttributeSet
+import android.widget.FrameLayout
+import timber.log.Timber
+
+/**
+ * @author linroid <linroid></linroid>@gmail.com>
+ * *
+ * @since 25/01/2017
+ */
+class InsetsFrameLayout : FrameLayout {
+    constructor(context: Context, attrs: AttributeSet) : super(context, attrs) {
+        init()
+    }
+
+    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {
+        init()
+    }
+
+    constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0, defStyleRes: Int) : super(context, attrs, defStyleAttr, defStyleRes) {
+        init()
+    }
+
+    fun init() {
+        clipToPadding = false
+        fitsSystemWindows = true
+        ViewCompat.setOnApplyWindowInsetsListener(this) { v, insets ->
+            Timber.i(insets.toString())
+            setPadding(0, insets.systemWindowInsetTop, 0, 0);
+            return@setOnApplyWindowInsetsListener insets.consumeSystemWindowInsets()
+        }
+    }
+}
diff --git a/app/src/main/res/layout/activity_gallery.xml b/app/src/main/res/layout/activity_gallery.xml
@@ -9,14 +9,9 @@
     <android.support.design.widget.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:theme="@style/AppTheme.AppBarOverlay">
+        android:theme="@style/Widget.AppBarOverlay">
 
-        <android.support.v7.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            app:popupTheme="@style/AppTheme.PopupOverlay" />
+        <include layout="@layout/toolbar"/>
 
     </android.support.design.widget.AppBarLayout>
 
diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
@@ -9,15 +9,9 @@
     <android.support.design.widget.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:theme="@style/AppTheme.AppBarOverlay">
-
-        <android.support.v7.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            app:popupTheme="@style/AppTheme.PopupOverlay" />
+        android:theme="@style/Widget.AppBarOverlay">
 
+        <include layout="@layout/toolbar"/>
     </android.support.design.widget.AppBarLayout>
 
     <android.support.v7.widget.RecyclerView
diff --git a/app/src/main/res/layout/activity_image_viewer.xml b/app/src/main/res/layout/activity_image_viewer.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             xmlns:app="http://schemas.android.com/apk/res-auto"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent"
+             android:orientation="vertical">
 
     <android.support.v4.view.ViewPager
         android:id="@+id/view_pager"
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>
-</LinearLayout>
+
+    <com.linroid.viewit.widget.InsetsFrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <android.support.v7.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="@android:color/transparent"
+            android:theme="@style/Widget.AppBarOverlay"
+            app:popupTheme="@style/Widget.Popup"/>
+    </com.linroid.viewit.widget.InsetsFrameLayout>
+
+</FrameLayout>
diff --git a/app/src/main/res/layout/toolbar.xml b/app/src/main/res/layout/toolbar.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v7.widget.Toolbar
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/toolbar"
+    android:layout_width="match_parent"
+    android:layout_height="?attr/actionBarSize"
+    android:background="?attr/colorPrimary"
+    android:theme="@style/Widget.AppBarOverlay"
+    app:popupTheme="@style/Widget.Popup"/>
diff --git a/app/src/main/res/menu/menu_image_viewer.xml b/app/src/main/res/menu/menu_image_viewer.xml
diff --git a/app/src/main/res/values-v21/themes.xml b/app/src/main/res/values-v21/themes.xml
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
diff --git a/build.gradle b/build.gradle
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
