Skip to content

Commit 12865df

Browse files
committed
Bump up version to 0.0.9-alpha05
1 parent b61aae5 commit 12865df

File tree

6 files changed

+34
-18
lines changed

6 files changed

+34
-18
lines changed

app/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ apply(plugin = "dagger.hilt.android.plugin")
1212
val versionMajor = 0
1313
val versionMinor = 0
1414
val versionPatch = 9
15-
val versionBuild = 4
15+
val versionBuild = 5
1616
val isStable = false
1717

1818
val composeVersion = "1.2.0-rc01"

app/src/main/java/com/junkfood/seal/ui/page/HomeEntry.kt

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,23 @@ fun HomeEntry(
3636
) {
3737
val navController = rememberAnimatedNavController()
3838
val onBackPressed = { navController.popBackStack() }
39-
Box(modifier = Modifier.fillMaxSize().background(MaterialTheme.colorScheme.background)) {
39+
Box(
40+
modifier = Modifier
41+
.fillMaxSize()
42+
.background(MaterialTheme.colorScheme.background)
43+
) {
4044
AnimatedNavHost(
41-
modifier = Modifier.fillMaxWidth(
42-
when (LocalWindowWidthState.current) {
43-
WindowWidthSizeClass.Compact -> 1f
44-
WindowWidthSizeClass.Expanded -> 0.5f
45-
else -> 0.8f
46-
}
47-
).align(Alignment.Center), navController = navController, startDestination = Route.HOME
45+
modifier = Modifier
46+
.fillMaxWidth(
47+
when (LocalWindowWidthState.current) {
48+
WindowWidthSizeClass.Compact -> 1f
49+
WindowWidthSizeClass.Expanded -> 0.5f
50+
else -> 0.8f
51+
}
52+
)
53+
.align(Alignment.Center),
54+
navController = navController,
55+
startDestination = Route.HOME
4856
) {
4957
animatedComposable(Route.HOME) {
5058
DownloadPage(
@@ -67,7 +75,7 @@ fun HomeEntry(
6775
}
6876
}
6977
WelcomeDialog {
70-
navController.navigate(Route.DOWNLOAD_PREFERENCES)
78+
navController.navigate(Route.SETTINGS)
7179
}
7280
}
7381
}

app/src/main/java/com/junkfood/seal/ui/page/WelcomeDialog.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ fun WelcomeDialog(onClick: () -> Unit) {
4646
onClick()
4747
onDismissRequest()
4848
}) {
49-
Text(stringResource(R.string.go_to_download_preferences))
49+
Text(stringResource(R.string.open_settings))
5050
}
5151
}, title = { Text(stringResource(R.string.user_guide)) }, text = {
5252
Column(modifier = Modifier.verticalScroll(rememberScrollState())) {

app/src/main/java/com/junkfood/seal/ui/page/download/DownloadPage.kt

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,9 @@ import androidx.compose.animation.AnimatedVisibility
77
import androidx.compose.animation.core.FastOutSlowInEasing
88
import androidx.compose.animation.core.animateFloatAsState
99
import androidx.compose.animation.core.tween
10-
import androidx.compose.foundation.background
11-
import androidx.compose.foundation.clickable
10+
import androidx.compose.foundation.*
1211
import androidx.compose.foundation.interaction.MutableInteractionSource
1312
import androidx.compose.foundation.layout.*
14-
import androidx.compose.foundation.rememberScrollState
15-
import androidx.compose.foundation.verticalScroll
1613
import androidx.compose.material.ExperimentalMaterialApi
1714
import androidx.compose.material.icons.Icons
1815
import androidx.compose.material.icons.outlined.*
@@ -44,6 +41,7 @@ import com.junkfood.seal.R
4441
import com.junkfood.seal.ui.common.LocalWindowWidthState
4542
import com.junkfood.seal.ui.common.Route
4643
import com.junkfood.seal.util.PreferenceUtil
44+
import com.junkfood.seal.util.PreferenceUtil.WELCOME_DIALOG
4745
import com.junkfood.seal.util.TextUtil
4846

4947

@@ -144,6 +142,10 @@ fun DownloadPage(
144142
onClick = {
145143
downloadViewModel.stopDownloadPlaylistOnNextItem()
146144
hapticFeedback.performHapticFeedback(HapticFeedbackType.LongPress)
145+
},
146+
onLongClick = {
147+
PreferenceUtil.updateInt(WELCOME_DIALOG, 1)
148+
hapticFeedback.performHapticFeedback(HapticFeedbackType.LongPress)
147149
}
148150
)
149151
Column(Modifier.padding(24.dp)) {
@@ -239,6 +241,7 @@ fun InputUrl(
239241
}
240242
}
241243

244+
@OptIn(ExperimentalFoundationApi::class)
242245
@Composable
243246
@Preview
244247
fun TitleWithProgressIndicator(
@@ -255,7 +258,12 @@ fun TitleWithProgressIndicator(
255258
this.clickable(
256259
interactionSource = remember { MutableInteractionSource() },
257260
indication = null
258-
) { onClick() } else this
261+
) { onClick() } else this.combinedClickable(
262+
interactionSource = remember { MutableInteractionSource() },
263+
indication = null,
264+
onClick = {},
265+
onLongClick = onLongClick
266+
)
259267
}
260268
) {
261269
Row(

app/src/main/res/values-zh-rCN/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
<string name="close">关闭</string>
8585
<string name="close_never_show_again">关闭后不再显示</string>
8686
<string name="user_guide">使用指引</string>
87-
<string name="go_to_download_preferences">打开下载设置</string>
87+
<string name="open_settings">打开应用设置</string>
8888
<string name="paste_desc">点击粘贴按钮,从剪贴板获取复制的视频链接。</string>
8989
<string name="download_desc">随后点击下载按钮,在开始下载前,你可以修改用于本次下载的设置。</string>
9090
<string name="download_history_desc">在下载记录页,查看与管理包括视频与音频在内的应用内下载。</string>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
<string name="close">Close</string>
9494
<string name="close_never_show_again">Don\'t show up again</string>
9595
<string name="user_guide">User guide</string>
96-
<string name="go_to_download_preferences">Open settings</string>
96+
<string name="open_settings">Open settings</string>
9797
<string name="paste_desc">Click on paste button to get video link from your clipboard.</string>
9898
<string name="download_desc">Then click on download button. Before starting, you can modify configurations for this
9999
download.

0 commit comments

Comments
 (0)