Skip to content
This repository was archived by the owner on Jun 28, 2025. It is now read-only.

Commit 1eb036c

Browse files
MoronsMorons
committed
Small tweaks 1.0.3
1 parent 3fb7e0c commit 1eb036c

File tree

8 files changed

+28
-32
lines changed

8 files changed

+28
-32
lines changed

‎.idea/misc.xml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎androidLib/build.gradle.kts‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ android {
1717
buildTypes {
1818
release {
1919
isMinifyEnabled = false
20-
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
20+
proguardFiles(getDefaultProguardFile(name = "proguard-android-optimize.txt"), "proguard-rules.pro")
2121
}
2222
}
2323
publishing {
@@ -41,7 +41,7 @@ publishing {
4141
register<MavenPublication>(name = "release") {
4242
groupId = "com.github.Morons"
4343
artifactId = "android-library"
44-
version = "1.0"
44+
version = "1.0.3"
4545

4646
afterEvaluate {
4747
from(components["release"])
@@ -54,12 +54,12 @@ dependencies {
5454

5555
implementation("io.ktor:ktor-client-core:2.3.6")
5656
implementation("com.github.bumptech.glide:glide:4.15.1")
57-
implementation("com.github.bumptech.glide:compiler:4.13.2")
57+
annotationProcessor("com.github.bumptech.glide:compiler:4.15.1")
5858
implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.1")
5959
implementation("org.mongodb:bson:4.11.0")
6060
implementation("androidx.core:core-ktx:1.12.0")
6161
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2")
62-
implementation("androidx.activity:activity-compose:1.8.0")
62+
implementation("androidx.activity:activity-compose:1.8.1")
6363
implementation(platform("androidx.compose:compose-bom:2023.10.01"))
6464
implementation("androidx.compose.ui:ui")
6565
implementation("androidx.compose.ui:ui-graphics")
@@ -74,4 +74,5 @@ dependencies {
7474
androidTestImplementation("androidx.compose.ui:ui-test-junit4")
7575
debugImplementation("androidx.compose.ui:ui-tooling")
7676
debugImplementation("androidx.compose.ui:ui-test-manifest")
77+
7778
}

‎androidLib/src/main/kotlin/za/co/zone/androidLib/components/AppTextField.kt‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -158,17 +158,17 @@ fun AppTextField(
158158
)
159159
},
160160
// FIXME: https://github.com/material-components/material-components-android/issues/3528
161-
leadingIcon = {
162-
if (leadingIcon != null) {
163-
IconButton(onClick = { onLeadingButtonClick() }) {
164-
Icon(
165-
imageVector = leadingIcon,
166-
contentDescription = null,
167-
modifier = Modifier.size(24.dp)
168-
)
169-
}
170-
} else {}
171-
},
161+
// leadingIcon = {
162+
// if (leadingIcon != null) {
163+
// IconButton(onClick = { onLeadingButtonClick() }) {
164+
// Icon(
165+
// imageVector = leadingIcon,
166+
// contentDescription = null,
167+
// modifier = Modifier.size(24.dp)
168+
// )
169+
// }
170+
// } else {}
171+
// },
172172
trailingIcon = {
173173
if (trailingIcon != null) {
174174
IconButton(

‎androidLib/src/main/kotlin/za/co/zone/androidLib/util/AppFileUtils.kt‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import android.graphics.Bitmap
66
import android.net.Uri
77
import android.os.Environment
88
import android.provider.MediaStore
9+
import android.provider.MediaStore.Images.Media
910
import android.util.Log
1011
import androidx.core.content.FileProvider
1112
import za.co.zone.androidLib.util.VersionCheck.isAtLeastQ29
@@ -57,13 +58,13 @@ object AppFileUtils {
5758

5859
fun Bitmap.saveImageToSharedMediaStore(context: Context): Uri? {
5960
val contentUri: Uri = if (isAtLeastQ29()) {
60-
MediaStore.Images.Media.getContentUri(MediaStore.VOLUME_EXTERNAL_PRIMARY)
61+
Media.getContentUri(MediaStore.VOLUME_EXTERNAL_PRIMARY)
6162
} else {
62-
MediaStore.Images.Media.EXTERNAL_CONTENT_URI
63+
Media.EXTERNAL_CONTENT_URI
6364
}
6465
val contentResolver = context.contentResolver
6566
val newImageDetails = ContentValues()
66-
newImageDetails.put(MediaStore.Images.Media.DISPLAY_NAME, TEMP_IMAGE_FILENAME)
67+
newImageDetails.put(Media.DISPLAY_NAME, TEMP_IMAGE_FILENAME)
6768
val imageContentUri = contentResolver.insert(contentUri, newImageDetails)
6869
try {
6970
contentResolver.openFileDescriptor(imageContentUri!!, "w", null).use { fileDescriptor ->

‎androidLib/src/main/kotlin/za/co/zone/androidLib/util/BitmapUtils.kt‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,7 @@ fun Uri.getByteArrayStringFromUri(context: Context): String {
2424
fun String.decodeImageString(): ByteArray = decode(this, DEFAULT)
2525

2626
fun ByteArray.toBitmap(): Bitmap? =
27-
if (isNotEmpty()) {
28-
BitmapFactory.decodeByteArray(this, 0, this.size)
29-
} else {
30-
null
31-
}
27+
if (isNotEmpty()) BitmapFactory.decodeByteArray(this, 0, this.size) else null
3228

3329
fun String.toBitmap(): Bitmap? =
3430
if (this.isNotEmpty()) this.decodeImageString().toBitmap() else null

‎androidLib/src/main/kotlin/za/co/zone/androidLib/util/EmailManager.kt‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,6 @@ class EmailManager {
1212

1313
fun evaluateEmail(mailAddressToTest: String): Boolean {
1414
val matcher: Matcher = emailAddressPattern.matcher(mailAddressToTest)
15-
// Log.i(GLOBAL_TAG, "TestEmail.Matches = ${matcher.matches()}")
16-
// Log.i(GLOBAL_TAG, "TestEmail.Full match: ${matcher.group(0)}")
17-
// for (i in 1..matcher.groupCount()) {
18-
// Log.i(GLOBAL_TAG, "TestEmail.Group $i: ${matcher.group(i)}")
19-
// }
2015
return matcher.matches()
2116
}
2217
}

‎app/build.gradle.kts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,17 +48,20 @@ dependencies {
4848
implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.1")
4949
implementation("androidx.core:core-ktx:1.12.0")
5050
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2")
51-
implementation("androidx.activity:activity-compose:1.8.0")
51+
implementation("androidx.activity:activity-compose:1.8.1")
5252
implementation(platform("androidx.compose:compose-bom:2023.03.00"))
5353
implementation("androidx.compose.ui:ui")
5454
implementation("androidx.compose.ui:ui-graphics")
5555
implementation("androidx.compose.ui:ui-tooling-preview")
5656
implementation("androidx.compose.material3:material3")
57+
implementation("androidx.compose.material:material-icons-core")
58+
implementation("androidx.compose.material:material-icons-extended:1.5.4")
5759
testImplementation("junit:junit:4.13.2")
5860
androidTestImplementation("androidx.test.ext:junit:1.1.5")
5961
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
6062
androidTestImplementation(platform("androidx.compose:compose-bom:2023.03.00"))
6163
androidTestImplementation("androidx.compose.ui:ui-test-junit4")
6264
debugImplementation("androidx.compose.ui:ui-tooling")
6365
debugImplementation("androidx.compose.ui:ui-test-manifest")
66+
6467
}

‎build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
plugins {
3-
id("com.android.application") version "8.1.3" apply false
3+
id("com.android.application") version "8.1.4" apply false
44
id("org.jetbrains.kotlin.android") version "1.8.10" apply false
5-
id("com.android.library") version "8.1.3" apply false
5+
id("com.android.library") version "8.1.4" apply false
66
}

0 commit comments

Comments
 (0)