Skip to content

Commit

Permalink
Update Android version
Browse files Browse the repository at this point in the history
  • Loading branch information
@adriangl
adriangl committed Aug 31, 2023
1 parent aaaedca commit 4a945c9
Show file tree
Hide file tree
Showing 8 changed files with 342 additions and 170 deletions.
107 changes: 59 additions & 48 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,50 +14,52 @@ GEM
specs:
CFPropertyList (3.0.6)
rexml
activesupport (7.0.4.2)
activesupport (7.0.7.2)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
addressable (2.8.1)
addressable (2.8.5)
public_suffix (>= 2.0.2, < 6.0)
artifactory (3.0.15)
ast (2.4.2)
atomos (0.1.3)
aws-eventstream (1.2.0)
aws-partitions (1.710.0)
aws-sdk-core (3.170.0)
aws-partitions (1.814.0)
aws-sdk-core (3.181.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.5)
jmespath (~> 1, >= 1.6.1)
aws-sdk-kms (1.62.0)
aws-sdk-core (~> 3, >= 3.165.0)
aws-sdk-kms (1.71.0)
aws-sdk-core (~> 3, >= 3.177.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.119.0)
aws-sdk-core (~> 3, >= 3.165.0)
aws-sdk-s3 (1.134.0)
aws-sdk-core (~> 3, >= 3.181.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.4)
aws-sigv4 (1.5.2)
aws-sigv4 (~> 1.6)
aws-sigv4 (1.6.0)
aws-eventstream (~> 1, >= 1.0.2)
babosa (1.0.4)
base64 (0.1.1)
cgi (0.3.6)
claide (1.1.0)
coderay (1.1.3)
colored (1.2)
colored2 (3.1.2)
commander (4.6.0)
highline (~> 2.0.0)
concurrent-ruby (1.2.0)
concurrent-ruby (1.2.2)
declarative (0.0.20)
digest-crc (0.6.4)
digest-crc (0.6.5)
rake (>= 12.0.0, < 14.0.0)
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
dotenv (2.8.1)
down (5.4.0)
down (5.4.1)
addressable (~> 2.8)
emoji_regex (3.2.3)
excon (0.99.0)
excon (0.102.0)
faraday (1.10.3)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
Expand Down Expand Up @@ -86,8 +88,8 @@ GEM
faraday-retry (1.0.3)
faraday_middleware (1.2.0)
faraday (~> 1.0)
fastimage (2.2.6)
fastlane (2.211.0)
fastimage (2.2.7)
fastlane (2.214.0)
CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.8, < 3.0.0)
artifactory (~> 3.0)
Expand All @@ -111,7 +113,7 @@ GEM
json (< 3.0.0)
jwt (>= 2.1.0, < 3)
mini_magick (>= 4.9.4, < 5.0.0)
multipart-post (~> 2.0.0)
multipart-post (>= 2.0.0, < 3.0.0)
naturally (~> 2.2)
optparse (~> 0.1.1)
plist (>= 3.1.0, < 4.0.0)
Expand All @@ -126,12 +128,14 @@ GEM
xcodeproj (>= 1.13.0, < 2.0.0)
xcpretty (~> 0.3.0)
xcpretty-travis-formatter (>= 0.0.3)
fastlane-plugin-firebase_app_distribution (0.4.2)
fastlane-plugin-huawei_appgallery_connect (1.0.23)
fastlane-plugin-firebase_app_distribution (0.7.2)
google-apis-firebaseappdistribution_v1 (~> 0.3.0)
fastlane-plugin-huawei_appgallery_connect (1.0.27)
cgi
gh_inspector (1.1.3)
google-apis-androidpublisher_v3 (0.33.0)
google-apis-core (>= 0.9.1, < 2.a)
google-apis-core (0.11.0)
google-apis-androidpublisher_v3 (0.49.0)
google-apis-core (>= 0.11.0, < 2.a)
google-apis-core (0.11.1)
addressable (~> 2.5, >= 2.5.1)
googleauth (>= 0.16.2, < 2.a)
httpclient (>= 2.8.1, < 3.a)
Expand All @@ -140,18 +144,20 @@ GEM
retriable (>= 2.0, < 4.a)
rexml
webrick
google-apis-iamcredentials_v1 (0.16.0)
google-apis-core (>= 0.9.1, < 2.a)
google-apis-playcustomapp_v1 (0.12.0)
google-apis-core (>= 0.9.1, < 2.a)
google-apis-firebaseappdistribution_v1 (0.3.0)
google-apis-core (>= 0.11.0, < 2.a)
google-apis-iamcredentials_v1 (0.17.0)
google-apis-core (>= 0.11.0, < 2.a)
google-apis-playcustomapp_v1 (0.13.0)
google-apis-core (>= 0.11.0, < 2.a)
google-apis-storage_v1 (0.19.0)
google-apis-core (>= 0.9.0, < 2.a)
google-cloud-core (1.6.0)
google-cloud-env (~> 1.0)
google-cloud-errors (~> 1.0)
google-cloud-env (1.6.0)
faraday (>= 0.17.3, < 3.0)
google-cloud-errors (1.3.0)
google-cloud-errors (1.3.1)
google-cloud-storage (1.44.0)
addressable (~> 2.8)
digest-crc (~> 0.4)
Expand All @@ -160,71 +166,76 @@ GEM
google-cloud-core (~> 1.6)
googleauth (>= 0.16.2, < 2.a)
mini_mime (~> 1.0)
googleauth (1.3.0)
googleauth (1.7.0)
faraday (>= 0.17.3, < 3.a)
jwt (>= 1.4, < 3.0)
memoist (~> 0.16)
multi_json (~> 1.11)
os (>= 0.9, < 2.0)
signet (>= 0.16, < 2.a)
gpgme (2.0.22)
gpgme (2.0.23)
mini_portile2 (~> 2.7)
highline (2.0.3)
http-cookie (1.0.5)
domain_name (~> 0.5)
httpclient (2.8.3)
i18n (1.12.0)
i18n (1.14.1)
concurrent-ruby (~> 1.0)
jmespath (1.6.2)
json (2.6.3)
jwt (2.7.0)
jwt (2.7.1)
language_server-protocol (3.17.0.3)
memoist (0.16.2)
method_source (1.0.0)
mini_magick (4.12.0)
mini_mime (1.1.2)
mini_portile2 (2.8.1)
minitest (5.17.0)
mini_mime (1.1.5)
mini_portile2 (2.8.4)
minitest (5.19.0)
multi_json (1.15.0)
multipart-post (2.0.0)
multipart-post (2.3.0)
nanaimo (0.3.0)
naturally (2.2.1)
optparse (0.1.1)
os (1.1.4)
parallel (1.22.1)
parser (3.2.1.0)
parallel (1.23.0)
parser (3.2.2.3)
ast (~> 2.4.1)
plist (3.6.0)
racc
plist (3.7.0)
pry (0.14.2)
coderay (~> 1.1)
method_source (~> 1.0)
public_suffix (5.0.1)
public_suffix (5.0.3)
racc (1.7.1)
rainbow (3.1.1)
rake (13.0.6)
regexp_parser (2.7.0)
regexp_parser (2.8.1)
representable (3.2.0)
declarative (< 0.1.0)
trailblazer-option (>= 0.1.1, < 0.2.0)
uber (< 0.2.0)
retriable (3.1.2)
rexml (3.2.5)
rexml (3.2.6)
rouge (2.0.7)
rubocop (1.45.1)
rubocop (1.56.2)
base64 (~> 0.1.1)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
parser (>= 3.2.0.0)
parser (>= 3.2.2.3)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 1.24.1, < 2.0)
rubocop-ast (>= 1.28.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.26.0)
rubocop-ast (1.29.0)
parser (>= 3.2.1.0)
rubocop-require_tools (0.1.2)
rubocop (>= 0.49.1)
rubocop-shopify (2.12.0)
rubocop (~> 1.44)
ruby-progressbar (1.11.0)
rubocop-shopify (2.14.0)
rubocop (~> 1.51)
ruby-progressbar (1.13.0)
ruby2_keywords (0.0.5)
rubyzip (2.3.2)
security (0.1.3)
Expand Down
34 changes: 17 additions & 17 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ ext {
* Android variables
********************
*/
compile_sdk_version = 33
compile_sdk_version = 34
min_sdk_version = 21
max_sdk_version = 29
target_sdk_version = 33
build_tools_version = "33.0.0"
target_sdk_version = 34
build_tools_version = "34.0.0"
// The Android version is multiplied by a big number so it is placed in the leftmost part
// of the version code because we can't add it in androidGitVersion's codeFormat parameter
version_code = compile_sdk_version * 100000 + androidGitVersion.code()
Expand All @@ -60,21 +60,21 @@ ext {
* Libraries
********************
*/
kotlin_coroutines_version = "1.6.4"
kotlin_coroutines_version = "1.7.3"
espresso_version = "3.5.1"
mockito_version = "3.11.2"
junit_jupiter_version = "5.9.2"
fragment_version = "1.3.1"
compose_ui_version = "1.3.3"
compose_material_version = "1.3.1"
compose_compiler_version = "1.4.2"
accompanist_version = "0.28.0"
compose_ui_version = "1.5.0"
compose_material_version = "1.5.0"
compose_compiler_version = "1.4.8"
accompanist_version = "0.30.1"
}

android {
namespace "com.adriangl.pict2cam"
compileSdkVersion compile_sdk_version
buildToolsVersion build_tools_version
compileSdk = compile_sdk_version
buildToolsVersion = build_tools_version

defaultConfig {
applicationId "com.adriangl.pict2cam"
Expand Down Expand Up @@ -167,7 +167,7 @@ android {
}
}

sourceSets.all {
sourceSets.configureEach {
java.srcDirs += "src/${name}/kotlin"
}

Expand Down Expand Up @@ -198,21 +198,21 @@ dependencies {
implementation fileTree(dir: "libs", include: ["*.jar"])

// Java 8+ API desugaring support
coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:2.0.2"
coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:2.0.3"

implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutines_version"

// AndroidX dependencies
implementation "androidx.appcompat:appcompat:1.6.1"
implementation "androidx.core:core-ktx:1.9.0"
implementation "androidx.core:core-ktx:1.10.1"

// Jetpack Compose
implementation "androidx.compose.ui:ui:$compose_ui_version"
implementation "androidx.compose.ui:ui-util:$compose_ui_version"
implementation "androidx.compose.material:material:$compose_material_version"
implementation "androidx.compose.ui:ui-tooling-preview:$compose_ui_version"
implementation "androidx.activity:activity-compose:1.6.1"
implementation "androidx.activity:activity-compose:1.7.2"

// Accompanist
implementation "com.google.accompanist:accompanist-pager:$accompanist_version"
Expand All @@ -226,7 +226,7 @@ dependencies {

// Testing
testImplementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
testImplementation "org.mockito:mockito-core:5.1.1"
testImplementation "org.mockito:mockito-core:5.4.0"
testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0"

// Use jUnit5 in unit tests
Expand Down Expand Up @@ -254,8 +254,8 @@ dependencies {
afterEvaluate {
detekt {
toolVersion = detekt_version
input = files(android.sourceSets.collect { it.java.srcDirs.collect { it.path } }.flatten())
config = files("${project.rootDir}/config/detekt/detekt.yml")
source.setFrom(files(android.sourceSets.collect { it.java.srcDirs.collect { it.path } }.flatten()))
config.setFrom(files("${project.rootDir}/config/detekt/detekt.yml"))
autoCorrect = true
}
}
8 changes: 4 additions & 4 deletions app/src/main/kotlin/com/adriangl/pict2cam/onboarding/OnboardingScreen.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ fun OnboardingScreen(onExitClick: () -> Unit = {}) {
title = stringResource(id = R.string.onboarding_welcome_title),
description = stringResource(id = R.string.onboarding_welcome_description),
backgroundColor = colorResource(id = R.color.onboarding_welcome_background_color),
image = painterResource(id = R.drawable.ic_onboarding_app_logo),
image = painterResource(id = R.drawable.ic_onboarding_app_logo)
),
OnboardingPageInfo(
title = stringResource(id = R.string.onboarding_instant_messaging_apps_title),
Expand All @@ -103,13 +103,13 @@ fun OnboardingScreen(onExitClick: () -> Unit = {}) {
title = stringResource(id = R.string.onboarding_pick_intent_title),
description = stringResource(id = R.string.onboarding_pick_intent_description),
backgroundColor = colorResource(id = R.color.onboarding_pick_intent_background_color),
image = painterResource(id = R.drawable.ic_onboarding_select_image),
image = painterResource(id = R.drawable.ic_onboarding_select_image)
),
OnboardingPageInfo(
title = stringResource(id = R.string.onboarding_crop_image_title),
description = stringResource(id = R.string.onboarding_crop_image_description),
backgroundColor = colorResource(id = R.color.onboarding_crop_image_background_color),
image = painterResource(id = R.drawable.ic_onboarding_crop_image),
image = painterResource(id = R.drawable.ic_onboarding_crop_image)
),
OnboardingPageInfo(
title = stringResource(id = R.string.onboarding_privacy_policy_title).toAnnotatedString(),
Expand All @@ -119,7 +119,7 @@ fun OnboardingScreen(onExitClick: () -> Unit = {}) {
linkTextId = R.string.onboarding_privacy_policy_link_text
),
backgroundColor = colorResource(id = R.color.onboarding_privacy_policy_background_color),
image = painterResource(id = R.drawable.ic_onboarding_privacy_policy),
image = painterResource(id = R.drawable.ic_onboarding_privacy_policy)
),
OnboardingPageInfo(
title = stringResource(id = R.string.onboarding_credits_title),
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/kotlin/com/adriangl/pict2cam/ui/components/OnboardingPager.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ fun OnboardingPager(modifier: Modifier = Modifier,
pagerState = pagerState,
modifier = Modifier
.align(Alignment.BottomCenter)
.padding(bottom = 36.dp),
.padding(bottom = 36.dp)
)
}

Expand Down
4 changes: 2 additions & 2 deletions app/src/main/kotlin/com/adriangl/pict2cam/ui/theme/Theme.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ private val DarkColorPalette = darkColors(
onSecondary = Color.White,
onBackground = Color.White,
onSurface = Color.White,
onError = Color.Black,
onError = Color.Black
)

private val LightColorPalette = lightColors(
Expand All @@ -34,7 +34,7 @@ private val LightColorPalette = lightColors(
onSecondary = Color.Black,
onBackground = Color.Black,
onSurface = Color.Black,
onError = Color.White,
onError = Color.White
)

/**
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/kotlin/com/adriangl/pict2cam/ui/theme/Type.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ val openSansItalicFontFamily = FontFamily(
)

val Pict2CamTypography = Typography(
defaultFontFamily = openSansNormalFontFamily,
defaultFontFamily = openSansNormalFontFamily
)
Loading

0 comments on commit 4a945c9

Please sign in to comment.