Skip to content

Commit

Permalink
Merge branch 'nightly' into 'master'
Browse files Browse the repository at this point in the history
更新語言文件

See merge request telegram-sms/telegram-sms!62
  • Loading branch information
qwe7002 committed Jul 16, 2022
2 parents 7120677 + d134f36 commit 8a5b764
Show file tree
Hide file tree
Showing 8 changed files with 31 additions and 18 deletions.
8 changes: 4 additions & 4 deletions .reall_network/changelog.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- Support Android 12
- Support Android 13

- Fix scan code bug
- Fix the bug that the background process is suddenly killed

- Remove SIM card status monitoring function
- Update dependency version

- Fix the bug that the background process is suddenly killed
- Add Cantonese translation
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,8 @@ I would also like to thank the following people for their hard work to localise
- Chinese(Traditional)
- [@lm902](https://github.com/lm902)
- [@孟武尼德霍格龍](https://github.com/tony8077616)
- Cantonese (Simp./Trad.) (Remember: these translations are only available when the locale is set/fallbacked to 粵語(香港)or 粤语(中华人民共和国) )
- [@ous50](https://github.com/ous50)

This APP uses the following public DNS service:

Expand Down
16 changes: 8 additions & 8 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
android {
compileSdkVersion 32
compileSdk 33
defaultConfig {
applicationId "com.qwe7002.telegram_sms"
minSdkVersion 22
targetSdkVersion 32
targetSdk 33
versionCode System.getenv("VERSION_CODE") == null ? 1 : System.getenv("VERSION_CODE").toInteger()
versionName System.getenv("VERSION_NAME") == null ? "Debug": System.getenv("VERSION_NAME").toString()
ndk{
Expand Down Expand Up @@ -37,19 +37,19 @@ android {
}

dependencies {
implementation 'androidx.appcompat:appcompat:1.4.1'
implementation 'androidx.appcompat:appcompat:1.4.2'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'com.google.android.material:material:1.6.1'
implementation 'androidx.browser:browser:1.4.0'
implementation 'com.squareup.okio:okio:3.0.0-alpha.9'
implementation 'com.squareup.okio:okio:3.2.0'
implementation 'com.squareup.okhttp3:okhttp:5.0.0-alpha.2'
implementation 'com.squareup.okhttp3:okhttp-dnsoverhttps:5.0.0-alpha.2'
implementation 'org.conscrypt:conscrypt-android:2.5.2'
implementation 'com.google.code.gson:gson:2.8.9'
implementation 'io.github.pilgr:paperdb:2.7.1'
implementation 'com.google.code.gson:gson:2.9.0'
implementation 'io.github.pilgr:paperdb:2.7.2'
implementation 'com.github.yuriy-budiyev:code-scanner:2.1.0'
implementation 'androidx.core:core-ktx:1.7.0'
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21'
implementation 'androidx.core:core-ktx:1.8.0'
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10'
}

task copy_language_pack(type: Copy) {
Expand Down
2 changes: 1 addition & 1 deletion app/language_pack
1 change: 1 addition & 0 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:networkSecurityConfig="@xml/network_security_config"
android:localeConfig="@xml/locale_config"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme"
Expand Down
10 changes: 10 additions & 0 deletions app/src/main/res/xml/locale_config.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<locale-config xmlns:android="http://schemas.android.com/apk/res/android">
<locale android:name="en"/>
<locale android:name="ja"/>
<locale android:name="es"/>
<locale android:name="zh-CN"/>
<locale android:name="zh-TW"/>
<locale android:name="yue-CN"/>
<locale android:name="yue-HK"/>
</locale-config>
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ buildscript {

}
dependencies {
classpath 'com.android.tools.build:gradle:7.1.3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21"
classpath 'com.android.tools.build:gradle:7.2.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10"
}
}

Expand Down
6 changes: 3 additions & 3 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Tue Jul 14 23:01:04 CST 2020
#Thu Jun 30 21:14:53 HKT 2022
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
zipStoreBase=GRADLE_USER_HOME

0 comments on commit 8a5b764

Please sign in to comment.