Skip to content

Commit

Permalink
Merge pull request #3 from NicosNicolaou16/version2.1.0
Browse files Browse the repository at this point in the history
Version2.1.0
  • Loading branch information
NicosNicolaou16 authored Sep 14, 2024
2 parents 754d0f3 + bd70d51 commit 7b27708
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 27 deletions.
2 changes: 1 addition & 1 deletion .idea/kotlinc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 9 additions & 9 deletions ImagePickerAndroid/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -46,18 +46,18 @@ android {
val appCompatVersion by extra("1.7.0")
val coreKtxVersion by extra("1.13.1")
val constraintLayoutVersion by extra("2.1.4")
val lifeCycleAndLiveDataCompilerAndViewModelKTXVersion by extra("2.8.4")
val activityVersion by extra("1.9.1")
val lifeCycleAndLiveDataCompilerAndViewModelKTXVersion by extra("2.8.5")
val activityVersion by extra("1.9.2")
val fragmentVersion by extra("1.6.1")
val coroutineVersion by extra("1.8.1")
val coroutineVersion by extra("1.9.0")
val multidexVersion by extra("2.0.1")
val materialDesignVersion by extra("1.12.0")
val recyclerViewVersion by extra("1.3.2")
val composeVersion by extra("1.7.0")
val composeLiveDataVersion by extra("1.7.0")
val composeFoundationVersion by extra("1.7.0")
val composeMaterialVersion by extra("1.6.8")
val composeMaterial3Version by extra("1.2.1")
val composeVersion by extra("1.7.1")
val composeLiveDataVersion by extra("1.7.1")
val composeFoundationVersion by extra("1.7.1")
val composeMaterialVersion by extra("1.7.1")
val composeMaterial3Version by extra("1.3.0")

dependencies {
implementation("androidx.core:core-ktx:$coreKtxVersion")
Expand Down Expand Up @@ -97,7 +97,7 @@ afterEvaluate {
register<MavenPublication>("release") {
groupId = "com.github.NicosNicolaou16"
artifactId = "ImagePickerAndroid"
version = "2.0.17"
version = "2.1.0"
from(components["release"])
}
}
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ THE BETA RELEASES MAYBE CONTAIN MAJOR/MINOR CHANGES
### Groovy

```Groovy
implementation 'com.github.NicosNicolaou16:ImagePickerAndroid:2.0.17'
implementation 'com.github.NicosNicolaou16:ImagePickerAndroid:2.1.0'
```

```Groovy
Expand All @@ -49,7 +49,7 @@ allprojects {
### Kotlin DSL

```Kotlin
implementation("com.github.NicosNicolaou16:ImagePickerAndroid:2.0.17")
implementation("com.github.NicosNicolaou16:ImagePickerAndroid:2.1.0")
```

```Kotlin
Expand All @@ -67,7 +67,7 @@ dependencyResolutionManagement {
```toml
[versions]
# other versions here...
imagePickerAndroid = "2.0.17"
imagePickerAndroid = "2.1.0"

[libraries]
# other libraries here...
Expand Down
4 changes: 2 additions & 2 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ android {
val appCompatVersion by extra("1.7.0")
val coreKtxVersion by extra("1.13.1")
val constraintLayoutVersion by extra("2.1.4")
val lifeCycleAndLiveDataCompilerAndViewModelKTXVersion by extra("2.8.4")
val lifeCycleAndLiveDataCompilerAndViewModelKTXVersion by extra("2.8.5")
val activityVersion by extra("1.8.0")
val fragmentVersion by extra("1.6.1")
val coroutineVersion by extra("1.8.1")
val coroutineVersion by extra("1.9.0")
val multidexVersion by extra("2.0.1")
val materialDesignVersion by extra("1.12.0")
val recyclerViewVersion by extra("1.3.2")
Expand Down
5 changes: 3 additions & 2 deletions app/src/main/res/layout/activity_main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView"
android:layout_width="match_parent"
android:layout_height="70dp"
android:layout_height="200dp"
android:layout_marginTop="16dp"
android:orientation="horizontal"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
app:layout_constraintEnd_toEndOf="parent"
Expand All @@ -48,7 +49,7 @@
android:id="@+id/pickImage"
android:layout_width="190dp"
android:layout_height="70dp"
android:layout_marginTop="70dp"
android:layout_marginTop="10dp"
android:text="@string/pick_image"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.497"
Expand Down
12 changes: 7 additions & 5 deletions app/src/main/res/layout/image_adapter_layout.xml
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="70dp"
android:layout_height="70dp">
android:layout_width="wrap_content"
android:layout_height="wrap_content">

<ImageView
android:id="@+id/image"
android:layout_width="70dp"
android:layout_height="70dp"
android:scaleType="centerCrop"
android:layout_width="200dp"
android:layout_height="200dp"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
android:scaleType="centerInside"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
Expand Down
10 changes: 5 additions & 5 deletions imagepickerandroidcompose/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -52,20 +52,20 @@ dependencies {
implementation(project(":ImagePickerAndroid"))
implementation("androidx.core:core-ktx:1.13.1")
implementation(platform("org.jetbrains.kotlin:kotlin-bom:2.0.20"))
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.4")
implementation("androidx.activity:activity-compose:1.9.1")
implementation(platform("androidx.compose:compose-bom:2024.09.00"))
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.5")
implementation("androidx.activity:activity-compose:1.9.2")
implementation(platform("androidx.compose:compose-bom:2024.09.01"))
implementation("androidx.compose.ui:ui")
implementation("androidx.compose.ui:ui-graphics")
implementation("androidx.compose.ui:ui-tooling-preview")
implementation("androidx.compose.material3:material3:1.3.0")
testImplementation("junit:junit:4.13.2")
androidTestImplementation("androidx.test.ext:junit:1.2.1")
androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
androidTestImplementation(platform("androidx.compose:compose-bom:2024.09.00"))
androidTestImplementation(platform("androidx.compose:compose-bom:2024.09.01"))
androidTestImplementation("androidx.compose.ui:ui-test-junit4")
debugImplementation("androidx.compose.ui:ui-tooling")
debugImplementation("androidx.compose.ui:ui-test-manifest:1.7.0")
debugImplementation("androidx.compose.ui:ui-test-manifest:1.7.1")
implementation("androidx.media3:media3-exoplayer:1.4.1")
implementation("androidx.media3:media3-ui:1.4.1")
}

0 comments on commit 7b27708

Please sign in to comment.