Skip to content

Commit

Permalink
Merge pull request #345 from UM-ARK/3-0-0-Good
Browse files Browse the repository at this point in the history
ARK ALL 3.0.0
  • Loading branch information
yyyyyyounger authored Jul 31, 2024
2 parents 6b0b261 + 7d7ca8c commit c4674c6
Show file tree
Hide file tree
Showing 23 changed files with 1,402 additions and 903 deletions.
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,7 @@ ios/UMAllWhite.xcodeproj/project.pbxproj
ios/UMAllWhite.xcodeproj/project.pbxproj

# Google Firebase
# google-services.json
# google-services.json

# UM API Token
umAPIToken.json
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

## 🎉 首次運行該項目

在此查看[已知 BUG](https://github.com/UM-ARK/UM-All-Frontend/blob/master/debugging_doc.md#android%E9%96%8B%E7%99%BC%E7%92%B0%E5%A2%83)
在此查看[已知 BUG](./README/debugging_doc.md#android%E9%96%8B%E7%99%BC%E7%92%B0%E5%A2%83)

### 🤖 Android 環境 [Setup](https://reactnative.dev/docs/environment-setup)

Expand Down Expand Up @@ -162,7 +162,7 @@ yarn ios --simulator="iPhone 15"

### 🐛 故障排除

在此查看[Android 解決方案](https://github.com/UM-ARK/UM-All-Frontend/blob/master/debugging_doc.md#android)[iOS 解決方案](https://github.com/UM-ARK/UM-All-Frontend/blob/master/debugging_doc.md#ios)
在此查看[Android 解決方案](./README/debugging_doc.md#android)[iOS 解決方案](./README/debugging_doc.md#ios)


---
Expand All @@ -171,7 +171,7 @@ yarn ios --simulator="iPhone 15"

## ⛵ 維護須知

1. 澳大日曆更新。從 `https://reg.um.edu.mo/university-almanac/?lang=zh-hant` 獲取 ics 文件;使用任何工具將 ics 轉為 json,例如 `https://ical-to-json.herokuapp.com/`**務必注意最終 json 中的 key 必須為小寫**。覆蓋 `src/static/UMCalendar/UMCalendar.json` 中的內容即可。
1. 澳大日曆更新。從 `https://reg.um.edu.mo/university-almanac/?lang=zh-hant` 獲取 ics 文件;使用任何工具將 ics 轉為 json(course-data-parse倉庫內也有icsToJSON工具),例如 `https://ical-to-json.herokuapp.com/`**務必注意最終 json 中的 key 必須為小寫**。覆蓋 `src/static/UMCalendar/UMCalendar.json` 中的內容即可。
* 按照程序注釋增加校曆的繁體中文翻譯內容。
2. 澳大課程更新。使用預選課Excel,使用Excel to JSON工具獲得JSON數據,放入`src/static/UMCourses/offer courses.json`
* 按照程序注釋增加開設課程的繁體中文翻譯內容。
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,8 @@ android {
applicationId "one.umall"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 57
versionName "2.8.6"
versionCode 58
versionName "3.0.0"
buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()

if (isNewArchitectureEnabled()) {
Expand Down
2 changes: 1 addition & 1 deletion android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {
buildToolsVersion = "31.0.0"
minSdkVersion = 21
compileSdkVersion = 33
targetSdkVersion = 33
targetSdkVersion = 34

if (System.properties['os.arch'] == "aarch64") {
// For M1 Users we need to use the NDK 24 which added support for aarch64
Expand Down
36 changes: 18 additions & 18 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -326,24 +326,24 @@ PODS:
- glog
- react-native-cameraroll (5.6.0):
- React-Core
- react-native-compressor (1.8.23):
- react-native-compressor (1.8.25):
- React-Core
- react-native-cookies (6.2.1):
- React-Core
- react-native-image-picker (4.10.3):
- React-Core
- react-native-menu (0.9.1):
- React
- react-native-pager-view (6.2.3):
- react-native-pager-view (6.3.3):
- React-Core
- react-native-restart (0.0.24):
- React-Core
- react-native-safe-area-context (4.9.0):
- react-native-safe-area-context (4.10.7):
- React-Core
- react-native-simple-toast (3.3.0):
- react-native-simple-toast (3.3.1):
- React-Core
- Toast (~> 4)
- react-native-webview (13.8.1):
- react-native-webview (13.10.4):
- React-Core
- React-perflogger (0.68.7)
- React-RCTActionSheet (0.68.7):
Expand Down Expand Up @@ -414,9 +414,9 @@ PODS:
- React
- rn-fetch-blob (0.12.0):
- React-Core
- RNCAsyncStorage (1.21.0):
- RNCAsyncStorage (1.23.1):
- React-Core
- RNCClipboard (1.13.2):
- RNCClipboard (1.14.1):
- React-Core
- RNDateTimePicker (6.7.5):
- React-Core
Expand All @@ -433,7 +433,7 @@ PODS:
- React-Core
- RNFS (2.20.0):
- React-Core
- RNGestureHandler (2.14.1):
- RNGestureHandler (2.17.1):
- React-Core
- RNInAppBrowser (3.7.0):
- React-Core
Expand Down Expand Up @@ -468,7 +468,7 @@ PODS:
- React-RCTText
- ReactCommon/turbomodule/core
- Yoga
- RNScreens (3.29.0):
- RNScreens (3.32.0):
- React-Core
- React-RCTImage
- RNSVG (12.5.1):
Expand Down Expand Up @@ -715,15 +715,15 @@ SPEC CHECKSUMS:
React-jsinspector: cab4d37ebde480f84c79ac89568abbf76b916c3e
React-logger: b75b80500ea80457b2cf169427d66de986cdcb29
react-native-cameraroll: 755bcc628148a90a7c9cf3f817a252be3a601bc5
react-native-compressor: 83d346f200b8618e890eb17a9cd486b1cd10dedc
react-native-compressor: c8a35e0e7b80b041804a7bed0cc97d647e487294
react-native-cookies: f54fcded06bb0cda05c11d86788020b43528a26c
react-native-image-picker: 60f4246eb5bb7187fc15638a8c1f13abd3820695
react-native-menu: 9728f90160c36b9a75481fc76e05354b99d54c59
react-native-pager-view: c29d484f19c49ff19525a94105e4ab2c4d4ae273
react-native-pager-view: 73a454fe1b01c275a6a11a99cccd659f6899bfdd
react-native-restart: 45c8dca02491980f2958595333cbccd6877cb57e
react-native-safe-area-context: b97eb6f9e3b7f437806c2ce5983f479f8eb5de4b
react-native-simple-toast: 6148335d096ab63dc852535ec64c82527315d575
react-native-webview: bef49fb935d75e1ca83aed3ac74eecf5b78764ac
react-native-safe-area-context: 422017db8bcabbada9ad607d010996c56713234c
react-native-simple-toast: 1f1cc551d419bc0ab05dcb0136554006c274789d
react-native-webview: 625925488f70034d18162509da93c320a8a56325
React-perflogger: 44436b315d757100a53dfb1ab6b77c58cb646d7d
React-RCTActionSheet: 1888a229684762c40cc96c7ff4716f809655dc09
React-RCTAnimation: f05da175751867521d14b02ab4d3994a7b96f131
Expand All @@ -738,19 +738,19 @@ SPEC CHECKSUMS:
ReactCommon: 29bb6fad3242e30e9d049bc9d592736fa3da9e50
ReactNativeUiLib: 8d3804947431a465a69f09c5e785c988314612a9
rn-fetch-blob: f065bb7ab7fb48dd002629f8bdcb0336602d3cba
RNCAsyncStorage: 618d03a5f52fbccb3d7010076bc54712844c18ef
RNCClipboard: 60fed4b71560d7bfe40e9d35dea9762b024da86d
RNCAsyncStorage: 826b603ae9c0f88b5ac4e956801f755109fa4d5c
RNCClipboard: 0a720adef5ec193aa0e3de24c3977222c7e52a37
RNDateTimePicker: 65e1d202799460b286ff5e741d8baf54695e8abd
RNFastImage: 5c9c9fed9c076e521b3f509fe79e790418a544e8
RNFBAnalytics: ec290267aac57446c10b491293373ac86357f575
RNFBApp: 9b25191f7a5e72c185b7e43fffb0d906869c4659
RNFS: 4ac0f0ea233904cb798630b3c077808c06931688
RNGestureHandler: e98441928705d9d1184b599d7c1c6df2dd4f7724
RNGestureHandler: 30704285c8ef803f7705f92dd9428261ed756e24
RNInAppBrowser: e36d6935517101ccba0e875bac8ad7b0cb655364
RNPermissions: b8968413f8aba5d451e59f269277583d36eb2b6d
RNReactNativeHapticFeedback: ec56a5f81c3941206fd85625fa669ffc7b4545f9
RNReanimated: 1f117be601c59177816351a965bc57320b766c15
RNScreens: fa9b582d85ae5d62c91c66003b5278458fed7aaa
RNScreens: afdbd43bcd6c81559917054da18ad101b4395000
RNSVG: d7d7bc8229af3842c9cfc3a723c815a52cdd1105
SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d
Expand Down
12 changes: 6 additions & 6 deletions ios/UMALL.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -623,18 +623,18 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = UMALL/UMALL.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CURRENT_PROJECT_VERSION = 2.8.6;
CURRENT_PROJECT_VERSION = 3.0.0;
DEVELOPMENT_TEAM = UVSHNJYJWU;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = UMALL/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = 2.8.6;
INFOPLIST_KEY_CFBundleDisplayName = 3.0.0;
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 2.8.6;
MARKETING_VERSION = 3.0.0;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand All @@ -661,17 +661,17 @@
CODE_SIGN_ENTITLEMENTS = UMALL/UMALL.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development";
CURRENT_PROJECT_VERSION = 2.8.6;
CURRENT_PROJECT_VERSION = 3.0.0;
DEVELOPMENT_TEAM = UVSHNJYJWU;
INFOPLIST_FILE = UMALL/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = 2.8.6;
INFOPLIST_KEY_CFBundleDisplayName = 3.0.0;
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 2.8.6;
MARKETING_VERSION = 3.0.0;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand Down
Loading

0 comments on commit c4674c6

Please sign in to comment.