Skip to content

修复：用户协议和隐私政策页面无法滚动问题 #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zyraxi21 wants to merge 1 commit into
base: feat/eas-multicampus-login-and-import
Choose a base branch
from
Open

修复：用户协议和隐私政策页面无法滚动问题 #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
312 changes: 258 additions & 54 deletions app/src/main/java/cn/limpu/hita/ui/about/UserAgreementDialog.kt
View file
Open in desktop

Large diffs are not rendered by default.

11 changes: 6 additions & 5 deletions app/src/main/java/cn/limpu/hita/ui/eas/login/PopUpLoginEAS.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,10 @@ class PopUpLoginEAS : BottomSheetDialogFragment() {
onFailed = {
onResponseListener?.onFailed(this@PopUpLoginEAS)
},
onShowAgreement = {
onShowAgreement = { pageIndex ->
UserAgreementDialog().apply {
setShowActionButtons(false)
initialPage = pageIndex
}.show(childFragmentManager, "user_agreement_view")
}
)
Expand Down Expand Up @@ -270,7 +271,7 @@ private fun LoginEASScreen(
onAutoLaunch: (EASToken.Campus) -> Unit,
onSuccess: () -> Unit,
onFailed: () -> Unit,
onShowAgreement: () -> Unit
onShowAgreement: (Int) -> Unit
) {
val tokens = HitaTheme.tokens
val view = LocalView.current
Expand Down Expand Up @@ -491,7 +492,7 @@ private fun LoginEASScreen(

private fun createAgreementSpannable(
context: Context,
onShowAgreement: () -> Unit
onShowAgreement: (Int) -> Unit
): android.text.SpannableString {
val hint = context.getString(R.string.user_agreement_hint)
val span = android.text.SpannableString(hint)
Expand All @@ -503,14 +504,14 @@ private fun createAgreementSpannable(
if (uaStart >= 0 && uaEnd > uaStart) {
span.setSpan(object : android.text.style.ClickableSpan() {
override fun onClick(widget: View) {
onShowAgreement()
onShowAgreement(0)
}
}, uaStart, uaEnd, android.text.Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
}
if (ppStart >= 0 && ppEnd > ppStart) {
span.setSpan(object : android.text.style.ClickableSpan() {
override fun onClick(widget: View) {
onShowAgreement()
onShowAgreement(1)
}
}, ppStart, ppEnd, android.text.Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
}
Expand Down
6 changes: 6 additions & 0 deletions app/src/main/java/cn/limpu/hita/ui/main/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -815,6 +815,12 @@ private fun MainScreen(
modifier = Modifier
.align(Alignment.BottomCenter)
.padding(bottom = systemNavAvoidance)
.graphicsLayer {
translationX = contentOffset
scaleX = contentScale
scaleY = contentScale
transformOrigin = androidx.compose.ui.graphics.TransformOrigin(1f, 0.5f)
}
)
}

Expand Down
6 changes: 6 additions & 0 deletions app/src/main/res/anim/slide_in_bottom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<translate xmlns:android="http://schemas.android.com/apk/res/android"
android:duration="300"
android:fromYDelta="100%"
android:toYDelta="0%"
android:interpolator="@android:interpolator/decelerate_cubic" />
6 changes: 6 additions & 0 deletions app/src/main/res/anim/slide_out_bottom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<translate xmlns:android="http://schemas.android.com/apk/res/android"
android:duration="300"
android:fromYDelta="0%"
android:toYDelta="100%"
android:interpolator="@android:interpolator/accelerate_cubic" />
6 changes: 6 additions & 0 deletions app/src/main/res/values-night/themes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,12 @@
旧主题别名 (兼容性保留)
========================================== -->
<style name="AppTheme" parent="Theme.HITA" />

<style name="DialogSlideAnimation">
<item name="android:windowEnterAnimation">@anim/slide_in_bottom</item>
<item name="android:windowExitAnimation">@anim/slide_out_bottom</item>
</style>

<style name="AppTheme.NoActionBar">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1009,8 +1009,8 @@
]]>
</string>
<string name="name_user_agreement">用户协议</string>
<string name="name_privacy_agreement">隐私协议</string>
<string name="name_ua_and_pp">用户与隐私协议</string>
<string name="name_privacy_agreement">隐私政策</string>
<string name="name_ua_and_pp">用户协议与隐私政策</string>
<string name="i_have_read">朕已阅</string>
<string name="agree_and_login">同意协议并登录</string>
<string name="agree">同意</string>
Expand All @@ -1020,7 +1020,7 @@
<string name="reply">回复</string>
<string name="send">发送</string>
<string name="create_comment">发表评论回复</string>
<string name="verify_stuid_hint">认证学号将会同步真实姓名、学院名称、学号信息到助手账号，请阅读隐私协议后再确认是否进行操作</string>
<string name="verify_stuid_hint">认证学号将会同步真实姓名、学院名称、学号信息到助手账号，请阅读隐私政策后再确认是否进行操作</string>
<string name="latest">最新</string>
<string name="hottest">近期热门</string>
<string name="tabs_theta_bulletin">通知公告</string>
Expand Down
5 changes: 5 additions & 0 deletions app/src/main/res/values/themes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,11 @@
<!-- 旧主题别名 (兼容性保留) -->
<!-- ========================================== -->
<style name="AppTheme" parent="Theme.HITA" />

<style name="DialogSlideAnimation">
<item name="android:windowEnterAnimation">@anim/slide_in_bottom</item>
<item name="android:windowExitAnimation">@anim/slide_out_bottom</item>
</style>
<style name="AppTheme.NoActionBar">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
Expand Down