Merge pull request #248 from sangcomz/release/1.0.0-beta01

Release/1.0.0 beta01

.github/workflows/android.yml

@@ -13,10 +13,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: set up JDK 1.8
+    - name: set up JDK 11
       uses: actions/setup-java@v1
       with:
-        java-version: 1.8
+        java-version: 11
     - name: Build with Gradle
       run: ./gradlew build
     - name: assemble and jacoco

.github/workflows/release.yml

@@ -0,0 +1,23 @@
+name: release library
+
+on:
+  push:
+    branches: [ master ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: set up JDK 11
+        uses: actions/setup-java@v1
+        with:
+          java-version: 11
+
+      - name: Build with Gradle
+        run: ./gradlew build
+
+      - name: Release
+        run: sh release.sh

FishBun/build.gradle

@@ -3,9 +3,12 @@ apply plugin: 'kotlin-android'
 apply plugin: 'com.hiya.jacoco-android'
 apply plugin: 'de.mobilej.unmock'
 
+jacoco {
+    toolVersion = "0.8.7"
+}
+
 buildscript {
     repositories {
-        jcenter()
         mavenCentral()
         maven {
             url "https://plugins.gradle.org/m2/"
@@ -27,8 +30,6 @@ android {
         minSdkVersion gradle.minSdk
         targetSdkVersion gradle.targetSdk
         consumerProguardFile('proguard-rules.pro')
-        versionCode gradle.versionCode
-        versionName gradle.versionName
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -53,7 +54,6 @@ android {
     }
 }
 
-apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'co.riiid.gradle'
 
 apply from: '../publish/release.gradle'
@@ -64,16 +64,14 @@ unMock {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    compileOnly "androidx.appcompat:appcompat:$rootProject.androidx_version"
+    implementation "androidx.appcompat:appcompat:$rootProject.androidx_version"
 
-    compile "androidx.constraintlayout:constraintlayout:$rootProject.constraint_version"
-    compile "com.google.android.material:material:$rootProject.material_version"
-    compile "androidx.recyclerview:recyclerview:$rootProject.recyclerview_version"
+    implementation "androidx.constraintlayout:constraintlayout:$rootProject.constraint_version"
+    implementation "com.google.android.material:material:$rootProject.material_version"
 
-
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.mockito:mockito-core:3.0.0'
-    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation 'androidx.test:runner:1.4.0'
     androidTestImplementation 'org.mockito:mockito-android:3.0.0'
 
     compileOnly "io.coil-kt:coil:$rootProject.coil_version"
@@ -84,10 +82,12 @@ tasks.withType(Javadoc).all {
     enabled = false
 }
 
-install {
-    repositories.mavenInstaller {
-        pom.groupId = 'com.sangcomz'
-        pom.version = gradle.versionName
-        pom.artifactId = project.name
+configurations.all{
+    resolutionStrategy {
+        eachDependency { details ->
+            if ('org.jacoco' == details.requested.group) {
+                details.useVersion "0.8.7"
+            }
+        }
     }
 }

FishBun/src/main/java/com/sangcomz/fishbun/BaseProperty.kt

@@ -1,6 +1,8 @@
 package com.sangcomz.fishbun
 
+import android.content.Intent
 import android.net.Uri
+import androidx.activity.result.ActivityResultLauncher
 
 /**
  * Created by sangcomz on 13/05/2017.
@@ -23,4 +25,8 @@ interface BaseProperty {
     fun exceptMimeType(exceptMimeTypeList: List<MimeType>): FishBunCreator
 
     fun startAlbum()
+
+    fun startAlbumWithOnActivityResult(requestCode: Int)
+
+    fun startAlbumWithActivityResultCallback(activityResultLauncher: ActivityResultLauncher<Intent>)
 }

FishBun/src/main/java/com/sangcomz/fishbun/CustomizationProperty.kt

@@ -60,5 +60,5 @@ interface CustomizationProperty {
 
     fun setSpecifyFolderList(specifyFolderList: List<String>): FishBunCreator
 
-    fun hasCameraInPickerPage(isCamera: Boolean): FishBunCreator
+    fun hasCameraInPickerPage(hasCamera: Boolean): FishBunCreator
 }

FishBun/src/main/java/com/sangcomz/fishbun/FishBun.kt

@@ -3,6 +3,7 @@ package com.sangcomz.fishbun
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
+import androidx.activity.result.ActivityResultLauncher
 import androidx.fragment.app.Fragment
 import com.sangcomz.fishbun.adapter.image.ImageAdapter
 import java.lang.ref.WeakReference
@@ -23,6 +24,7 @@ class FishBun private constructor(activity: Activity?, fragment: Fragment?) {
     }
 
     companion object {
+        @Deprecated("To be deleted along with the startAlbum function")
         const val FISHBUN_REQUEST_CODE = 27
         const val INTENT_PATH = "intent_path"
 
@@ -46,6 +48,16 @@ class FishBun private constructor(activity: Activity?, fragment: Fragment?) {
                 else -> throw NullPointerException("Activity or Fragment Null")
             }
         }
+
+        fun startWithRegisterForActivityResult(
+            activityResultLauncher: ActivityResultLauncher<Intent>,
+            intent: Intent
+        ) {
+            when {
+                activity != null || fragment != null -> activityResultLauncher.launch(intent)
+                else -> throw NullPointerException("Activity or Fragment Null")
+            }
+        }
     }
 }
 

FishBun/src/main/java/com/sangcomz/fishbun/FishBunCreator.kt

@@ -1,8 +1,10 @@
 package com.sangcomz.fishbun
 
+import android.content.Context
 import android.content.Intent
 import android.graphics.drawable.Drawable
 import android.net.Uri
+import androidx.activity.result.ActivityResultLauncher
 import com.sangcomz.fishbun.ui.album.ui.AlbumActivity
 import com.sangcomz.fishbun.ui.picker.PickerActivity
 import kotlin.collections.ArrayList
@@ -72,7 +74,7 @@ class FishBunCreator(private val fishBun: FishBun, private val fishton: Fishton)
         fishton.hasCameraInPickerPage = hasCamera
     }
 
-
+    @Deprecated("To be deleted along with the startAlbum function")
     override fun setRequestCode(requestCode: Int): FishBunCreator = this.apply {
         this.requestCode = requestCode
     }
@@ -176,32 +178,56 @@ class FishBunCreator(private val fishBun: FishBun, private val fishton: Fishton)
         fishton.specifyFolderList = specifyFolderList
     }
 
+    private fun prepareStartAlbum(context: Context) {
+        checkNotNull(fishton.imageAdapter)
+        exceptionHandling()
+        setDefaultValue(context)
+    }
+
+    @Deprecated("instead startAlbumWithOnActivityResult(requestCode)", ReplaceWith("startAlbumWithOnActivityResult(requestCode)"))
     override fun startAlbum() {
         val fishBunContext = fishBun.fishBunContext
         val context = fishBunContext.getContext()
 
-        exceptionHandling()
+        prepareStartAlbum(context)
+
+        fishBunContext.startActivityForResult(getIntent(context), requestCode)
+    }
+
+    override fun startAlbumWithOnActivityResult(requestCode: Int) {
+        val fishBunContext = fishBun.fishBunContext
+        val context = fishBunContext.getContext()
+
+        prepareStartAlbum(context)
 
-        if (fishton.imageAdapter == null) throw NullPointerException("ImageAdapter is Null")
+        fishBunContext.startActivityForResult(getIntent(context), requestCode)
+    }
+
+    override fun startAlbumWithActivityResultCallback(activityResultLauncher: ActivityResultLauncher<Intent>) {
+        val fishBunContext = fishBun.fishBunContext
+        val context = fishBunContext.getContext()
+
+        prepareStartAlbum(context)
 
+        fishBunContext.startWithRegisterForActivityResult(activityResultLauncher, getIntent(context))
+    }
+
+    private fun getIntent(context: Context): Intent =
+        if (fishton.isStartInAllView) {
+            PickerActivity.getPickerActivityIntent(context, 0L, fishton.titleAlbumAllView, 0)
+        } else {
+            Intent(context, AlbumActivity::class.java)
+        }
+
+    private fun setDefaultValue(context: Context) {
         with(fishton) {
             setDefaultMessage(context)
             setMenuTextColor()
             setDefaultDimen(context)
         }
-
-        val intent: Intent =
-            if (fishton.isStartInAllView) {
-                PickerActivity.getPickerActivityIntent(context, 0L, fishton.titleAlbumAllView, 0)
-            } else {
-                Intent(context, AlbumActivity::class.java)
-            }
-
-        fishBunContext.startActivityForResult(intent, requestCode)
     }
 
     private fun exceptionHandling() {
-        //TODO support camera
         if (fishton.hasCameraInPickerPage) {
             fishton.hasCameraInPickerPage = fishton.specifyFolderList.isEmpty()
         }

FishBun/src/main/res/layout/detail_item.xml

@@ -6,17 +6,12 @@
 
     <com.sangcomz.fishbun.util.TouchImageView
         android:id="@+id/img_detail_image"
-        android:layout_width="0dp"
+        android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_marginLeft="0dp"
-        android:layout_marginTop="0dp"
-        android:layout_marginRight="0dp"
-        android:layout_marginBottom="0dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.5" />
+        app:layout_constraintTop_toTopOf="parent" />
 
     <ImageView
         android:layout_width="match_parent"

FishBunDemo/build.gradle

@@ -3,7 +3,6 @@ apply plugin: 'kotlin-android'
 
 buildscript {
     repositories {
-        jcenter()
         mavenCentral()
     }
 }
@@ -74,18 +73,14 @@ dependencies {
     implementation "androidx.appcompat:appcompat:$rootProject.androidx_version"
     implementation "androidx.recyclerview:recyclerview:$rootProject.recyclerview_version"
 
-    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.0-beta-4'
+    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.8.1'
 
     implementation "androidx.legacy:legacy-support-v4:1.0.0"
-    implementation 'com.squareup.picasso:picasso:2.71828'
     implementation "com.github.bumptech.glide:glide:$rootProject.glide_version"
     implementation "io.coil-kt:coil:$rootProject.coil_version"
 }
 
 buildscript {
-    repositories {
-        jcenter()
-    }
     dependencies {
         classpath 'com.github.triplet.gradle:play-publisher:1.2.2'
         // NOTE: Do not place your application dependencies here; they belong

FishBunDemo/src/main/AndroidManifest.xml

@@ -20,7 +20,9 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity android:name="com.sangcomz.fishbundemo.WithActivityActivity" />
-        <activity android:name="com.sangcomz.fishbundemo.MainActivity">
+        <activity
+            android:name="com.sangcomz.fishbundemo.MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

FishBunDemo/src/main/java/com/sangcomz/fishbundemo/ImageAdapter.kt

@@ -3,13 +3,13 @@ package com.sangcomz.fishbundemo
 import android.content.Context
 import android.net.Uri
 import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
-import android.widget.ImageView
 import androidx.recyclerview.widget.RecyclerView
+import coil.api.load
+import coil.size.Scale
+import coil.transform.CircleCropTransformation
+import coil.transform.RoundedCornersTransformation
 import com.sangcomz.fishbundemo.databinding.ItemBinding
-import com.squareup.picasso.Picasso
-import java.util.*
 
 /**
  * Created by sangc on 2015-11-06.
@@ -26,12 +26,8 @@ class ImageAdapter(
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         val imagePath = imagePaths[position]
-
-        Picasso.get()
-            .load(imagePath)
-            .fit()
-            .centerCrop()
-            .into(holder.imageView)
+
+        holder.imageView.load(imagePath)
 
         holder.imageView.setOnClickListener { imageController.setImgMain(imagePath) }
     }

FishBunDemo/src/main/java/com/sangcomz/fishbundemo/ImageController.kt

@@ -2,18 +2,18 @@ package com.sangcomz.fishbundemo
 
 import android.net.Uri
 import android.widget.ImageView
-import com.squareup.picasso.Picasso
+import coil.api.load
+import coil.size.Scale
 
 /**
  * Created by sangc on 2015-11-06.
  */
 class ImageController(private val imgMain: ImageView) {
 
     fun setImgMain(path: Uri) {
-        Picasso.get()
-            .load(path)
-            .fit()
-            .centerCrop()
-            .into(imgMain)
+        imgMain.load(path) {
+            scale(Scale.FILL)
+            scale(Scale.FIT)
+        }
     }
 }