Skip to content

Commit

Permalink
Mirego-base-setup 4 of X: Styling (#43)
Browse files Browse the repository at this point in the history
* Trikot + Kword + Koin/KSP

* oups

* common + iOS

* Android wip

* Android stuff + remove stuff

* datasource + preview stuff

* Fix loading state

* Fix build

* Gorgeous stuff

* lint fix

* viewmodel + usecase tests

* Locale flow

* Locale repository

* Concrete flow for iOS

* Android locale

* Add Android UI

* Update Android views

* Create better placeholder and loading state on Android

* Mirego-base-setup 5 of X: Navigation (#42)

* Base nav

* navigation viewmodels

* open details

* add close icon

* iOS nav

* For the font

* override navigaiton type

* fix stuff

* Add navigation and UI on Android

* Mirego-base-setup 7 of X: Killswitch (#39)

* Analytics stuff

* Analytics tracking

* killswitch integration

* pr comment

* fixes

* fix mock item in test

* killswitch qa env

* Revert qa killswitch url

* add possibility to use maven local dependencies

* Dummy firebase initialization

* update killswitch version

* Mirego-base-setup 8 of X: CI tasks + lint (#40)

* fix

* Test fix

* Format

* disable enum rule

* fix permissions

* add task to ci

* Add checkCommon

* android ktlint

* oups

* Mirego-base-setup 9 of X: App Center (#47)

* setup appcenter

* add init on Android

* base setup for fastlane (#48)

---------

Co-authored-by: Christophe Tremblay <[email protected]>

---------

Co-authored-by: Olivier Pineau <[email protected]>
Co-authored-by: Olivier Pineau <[email protected]>

* Mirego-base-setup 6 of X: Analytics (#41)

* Analytics stuff

* Analytics tracking

* Dummy firebase initialization

* fix

* oups

* remove comment

---------

Co-authored-by: Steven de Tilly <[email protected]>

---------

Co-authored-by: Francis Pepin <[email protected]>
Co-authored-by: Christophe Tremblay <[email protected]>
Co-authored-by: Steven de Tilly <[email protected]>

* Merge branch 'mirego' into feature/mirego-base-setup-view-styling

# Conflicts:
#	androidApp/build.gradle.kts
#	androidApp/src/main/java/com/mirego/kmp/boilerplate/app/AndroidApplication.kt
#	androidApp/src/main/java/com/mirego/kmp/boilerplate/app/bootstrap/AndroidBootstrap.kt
#	androidApp/src/main/java/com/mirego/kmp/boilerplate/app/bootstrap/AppInformationImpl.kt
#	androidApp/src/main/java/com/mirego/kmp/boilerplate/app/resources/AndroidImageProvider.kt
#	androidApp/src/main/java/com/mirego/kmp/boilerplate/app/ui/application/ApplicationView.kt
#	androidApp/src/main/java/com/mirego/kmp/boilerplate/app/ui/preview/PreviewProvider.kt
#	androidApp/src/main/java/com/mirego/kmp/boilerplate/app/ui/root/RootView.kt
#	gradle/libs.versions.toml
#	ios/.swiftlint.yml
#	ios/Podfile
#	ios/Podfile.lock
#	ios/iosApp.xcodeproj/project.pbxproj
#	ios/iosApp/AppInitializer.swift
#	ios/iosApp/Domain/AppInformationImpl.swift
#	ios/iosApp/Domain/ImageProvider.swift
#	ios/iosApp/UI/Application/ApplicationView.swift
#	ios/iosApp/UI/Root/RootView.swift
#	shared/build.gradle.kts
#	shared/src/commonMain/generated/com/mirego/kmp/boilerplate/localization/KWordTranslation.kt
#	shared/src/commonMain/kotlin/com/mirego/kmp/boilerplate/StateDataExtensions.kt
#	shared/src/commonMain/kotlin/com/mirego/kmp/boilerplate/bootstrap/AppEnvironment.kt
#	shared/src/commonMain/kotlin/com/mirego/kmp/boilerplate/bootstrap/AppInformation.kt
#	shared/src/commonMain/kotlin/com/mirego/kmp/boilerplate/bootstrap/Module.kt
#	shared/src/commonMain/kotlin/com/mirego/kmp/boilerplate/datasource/DataSourceUtils.kt
#	shared/src/commonMain/kotlin/com/mirego/kmp/boilerplate/datasource/apollo/ApolloGraphQLDataSource.kt
#	shared/src/commonMain/kotlin/com/mirego/kmp/boilerplate/datasource/generic/GenericDataSource.kt
#	shared/src/commonMain/kotlin/com/mirego/kmp/boilerplate/extension/StateDataExtensions.kt
#	shared/src/commonMain/kotlin/com/mirego/kmp/boilerplate/graphql/query/ProjectsQuery.graphql
#	shared/src/commonMain/kotlin/com/mirego/kmp/boilerplate/repository/projects/ProjectsRepositoryImpl.kt
#	shared/src/commonMain/kotlin/com/mirego/kmp/boilerplate/usecase/preview/ProjectsUseCasePreview.kt
#	shared/src/commonMain/kotlin/com/mirego/kmp/boilerplate/usecase/projects/ProjectsUseCase.kt
#	shared/src/commonMain/kotlin/com/mirego/kmp/boilerplate/usecase/projects/ProjectsUseCaseImpl.kt
#	shared/src/commonMain/kotlin/com/mirego/kmp/boilerplate/utils/StateData.kt
#	shared/src/commonMain/kotlin/com/mirego/kmp/boilerplate/viewmodel/common/ErrorViewModelImpl.kt
#	shared/src/commonMain/kotlin/com/mirego/kmp/boilerplate/viewmodel/factory/ViewModelFactoryPreview.kt
#	shared/src/commonMain/kotlin/com/mirego/kmp/boilerplate/viewmodel/projects/ProjectsViewModel.kt
#	shared/src/commonMain/kotlin/com/mirego/kmp/boilerplate/viewmodel/projects/ProjectsViewModelImpl.kt
#	shared/src/commonMain/kotlin/com/mirego/kmp/boilerplate/viewmodel/root/RootViewModelImpl.kt
#	shared/src/commonMain/resources/translations/translation.en.json
#	shared/src/commonMain/resources/translations/translation.fr.json

---------

Co-authored-by: Francis Pepin <[email protected]>
Co-authored-by: Christophe Tremblay <[email protected]>
Co-authored-by: Steven de Tilly <[email protected]>
  • Loading branch information
4 people authored Nov 27, 2023
1 parent a15802b commit 5cd3954
Show file tree
Hide file tree
Showing 138 changed files with 4,342 additions and 184 deletions.
32 changes: 27 additions & 5 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,6 +1,28 @@
[*]
charset = utf-8
end_of_line = lf
insert_final_newline = true
indent_style = space
indent_size = 4

[*.json]
indent_size = 2

[{*.yml,*.yaml}]
indent_size = 2

[*.{kt,kts}]
max_line_length = off
ij_kotlin_allow_trailing_comma_on_call_site = false
ij_kotlin_allow_trailing_comma = false
ktlint_code_style = ktlint_official
ktlint_disabled_rules=no-enum-name-in-uppercase,enum-entry-name-case,filename
max_line_length = 180
ij_kotlin_code_style_defaults = kotlin_official
ij_kotlin_keep_blank_lines_in_declarations = 1
ij_kotlin_keep_blank_lines_in_code = 1
ij_kotlin_name_count_to_use_star_import = 2147483647
ij_kotlin_name_count_to_use_star_import_for_members = 2147483647
ij_kotlin_align_multiline_parameters = false
ij_kotlin_import_nested_classes = false
ij_kotlin_packages_to_use_import_on_demand = unset
ij_kotlin_imports_layout = *
ktlint_disabled_rules = enum-entry-name-case,filename

[*.md]
max_line_length = 300
7 changes: 5 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,8 @@ jobs:
- name: Grant execute permission for gradlew
run: chmod +x gradlew

- name: Build with Gradle
run: ./gradlew check
- name: Run common tests and lint
run: ./gradlew clean shared:checkCommon --parallel --stacktrace -Pskip_gitversion --info

- name: Run Android lint
run: ./gradlew androidApp:ktlintCheck --stacktrace -Pskip_gitversion
3 changes: 3 additions & 0 deletions androidApp/Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source "https://rubygems.org"

gem "fastlane"
217 changes: 217 additions & 0 deletions androidApp/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,217 @@
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.6)
rexml
addressable (2.8.5)
public_suffix (>= 2.0.2, < 6.0)
artifactory (3.0.15)
atomos (0.1.3)
aws-eventstream (1.2.0)
aws-partitions (1.846.0)
aws-sdk-core (3.186.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.72.0)
aws-sdk-core (~> 3, >= 3.184.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.136.0)
aws-sdk-core (~> 3, >= 3.181.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.6)
aws-sigv4 (1.6.1)
aws-eventstream (~> 1, >= 1.0.2)
babosa (1.0.4)
claide (1.1.0)
colored (1.2)
colored2 (3.1.2)
commander (4.6.0)
highline (~> 2.0.0)
declarative (0.0.20)
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)
emoji_regex (3.2.3)
excon (0.104.0)
faraday (1.10.3)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1)
faraday-httpclient (~> 1.0)
faraday-multipart (~> 1.0)
faraday-net_http (~> 1.0)
faraday-net_http_persistent (~> 1.0)
faraday-patron (~> 1.0)
faraday-rack (~> 1.0)
faraday-retry (~> 1.0)
ruby2_keywords (>= 0.0.4)
faraday-cookie_jar (0.0.7)
faraday (>= 0.8.0)
http-cookie (~> 1.0.0)
faraday-em_http (1.0.0)
faraday-em_synchrony (1.0.0)
faraday-excon (1.1.0)
faraday-httpclient (1.0.1)
faraday-multipart (1.0.4)
multipart-post (~> 2)
faraday-net_http (1.0.1)
faraday-net_http_persistent (1.2.0)
faraday-patron (1.0.0)
faraday-rack (1.0.0)
faraday-retry (1.0.3)
faraday_middleware (1.2.0)
faraday (~> 1.0)
fastimage (2.2.7)
fastlane (2.216.0)
CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.8, < 3.0.0)
artifactory (~> 3.0)
aws-sdk-s3 (~> 1.0)
babosa (>= 1.0.3, < 2.0.0)
bundler (>= 1.12.0, < 3.0.0)
colored
commander (~> 4.6)
dotenv (>= 2.1.1, < 3.0.0)
emoji_regex (>= 0.1, < 4.0)
excon (>= 0.71.0, < 1.0.0)
faraday (~> 1.0)
faraday-cookie_jar (~> 0.0.6)
faraday_middleware (~> 1.0)
fastimage (>= 2.1.0, < 3.0.0)
gh_inspector (>= 1.1.2, < 2.0.0)
google-apis-androidpublisher_v3 (~> 0.3)
google-apis-playcustomapp_v1 (~> 0.1)
google-cloud-storage (~> 1.31)
highline (~> 2.0)
http-cookie (~> 1.0.5)
json (< 3.0.0)
jwt (>= 2.1.0, < 3)
mini_magick (>= 4.9.4, < 5.0.0)
multipart-post (>= 2.0.0, < 3.0.0)
naturally (~> 2.2)
optparse (~> 0.1.1)
plist (>= 3.1.0, < 4.0.0)
rubyzip (>= 2.0.0, < 3.0.0)
security (= 0.1.3)
simctl (~> 1.6.3)
terminal-notifier (>= 2.0.0, < 3.0.0)
terminal-table (~> 3)
tty-screen (>= 0.6.3, < 1.0.0)
tty-spinner (>= 0.8.0, < 1.0.0)
word_wrap (~> 1.0.0)
xcodeproj (>= 1.13.0, < 2.0.0)
xcpretty (~> 0.3.0)
xcpretty-travis-formatter (>= 0.0.3)
gh_inspector (1.1.3)
google-apis-androidpublisher_v3 (0.51.0)
google-apis-core (>= 0.11.0, < 2.a)
google-apis-core (0.11.2)
addressable (~> 2.5, >= 2.5.1)
googleauth (>= 0.16.2, < 2.a)
httpclient (>= 2.8.1, < 3.a)
mini_mime (~> 1.0)
representable (~> 3.0)
retriable (>= 2.0, < 4.a)
rexml
webrick
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.29.0)
google-apis-core (>= 0.11.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.1)
google-cloud-storage (1.45.0)
addressable (~> 2.8)
digest-crc (~> 0.4)
google-apis-iamcredentials_v1 (~> 0.1)
google-apis-storage_v1 (~> 0.29.0)
google-cloud-core (~> 1.6)
googleauth (>= 0.16.2, < 2.a)
mini_mime (~> 1.0)
googleauth (1.8.1)
faraday (>= 0.17.3, < 3.a)
jwt (>= 1.4, < 3.0)
multi_json (~> 1.11)
os (>= 0.9, < 2.0)
signet (>= 0.16, < 2.a)
highline (2.0.3)
http-cookie (1.0.5)
domain_name (~> 0.5)
httpclient (2.8.3)
jmespath (1.6.2)
json (2.6.3)
jwt (2.7.1)
mini_magick (4.12.0)
mini_mime (1.1.5)
multi_json (1.15.0)
multipart-post (2.3.0)
nanaimo (0.3.0)
naturally (2.2.1)
optparse (0.1.1)
os (1.1.4)
plist (3.7.0)
public_suffix (5.0.3)
rake (13.1.0)
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.6)
rouge (2.0.7)
ruby2_keywords (0.0.5)
rubyzip (2.3.2)
security (0.1.3)
signet (0.18.0)
addressable (~> 2.8)
faraday (>= 0.17.5, < 3.a)
jwt (>= 1.5, < 3.0)
multi_json (~> 1.10)
simctl (1.6.10)
CFPropertyList
naturally
terminal-notifier (2.0.0)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
trailblazer-option (0.1.2)
tty-cursor (0.7.1)
tty-screen (0.8.1)
tty-spinner (0.9.3)
tty-cursor (~> 0.7)
uber (0.1.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.8.2)
unicode-display_width (2.5.0)
webrick (1.8.1)
word_wrap (1.0.0)
xcodeproj (1.23.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.3.0)
rexml (~> 3.2.4)
xcpretty (0.3.0)
rouge (~> 2.0.7)
xcpretty-travis-formatter (1.0.1)
xcpretty (~> 0.2, >= 0.0.7)

PLATFORMS
arm64-darwin-22

DEPENDENCIES
fastlane

BUNDLED WITH
2.4.10
12 changes: 11 additions & 1 deletion androidApp/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ plugins {
alias(libs.plugins.android.application)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.ktlint)
alias(libs.plugins.crashlyticsPlugin)
}

kotlin {
Expand Down Expand Up @@ -42,6 +43,9 @@ android {
buildFeatures {
compose = true
}
androidResources {
generateLocaleConfig = true
}
composeOptions {
kotlinCompilerExtensionVersion = libs.versions.androidComposeCompiler.get()
}
Expand Down Expand Up @@ -79,10 +83,14 @@ dependencies {
implementation(project(":shared"))

implementation(libs.android.splash)
implementation(libs.android.firebase.analytics)
implementation(libs.android.firebase.crashlytics)
implementation(platform(libs.android.firebase.bom))
implementation(libs.androidx.appcompat)
implementation(libs.androidx.activity.compose)

implementation(platform(libs.androidx.compose.bom))
implementation(libs.accompanist.systemuicontroller)
implementation(libs.accompanist.placeholder.material)
implementation(libs.androidx.compose.ui)
implementation(libs.androidx.compose.ui.tooling)
implementation(libs.androidx.compose.material)
Expand All @@ -91,4 +99,6 @@ dependencies {
implementation(libs.koin.androidx.compose.navigation)
implementation(libs.trikot.viewmodels.databinding)
implementation(libs.trikot.vmd.compose)
"ciImplementation"(libs.appcenter)
"storeImplementation"(libs.appcenter.play)
}
Loading

0 comments on commit 5cd3954

Please sign in to comment.