Skip to content
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

Fix/3.10.3 #245

Merged
merged 13 commits into from
Jan 6, 2024
+361 −99
Merged

Fix/3.10.3 #245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b265e81
feat: bump `ap_common` to v0.23.1
abc873693 Jan 6, 2024
b4f3c50
fix: login parser condition for password error
abc873693 Jan 6, 2024
e6b472c
feat: improve password error when enable auto login
abc873693 Jan 6, 2024
82d2f32
feat: `password error five times` in login error hanlde
abc873693 Jan 6, 2024
cb0c1e3
Revert "fix: remove iOS widget extension for Xcode 15 temporary"
abc873693 Jan 6, 2024
5e05f2d
fix: iOS widget in Xocde 15 error
abc873693 Jan 6, 2024
5e2106f
feat: update iOS home widget for iOS 17 API
abc873693 Jan 6, 2024
9548354
chore: code tune
abc873693 Jan 6, 2024
94944cf
chore: password error five times source HTML
abc873693 Jan 6, 2024
4eb7b87
chore: code tune for dart 2.19 lint
abc873693 Jan 6, 2024
73c9771
feat: upgrade CI action android JAVA version to `17`
abc873693 Jan 6, 2024
5bc43dc
fix: iOS swift compile error
abc873693 Jan 6, 2024
ad2bdc9
feat: update CD android and iOS setting
abc873693 Jan 6, 2024
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
10 changes: 8 additions & 2 deletions .github/workflows/cd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Setup Java
uses: actions/setup-java@v1
with:
java-version: '11.0'
java-version: '17.0'
- name: Decrypt Android keys
run: sh ./.github/scripts/decrypt_android_keys.sh
env:
Expand Down Expand Up @@ -50,8 +50,14 @@ jobs:

deploy_ios:
name: iOS Deploy TestFlight
runs-on: macOS-latest
runs-on: macos-13
steps:
# Ensure the xcode version is available
- name: List Xcode installations
run: sudo ls -1 /Applications | grep "Xcode"
# Select your required version
- name: Select Xcode 15.0
run: sudo xcode-select -s /Applications/Xcode_15.0.app/Contents/Developer
- name: Checkout code
uses: actions/checkout@v2
with:
Expand Down
10 changes: 8 additions & 2 deletions .github/workflows/workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
- name: Setup Java
uses: actions/setup-java@v1
with:
java-version: '11.0'
java-version: '17.0'
- name: Decrypt Android keys
run: sh ./.github/scripts/decrypt_android_keys.sh
env:
Expand All @@ -53,8 +53,14 @@ jobs:

build_ios:
name: Build iOS App
runs-on: macOS-latest
runs-on: macos-13
steps:
# Ensure the xcode version is available
- name: List Xcode installations
run: sudo ls -1 /Applications | grep "Xcode"
# Select your required version
- name: Select Xcode 15.0
run: sudo xcode-select -s /Applications/Xcode_15.0.app/Contents/Developer
- name: Checkout code
uses: actions/checkout@v2
- name: Decrypt iOS keys
Expand Down
40 changes: 40 additions & 0 deletions assets_test/login/password_error_five.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<script>alert('Please Logon From Homepage!!');top.location.href='index.html';</script>


<html>
<title></title>
<head>
<META HTTP-EQUIV="Pragma" content="no-cache">
<META HTTP-EQUIV="Cache-Control" CONTENT="no-cache">
<META HTTP-EQUIV="Content-Type" content="text/html;charset=UTF-8">
<script language='javascript'>
function showalert(msgfilename){
obj = window.open (msgfilename,"msgwindow","height=500,width=700,scrollbars=1");
}
</script>
</head>

<body style="margin-top:0;margin-left:0;" bgcolor="#dcdcdc">











<script language='javascript'>alert('您先前已登入失敗達5次!!請30分鐘後再嘗試登入!!');top.location.href='index.html';</script>
<script type="text/javascript">
function go_change()
{
thisform.action = "system/sys010_changepwd_mod.jsp" ;
thisform.method = "post";
thisform.target = "_self";
thisform.submit();
}
</script>
</body>
</html>
25 changes: 24 additions & 1 deletion ios/CourseAppWidget/CourseAppWidget.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ struct CourseAppWidgetEntryView: View {
.padding([.trailing, .leading], 8)
.multilineTextAlignment(.center)
}
.background(getContentBackgroudColor())
.widgetBackground(getContentBackgroudColor())
}
}
}
Expand All @@ -134,6 +134,7 @@ struct CourseAppWidget: Widget {
}
.configurationDisplayName("上課提醒")
.description("提醒本日下一堂課")
.disableContentMarginsIfNeeded()
}
}

Expand All @@ -143,3 +144,25 @@ struct CourseAppWidget_Previews: PreviewProvider {
.previewContext(WidgetPreviewContext(family: .systemSmall))
}
}

extension View {
func widgetBackground(_ backgroundView: some View) -> some View {
if #available(iOSApplicationExtension 17.0, *) {
return containerBackground(for: .widget) {
backgroundView
}
} else {
return background(backgroundView)
}
}
}

extension WidgetConfiguration {
func disableContentMarginsIfNeeded() -> some WidgetConfiguration {
if #available(iOSApplicationExtension 17.0, *) {
return self.contentMarginsDisabled()
} else {
return self
}
}
}
Loading
Loading