Skip to content

Commit 9a2eafe

Browse files
committed
feat: Update dependencies and improve Android UI
- Update various GitHub Actions to newer versions (`setup-java`, `setup-gradle`, `upload-artifact`, `action-gh-release`, `upload-pages-artifact`). - Upgrade `compose` to `1.9.3` and `androidx.core.splashscreen` to `1.2.0`. - Increment app versions for Android, iOS, and Desktop releases. - Add new adaptive icons and a splash screen theme for the Android app. - Move UI composables into `main` and `settings` subpackages for better organization. - Create `AdaptiveMainScreen` and `AdaptiveSettingsScreen` for better large-screen layouts. - Introduce `MainDetailPanePlaceholder` and `SettingsDetailPanePlaceholder` for empty detail panes.
1 parent 03e23b9 commit 9a2eafe

File tree

45 files changed

+267
-117
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+267
-117
lines changed

.github/workflows/android.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ jobs:
1313
- name: Check out
1414
uses: actions/checkout@v4
1515
- name: Set up JDK 17
16-
uses: actions/setup-java@v4
16+
uses: actions/setup-java@v5
1717
with:
1818
distribution: 'oracle'
1919
java-version: 17
2020
- name: Setup Gradle
21-
uses: gradle/actions/setup-gradle@v4
21+
uses: gradle/actions/setup-gradle@v5
2222
with:
2323
cache-read-only: false
2424
cache-overwrite-existing: true
@@ -31,7 +31,7 @@ jobs:
3131
run: fastlane build_bundle_publish
3232
- name: Archive build artifacts
3333
if: ${{ always() }}
34-
uses: actions/upload-artifact@v4
34+
uses: actions/upload-artifact@v5
3535
with:
3636
name: build-artifacts
3737
path: |

.github/workflows/desktop.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,19 @@ jobs:
1717
- name: Check out
1818
uses: actions/checkout@v4
1919
- name: Set up JDK 17
20-
uses: actions/setup-java@v4
20+
uses: actions/setup-java@v5
2121
with:
2222
distribution: 'oracle'
2323
java-version: 17
2424
- name: Setup Gradle
25-
uses: gradle/actions/setup-gradle@v4
25+
uses: gradle/actions/setup-gradle@v5
2626
with:
2727
cache-read-only: false
2828
cache-overwrite-existing: true
2929
- name: Packaging
3030
run: ./gradlew packageReleaseDistributionForCurrentOS #TODO packageRelease
3131
- name: Release
32-
uses: softprops/action-gh-release@v1
32+
uses: softprops/action-gh-release@v2
3333
with:
3434
files: |
3535
app/desktop/build/compose/binaries/main-release/deb/*.deb

.github/workflows/ios.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ jobs:
1414
- name: Check out
1515
uses: actions/checkout@v4
1616
- name: Set up JDK 17
17-
uses: actions/setup-java@v4
17+
uses: actions/setup-java@v5
1818
with:
1919
distribution: 'oracle'
2020
java-version: 17
2121
- name: Setup Gradle
22-
uses: gradle/actions/setup-gradle@v4
22+
uses: gradle/actions/setup-gradle@v5
2323
with:
2424
cache-read-only: false
2525
cache-overwrite-existing: true
@@ -46,7 +46,7 @@ jobs:
4646
run: fastlane appstore_publish_deliver_lane
4747
- name: Archive build artifacts
4848
if: ${{ always() }}
49-
uses: actions/upload-artifact@v4
49+
uses: actions/upload-artifact@v5
5050
with:
5151
name: test-artifacts
5252
path: |

.github/workflows/kmp.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,22 @@ jobs:
1717
- name: Check out
1818
uses: actions/checkout@v4
1919
- name: Gradle Wrapper Validation
20-
uses: gradle/actions/wrapper-validation@v4
20+
uses: gradle/actions/wrapper-validation@v5
2121
- name: Set up JDK 17
22-
uses: actions/setup-java@v4
22+
uses: actions/setup-java@v5
2323
with:
2424
distribution: 'oracle'
2525
java-version: 17
2626
- name: Setup Gradle
27-
uses: gradle/actions/setup-gradle@v4
27+
uses: gradle/actions/setup-gradle@v5
2828
with:
2929
cache-read-only: false
3030
cache-overwrite-existing: true
3131
- name: Build
3232
run: ./gradlew build
3333
- name: Archive build-output artifacts
3434
if: always()
35-
uses: actions/upload-artifact@v4
35+
uses: actions/upload-artifact@v5
3636
with:
3737
name: output-build-artifacts
3838
path: |
@@ -54,12 +54,12 @@ jobs:
5454
- name: Check out
5555
uses: actions/checkout@v4
5656
- name: Set up JDK 17
57-
uses: actions/setup-java@v4
57+
uses: actions/setup-java@v5
5858
with:
5959
distribution: 'oracle'
6060
java-version: 17
6161
- name: Setup Gradle
62-
uses: gradle/actions/setup-gradle@v4
62+
uses: gradle/actions/setup-gradle@v5
6363
with:
6464
cache-read-only: false
6565
cache-overwrite-existing: true
@@ -101,7 +101,7 @@ jobs:
101101
script: ./gradlew :app:android:connectedCheck
102102
- name: Archive ui-tests-output artifacts
103103
if: always()
104-
uses: actions/upload-artifact@v4
104+
uses: actions/upload-artifact@v5
105105
with:
106106
name: output-ui-tests-artifacts-${{ matrix.api-level }}-${{ matrix.target }}
107107
path: |

.github/workflows/web.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ jobs:
2626
- name: Checkout
2727
uses: actions/checkout@v4
2828
- name: Set up JDK 17
29-
uses: actions/setup-java@v4
29+
uses: actions/setup-java@v5
3030
with:
3131
distribution: 'oracle'
3232
java-version: 17
3333
- name: Setup Gradle
34-
uses: gradle/actions/setup-gradle@v4
34+
uses: gradle/actions/setup-gradle@v5
3535
with:
3636
cache-read-only: false
3737
cache-overwrite-existing: true
@@ -48,7 +48,7 @@ jobs:
4848
uses: actions/configure-pages@v5
4949
- name: Upload artifact
5050
if: ${{ steps.build.outcome != 'failure' || steps.dist.outcome != 'failure' }}
51-
uses: actions/upload-pages-artifact@v3
51+
uses: actions/upload-pages-artifact@v4
5252
with:
5353
path: ./app/web/build/dist/wasmJs/productionExecutable
5454

app/android/build.gradle.kts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ android {
2424
applicationId = "com.softartdev.noteroom"
2525
minSdk = libs.versions.minSdk.get().toInt()
2626
targetSdk = libs.versions.targetSdk.get().toInt()
27-
versionCode = 843
28-
versionName = "8.4.3"
27+
versionCode = 844
28+
versionName = "8.4.4"
2929
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
3030
testInstrumentationRunnerArguments["clearPackageData"] = "true"
3131
vectorDrawables.useSupportLibrary = true
@@ -72,6 +72,7 @@ dependencies {
7272
implementation(project(":core:presentation"))
7373
implementation(project(":ui:shared"))
7474
implementation(kotlin("reflect"))
75+
implementation(libs.androidx.core.splashscreen)
7576
implementation(libs.androidx.activity.compose)
7677
implementation(compose.ui)
7778
implementation(compose.material3)

app/android/src/main/AndroidManifest.xml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,17 @@
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
33

44
<application
5-
android:name=".MainApplication"
6-
android:icon="@mipmap/ic_launcher"
7-
android:label="@string/app_name"
8-
android:supportsRtl="true"
9-
android:theme="@style/Theme.AppCompat.Light.NoActionBar">
5+
android:name=".MainApplication"
6+
android:icon="@mipmap/ic_launcher"
7+
android:label="@string/app_name"
8+
android:supportsRtl="true"
9+
android:theme="@style/Theme.NoteDelight">
1010
<activity
11-
android:name=".MainActivity"
12-
android:exported="true"
13-
android:windowSoftInputMode="adjustResize">
11+
android:name=".MainActivity"
12+
android:exported="true"
13+
android:windowSoftInputMode="adjustResize">
1414
<intent-filter>
1515
<action android:name="android.intent.action.MAIN" />
16-
1716
<category android:name="android.intent.category.LAUNCHER" />
1817
</intent-filter>
1918
</activity>
9.78 KB
Loading

app/android/src/main/java/com/softartdev/notedelight/MainPreview.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ import android.content.res.Configuration.UI_MODE_NIGHT_YES
44
import androidx.compose.runtime.Composable
55
import androidx.compose.ui.tooling.preview.Devices
66
import androidx.compose.ui.tooling.preview.Preview
7-
import com.softartdev.notedelight.ui.NoteDetailBody
8-
import com.softartdev.notedelight.ui.PreviewMainScreen
7+
import com.softartdev.notedelight.ui.main.NoteDetailBody
8+
import com.softartdev.notedelight.ui.main.PreviewMainScreen
99
import com.softartdev.notedelight.ui.SignInScreenBody
1010
import com.softartdev.notedelight.ui.SplashScreenBody
11-
import com.softartdev.notedelight.ui.adaptive.PreviewAdaptiveScreen
11+
import com.softartdev.notedelight.ui.main.PreviewAdaptiveScreen
1212
import com.softartdev.theme.material3.PreferableMaterialTheme
1313

1414
@Preview(name = "Adaptive", group = "light", showSystemUi = true, showBackground = true, device = Devices.TABLET)
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="24"
5+
android:viewportHeight="24">
6+
<path
7+
android:fillColor="#06E5FF"
8+
android:pathData="M6,2C4.89,2 4,2.9 4,4V20A2,2 0,0 0,6 22H18A2,2 0,0 0,20 20V8L14,2H6M13,3.5L18.5,9H13V3.5M12,11A3,3 0,0 1,15 14V15H16V19H8V15H9V14C9,12.36 10.34,11 12,11M12,13A1,1 0,0 0,11 14V15H13V14C13,13.47 12.55,13 12,13Z"/>
9+
</vector>

0 commit comments

Comments
 (0)