Skip to content
This repository has been archived by the owner on Nov 5, 2024. It is now read-only.

Commit

Permalink
Simplify the project structure (#2914)
Browse files Browse the repository at this point in the history
* WIP: Restructure modules

* Re-structure modules

* Delete the `create_module.sh`

* Fix the "Integration tests" workflow

* Fix build errors caused by missing dependencies

* Remove unnecessary git hooks and initialization instructions
  • Loading branch information
ILIYANGERMANOV authored Feb 4, 2024
1 parent b7586f2 commit c22e1e5
Show file tree
Hide file tree
Showing 1,517 changed files with 629 additions and 838 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/integration_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
${{ runner.os }}-gradle-
- name: Build Ivy Wallet's code
run: ./gradlew ivy-data:assembleDebug ivy-data:assembleAndroidTest
run: ./gradlew :shared:data:assembleDebug :shared:data:assembleAndroidTest

- name: Enable KVM (emulator optimization)
run: |
Expand All @@ -42,4 +42,4 @@ jobs:
uses: reactivecircus/android-emulator-runner@v2
with:
api-level: 29
script: ./gradlew ivy-data:connectedDebugAndroidTest
script: ./gradlew :shared:data:connectedDebugAndroidTest
4 changes: 1 addition & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@

## 1. Fork the repo

You can do that by cliking this badge: 👉 [![Fork Ivy Wallet](https://img.shields.io/github/forks/Ivy-Apps/ivy-wallet?logo=github&style=social)](https://github.com/Ivy-Apps/ivy-wallet/fork) 👈
You can do that by clicking this badge: 👉 [![Fork Ivy Wallet](https://img.shields.io/github/forks/Ivy-Apps/ivy-wallet?logo=github&style=social)](https://github.com/Ivy-Apps/ivy-wallet/fork) 👈

**[How To Fork Guide by GitHub](https://docs.github.com/en/get-started/quickstart/fork-a-repo)**

**Important:** After you've cloned your Ivy Wallet fork make sure to initialize the project using [the initialization instructions in the README](./README.md#initialize-the-project).

## 2. Pick an issue

What do you want to work on? [Choose an issue](https://github.com/Ivy-Apps/ivy-wallet/issues) that you'd like to contribute to.
Expand Down
10 changes: 0 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,16 +48,6 @@ Ivy Wallet lacks features but its biggest advantage is its UI/UX, simplicity, an

Instructions in [CONTRIBUTING.md](./CONTRIBUTING.md).

**2. Make the initialization script executable:**
```
chmod +x scripts/init.sh
```

**3. Initialize the project:**
```
./scripts/init.sh
```

### Need help?

Jour our Telegram community and drop a message in the "Development" topic.
Expand Down
116 changes: 56 additions & 60 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -124,36 +124,34 @@ android {
}

dependencies {
implementation(projects.ivyBase)
implementation(projects.ivyData)
implementation(projects.ivyDomain)
implementation(projects.ivyNavigation)
implementation(projects.ivyResources)
implementation(projects.ivyWidgetBase)
implementation(projects.screenAttributions)
implementation(projects.screenBalance)
implementation(projects.screenBudgets)
implementation(projects.screenCategories)
implementation(projects.screenContributors)
implementation(projects.screenExchangeRates)
implementation(projects.screenFeatures)
implementation(projects.screenHome)
implementation(projects.screenImportData)
implementation(projects.screenLoans)
implementation(projects.screenMain)
implementation(projects.screenOnboarding)
implementation(projects.screenPiechart)
implementation(projects.screenPlannedPayments)
implementation(projects.screenReleases)
implementation(projects.screenReports)
implementation(projects.screenSearch)
implementation(projects.screenSettings)
implementation(projects.screenTransaction)
implementation(projects.screenTransactions)
implementation(projects.tempLegacyCode)
implementation(projects.tempOldDesign)
implementation(projects.widgetAddTransaction)
implementation(projects.widgetBalance)
implementation(projects.shared.base)
implementation(projects.shared.data)
implementation(projects.shared.domain)
implementation(projects.shared.navigation)
implementation(projects.screen.attributions)
implementation(projects.screen.balance)
implementation(projects.screen.budgets)
implementation(projects.screen.categories)
implementation(projects.screen.contributors)
implementation(projects.screen.exchangeRates)
implementation(projects.screen.features)
implementation(projects.screen.home)
implementation(projects.screen.importData)
implementation(projects.screen.loans)
implementation(projects.screen.main)
implementation(projects.screen.onboarding)
implementation(projects.screen.piechart)
implementation(projects.screen.plannedPayments)
implementation(projects.screen.releases)
implementation(projects.screen.reports)
implementation(projects.screen.search)
implementation(projects.screen.settings)
implementation(projects.screen.editTransaction)
implementation(projects.screen.transactions)
implementation(projects.temp.legacyCode)
implementation(projects.temp.oldDesign)
implementation(projects.widget.addTransaction)
implementation(projects.widget.balance)

implementation(libs.bundles.kotlin)
implementation(libs.bundles.kotlin.android)
Expand Down Expand Up @@ -197,34 +195,32 @@ dependencies {
}
}

kover(projects.ivyBase)
kover(projects.ivyData)
kover(projects.ivyDomain)
kover(projects.ivyNavigation)
kover(projects.ivyResources)
kover(projects.ivyWidgetBase)
kover(projects.screenAttributions)
kover(projects.screenBalance)
kover(projects.screenBudgets)
kover(projects.screenCategories)
kover(projects.screenContributors)
kover(projects.screenExchangeRates)
kover(projects.screenFeatures)
kover(projects.screenHome)
kover(projects.screenImportData)
kover(projects.screenLoans)
kover(projects.screenMain)
kover(projects.screenOnboarding)
kover(projects.screenPiechart)
kover(projects.screenPlannedPayments)
kover(projects.screenReleases)
kover(projects.screenReports)
kover(projects.screenSearch)
kover(projects.screenSettings)
kover(projects.screenTransaction)
kover(projects.screenTransactions)
kover(projects.tempLegacyCode)
kover(projects.tempOldDesign)
kover(projects.widgetAddTransaction)
kover(projects.widgetBalance)
kover(projects.shared.base)
kover(projects.shared.data)
kover(projects.shared.domain)
kover(projects.shared.navigation)
kover(projects.shared.resources)
kover(projects.widget.sharedBase)
kover(projects.screen.attributions)
kover(projects.screen.balance)
kover(projects.screen.budgets)
kover(projects.screen.categories)
kover(projects.screen.contributors)
kover(projects.screen.exchangeRates)
kover(projects.screen.features)
kover(projects.screen.home)
kover(projects.screen.importData)
kover(projects.screen.loans)
kover(projects.screen.main)
kover(projects.screen.onboarding)
kover(projects.screen.piechart)
kover(projects.screen.plannedPayments)
kover(projects.screen.releases)
kover(projects.screen.reports)
kover(projects.screen.search)
kover(projects.screen.settings)
kover(projects.screen.editTransaction)
kover(projects.screen.transactions)
kover(projects.widget.addTransaction)
kover(projects.widget.balance)
}
8 changes: 0 additions & 8 deletions git/hooks/pre-push

This file was deleted.

16 changes: 0 additions & 16 deletions ivy-common-ui/build.gradle.kts

This file was deleted.

19 changes: 0 additions & 19 deletions ivy-data-testing/build.gradle.kts

This file was deleted.

13 changes: 0 additions & 13 deletions ivy-navigation/build.gradle.kts

This file was deleted.

13 changes: 0 additions & 13 deletions ivy-widget-base/build.gradle.kts

This file was deleted.

19 changes: 0 additions & 19 deletions screen-accounts/build.gradle.kts

This file was deleted.

18 changes: 0 additions & 18 deletions screen-attributions/build.gradle.kts

This file was deleted.

18 changes: 0 additions & 18 deletions screen-balance/build.gradle.kts

This file was deleted.

19 changes: 0 additions & 19 deletions screen-budgets/build.gradle.kts

This file was deleted.

19 changes: 0 additions & 19 deletions screen-categories/build.gradle.kts

This file was deleted.

20 changes: 0 additions & 20 deletions screen-contributors/build.gradle.kts

This file was deleted.

19 changes: 0 additions & 19 deletions screen-exchange-rates/build.gradle.kts

This file was deleted.

Loading

0 comments on commit c22e1e5

Please sign in to comment.