Skip to content

Commit

Permalink
Merge pull request #6 from NicosNicolaou16/version2.2.1
Browse files Browse the repository at this point in the history
Version2.2.1
  • Loading branch information
NicosNicolaou16 authored Nov 28, 2024
2 parents eb1b82e + 8549e68 commit 8eeb8ea
Show file tree
Hide file tree
Showing 7 changed files with 35 additions and 29 deletions.
20 changes: 10 additions & 10 deletions ImagePickerAndroid/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
id("org.jetbrains.kotlin.android")
id("kotlin-kapt")
id("maven-publish")
id("org.jetbrains.kotlin.plugin.compose") version "2.0.21"
id("org.jetbrains.kotlin.plugin.compose") version "2.1.0"
}

android {
Expand Down Expand Up @@ -44,20 +44,20 @@ 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.6")
val coreKtxVersion by extra("1.15.0")
val constraintLayoutVersion by extra("2.2.0")
val lifeCycleAndLiveDataCompilerAndViewModelKTXVersion by extra("2.8.7")
val activityVersion by extra("1.9.3")
val fragmentVersion by extra("1.6.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.4")
val composeLiveDataVersion by extra("1.7.4")
val composeFoundationVersion by extra("1.7.4")
val composeMaterialVersion by extra("1.7.4")
val composeMaterial3Version by extra("1.3.0")
val composeVersion by extra("1.7.5")
val composeLiveDataVersion by extra("1.7.5")
val composeFoundationVersion by extra("1.7.5")
val composeMaterialVersion by extra("1.7.5")
val composeMaterial3Version by extra("1.3.1")

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.2.0"
version = "2.2.1"
from(components["release"])
}
}
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ The library contain/features:

### Versioning

Gradle Version 8.7.1 <br />
Kotlin Version 2.0.21 <br />
Gradle Version 8.7.2 <br />
Kotlin Version 2.1.0 <br />
JDK Version 17 <br />
Minimum SDK 24 <br />
Target SDK 35 <br />
Expand All @@ -35,7 +35,7 @@ THE BETA RELEASES MAYBE CONTAIN MAJOR/MINOR CHANGES
### Groovy

```Groovy
implementation 'com.github.NicosNicolaou16:ImagePickerAndroid:2.2.0'
implementation 'com.github.NicosNicolaou16:ImagePickerAndroid:2.2.1'
```

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

```Kotlin
implementation("com.github.NicosNicolaou16:ImagePickerAndroid:2.2.0")
implementation("com.github.NicosNicolaou16:ImagePickerAndroid:2.2.1")
```

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

[libraries]
# other libraries here...
Expand Down
6 changes: 3 additions & 3 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ 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.6")
val coreKtxVersion by extra("1.15.0")
val constraintLayoutVersion by extra("2.2.0")
val lifeCycleAndLiveDataCompilerAndViewModelKTXVersion by extra("2.8.7")
val activityVersion by extra("1.8.0")
val fragmentVersion by extra("1.6.1")
val coroutineVersion by extra("1.9.0")
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/layout/activity_main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
android:fitsSystemWindows="true"
tools:context=".MainActivity">

<ImageView
Expand Down
6 changes: 3 additions & 3 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
id("com.android.application") version "8.7.1" apply false
id("com.android.library") version "8.7.1" apply false
id("org.jetbrains.kotlin.android") version "2.0.21" apply false
id("com.android.application") version "8.7.2" apply false
id("com.android.library") version "8.7.2" apply false
id("org.jetbrains.kotlin.android") version "2.1.0" apply false
}
14 changes: 7 additions & 7 deletions imagepickerandroidcompose/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id("com.android.application")
id("org.jetbrains.kotlin.android")
id("org.jetbrains.kotlin.plugin.compose") version "2.0.21"
id("org.jetbrains.kotlin.plugin.compose") version "2.1.0"
}

android {
Expand Down Expand Up @@ -50,22 +50,22 @@ android {

dependencies {
implementation(project(":ImagePickerAndroid"))
implementation("androidx.core:core-ktx:1.13.1")
implementation("androidx.core:core-ktx:1.15.0")
implementation(platform("org.jetbrains.kotlin:kotlin-bom:2.0.21"))
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.6")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.7")
implementation("androidx.activity:activity-compose:1.9.3")
implementation(platform("androidx.compose:compose-bom:2024.10.00"))
implementation(platform("androidx.compose:compose-bom:2024.11.00"))
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")
implementation("androidx.compose.material3:material3:1.3.1")
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.10.00"))
androidTestImplementation(platform("androidx.compose:compose-bom:2024.11.00"))
androidTestImplementation("androidx.compose.ui:ui-test-junit4")
debugImplementation("androidx.compose.ui:ui-tooling")
debugImplementation("androidx.compose.ui:ui-test-manifest:1.7.4")
debugImplementation("androidx.compose.ui:ui-test-manifest:1.7.5")
implementation("androidx.media3:media3-exoplayer:1.4.1")
implementation("androidx.media3:media3-ui:1.4.1")
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,18 @@ import android.os.Bundle
import android.util.Log
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.activity.enableEdgeToEdge
import androidx.compose.foundation.Image
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.displayCutoutPadding
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.safeDrawingPadding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.statusBarsPadding
import androidx.compose.foundation.lazy.LazyRow
import androidx.compose.foundation.lazy.items
import androidx.compose.material3.Button
Expand Down Expand Up @@ -53,7 +57,7 @@ class MainActivity : ComponentActivity() {
ImagePickerAndroidTheme {
// A surface container using the 'background' color from the theme
Surface(
modifier = Modifier.fillMaxSize(),
modifier = Modifier.fillMaxSize().statusBarsPadding(),
color = MaterialTheme.colorScheme.background
) {
ImagePicker()
Expand Down

0 comments on commit 8eeb8ea

Please sign in to comment.