bugfix

Author: fengpeng

app/src/main/res/layout/activity_main.xml

@@ -48,7 +48,7 @@
         android:layout_marginStart="@dimen/pick_media_activity_margin"
         android:layout_marginTop="25dp"
         android:layout_marginBottom="@dimen/pick_media_activity_margin"
-        android:text="@string/pick_sigle_photo"
+        android:text="@string/pick_single_photo"
         android:textColor="@color/pick_chose_text_color"
         android:textSize="18sp" />
 

app/src/main/res/values/strings.xml

@@ -2,5 +2,5 @@
     <string name="app_name">MEDIA PICKER</string>
     <string name="file_provider">pizzk.media.picker.demo.file.provider</string>
     <string name="pick_demo_show">选择照片演示</string>
-    <string name="pick_sigle_photo">选取单张图片</string>
+    <string name="pick_single_photo">选取单张图片</string>
 </resources>

picker/src/main/java/pizzk/media/picker/adapter/PreviewPhotoAdapter.kt

@@ -37,10 +37,10 @@ class PreviewPhotoAdapter(private val context: Context, private val source: IMed
             views.removeAt(0)
         }
         container.addView(view, lp)
-        view.setOnClickListener(clickBlock)
         //
         val vPhoto = view.findViewById<PhotoView>(R.id.vPhoto)
         vPhoto.setOnScaleChangeListener { _, _, _ -> scaleBlock() }
+        vPhoto.setOnClickListener(clickBlock)
         val vVideo = view.findViewById<VideoView>(R.id.video)
         val vPause = view.findViewById<View>(R.id.vPause)
         //
@@ -91,7 +91,7 @@ class PreviewPhotoAdapter(private val context: Context, private val source: IMed
     fun resetScale() {
         val view = vCurrent ?: return
         val vPhoto = view.findViewById<PhotoView>(R.id.vPhoto)
-        if (vPhoto.scale != 1.0f) vPhoto.scale = 1.0f
+        vPhoto.scale = 1.0f
     }
 
     fun stopPlay() {

picker/src/main/java/pizzk/media/picker/arch/PickControl.kt

@@ -31,6 +31,8 @@ class PickControl private constructor() {
         private val disableFilter: (Uri?, String) -> Boolean = { _, _ -> false }
         private val dCallback: PickCallback = PickCallback()
 
+        //原图标志
+        private var originQuality: Boolean = false
         private val picker: PickControl = PickControl()
 
         fun obtain(clean: Boolean): PickControl = if (clean) picker.clean() else picker
@@ -42,6 +44,12 @@ class PickControl private constructor() {
         fun authority() = authority
 
         fun imageLoad() = imageLoad
+
+        fun originQuality() = originQuality
+
+        internal fun setOriginQuality(value: Boolean) {
+            originQuality = value
+        }
     }
 
     private var action: Int = ACTION_NONE
@@ -60,6 +68,9 @@ class PickControl private constructor() {
     //拍照
     private var cameraFile: File? = null
 
+    //标题
+    private var title: String = ""
+
     /**
      * 重置配置属性
      */
@@ -68,6 +79,7 @@ class PickControl private constructor() {
         filter = disableFilter
         crop = null
         limit = 1
+        title = ""
         callback = dCallback
         selects = emptyList()
         index = 0
@@ -98,6 +110,11 @@ class PickControl private constructor() {
         return this
     }
 
+    fun title(value: String): PickControl {
+        this.title = value
+        return this
+    }
+
     /**
      * 通过URI和MIME过滤
      */
@@ -164,6 +181,11 @@ class PickControl private constructor() {
      */
     internal fun limit(): Int = limit
 
+    /**
+     * 获取标题名称
+     */
+    internal fun title(): String = title
+
     /**
      * 获取回调函数
      */

picker/src/main/java/pizzk/media/picker/utils/PickUtils.kt

@@ -307,14 +307,9 @@ object PickUtils {
     fun hideSystemStatusBar(activity: Activity?): Boolean {
         activity ?: return false
         val decorView: View = activity.window.decorView
-        val flag: Boolean =
-            0 == (decorView.systemUiVisibility and View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION)
-        activity.intent.putExtra(KEY_NAVIGATION_FLAG, flag)
         decorView.systemUiVisibility = (View.SYSTEM_UI_FLAG_LAYOUT_STABLE
                 or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-                or View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
-                or View.SYSTEM_UI_FLAG_HIDE_NAVIGATION // hide nav bar
-                or View.SYSTEM_UI_FLAG_FULLSCREEN // hide status bar
+                or View.SYSTEM_UI_FLAG_FULLSCREEN
                 or View.SYSTEM_UI_FLAG_IMMERSIVE)
         return true
     }
@@ -323,12 +318,8 @@ object PickUtils {
     fun showSystemStatusBar(activity: Activity?): Boolean {
         activity ?: return false
         val decorView: View = activity.window.decorView
-        decorView.systemUiVisibility = (View.SYSTEM_UI_FLAG_LAYOUT_STABLE
-                or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN)
-        if (!activity.intent.getBooleanExtra(KEY_NAVIGATION_FLAG, false)) {
-            decorView.systemUiVisibility =
-                decorView.systemUiVisibility or View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
-        }
+        decorView.systemUiVisibility =
+            (View.SYSTEM_UI_FLAG_LAYOUT_STABLE or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN)
         return true
     }
 

picker/src/main/java/pizzk/media/picker/view/AlbumActivity.kt

@@ -24,6 +24,7 @@ import androidx.recyclerview.widget.SimpleItemAnimator
 import pizzk.media.picker.R
 import pizzk.media.picker.adapter.AlbumBucketAdapter
 import pizzk.media.picker.adapter.AlbumPhotoAdapter
+import pizzk.media.picker.arch.PickControl
 import pizzk.media.picker.arch.PickLiveSource
 import pizzk.media.picker.entity.AlbumBucket
 import pizzk.media.picker.source.IMedia
@@ -63,7 +64,6 @@ class AlbumActivity : AppCompatActivity() {
     private lateinit var bucketAdapter: AlbumBucketAdapter
 
     //标志位
-    private var useOriginPhoto: Boolean = false
     private var finishFlag: Boolean = false
 
     //动画
@@ -129,7 +129,10 @@ class AlbumActivity : AppCompatActivity() {
     private fun initViews() {
         //标题栏
         toolbar = findViewById(R.id.toolbar)
-        toolbar.title = getString(R.string.pick_media_select_picture)
+        toolbar.title = PickControl.obtain(clean = false).title()
+        if (toolbar.title.isNullOrEmpty()) {
+            toolbar.title = getString(R.string.pick_media_select_picture)
+        }
         toolbar.setNavigationOnClickListener { finish() }
         //提交按钮
         doneButton = PickActionMenu(toolbar) {
@@ -148,7 +151,7 @@ class AlbumActivity : AppCompatActivity() {
         tvSection = findViewById(R.id.tvSection)
         tvSection.setOnClickListener(::onWidgetClick)
         vCenter = findViewById(R.id.vCenter)
-        changeOriginState()
+        updateOriginState()
         llCenter = findViewById(R.id.llCenter)
         llCenter.setOnClickListener(::onWidgetClick)
         tvPreview = findViewById(R.id.tvPreview)
@@ -171,8 +174,8 @@ class AlbumActivity : AppCompatActivity() {
                 showSectionView(View.VISIBLE != sectionMask.visibility)
             }
             llCenter -> {
-                useOriginPhoto = !useOriginPhoto
-                changeOriginState()
+                PickControl.setOriginQuality(!PickControl.originQuality())
+                updateOriginState()
             }
             tvPreview -> {
                 val selects: List<String> = photoAdapter.getSelectList()
@@ -252,7 +255,8 @@ class AlbumActivity : AppCompatActivity() {
     }
 
     //调整原图选中状态
-    private fun changeOriginState(check: Boolean = useOriginPhoto) {
+    private fun updateOriginState() {
+        val check = PickControl.originQuality()
         val res: Int = if (check) R.drawable.pick_radio_checked else R.drawable.pick_radio_normal
         vCenter.background = ContextCompat.getDrawable(baseContext, res)
     }

picker/src/main/java/pizzk/media/picker/view/PreviewActivity.kt

@@ -4,9 +4,11 @@ import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Intent
 import android.net.Uri
+import android.os.Build
 import android.os.Bundle
 import android.view.View
 import android.view.ViewGroup
+import android.view.WindowManager
 import android.view.animation.AlphaAnimation
 import android.view.animation.Animation
 import android.widget.ImageView
@@ -127,6 +129,12 @@ class PreviewActivity : AppCompatActivity() {
         } else {
             systemUiVisibility = -1
         }
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            val lp: WindowManager.LayoutParams = window.attributes
+            val mode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
+            lp.layoutInDisplayCutoutMode = mode
+            window.attributes = lp
+        }
         //标题栏
         toolbar = findViewById(R.id.toolbar)
         toolbar.title = ""

picker/src/main/res/values/strings.xml

@@ -6,7 +6,7 @@
     <string name="open_camera_permission">请前往设置打开相机权限</string>
     <string name="open_external_storage_permission">请前往设置打开外部存储读写权限</string>
     <string name="pick_media_most_select_limit">最多只能选择%1$d张图片</string>
-    <string name="pick_media_all_picture">所有图片</string>
+    <string name="pick_media_all_picture">全部</string>
     <string name="pick_media_edit">编辑</string>
     <string name="pick_media_origin_picture">原图</string>
     <string name="pick_media_preview">预览</string>

picker/src/main/res/values/styles.xml

@@ -9,6 +9,11 @@
         <item name="android:background">@color/pick_accent_color</item>
         <item name="navigationIcon">@drawable/pick_title_back</item>
         <item name="titleTextColor">@color/pick_title_color</item>
+        <item name="titleTextAppearance">@style/PickToolbarTitle</item>
+    </style>
+
+    <style name="PickToolbarTitle">
+        <item name="android:textSize">16sp</item>
     </style>
 
     <style name="PickToolbarTheme" parent="@style/Theme.AppCompat.Light.DarkActionBar">