Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/android-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ name: Android
on:
pull_request:
branches: [ main, master, develop ]
push:
branches: [ main, master, develop ]
workflow_dispatch:

jobs:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/ios-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ name: iOS
on:
pull_request:
branches: [ main, master, develop ]
push:
branches: [ main, master, develop ]
workflow_dispatch:

permissions:
Expand Down
6 changes: 6 additions & 0 deletions androidApp/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ android {
versionCode = 1
versionName = appVersionName

resourceConfigurations.addAll(setOf("en", "ar"))

val baseUrl = localProperties.getProperty("BASE_URL", "")
buildConfigField("String", "BASE_URL", "\"${baseUrl}\"")
}
Expand Down Expand Up @@ -66,6 +68,10 @@ android {
signingConfig = signingConfigs.getByName("release")
}

ndk {
abiFilters.addAll(setOf("armeabi-v7a", "arm64-v8a"))
}

proguardFiles(
getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-rules.pro"
Expand Down
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ import kotlinx.datetime.LocalDateTime
import org.koin.compose.viewmodel.koinViewModel
import org.koin.core.parameter.parametersOf
import spendoo.designsystem.generated.resources.Res
import spendoo.designsystem.generated.resources.avatar_me
import spendoo.designsystem.generated.resources.img_avatar_me
import spendoo.designsystem.generated.resources.ic_download
import spendoo.designsystem.generated.resources.ic_user_follow

Expand Down Expand Up @@ -153,7 +153,7 @@ private fun StatisticsContent(
leading = {
AsyncImage(
model = state.userImageUrl,
placeholder = Res.drawable.avatar_me.painter(),
placeholder = Res.drawable.img_avatar_me.painter(),
contentDescription = null,
modifier = Modifier
.padding(end = 12.dp)
Expand Down
Loading