Skip to content

Commit 15ddbe4

Browse files
committed
Merge branch 'dev'
2 parents f9c85de + 57cb898 commit 15ddbe4

File tree

7 files changed

+3073
-2452
lines changed

7 files changed

+3073
-2452
lines changed

.github/workflows/android.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
runs-on: ubuntu-latest
88

99
steps:
10-
- uses: actions/checkout@v4
10+
- uses: actions/checkout@v5
1111
- name: Set up JDK 21
1212
uses: actions/setup-java@v4
1313
with:

app/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ android {
1919
applicationId = "org.nsh07.wikireader"
2020
minSdk = 26
2121
targetSdk = 36
22-
versionCode = 48
23-
versionName = "2.5.0"
22+
versionCode = 49
23+
versionName = "2.5.1"
2424

2525
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
2626
vectorDrawables {

app/src/main/res/values-iw/strings.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
<string name="settingImmersiveModeDesc">הסתר את סרגל החיפוש וכפתורי הפעולה הצפים בזמן גלילה. מופעל כברירת מחדל במסכים קטנים.</string>
7979
<string name="settingRenderMath">עיבוד ביטויים מתמטיים</string>
8080
<string name="settingSearchHistory">היסטורית חיפוש</string>
81-
<string name="settingSearchHistoryDesc">שמור היסטוריית חיפושים. היסטוריה קיימת אינה מושפעת מאפשרות זו.</string>
81+
<string name="settingSearchHistoryDesc">שמירת היסטוריית החיפוש</string>
8282
<string name="settings">הגדרות</string>
8383
<string name="shareLink">שתף קישור</string>
8484
<string name="sharePage">שתף דף</string>
@@ -135,4 +135,5 @@
135135
<string name="otherLanguages">שפות אחרות</string>
136136
<string name="items">%1$s פריטים</string>
137137
<string name="infobox">תיבת מידע</string>
138+
<string name="historyDesc">שמירת היסטוריית גלישה במאמרים</string>
138139
</resources>

app/src/release/generated/baselineProfiles/baseline-prof.txt

Lines changed: 1526 additions & 1220 deletions
Large diffs are not rendered by default.

app/src/release/generated/baselineProfiles/startup-prof.txt

Lines changed: 1526 additions & 1220 deletions
Large diffs are not rendered by default.
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
New features:
2+
- Navigating back to the previous page is now instant (thanks to a revamped page loading system)
3+
- Images and other text now animate while navigating between pages
4+
- List items now morph and change shapes depending on the interaction and state (M3 Expressive)
5+
- The app now uses a rounded icon style
6+
- Switches now follow a Material 3 Expressive style
7+
8+
And general performance improvements and bug fixes

gradle/libs.versions.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
[versions]
2-
activityCompose = "1.12.0-alpha05"
2+
activityCompose = "1.12.0-alpha06"
33
adaptive = "1.1.0"
4-
agp = "8.12.0"
4+
agp = "8.11.1"
55
coil = "3.3.0"
66
coilGif = "3.3.0"
7-
composeBom = "2025.07.01"
8-
composeChartsVersion = "0.1.8"
9-
coreKtx = "1.16.0"
7+
composeBom = "2025.08.00"
8+
composeChartsVersion = "0.1.9"
9+
coreKtx = "1.17.0"
1010
coreSplashscreen = "1.0.1"
1111
espressoCore = "3.7.0"
1212
junit = "4.13.2"
1313
junitVersion = "1.3.0"
14-
kotlin = "2.2.0"
14+
kotlin = "2.2.10"
1515
kotlinxSerialization = "1.9.0"
16-
ksp = "2.2.0-2.0.2"
16+
ksp = "2.2.10-2.0.2"
1717
latex2unicode_xX3 = "0.3.2"
1818
lifecycleRuntimeKtx = "2.9.2"
1919
lifecycleViewmodelCompose = "2.9.2"
2020
materialKolor = "3.0.1"
21-
nav3Core = "1.0.0-alpha06"
21+
nav3Core = "1.0.0-alpha07"
2222
navigationCompose = "2.9.3"
2323
okhttp = "5.1.0"
2424
retrofit = "3.0.0"

0 commit comments

Comments
 (0)