Merge pull request #225 from NickalasB/update_to_android_11

Update to android 11
sangcomz · Nov 4, 2020 · 381f201 · 381f201
2 parents cd55a65 + eb96bd5
commit 381f201
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 15 deletions.
diff --git a/FishBun/src/main/java/com/sangcomz/fishbun/datasource/PickerIntentDataSourceImpl.kt b/FishBun/src/main/java/com/sangcomz/fishbun/datasource/PickerIntentDataSourceImpl.kt
@@ -9,11 +9,13 @@ class PickerIntentDataSourceImpl(private val intent: Intent) : PickerIntentDataS
             && intent.hasExtra(ARG_ALBUM_ID)
             && intent.hasExtra(ARG_ALBUM_POSITION)
         )
-            AlbumData(
-                intent.getLongExtra(ARG_ALBUM_ID, -1),
-                intent.getStringExtra(ARG_ALBUM_NAME),
-                intent.getIntExtra(ARG_ALBUM_POSITION, -1)
-            )
+            intent.getStringExtra(ARG_ALBUM_NAME)?.let {
+                AlbumData(
+                    intent.getLongExtra(ARG_ALBUM_ID, -1),
+                        it,
+                    intent.getIntExtra(ARG_ALBUM_POSITION, -1)
+                )
+            }
         else
             null
     }

diff --git a/FishBun/src/main/res/layout/header_item.xml b/FishBun/src/main/res/layout/header_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_margin="1dp"
@@ -9,7 +10,9 @@
         android:id="@+id/rel_header_area"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="#d9d9d9">
+        android:background="#d9d9d9"
+        android:foreground="?attr/selectableItemBackground"
+        tools:targetApi="m">
 
         <ImageView
             android:layout_width="wrap_content"

diff --git a/FishBunDemo/src/main/AndroidManifest.xml b/FishBunDemo/src/main/AndroidManifest.xml
@@ -6,6 +6,12 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.CAMERA" />
 
+    <queries>
+        <intent>
+            <action android:name="android.media.action.IMAGE_CAPTURE" />
+        </intent>
+    </queries>
+
     <application
         android:name="com.sangcomz.fishbundemo.CommonApplication"
         android:allowBackup="true"
@@ -23,5 +29,4 @@
         </activity>
         <activity android:name="com.sangcomz.fishbundemo.WithFragmentActivity" />
     </application>
-
 </manifest>
diff --git a/FishBunDemo/src/main/java/com/sangcomz/fishbundemo/SubFragment.kt b/FishBunDemo/src/main/java/com/sangcomz/fishbundemo/SubFragment.kt
@@ -14,6 +14,7 @@ import com.sangcomz.fishbun.FishBun
 import com.sangcomz.fishbun.adapter.image.impl.CoilAdapter
 import kotlinx.android.synthetic.main.fragment_sub.*
 import java.util.*
+import kotlin.collections.ArrayList
 
 /**
  * A simple [Fragment] subclass.
@@ -52,7 +53,7 @@ class SubFragment : Fragment() {
         super.onActivityResult(requestCode, resultCode, data)
         when (requestCode) {
             FishBun.FISHBUN_REQUEST_CODE -> if (resultCode == Activity.RESULT_OK) {
-                path = data!!.getParcelableArrayListExtra(FishBun.INTENT_PATH)
+                path = data?.getParcelableArrayListExtra(FishBun.INTENT_PATH) ?: arrayListOf()
                 imageAdapter.changePath(path)
             }
         }

diff --git a/FishBunDemo/src/main/java/com/sangcomz/fishbundemo/WithActivityActivity.kt b/FishBunDemo/src/main/java/com/sangcomz/fishbundemo/WithActivityActivity.kt
@@ -10,6 +10,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.sangcomz.fishbun.FishBun
+import com.sangcomz.fishbun.MimeType
 import com.sangcomz.fishbun.adapter.image.impl.GlideAdapter
 import com.sangcomz.fishbun.adapter.image.impl.CoilAdapter
 import kotlinx.android.synthetic.main.activity_withactivity.*
@@ -46,7 +47,7 @@ class WithActivityActivity : AppCompatActivity() {
         super.onActivityResult(requestCode, resultCode, imageData)
 
         if (requestCode == FishBun.FISHBUN_REQUEST_CODE && resultCode == RESULT_OK) {
-            path = imageData!!.getParcelableArrayListExtra(FishBun.INTENT_PATH)
+            path = imageData?.getParcelableArrayListExtra(FishBun.INTENT_PATH) ?: arrayListOf()
             imageAdapter.changePath(path)
         }
     }
@@ -84,8 +85,8 @@ class WithActivityActivity : AppCompatActivity() {
                         .setSelectedImages(path)
                         .setAlbumSpanCount(2, 3)
                         .setButtonInAlbumActivity(false)
-                        .setCamera(true)
-                        .exceptGif(true)
+                        .hasCameraInPickerPage(true)
+                        .exceptMimeType(arrayListOf(MimeType.GIF))
                         .setReachLimitAutomaticClose(true)
                         .setHomeAsUpIndicatorDrawable(
                             ContextCompat.getDrawable(
@@ -119,8 +120,8 @@ class WithActivityActivity : AppCompatActivity() {
                         .setSelectedImages(path)
                         .setAlbumSpanCount(1, 2)
                         .setButtonInAlbumActivity(true)
-                        .setCamera(false)
-                        .exceptGif(true)
+                        .hasCameraInPickerPage(false)
+                        .exceptMimeType(arrayListOf(MimeType.GIF))
                         .setReachLimitAutomaticClose(false)
                         .setHomeAsUpIndicatorDrawable(
                             ContextCompat.getDrawable(

diff --git a/README.md b/README.md
@@ -142,6 +142,13 @@ and to allow the following permissions in your `Manifest`:
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
+If your app targets Android 11 with compileSdk/targetSdk >= 30 then you will need to add this to the manifest (outside of the application block) in order to capture pictures with the device camera. [Android documentation here](https://developer.android.com/about/versions/11/privacy/package-visibility):
+
+    <queries>
+        <intent>
+            <action android:name="android.media.action.IMAGE_CAPTURE" />
+        </intent>
+    </queries>
 
 ## How to Use
 

diff --git a/settings.gradle b/settings.gradle
@@ -4,5 +4,5 @@ gradle.ext.versionCode = 31
 gradle.ext.versionName = '1.0.0-alpha03'
 
 gradle.ext.set('minSdk', 15)
-gradle.ext.set('targetSdk', 29)
-gradle.ext.set('compileSdk', 29)
+gradle.ext.set('targetSdk', 30)
+gradle.ext.set('compileSdk', 30)