Skip to content

Commit

Permalink
Merge pull request #33 from lovoo/develop
Browse files Browse the repository at this point in the history
Dev to master
  • Loading branch information
mario222k authored May 25, 2021
2 parents 89d32f6 + 686de02 commit c2ffc89
Show file tree
Hide file tree
Showing 521 changed files with 1,003 additions and 807 deletions.
9 changes: 6 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# android-pickpic (Pick a Picture)
[ ![Download](https://api.bintray.com/packages/lovoo/maven/PickPic/images/download.svg) ](https://bintray.com/lovoo/maven/PickPic/_latestVersion)
[![](https://jitpack.io/v/lovoo/android-pickpic.svg)](https://jitpack.io/#lovoo/android-pickpic)

## Description
Ready to use library that allows people to select pictures from their device and Facebook account. It's designed to unify multiple picture sources in one flow.
Expand All @@ -22,8 +22,11 @@ What PickPic will not handle are animated pictures and videos.
<img src="/images/screenshot.png" width="50%" height="50%" alt="Screenshot">
<img src="/images/screenshot2.png" width="50%" height="50%" alt="Screenshot">

## Import
PickPic is hosted on Jcenter. Add this to your project's `build.gradle`.
## Import
We have to find a new host. Since Bintray shuts down we do not deploy to any repository since 1.4.0.
We are sorry and try to find time to setup a new repository as host soon.

PickPic was hosted on Jcenter. Add this to your project's `build.gradle`.

```groovy
repositories {
Expand Down
14 changes: 6 additions & 8 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,12 @@ dependencies {

implementation "androidx.recyclerview:recyclerview:$recycler_view_version"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:$arch_version"
// implementation "com.lovoo.android.pickpic:pickapp:1.3.0-SNAPSHOT"
// implementation "com.lovoo.android.pickpic:pickui:1.3.0-SNAPSHOT"
// implementation "com.lovoo.android.pickpic:pickcore:1.3.0-SNAPSHOT"
// implementation "com.lovoo.android.pickpic:pickcam:1.3.0-SNAPSHOT"
// implementation "com.lovoo.android.pickpic:pickfacebook:1.3.0-SNAPSHOT"
// implementation "io.reactivex.rxjava2:rxjava:$rx_java_version"
// implementation "io.reactivex.rxjava2:rxandroid:$rx_android_version"
// implementation "com.facebook.android:facebook-login:$facebook_version"
/*implementation "com.github.lovoo.android.pickpic:pickcore:1.5.0-SNAPSHOT"
implementation "com.github.lovoo.android.pickpic:pickui:1.5.0-SNAPSHOT"
implementation "com.github.lovoo.android.pickpic:pickapp:1.5.0-SNAPSHOT"
implementation "io.reactivex.rxjava2:rxjava:$rx_java_version"
implementation "io.reactivex.rxjava2:rxandroid:$rx_android_version"
implementation "com.facebook.android:facebook-login:$facebook_version"*/


// fix dependency conflict with Facebook sdk
Expand Down
6 changes: 1 addition & 5 deletions app/src/main/res/values-de/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,11 @@
<string name="pickpic_menu_faq">FAQ</string>
<string name="pickpic_menu_delete">entfernen</string>


<string name="pickpic_label_count_of_max_selected">%1$d / %2$d ausgewählt</string>
<plurals name="pickpic_label_selection_more">
<item quantity="one">Wähle noch ein Foto aus</item>
<item quantity="other">Wähle mindestens noch %d Fotos aus</item>
</plurals>
<plurals name="pickpic_label_selection_count">
<item quantity="one">%d Foto ausgewählt</item>
<item quantity="other">%d Fotos ausgewählt</item>
</plurals>
<plurals name="pickpic_label_selection_max">
<item quantity="one">Du kannst maximal ein Foto auswählen</item>
<item quantity="other">Du kannst maximal %d Fotos auswählen</item>
Expand Down
33 changes: 19 additions & 14 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -43,25 +43,14 @@ buildscript {
ext.artifactory_pwd = artifactory_pwd

repositories {
google {
content {
excludeGroupByRegex "com\\.lovoo\\.android\\.pickpic.*"
}
}
jcenter {
content {
excludeGroupByRegex "com\\.lovoo\\.android\\.pickpic.*"
}
}
google()
jcenter()
maven {
url 'https://lovoo.jfrog.io/artifactory/libs-snapshot'
credentials {
username artifactory_user
password artifactory_pwd
}
content {
includeGroupByRegex "com\\.lovoo\\.android\\.pickpic.*"
}
}
}
dependencies {
Expand All @@ -76,16 +65,27 @@ buildscript {
}
}


allprojects {
apply plugin: 'com.jfrog.artifactory'
apply plugin: 'maven-publish'

setGroup('com.lovoo.android.pickpic')
setGroup('com.github.lovoo.android.pickpic')
setVersion(version_name)

repositories {
google()
jcenter()
maven {
url 'https://lovoo.jfrog.io/artifactory/libs-snapshot'
credentials {
username artifactory_user
password artifactory_pwd
}
content {
includeGroupByRegex "com\\.github\\.lovoo\\.android\\.pick.*"
}
}
}

tasks.withType(Javadoc).all {
Expand All @@ -100,6 +100,7 @@ gradle.projectsEvaluated {
}

project('pickcore') {
apply from: '../documentation.gradle'
artifactoryPublish.dependsOn('build')
publishing {
publications {
Expand All @@ -119,6 +120,7 @@ project('pickcore') {
}

project('pickui') {
apply from: '../documentation.gradle'
artifactoryPublish.dependsOn('build')
publishing {
publications {
Expand All @@ -138,6 +140,7 @@ project('pickui') {
}

project('pickcam') {
apply from: '../documentation.gradle'
artifactoryPublish.dependsOn('build')
publishing {
publications {
Expand All @@ -157,6 +160,7 @@ project('pickcam') {
}

project('pickfacebook') {
apply from: '../documentation.gradle'
artifactoryPublish.dependsOn('build')
publishing {
publications {
Expand All @@ -176,6 +180,7 @@ project('pickfacebook') {
}

project('pickapp') {
apply from: '../documentation.gradle'
artifactoryPublish.dependsOn('build')
publishing {
publications {
Expand Down
2 changes: 1 addition & 1 deletion documentation.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ dokka {
dir = "./"

// URL showing where the source code can be accessed through the web browser
url = "https://github.com/lovoo/android-pickpic/blob/master"
url = "https://github.com/lovoo/android-pickpic/blob/master/${project.getName()}"

// Suffix which is used to append the line number to the URL. Use #L for GitHub
suffix = "#L"
Expand Down
3 changes: 1 addition & 2 deletions pickapp/javadoc/pickapp/alltypes/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@
| [com.lovoo.android.pickapp.adapter.PickPicAdapter](../com.lovoo.android.pickapp.adapter/-pick-pic-adapter/index.md) | [FragmentStatePagerAdapter](#) that contains [GalleryFragment](#) and optional [FbGalleryFragment](#). |
| [com.lovoo.android.pickapp.model.PickPicConfig](../com.lovoo.android.pickapp.model/-pick-pic-config/index.md) | The configuration for [com.lovoo.android.pickapp.view.PickPicActivity](../com.lovoo.android.pickapp.view/-pick-pic-activity/index.md) behaviour. |
| [com.lovoo.android.pickapp.model.PickType](../com.lovoo.android.pickapp.model/-pick-type/index.md) | Simple enum class that contains all the types used by [com.lovoo.android.pickapp.adapter.PickPicAdapter](../com.lovoo.android.pickapp.adapter/-pick-pic-adapter/index.md) |
| [com.lovoo.android.pickapp.view.Preview](../com.lovoo.android.pickapp.view/-preview/index.md) | UI extension to handle PickPicActivities Preview ViewPager. It observes [Picker.SelectionState](../com.lovoo.android.pickapp.model/-picker/-selection-state/index.md) changes and show, update or hide the Preview. You have to call destroy if the UI is removed. |
| [com.lovoo.android.pickapp.view.Preview](../com.lovoo.android.pickapp.view/-preview/index.md) | UI extension to handle PickPicActivities Preview ViewPager. It observes [Picker.State](../com.lovoo.android.pickapp.model/-picker/-state/index.md) changes and show, update or hide the Preview. You have to call destroy if the UI is removed. |
| [com.lovoo.android.pickapp.view.PreviewFragment](../com.lovoo.android.pickapp.view/-preview-fragment/index.md) | The [Fragment](#) that is used for the [Preview](../com.lovoo.android.pickapp.view/-preview/index.md) ViewPager. |
| [com.lovoo.android.pickapp.view.ReverseLayoutManager](../com.lovoo.android.pickapp.view/-reverse-layout-manager/index.md) | Custom LinearLayoutManager that triggers scroll to position 0 on view added when it is enabled. |
| [com.lovoo.android.pickapp.adapter.SelectionAdapter](../com.lovoo.android.pickapp.adapter/-selection-adapter/index.md) | [RecyclerView.Adapter](#) for the selection bar. |
| [com.lovoo.android.pickapp.view.Selectionbar](../com.lovoo.android.pickapp.view/-selectionbar/index.md) | UI extension to handle the PickPicActivities Selectionbar and RecyclerView. It observes changes emitted by [Picker](../com.lovoo.android.pickapp.model/-picker/index.md) and add, removes or select the Thumbnails. You have to call destroy if the UI is removed. |
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

# getCount

`fun getCount(): `[`Int`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-int/index.html) [(source)](https://github.com/lovoo/android-pickpic/blob/master/pickapp/src/main/kotlin/com/lovoo/android/pickapp/adapter/PickPicAdapter.kt#L27)
`fun getCount(): `[`Int`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-int/index.html) [(source)](https://github.com/lovoo/android-pickpic/blob/master/pickapp/pickapp/src/main/kotlin/com/lovoo/android/pickapp/adapter/PickPicAdapter.kt#L42)
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

# getItem

`fun getItem(position: `[`Int`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-int/index.html)`): Fragment` [(source)](https://github.com/lovoo/android-pickpic/blob/master/pickapp/src/main/kotlin/com/lovoo/android/pickapp/adapter/PickPicAdapter.kt#L25)
`fun getItem(position: `[`Int`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-int/index.html)`): Fragment` [(source)](https://github.com/lovoo/android-pickpic/blob/master/pickapp/pickapp/src/main/kotlin/com/lovoo/android/pickapp/adapter/PickPicAdapter.kt#L40)
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

# getPageTitle

`fun getPageTitle(position: `[`Int`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-int/index.html)`): `[`String`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-string/index.html) [(source)](https://github.com/lovoo/android-pickpic/blob/master/pickapp/src/main/kotlin/com/lovoo/android/pickapp/adapter/PickPicAdapter.kt#L32)
`fun getPageTitle(position: `[`Int`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-int/index.html)`): `[`String`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-string/index.html) [(source)](https://github.com/lovoo/android-pickpic/blob/master/pickapp/pickapp/src/main/kotlin/com/lovoo/android/pickapp/adapter/PickPicAdapter.kt#L47)
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# PickPicAdapter

`class PickPicAdapter : FragmentStatePagerAdapter` [(source)](https://github.com/lovoo/android-pickpic/blob/master/pickapp/src/main/kotlin/com/lovoo/android/pickapp/adapter/PickPicAdapter.kt#L19)
`class PickPicAdapter : FragmentStatePagerAdapter` [(source)](https://github.com/lovoo/android-pickpic/blob/master/pickapp/pickapp/src/main/kotlin/com/lovoo/android/pickapp/adapter/PickPicAdapter.kt#L34)

[FragmentStatePagerAdapter](#) that contains [GalleryFragment](#) and optional [FbGalleryFragment](#).

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# &lt;init&gt;

`SelectionAdapter()`
`SelectionAdapter(slots: `[`Int`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-int/index.html)`)`

[RecyclerView.Adapter](#) for the selection bar.

Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

# bind

`fun bind(uri: Uri?, isSelected: `[`Boolean`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-boolean/index.html)`, onClickListener: ((View, Uri) -> `[`Unit`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-unit/index.html)`)?): `[`Unit`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-unit/index.html) [(source)](https://github.com/lovoo/android-pickpic/blob/master/pickapp/src/main/kotlin/com/lovoo/android/pickapp/adapter/SelectionAdapter.kt#L109)
`fun bind(uri: Uri?, isSelected: `[`Boolean`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-boolean/index.html)`, onClickListener: ((View, Uri) -> `[`Unit`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-unit/index.html)`)?): `[`Unit`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-unit/index.html) [(source)](https://github.com/lovoo/android-pickpic/blob/master/pickapp/pickapp/src/main/kotlin/com/lovoo/android/pickapp/adapter/SelectionAdapter.kt#L117)
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

# create

`fun create(parent: ViewGroup, imageEngine: ImageEngine): `[`SelectionAdapter.ViewHolder`](index.md) [(source)](https://github.com/lovoo/android-pickpic/blob/master/pickapp/src/main/kotlin/com/lovoo/android/pickapp/adapter/SelectionAdapter.kt#L135)
`fun create(parent: ViewGroup, imageEngine: ImageEngine): `[`SelectionAdapter.ViewHolder`](index.md) [(source)](https://github.com/lovoo/android-pickpic/blob/master/pickapp/pickapp/src/main/kotlin/com/lovoo/android/pickapp/adapter/SelectionAdapter.kt#L131)
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,14 @@

# ViewHolder

`class ViewHolder : ViewHolder` [(source)](https://github.com/lovoo/android-pickpic/blob/master/pickapp/src/main/kotlin/com/lovoo/android/pickapp/adapter/SelectionAdapter.kt#L92)
`class ViewHolder : ViewHolder` [(source)](https://github.com/lovoo/android-pickpic/blob/master/pickapp/pickapp/src/main/kotlin/com/lovoo/android/pickapp/adapter/SelectionAdapter.kt#L110)

### Constructors

| Name | Summary |
|---|---|
| [&lt;init&gt;](-init-.md) | `ViewHolder(view: View, imageEngine: ImageEngine)` |

### Properties

| Name | Summary |
|---|---|
| [size](size.md) | `val size: MutableLiveData<`[`Int`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-int/index.html)`>` |

### Functions

| Name | Summary |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# add

`fun add(uri: Uri): `[`Boolean`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-boolean/index.html) [(source)](https://github.com/lovoo/android-pickpic/blob/master/pickapp/src/main/kotlin/com/lovoo/android/pickapp/adapter/SelectionAdapter.kt#L64)
`fun add(uri: Uri): `[`Int`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-int/index.html) [(source)](https://github.com/lovoo/android-pickpic/blob/master/pickapp/pickapp/src/main/kotlin/com/lovoo/android/pickapp/adapter/SelectionAdapter.kt#L80)

### Parameters

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# clear

`fun clear(): `[`Unit`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-unit/index.html) [(source)](https://github.com/lovoo/android-pickpic/blob/master/pickapp/src/main/kotlin/com/lovoo/android/pickapp/adapter/SelectionAdapter.kt#L87)
`fun clear(): `[`Unit`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-unit/index.html) [(source)](https://github.com/lovoo/android-pickpic/blob/master/pickapp/pickapp/src/main/kotlin/com/lovoo/android/pickapp/adapter/SelectionAdapter.kt#L105)

Clear the selection list.

Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

# getItemCount

`fun getItemCount(): `[`Int`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-int/index.html) [(source)](https://github.com/lovoo/android-pickpic/blob/master/pickapp/src/main/kotlin/com/lovoo/android/pickapp/adapter/SelectionAdapter.kt#L47)
`fun getItemCount(): `[`Int`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-int/index.html) [(source)](https://github.com/lovoo/android-pickpic/blob/master/pickapp/pickapp/src/main/kotlin/com/lovoo/android/pickapp/adapter/SelectionAdapter.kt#L61)
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[pickapp](../../index.md) / [com.lovoo.android.pickapp.adapter](../index.md) / [SelectionAdapter](index.md) / [getListCount](./get-list-count.md)

# getListCount

`fun getListCount(): `[`Int`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-int/index.html) [(source)](https://github.com/lovoo/android-pickpic/blob/master/pickapp/pickapp/src/main/kotlin/com/lovoo/android/pickapp/adapter/SelectionAdapter.kt#L74)
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# get

`fun get(index: `[`Int`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-int/index.html)`): Uri?` [(source)](https://github.com/lovoo/android-pickpic/blob/master/pickapp/src/main/kotlin/com/lovoo/android/pickapp/adapter/SelectionAdapter.kt#L58)
`fun get(index: `[`Int`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-int/index.html)`): Uri?` [(source)](https://github.com/lovoo/android-pickpic/blob/master/pickapp/pickapp/src/main/kotlin/com/lovoo/android/pickapp/adapter/SelectionAdapter.kt#L72)

### Parameters

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# SelectionAdapter

`class SelectionAdapter : Adapter<`[`SelectionAdapter.ViewHolder`](-view-holder/index.md)`>` [(source)](https://github.com/lovoo/android-pickpic/blob/master/pickapp/src/main/kotlin/com/lovoo/android/pickapp/adapter/SelectionAdapter.kt#L20)
`class SelectionAdapter : Adapter<`[`SelectionAdapter.ViewHolder`](-view-holder/index.md)`>` [(source)](https://github.com/lovoo/android-pickpic/blob/master/pickapp/pickapp/src/main/kotlin/com/lovoo/android/pickapp/adapter/SelectionAdapter.kt#L32)

[RecyclerView.Adapter](#) for the selection bar.

Expand All @@ -16,7 +16,7 @@

| Name | Summary |
|---|---|
| [&lt;init&gt;](-init-.md) | `SelectionAdapter()`<br>[RecyclerView.Adapter](#) for the selection bar. |
| [&lt;init&gt;](-init-.md) | `SelectionAdapter(slots: `[`Int`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-int/index.html)`)`<br>[RecyclerView.Adapter](#) for the selection bar. |

### Properties

Expand All @@ -29,10 +29,11 @@

| Name | Summary |
|---|---|
| [add](add.md) | `fun add(uri: Uri): `[`Boolean`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-boolean/index.html) |
| [add](add.md) | `fun add(uri: Uri): `[`Int`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-int/index.html) |
| [clear](clear.md) | `fun clear(): `[`Unit`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-unit/index.html)<br>Clear the selection list. |
| [get](get.md) | `fun get(index: `[`Int`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-int/index.html)`): Uri?` |
| [getItemCount](get-item-count.md) | `fun getItemCount(): `[`Int`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-int/index.html) |
| [getListCount](get-list-count.md) | `fun getListCount(): `[`Int`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-int/index.html) |
| [onBindViewHolder](on-bind-view-holder.md) | `fun onBindViewHolder(holder: `[`SelectionAdapter.ViewHolder`](-view-holder/index.md)`, position: `[`Int`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-int/index.html)`): `[`Unit`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-unit/index.html) |
| [onCreateViewHolder](on-create-view-holder.md) | `fun onCreateViewHolder(parent: ViewGroup, viewType: `[`Int`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-int/index.html)`): `[`SelectionAdapter.ViewHolder`](-view-holder/index.md) |
| [remove](remove.md) | `fun remove(uri: Uri): `[`Int`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-int/index.html) |
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

# onBindViewHolder

`fun onBindViewHolder(holder: `[`SelectionAdapter.ViewHolder`](-view-holder/index.md)`, position: `[`Int`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-int/index.html)`): `[`Unit`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-unit/index.html) [(source)](https://github.com/lovoo/android-pickpic/blob/master/pickapp/src/main/kotlin/com/lovoo/android/pickapp/adapter/SelectionAdapter.kt#L49)
`fun onBindViewHolder(holder: `[`SelectionAdapter.ViewHolder`](-view-holder/index.md)`, position: `[`Int`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-int/index.html)`): `[`Unit`](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-unit/index.html) [(source)](https://github.com/lovoo/android-pickpic/blob/master/pickapp/pickapp/src/main/kotlin/com/lovoo/android/pickapp/adapter/SelectionAdapter.kt#L63)
Loading

0 comments on commit c2ffc89

Please sign in to comment.