Skip to content

Commit

Permalink
update design lib
Browse files Browse the repository at this point in the history
  • Loading branch information
Lemkinator committed Oct 24, 2024
1 parent 58a6895 commit 8a0a7ed
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 18 deletions.
12 changes: 7 additions & 5 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ android {
applicationId = "de.lemke.oneurl"
minSdk = 26
targetSdk = 35
versionCode = 21
versionName = "1.3.1"
versionCode = 22
versionName = "1.3.2"
resourceConfigurations += listOf("en", "de")
ksp { arg("room.schemaLocation", "$projectDir/schemas") }
}
Expand Down Expand Up @@ -86,15 +86,17 @@ secrets {
}

dependencies {
//sesl6 modules
//SESL6(OneUI 6) Android Jetpack
implementation("sesl.androidx.core:core:1.15.0-rc01+1.0.11-sesl6+rev0")
implementation("sesl.androidx.core:core-ktx:1.15.0-rc01+1.0.0-sesl6+rev0")
implementation("sesl.androidx.appcompat:appcompat:1.7.0+1.0.34-sesl6+rev5")
implementation("sesl.androidx.preference:preference:1.2.1+1.0.4-sesl6+rev3")
//SESL6(OneUI 6) Samsung
implementation("sesl.androidx.picker:picker-color:1.0.6+1.0.6-sesl6+rev3")
implementation("sesl.com.google.android.material:material:1.12.0+1.0.23-sesl6+rev1")

implementation(project(":lib"))
//SESL6(OneUI 6) Material Components + Design Lib + Icons
implementation("sesl.com.google.android.material:material:1.12.0+1.0.23-sesl6+rev1")
implementation("io.github.tribalfs:oneui-design:0.1.0+oneui6")
implementation("io.github.oneuiproject:icons:1.1.0")

implementation("com.airbnb.android:lottie:6.5.2")
Expand Down
Binary file modified app/release/app-release.apk
Binary file not shown.
4 changes: 2 additions & 2 deletions app/release/output-metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"type": "SINGLE",
"filters": [],
"attributes": [],
"versionCode": 20,
"versionName": "1.3.0",
"versionCode": 21,
"versionName": "1.3.1",
"outputFile": "app-release.apk"
}
],
Expand Down
5 changes: 2 additions & 3 deletions app/src/main/java/de/lemke/oneurl/ui/AboutActivity.kt
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package de.lemke.oneurl.ui

import android.app.Activity
import android.content.Intent
import android.net.ConnectivityManager
import android.net.NetworkCapabilities
Expand Down Expand Up @@ -99,8 +98,8 @@ class AboutActivity : AppCompatActivity() {
when (result.resultCode) {
// For immediate updates, you might not receive RESULT_OK because
// the update should already be finished by the time control is given back to your app.
Activity.RESULT_OK -> Log.d("InAppUpdate", "Update successful")
Activity.RESULT_CANCELED -> Log.w("InAppUpdate", "Update canceled")
RESULT_OK -> Log.d("InAppUpdate", "Update successful")
RESULT_CANCELED -> Log.w("InAppUpdate", "Update canceled")
ActivityResult.RESULT_IN_APP_UPDATE_FAILED -> Log.e("InAppUpdate", "Update failed")
}
}
Expand Down
8 changes: 7 additions & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ buildscript {
dependencies {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20")
classpath("com.android.tools.build:gradle:8.7.1")
classpath("com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin:2.0.20-1.0.25")
classpath("com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin:2.0.21-1.0.25")
classpath("com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:2.0.1")
}
}
Expand All @@ -59,6 +59,12 @@ allprojects {
password = githubAccessToken
}
}
maven("https://maven.pkg.github.com/tribalfs/oneui-design") {
credentials {
username = githubUsername
password = githubAccessToken
}
}
}
}

Expand Down
7 changes: 0 additions & 7 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
rootProject.name = "OneURL"
include(":app")

//To include the design `lib' to your project as a local module,
//you may add the following lines to your project's settings.gradle
//with the Path to the `lib` folder of your local clone of the design-lib
//https://github.com/tribalfs/oneui-design-sample-app
include(":lib")
project(":lib").projectDir = File("../oneui-design-sample-app/lib")

0 comments on commit 8a0a7ed

Please sign in to comment.