Skip to content

Commit 0b1835d

Browse files
nsh07nsh07
committed
Merge branch 'dev'
2 parents 7b35f73 + 71f7a03 commit 0b1835d

File tree

24 files changed

+41526
-51187
lines changed

24 files changed

+41526
-51187
lines changed

‎app/build.gradle.kts‎

Lines changed: 4 additions & 4 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 = 51
23-
versionName = "2.5.3"
22+
versionCode = 52
23+
versionName = "2.5.4"
2424

2525
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
2626
vectorDrawables {
@@ -33,12 +33,12 @@ android {
3333

3434
buildTypes {
3535
release {
36-
isMinifyEnabled = false
36+
isMinifyEnabled = true
37+
isShrinkResources = true
3738
proguardFiles(
3839
getDefaultProguardFile("proguard-android-optimize.txt"),
3940
"proguard-rules.pro"
4041
)
41-
signingConfig = signingConfigs.getByName("debug")
4242
}
4343
}
4444
compileOptions {

‎app/proguard-rules.pro‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,6 @@
1818

1919
# If you keep the line number information, uncomment this to
2020
# hide the original source file name.
21-
#-renamesourcefileattribute SourceFile
21+
#-renamesourcefileattribute SourceFile
22+
23+
-dontobfuscate

‎app/src/main/java/org/nsh07/wikireader/parser/wikitextToAnnotatedString.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,7 @@ fun String.toWikitextAnnotatedString(
539539
}
540540

541541
currSubstring.startsWith("{{efn", ignoreCase = true) -> {
542-
val curr = currSubstring.substringAfter('|')
542+
val curr = currSubstring.substringAfter('|', "")
543543
curr.twas()
544544
}
545545

‎app/src/main/java/org/nsh07/wikireader/ui/AppScreen.kt‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -215,10 +215,7 @@ fun AppScreen(
215215
startDestination = HomeScreen(),
216216
enterTransition = {
217217
if (compactWindow)
218-
slideInHorizontally(
219-
initialOffsetX = { it / 4 },
220-
animationSpec = motionScheme.defaultSpatialSpec()
221-
) + fadeIn(motionScheme.defaultEffectsSpec())
218+
slideInHorizontally(initialOffsetX = { it })
222219
else
223220
fadeIn(animationSpec = tween(220, delayMillis = 90)) +
224221
scaleIn(
@@ -228,19 +225,13 @@ fun AppScreen(
228225
},
229226
exitTransition = {
230227
if (compactWindow)
231-
slideOutHorizontally(
232-
targetOffsetX = { -it / 4 },
233-
animationSpec = motionScheme.fastSpatialSpec()
234-
) + fadeOut(motionScheme.fastEffectsSpec())
228+
slideOutHorizontally(targetOffsetX = { -it / 4 })
235229
else
236230
fadeOut(animationSpec = tween(90))
237231
},
238232
popEnterTransition = {
239233
if (compactWindow)
240-
slideInHorizontally(
241-
initialOffsetX = { -it / 4 },
242-
animationSpec = motionScheme.defaultSpatialSpec()
243-
) + fadeIn(motionScheme.defaultEffectsSpec())
234+
slideInHorizontally(initialOffsetX = { -it / 4 }) + fadeIn()
244235
else
245236
fadeIn(animationSpec = tween(220, delayMillis = 90)) +
246237
scaleIn(
@@ -250,10 +241,7 @@ fun AppScreen(
250241
},
251242
popExitTransition = {
252243
if (compactWindow)
253-
slideOutHorizontally(
254-
targetOffsetX = { it / 4 },
255-
animationSpec = motionScheme.fastSpatialSpec()
256-
) + fadeOut(motionScheme.fastEffectsSpec())
244+
slideOutHorizontally(targetOffsetX = { it })
257245
else
258246
fadeOut(animationSpec = tween(90))
259247
}

‎app/src/main/java/org/nsh07/wikireader/ui/homeScreen/AppHomeScreen.kt‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@ import androidx.compose.ui.res.stringResource
7575
import androidx.compose.ui.unit.dp
7676
import androidx.compose.ui.unit.max
7777
import androidx.core.text.parseAsHtml
78-
import androidx.navigation3.runtime.entry
7978
import androidx.navigation3.runtime.entryProvider
8079
import androidx.navigation3.ui.NavDisplay
80+
import androidx.navigationevent.NavigationEvent
8181
import androidx.window.core.layout.WindowSizeClass
8282
import kotlinx.coroutines.launch
8383
import org.nsh07.wikireader.R
@@ -241,17 +241,15 @@ fun AppHomeScreen(
241241
},
242242
transitionSpec = { fadeIn().togetherWith(fadeOut()) },
243243
popTransitionSpec = { fadeIn().togetherWith(fadeOut()) },
244-
predictivePopTransitionSpec = {
244+
predictivePopTransitionSpec = { edge ->
245245
if (backStack.size > 2 && backStack.last() !is HomeSubscreen.Image)
246-
(slideInHorizontally(
247-
initialOffsetX = { -it / 4 },
248-
animationSpec = motionScheme.defaultSpatialSpec()
249-
) + fadeIn()).togetherWith(
250-
slideOutHorizontally(
251-
targetOffsetX = { it / 4 },
252-
animationSpec = motionScheme.fastSpatialSpec()
253-
) + fadeOut()
254-
)
246+
if (edge == NavigationEvent.EDGE_LEFT) {
247+
(slideInHorizontally(initialOffsetX = { -it / 4 }) + fadeIn())
248+
.togetherWith(slideOutHorizontally(targetOffsetX = { it }))
249+
} else {
250+
(slideInHorizontally(initialOffsetX = { it / 4 }) + fadeIn())
251+
.togetherWith(slideOutHorizontally(targetOffsetX = { -it }))
252+
}
255253
else fadeIn().togetherWith(fadeOut())
256254
},
257255
entryProvider = entryProvider {
@@ -355,7 +353,8 @@ fun AppHomeScreen(
355353
)
356354
},
357355
setSearchStr = { onAction(HomeAction.UpdateLanguageSearchStr(it)) },
358-
onAction = onAction
356+
onAction = onAction,
357+
modifier = Modifier.background(colorScheme.surface)
359358
)
360359
}
361360

‎app/src/main/java/org/nsh07/wikireader/ui/savedArticlesScreen/SavedArticlesScreen.kt‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ import androidx.compose.ui.res.painterResource
5959
import androidx.compose.ui.res.stringResource
6060
import androidx.compose.ui.text.style.TextAlign
6161
import androidx.compose.ui.text.style.TextOverflow
62+
import androidx.compose.ui.unit.coerceAtLeast
6263
import androidx.compose.ui.unit.dp
6364
import androidx.compose.ui.util.fastFilter
6465
import androidx.compose.ui.util.fastForEach
@@ -251,7 +252,7 @@ fun SavedArticlesScreen(
251252
background = imageBackground,
252253
modifier = Modifier
253254
.size(64.dp)
254-
.clip(RoundedCornerShape(imageCorners))
255+
.clip(RoundedCornerShape(imageCorners.coerceAtLeast(0.dp)))
255256
)
256257
}
257258
} else {
@@ -281,10 +282,10 @@ fun SavedArticlesScreen(
281282
.padding(horizontal = 16.dp)
282283
.clip(
283284
RoundedCornerShape(
284-
topStart = top,
285-
topEnd = top,
286-
bottomStart = bottom,
287-
bottomEnd = bottom
285+
topStart = top.coerceAtLeast(0.dp),
286+
topEnd = top.coerceAtLeast(0.dp),
287+
bottomStart = bottom.coerceAtLeast(0.dp),
288+
bottomEnd = bottom.coerceAtLeast(0.dp)
288289
)
289290
)
290291
.combinedClickable(

‎app/src/main/java/org/nsh07/wikireader/ui/settingsScreen/ClickableListItem.kt‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import androidx.compose.runtime.remember
1616
import androidx.compose.ui.Modifier
1717
import androidx.compose.ui.draw.clip
1818
import androidx.compose.ui.unit.Dp
19+
import androidx.compose.ui.unit.coerceAtLeast
1920
import androidx.compose.ui.unit.dp
2021

2122
@OptIn(ExperimentalMaterial3ExpressiveApi::class)
@@ -59,10 +60,10 @@ fun ClickableListItem(
5960
modifier = modifier
6061
.clip(
6162
RoundedCornerShape(
62-
topStart = top,
63-
topEnd = top,
64-
bottomStart = bottom,
65-
bottomEnd = bottom
63+
topStart = top.coerceAtLeast(0.dp),
64+
topEnd = top.coerceAtLeast(0.dp),
65+
bottomStart = bottom.coerceAtLeast(0.dp),
66+
bottomEnd = bottom.coerceAtLeast(0.dp)
6667
)
6768
)
6869
.clickable(

‎app/src/main/res/values-bn/strings.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<string name="about">এই সম্পর্কে</string>
4+
<string name="app">অ্যাপ</string>
5+
</resources>

‎app/src/main/res/values-el/strings.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
<string name="settingRenderMath">Απεικόνιση μαθηματικών εκφράσεων</string>
9494
<string name="settingRenderMathDesc">Απαιτεί λίγα παραπάνω δεδομένα. Απενεργοποιήστε για να βελτιώσετε την απόδοση με το κόστος την αναγνωσιμότητα.</string>
9595
<string name="settingSearchHistory">Ιστορικό αναζήτησης</string>
96-
<string name="settingSearchHistoryDesc">Αποθήκευση ιστορικού αναζήτησης. Το υπάρχον ιστορικό δεν επηρεάζεται από αυτή την επιλογή.</string>
96+
<string name="settingSearchHistoryDesc">Αποθήκευση ιστορικού αναζήτησης</string>
9797
<string name="settingTheme">Θέμα</string>
9898
<string name="settingWikipediaLanguage">Γλώσσα Βικιπαίδειας</string>
9999
<string name="settings">Ρυθμίσεις</string>
@@ -135,4 +135,5 @@
135135
<string name="otherLanguages">Άλλες γλώσσες</string>
136136
<string name="items">%1$s στοιχεία</string>
137137
<string name="infobox">Infobox</string>
138+
<string name="historyDesc">Αποθήκευση ιστορικού περιήγησης άρθρου</string>
138139
</resources>

‎app/src/main/res/values-tr/strings.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
<string name="settingImmersiveModeDesc">Kaydırma sırasında arama çubuğunu ve kayan eylem düğmelerini gizleyin. Küçük ekran boyutlarında varsayılan olarak etkindir.</string>
8686
<string name="settingRenderMath">Matematik ifadelerini işle</string>
8787
<string name="settingSearchHistory">Arama geçmişi</string>
88-
<string name="settingSearchHistoryDesc">Arama geçmişini kaydet. Mevcut geçmiş bu seçenekten etkilenmez.</string>
88+
<string name="settingSearchHistoryDesc">Arama geçmişini kaydet</string>
8989
<string name="settingTheme">Tema</string>
9090
<string name="settingWikipediaLanguage">Vikipedi dili</string>
9191
<string name="settings">Ayarlar</string>
@@ -128,11 +128,12 @@
128128
<string name="table">Tablo</string>
129129
<string name="reference">Referans</string>
130130
<string name="noHistoryItemsDesc">Yakın zamanda görüntülediğiniz maddeler burada görünür</string>
131-
<string name="noHistoryItems">Geçmişte öge yok</string>
131+
<string name="noHistoryItems">Geçmişte kayıt bulunmuyor</string>
132132
<string name="recentLanguages">Yakın zamanda kullanılan diller</string>
133133
<string name="currentLanguage">Kullanılan dil</string>
134134
<string name="otherLanguages">Diğer diller</string>
135135
<string name="items">%1$s öge</string>
136136
<string name="infobox">Bilgi kutusu</string>
137137
<string name="allHistoryDeleted">Tüm geçmiş silindi</string>
138+
<string name="historyDesc">Makale tarama geçmişini kaydet</string>
138139
</resources>

0 commit comments

Comments
 (0)