diff --git a/app/build.gradle b/app/build.gradle
index 7deb2dd..1c5ac96 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -63,10 +63,10 @@ dependencies {
implementation 'androidx.core:core-ktx:1.9.0'
implementation "androidx.compose.ui:ui:$compose_version"
implementation "androidx.compose.ui:ui-util:$compose_version"
- implementation "androidx.compose.material:material-icons-extended:1.4.0"
+ implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
+ implementation "androidx.compose.material:material-icons-extended:$compose_version"
implementation "androidx.compose.material3:material3:$material3"
implementation "androidx.compose.material:material:1.3.1"
- implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1'
implementation 'androidx.activity:activity-compose:1.7.0'
implementation "com.google.accompanist:accompanist-navigation-animation:$accompanist"
diff --git a/app/src/main/java/com/ldlywt/memo/ui/component/DisplayText.kt b/app/src/main/java/com/ldlywt/memo/ui/component/DisplayText.kt
index 6f1ab56..8adcbbf 100644
--- a/app/src/main/java/com/ldlywt/memo/ui/component/DisplayText.kt
+++ b/app/src/main/java/com/ldlywt/memo/ui/component/DisplayText.kt
@@ -31,7 +31,7 @@ fun DisplayText(
) {
Text(
modifier = Modifier
- .height(44.dp),
+ .height(48.dp),
// .animateContentSize(tween()),
text = text,
style = MaterialTheme.typography.displaySmall.copy(
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 499993e..b872aa8 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -1,6 +1,6 @@
- Light Memos
+ 轻笔记
搜索
返回
灵感
@@ -36,6 +36,47 @@
分享
归档
探索
+ 用户协议
+ 联系
+ 开发者：ldlywt
+ Json 导出
+ 导出为 Json 数据，不支持图片附件
+ 颜色和样式
+ 主题、色调样式
+ 本地数据管理
+ 本地数据备份/还原/Json导出
+ 数据本地持久化
+ 云数据管理
+ 云数据账号配置/备份/还原
+ 标签修复
+ 修正标签与笔记之间的关系
+ 关于
+ 数据备份
+ 将数据进行备份
+ 数据导出
+ 还原已经备份过的数据
+ 外观
+ 深色主题
+ 跟随系统设置
+ 开启
+ 关闭
+ AMOLED 深色主题
+ 其他
+ 壁纸颜色
+ 基本颜色
+ 暂无色板
+ 仅限 Android 8.1+
+ 清除
+ 粘贴
+ 强调色
+ 例如 #666666 或 666666
+ 捐赠
+ 帮助
+ 云盘账号配置
+ 云盘的账号密码配置
+ 服务器地址
+ 添加
+ 在此之前，请阅读并同意服务条款与隐私政策。
查看《服务条款与隐私政策》
同意
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e561341..398a9ff 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3,7 +3,7 @@
Search
Back
Memos
- New Memo
+ New
Compose
Remove
Resources
@@ -44,45 +44,45 @@
QQ: 670831931
Icon
- Json导出
- 导出为 Json 数据，不支持图片附件
- 颜色和样式
- 主题、色调样式
- 本地数据管理
- 本地数据备份/还原/Json导出
- 数据本地持久化
- 云数据管理
- 云数据账号配置/备份/还原
- 标签修复
- 修正标签与笔记之间的关系
- 关于、开源
- 数据备份
- 将数据进行备份
- 数据导出
- 还原已经备份过的数据
- 外观
- 深色主题
- 跟随系统设置
- 开启
- 关闭
- AMOLED 深色主题
- 其他
- 壁纸颜色
- 基本颜色
- 暂无色板
- 仅限 Android 8.1+
- 清除
- 粘贴
- 强调色
- 例如 #666666 或 666666
- 捐赠
- 帮助
- 云盘账号配置
- 云盘的账号密码配置
- 服务器地址
- 添加
- Welcome
- 在此之前，请阅读并同意服务条款与隐私政策。
- 查看《服务条款与隐私政策》
+ Json Export
+ Export as Json data, does not support image attachments
+ Color and Style
+ Themes, Color Styles
+ Local Data
+ Local data backup/restore/Json export
+ Data local persistence
+ Cloud Data
+ Cloud data configuration/backup/restore
+ Tag Repair
+ About
+ Data Backup
+ Backup Data
+ Restoring data that has been backed up
+ Exterior
+ Follow System
+ AMOLED Dark Theme
+ Other
+ Wallpaper Color
+ Basic Color
+ No Color Palette
+ Android 8.1+ Only
+ For example #666666 or 666666
+ Cloud disk account password configuration
+ Welcome
+ Browse the <i><u>Terms of Service and Privacy Policy</u></i>
Agree
+ Fix relationship between tags and notes
+ Data Export
+ Dark Theme
+ On
+ Off
+ Clear
+ Paste
+ Primary Color
+ Sponsor
+ Help
+ Cloud Data Config
+ Server Address
+ Add
+ Before doing so, please read and agree to the Terms of Service and Privacy Policy.
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index b9086bf..51f65ad 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,16 +6,8 @@ buildscript {
accompanist = '0.30.0'
// https://developer.android.com/jetpack/androidx/releases/compose-material3
material3 = '1.1.0-beta01'
- // https://square.github.io/okhttp/changelogs/changelog/
- okhttp_version = '4.10.0'
- // https://github.com/square/retrofit/tags
- retrofit_version = '2.9.0'
// https://developer.android.com/jetpack/androidx/releases/datastore
datastore = "1.0.0"
- // https://github.com/skydoves/sandwich/releases
- sandwich = "1.3.5"
- // https://github.com/square/moshi/tags
- moshi = "1.14.0"
// https://developer.android.com/jetpack/androidx/releases/paging
paging_version = "3.1.1"
accompanist = '0.24.7-alpha'