Skip to content

Commit

Permalink
Merge pull request #413 from ppolariss/main
Browse files Browse the repository at this point in the history
change: rename
  • Loading branch information
w568w authored Sep 5, 2024
2 parents 4adaffc + da091c5 commit 219b929
Show file tree
Hide file tree
Showing 28 changed files with 126 additions and 124 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug--.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ assignees: ''
**系统信息**
- 设备型号:
- 系统版本:
- 旦夕版本(见「设置-关于本应用」):
- 旦挞校园助手版本(见「设置-关于本应用」):
2 changes: 1 addition & 1 deletion CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ further defined and clarified by project maintainers.
## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting
the project team at dev@fduhole.com. All complaints will be reviewed and investigated and
the project team at dev@danta.tech. All complaints will be reviewed and investigated and
will result in a response that is deemed necessary and appropriate to the circumstances. The project
team is obligated to maintain confidentiality with regard to the reporter of an incident. Further
details of specific enforcement policies may be posted separately.
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Contributing to DanXi
# Contributing to Danta

:+1::tada: First off, thanks for taking the time to contribute! :tada::+1:

Above all, DanXi(or Danxi, 旦夕) is the source part of an application hosted by Github. We do not want to set a lot of guidelines or something else, just judge your contribution by your heart! ;)
Above all, Danta(or Danta, 旦挞) is the source part of an application hosted by Github. We do not want to set a lot of guidelines or something else, just judge your contribution by your heart! ;)

## :+1: What we love to see
- Codes linted with [Prettier](https://prettier.io/), or similar tools provided by your IDE
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
中文版 [English Version](README_EN.md)
[官方网站](https://danxi.fduhole.com)

# 旦夕
# 旦挞

[![CI](https://github.com/DanXi-Dev/DanXi/actions/workflows/ci_ios.yml/badge.svg)](https://github.com/DanXi-Dev/DanXi/actions/workflows/ci_ios.yml)
[![Deploy to GitHub Pages](https://github.com/DanXi-Dev/DanXi/actions/workflows/deploy_to_gh-pages.yml/badge.svg)](https://github.com/DanXi-Dev/DanXi/actions/workflows/deploy_to_gh-pages.yml)

原名旦兮
原名旦夕、旦兮

日月光华,旦复旦兮.

Expand Down Expand Up @@ -88,4 +88,4 @@ dart run build_runner build --delete-conflicting-outputs

由于 Apple Developer Program 费用(发布应用至 App Store 和 TestFlight 所必需)费用较高,如果您希望赞助我们,请通过邮件联系我们!

我们的邮箱:[dev@fduhole.com](mailto:dev@fduhole.com)
我们的邮箱:[dev@danta.tech](mailto:dev@danta.tech)
6 changes: 3 additions & 3 deletions README_EN.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[中文版](README.md) English Version
[Official Website(Chinese Only)](https://danxi.fduhole.com)

# DanXi
# Danta

[![CI](https://github.com/DanXi-Dev/DanXi/actions/workflows/ci_ios.yml/badge.svg)](https://github.com/DanXi-Dev/DanXi/actions/workflows/ci_ios.yml)
[![Deploy to GitHub Pages](https://github.com/DanXi-Dev/DanXi/actions/workflows/deploy_to_gh-pages.yml/badge.svg)](https://github.com/DanXi-Dev/DanXi/actions/workflows/deploy_to_gh-pages.yml)
Expand All @@ -14,7 +14,7 @@ again.)

Maybe the best all-rounded service app for Fudan University students!

**DanXi only support Chinese (Simplified) and English language at the moment. Come to help us!**
**Danta only support Chinese (Simplified) and English language at the moment. Come to help us!**

- Campus card balance and transactions
- Dining hall traffic
Expand All @@ -33,7 +33,7 @@ This application is still at active development stage, we will be happy if you c
# Install

If you meet abnormal behavior in
DanXi,Please [create an issue](https://github.com/DanXi-Dev/DanXi/issues/new/choose)
Danta, Please [create an issue](https://github.com/DanXi-Dev/DanXi/issues/new/choose)
or [create a new pull request](https://github.com/DanXi-Dev/DanXi/compare).

## Windows
Expand Down
6 changes: 3 additions & 3 deletions assets/texts/tips.dat
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
请勿引战、钓鱼
政治相关讨论必须严格遵守我国法律法规和社区公约
性相关属于敏感话题,只支持学术性讨论
反馈旦夕、茶楼问题和建议请到站务分区
反馈旦挞校园助手、茶楼问题和建议请到站务分区
你有权通过电子邮件上诉管理团队的处罚决定
请在正确的分区发帖
发帖时请打好合适的 Tag
旦夕开发团队的邮箱是 dev@fduhole.com
编辑器支持自动保存草稿,但退出旦夕会清空草稿
旦挞开发团队的邮箱是 dev@danta.tech
编辑器支持自动保存草稿,但退出旦挞校园助手会清空草稿
对某些帖子不感兴趣?去设置屏蔽一下吧
4 changes: 2 additions & 2 deletions ios/Runner/Base.lproj/InfoPlist.strings
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
CFBundleDisplayName = "DanXi";
NSLocationWhenInUseUsageDescription = "To provide location information for Safety Fudan check-in";
NSLocationAlwaysUsageDescription = "To provide location information for Safety Fudan check-in";
NSPhotoLibraryUsageDescription = "To upload images to FDUHole";
NSCameraUsageDescription = "To upload images to FDUHole";
NSPhotoLibraryUsageDescription = "To upload images to Forum";
NSCameraUsageDescription = "To upload images to Forum";
NSCalendarsUsageDescription = "To save events to your calendar";
4 changes: 2 additions & 2 deletions ios/Runner/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,13 @@
<key>NSCalendarsUsageDescription</key>
<string>为向系统日历中添加课程表和考试日程</string>
<key>NSCameraUsageDescription</key>
<string>为上传图片至树洞</string>
<string>为上传图片至茶楼</string>
<key>NSLocationAlwaysUsageDescription</key>
<string></string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>为平安复旦打卡提供位置信息</string>
<key>NSPhotoLibraryUsageDescription</key>
<string>为上传图片至树洞</string>
<string>为上传图片至茶楼</string>
<key>UIApplicationSceneManifest</key>
<dict>
<key>UIApplicationSupportsMultipleScenes</key>
Expand Down
4 changes: 2 additions & 2 deletions ios/Runner/en.lproj/InfoPlist.strings
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
CFBundleDisplayName = "DanXi";
NSLocationWhenInUseUsageDescription = "To provide location information for Safety Fudan check-in";
NSLocationAlwaysUsageDescription = "To provide location information for Safety Fudan check-in";
NSPhotoLibraryUsageDescription = "To upload images to FDUHole";
NSCameraUsageDescription = "To upload images to FDUHole";
NSPhotoLibraryUsageDescription = "To upload images to Forum";
NSCameraUsageDescription = "To upload images to Forum";
NSCalendarsUsageDescription = "To save events to your calendar";
4 changes: 2 additions & 2 deletions ios/Runner/ja.lproj/InfoPlist.strings
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
CFBundleDisplayName = "DanXi";
NSLocationWhenInUseUsageDescription = "To provide location information for Safety Fudan check-in";
NSLocationAlwaysUsageDescription = "To provide location information for Safety Fudan check-in";
NSPhotoLibraryUsageDescription = "To upload images to FDUHole";
NSCameraUsageDescription = "To upload images to FDUHole";
NSPhotoLibraryUsageDescription = "To upload images to Forum";
NSCameraUsageDescription = "To upload images to Forum";
NSCalendarsUsageDescription = "To save events to your calendar";
4 changes: 2 additions & 2 deletions ios/Runner/zh-Hans.lproj/InfoPlist.strings
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
CFBundleDisplayName = "旦夕";
NSLocationWhenInUseUsageDescription = "为平安复旦打卡提供位置信息";
NSLocationAlwaysUsageDescription = "为平安复旦打卡提供位置信息";
NSPhotoLibraryUsageDescription = "为上传图片至FDUHole";
NSCameraUsageDescription = "为上传图片至FDUHole";
NSPhotoLibraryUsageDescription = "为上传图片至Forum";
NSCameraUsageDescription = "为上传图片至Forum";
NSCalendarsUsageDescription = "为向系统日历中添加课程表和考试日程";
2 changes: 1 addition & 1 deletion ios/nano Extension/zh-Hans.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

// Content View
"dashboard" = "Dashboard";
"treehole" = "树洞";
"treehole" = "茶楼";

// Login Page
"login" = "Login";
Expand Down
10 changes: 5 additions & 5 deletions lib/common/constant.dart
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import 'package:flutter/services.dart';

/// Store some important constants, such as app id, default color styles, etc.
class Constant {
/// The number of posts on each pages returned from the server of FDUHole.
/// The number of posts on each pages returned from the server of Forum.
static const POST_COUNT_PER_PAGE = 10;

/// The number of serach results on each pages returned from the server of Danke.
Expand All @@ -64,7 +64,7 @@ class Constant {

static const String APPSTORE_APPID = '1568629997';

/// A link to the "forget password" page of FDUHole.
/// A link to the "forget password" page of Forum.
static const String FORUM_FORGOT_PASSWORD_URL =
"https://auth.fduhole.com/register?type=forget_password";

Expand Down Expand Up @@ -101,9 +101,9 @@ class Constant {
static String get version {
if (PlatformX.isWeb) {
// web does not support [Platform] API
return "DanXi/${FlutterApp.versionName}b${Pubspec.version.build.single} (Web)";
return "Danta/${FlutterApp.versionName}b${Pubspec.version.build.single} (Web)";
} else {
return "DanXi/${FlutterApp.versionName}b${Pubspec.version.build.single} (${Platform.operatingSystem}; ${Platform.operatingSystemVersion})";
return "Danta/${FlutterApp.versionName}b${Pubspec.version.build.single} (${Platform.operatingSystem}; ${Platform.operatingSystemVersion})";
}
}

Expand Down Expand Up @@ -450,7 +450,7 @@ class Constant {
);
}

/// A list of tag colors used by FDUHole.
/// A list of tag colors used by Forum.
static const List<String> TAG_COLOR_LIST = [
'red',
'pink',
Expand Down
Loading

0 comments on commit 219b929

Please sign in to comment.