Preparations (#1)

* * migrate to another package

* * publish preparations

* * maven-publish

* * jitpack

* * fix path

* * version 0.1.6

* * small improvements

* * result parser

app/build.gradle

@@ -8,7 +8,7 @@ android {
     buildToolsVersion "30.0.1"
 
     defaultConfig {
-        applicationId "com.yatsenko.imagepicker"
+        applicationId "com.yatsenko.picropper"
         minSdkVersion 21
         targetSdkVersion 32
         versionCode 1
@@ -54,7 +54,7 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 
-    implementation project(':imagepicker')
+    implementation project(':picropper')
 
 
 }

app/src/androidTest/java/com/yatsenko/imagepickerdemo/ExampleInstrumentedTest.kt

@@ -1,4 +1,4 @@
-package com.yatsenko.imagepickerdemo
+package com.yatsenko.picropperdemo
 
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -19,6 +19,6 @@ class ExampleInstrumentedTest {
     fun useAppContext() {
         // Context of the app under test.
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("com.yatsenko.imagepicker", appContext.packageName)
+        assertEquals("com.yatsenko.picropper", appContext.packageName)
     }
 }

app/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.yatsenko.imagepickerdemo">
+    package="com.yatsenko.imagepicker">
 
     <application
         android:allowBackup="true"
@@ -9,18 +9,15 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/DemoTheme">
-        <activity android:name="com.yatsenko.imagepickerdemo.DemoActivity"
-            android:screenOrientation="portrait">
+        <activity android:name="com.yatsenko.imagepicker.DemoActivity"
+            android:screenOrientation="portrait"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-
-        <activity android:name="com.yatsenko.imagepicker.ui.PiCropperActivity"
-            android:screenOrientation="portrait"
-            android:exported="true" />
     </application>
 
 </manifest>

app/src/main/java/com/yatsenko/imagepickerdemo/DemoActivity.kt → app/src/main/java/com/yatsenko/imagepicker/DemoActivity.kt

@@ -1,9 +1,7 @@
-package com.yatsenko.imagepickerdemo
+package com.yatsenko.imagepicker
 
-import android.net.Uri
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import com.google.android.material.floatingactionbutton.FloatingActionButton
 
 class DemoActivity : AppCompatActivity() {
 

app/src/main/java/com/yatsenko/imagepickerdemo/HomeFragment.kt → app/src/main/java/com/yatsenko/imagepicker/HomeFragment.kt

@@ -1,5 +1,6 @@
-package com.yatsenko.imagepickerdemo
+package com.yatsenko.imagepicker
 
+import android.net.Uri
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -10,7 +11,8 @@ import androidx.navigation.fragment.findNavController
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.floatingactionbutton.FloatingActionButton
-import com.yatsenko.imagepicker.ui.PiCropperFragment
+import com.yatsenko.picropper.core.piCropperFragmentResultListener
+import com.yatsenko.picropper.ui.PiCropperFragment
 
 class HomeFragment: Fragment() {
 
@@ -20,11 +22,7 @@ class HomeFragment: Fragment() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setFragmentResultListener(PiCropperFragment.PiCROPPER_RESULT) { key, bundle ->
-            bundle.getStringArrayList(PiCropperFragment.RESULT_MEDIA)?.mapNotNull { it }?.let {
-                applyMediaResult(it)
-            }
-        }
+        piCropperFragmentResultListener(::applyMediaResult)
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
@@ -53,7 +51,7 @@ class HomeFragment: Fragment() {
         findNavController().navigate(R.id.piCropperFragment, args)
     }
 
-    private fun applyMediaResult(list: List<String>) {
+    private fun applyMediaResult(list: List<Uri>) {
         adapter.submitList(list)
     }
 }

app/src/main/java/com/yatsenko/imagepickerdemo/MediaAdapter.kt → app/src/main/java/com/yatsenko/imagepicker/MediaAdapter.kt

@@ -1,5 +1,6 @@
-package com.yatsenko.imagepickerdemo
+package com.yatsenko.imagepicker
 
+import android.net.Uri
 import android.view.ViewGroup
 import android.widget.ImageView
 import androidx.recyclerview.widget.RecyclerView
@@ -8,9 +9,9 @@ import com.bumptech.glide.request.RequestOptions
 
 class MediaAdapter: RecyclerView.Adapter<MediaAdapter.ViewHolder>() {
 
-    private val list: MutableList<String> = mutableListOf()
+    private val list: MutableList<Uri> = mutableListOf()
 
-    fun submitList(list: List<String>) {
+    fun submitList(list: List<Uri>) {
         this.list.clear()
         this.list.addAll(list)
         notifyDataSetChanged()
@@ -36,7 +37,7 @@ class MediaAdapter: RecyclerView.Adapter<MediaAdapter.ViewHolder>() {
             }
         }
 
-        fun bind(url: String) {
+        fun bind(url: Uri) {
             Glide.with(view)
                 .load(url)
                 .apply(RequestOptions().dontTransform())

app/src/main/res/navigation/main_graph.xml

@@ -6,12 +6,12 @@
 
     <fragment
         android:id="@+id/homeFragment"
-        android:name="com.yatsenko.imagepickerdemo.HomeFragment"
+        android:name="com.yatsenko.imagepicker.HomeFragment"
         android:label="HomeFragment" />
 
     <fragment
         android:id="@+id/piCropperFragment"
-        android:name="com.yatsenko.imagepicker.ui.PiCropperFragment"
+        android:name="com.yatsenko.picropper.ui.PiCropperFragment"
         android:label="PiCropperFragment" />
 
 

app/src/test/java/com/yatsenko/imagepickerdemo/ExampleUnitTest.kt

@@ -1,4 +1,4 @@
-package com.yatsenko.imagepickerdemo
+package com.yatsenko.picropperdemo
 
 import org.junit.Test
 

build.gradle

@@ -6,22 +6,14 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:4.0.2"
+        classpath "com.android.tools.build:gradle:7.0.4"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
 }
 
-allprojects {
-    repositories {
-        google()
-        mavenCentral()
-        maven { url "https://jitpack.io" }
-    }
-}
-
 task clean(type: Delete) {
     delete rootProject.buildDir
 }

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip

jitpack.yml

@@ -0,0 +1,2 @@
+jdk:
+  - openjdk11

imagepicker/build.gradle → picropper/build.gradle

@@ -2,14 +2,15 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
+apply plugin: 'maven-publish'
 
 android {
-    compileSdkVersion 30
-    buildToolsVersion "30.0.1"
+    compileSdkVersion 31
+    buildToolsVersion "31.0.0"
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 30
+        targetSdkVersion 31
     }
 
     buildTypes {
@@ -47,19 +48,30 @@ dependencies {
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.1"
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.1"
 
-    //todo remove this
     implementation "com.github.bumptech.glide:glide:4.12.0"
 
-    implementation 'com.github.yalantis:ucrop:2.2.8-native'
+    implementation 'com.github.yalantis:ucrop:2.2.8'
 
     implementation 'com.github.chrisbanes:PhotoView:2.3.0'
     implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.10.0'
     implementation 'androidx.viewpager2:viewpager2:1.0.0'
     implementation 'androidx.paging:paging-runtime-ktx:2.1.2'
     implementation 'com.google.android.exoplayer:exoplayer:2.18.0'
 
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    implementation 'com.github.jitpack:gradle-simple:1.0'
 
 }
+
+afterEvaluate {
+    publishing {
+        publications {
+            release(MavenPublication) {
+                from components.release
+
+                groupId = 'com.github.VladYatsenko'
+                artifactId = 'Pi-Cropper'
+                version = '0.1.6'
+            }
+        }
+    }
+}

imagepicker/src/main/AndroidManifest.xml → picropper/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.yatsenko.imagepicker">
+    package="com.yatsenko.picropper">
 
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>

picropper/src/main/java/com/yatsenko/picropper/core/Result.kt

@@ -0,0 +1,14 @@
+package com.yatsenko.picropper.core
+
+import android.net.Uri
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.setFragmentResultListener
+import com.yatsenko.picropper.ui.PiCropperFragment
+
+fun Fragment.piCropperFragmentResultListener(result: (List<Uri>) -> Unit) {
+    setFragmentResultListener(PiCropperFragment.PiCROPPER_RESULT) { key, bundle ->
+        bundle.getStringArrayList(PiCropperFragment.RESULT_MEDIA)?.mapNotNull { Uri.parse(it) }?.let {
+            result(it)
+        }
+    }
+}

imagepicker/src/main/java/com/yatsenko/imagepicker/core/Theme.kt → picropper/src/main/java/com/yatsenko/picropper/core/Theme.kt

@@ -1,8 +1,8 @@
-package com.yatsenko.imagepicker.core
+package com.yatsenko.picropper.core
 
 import android.content.Context
 import androidx.core.content.ContextCompat
-import com.yatsenko.imagepicker.R
+import com.yatsenko.picropper.R
 
 object Theme {
 

imagepicker/src/main/java/com/yatsenko/imagepicker/data/DataProvider.kt → picropper/src/main/java/com/yatsenko/picropper/data/DataProvider.kt

@@ -1,8 +1,8 @@
-package com.yatsenko.imagepicker.data
+package com.yatsenko.picropper.data
 
 import android.os.Handler
 import android.os.Looper
-import com.yatsenko.imagepicker.model.Media
+import com.yatsenko.picropper.model.Media
 import kotlin.math.min
 
 internal interface DataProvider {
@@ -11,7 +11,7 @@ internal interface DataProvider {
     fun loadBefore(key: String, callback: (List<Media>) -> Unit) {}
 }
 
-internal class SimpleDataProvider(val list: List<Media>) : DataProvider {
+internal class MediaDataProvider(val list: List<Media>) : DataProvider {
 
     override fun loadInitial() = list
 

imagepicker/src/main/java/com/yatsenko/imagepicker/data/ImageComparator.kt → picropper/src/main/java/com/yatsenko/picropper/data/ImageComparator.kt

@@ -1,6 +1,6 @@
-package com.yatsenko.imagepicker.data
+package com.yatsenko.picropper.data
 
-import com.yatsenko.imagepicker.model.Media
+import com.yatsenko.picropper.model.Media
 
 internal class ImageComparator: Comparator<Media> {
 

imagepicker/src/main/java/com/yatsenko/imagepicker/data/ImageReaderContract.kt → picropper/src/main/java/com/yatsenko/picropper/data/ImageReaderContract.kt

@@ -1,4 +1,4 @@
-package com.yatsenko.imagepicker.data
+package com.yatsenko.picropper.data
 
 import android.content.Context
 import android.database.Cursor
@@ -7,9 +7,9 @@ import android.provider.BaseColumns
 import android.provider.MediaStore
 import android.util.Log
 import androidx.core.database.getStringOrNull
-import com.yatsenko.imagepicker.R
-import com.yatsenko.imagepicker.model.Folder
-import com.yatsenko.imagepicker.model.Media
+import com.yatsenko.picropper.R
+import com.yatsenko.picropper.model.Folder
+import com.yatsenko.picropper.model.Media
 import java.util.*
 
 internal class ImageReaderContract(private val context: Context) {

imagepicker/src/main/java/com/yatsenko/imagepicker/model/AdapterResult.kt → picropper/src/main/java/com/yatsenko/picropper/model/AdapterResult.kt

@@ -1,8 +1,8 @@
-package com.yatsenko.imagepicker.model
+package com.yatsenko.picropper.model
 
 import android.widget.ImageView
-import com.yatsenko.imagepicker.widgets.crop.AspectRatioAdapter
-import com.yatsenko.imagepicker.widgets.crop.AspectRatioWrapper
+import com.yatsenko.picropper.widgets.crop.AspectRatioAdapter
+import com.yatsenko.picropper.widgets.crop.AspectRatioWrapper
 
 internal sealed class AdapterResult {
     data class FolderChanged(val folder: Folder): AdapterResult()