Skip to content
This repository was archived by the owner on May 27, 2025. It is now read-only.

Commit a883b0f

Browse files
gohj99gohj99
committed
feat(notifications): Improved chat notifications and optimized some functions
- Optimized the storage and reading of notification history - Added screen zoom factor adjustment - Optimized some functions feat(notifications): 改进聊天通知并优化部分功能 - 优化通知历史记录的存储和读取方式 - 添加了屏幕缩放因子调节 - 优化一些功能 Signed-off-by: gohj99 <[email protected]>
1 parent 1420c62 commit a883b0f

File tree

22 files changed

+562
-127
lines changed

22 files changed

+562
-127
lines changed

‎app/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ android {
2222
minSdk = 26
2323
//noinspection OldTargetApi
2424
targetSdk = 34
25-
versionCode = 30
26-
versionName = "1.4.0beta2"
25+
versionCode = 31
26+
versionName = "1.4.0"
2727

2828
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
2929
vectorDrawables {

‎app/src/main/AndroidManifest.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,10 @@
149149
</intent-filter>
150150
</activity>
151151

152+
<receiver
153+
android:name=".utils.NotificationDismissReceiver"
154+
android:exported="true" />
155+
152156
<provider
153157
android:name="androidx.core.content.FileProvider"
154158
android:authorities="${applicationId}.fileprovider"

‎app/src/main/java/com/gohj99/telewatch/MainActivity.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ class MainActivity : ComponentActivity() {
135135
checkAndUpdateConfiguration(this)
136136
}
137137

138-
if (!settingsSharedPref.getBoolean("Remind1_read", false)) {
138+
if (!settingsSharedPref.getBoolean("Remind2_read", false)) {
139139
startActivity(
140140
Intent(
141141
this,

‎app/src/main/java/com/gohj99/telewatch/RemindActivity.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class RemindActivity : ComponentActivity() {
5353
TelewatchTheme {
5454
SplashRemindScreen { donate ->
5555
with(settingsSharedPref.edit()) {
56-
putBoolean("Remind1_read", true)
56+
putBoolean("Remind2_read", true)
5757
commit()
5858
finish()
5959
}
@@ -105,7 +105,7 @@ fun SplashRemindScreen(done: (Boolean) -> Unit) {
105105
) {
106106
// 主要说明部分
107107
LinkText(
108-
text = stringResource(id = R.string.Remind1),
108+
text = stringResource(id = R.string.Remind2),
109109
style = MaterialTheme.typography.titleMedium,
110110
color = Color.White,
111111
modifier = Modifier.padding(16.dp),

‎app/src/main/java/com/gohj99/telewatch/SettingActivity.kt‎

Lines changed: 80 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,30 @@ class SettingActivity : ComponentActivity() {
199199
1 -> {
200200
title = getString(R.string.UI_Edit)
201201
settingsList.value = listOf(
202+
SettingItem.Click(
203+
itemName = getString(R.string.ui_test),
204+
onClick = {
205+
startActivity(
206+
Intent(
207+
this,
208+
SettingActivity::class.java
209+
).putExtra("page", 4)
210+
)
211+
}
212+
),
213+
SettingItem.ProgressBar(
214+
itemName = getString(R.string.global_scale_factor),
215+
progress = settingsSharedPref.getFloat("global_scale_factor", 1.0f).toFloat(),
216+
maxValue = 2.5f,
217+
minValue = 0.5f,
218+
base = 0.01f,
219+
onProgressChange = { size ->
220+
with(settingsSharedPref.edit()) {
221+
putFloat("global_scale_factor", size)
222+
apply()
223+
}
224+
}
225+
),
202226
SettingItem.ProgressBar(
203227
itemName = getString(R.string.Down_Button_Offset),
204228
progress = settingsSharedPref.getInt("Down_Button_Offset", 25).toFloat(),
@@ -455,7 +479,6 @@ class SettingActivity : ComponentActivity() {
455479
}
456480
)
457481
)
458-
459482
}
460483

461484
3 -> {
@@ -505,6 +528,62 @@ class SettingActivity : ComponentActivity() {
505528
)
506529
)
507530
}
531+
532+
4 -> {
533+
title = getString(R.string.ui_test)
534+
settingsList.value = listOf(
535+
SettingItem.Click(
536+
itemName = "test1",
537+
onClick = {
538+
Toast.makeText(
539+
this,
540+
"test1",
541+
Toast.LENGTH_SHORT
542+
).show()
543+
}
544+
),
545+
SettingItem.Click(
546+
itemName = "test2",
547+
onClick = {
548+
Toast.makeText(
549+
this,
550+
"test2",
551+
Toast.LENGTH_SHORT
552+
).show()
553+
}
554+
),
555+
SettingItem.Click(
556+
itemName = "test3",
557+
onClick = {
558+
Toast.makeText(
559+
this,
560+
"test3",
561+
Toast.LENGTH_SHORT
562+
).show()
563+
}
564+
),
565+
SettingItem.Click(
566+
itemName = "test4",
567+
onClick = {
568+
Toast.makeText(
569+
this,
570+
"test4",
571+
Toast.LENGTH_SHORT
572+
).show()
573+
}
574+
),
575+
SettingItem.Click(
576+
itemName = "test5",
577+
onClick = {
578+
Toast.makeText(
579+
this,
580+
"test5",
581+
Toast.LENGTH_SHORT
582+
).show()
583+
}
584+
)
585+
)
586+
}
508587
}
509588

510589
setContent {

‎app/src/main/java/com/gohj99/telewatch/UiTestActivity.kt‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
/*
2+
* Copyright (c) 2025 gohj99. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
3+
* Morbi non lorem porttitor neque feugiat blandit. Ut vitae ipsum eget quam lacinia accumsan.
4+
* Etiam sed turpis ac ipsum condimentum fringilla. Maecenas magna.
5+
* Proin dapibus sapien vel ante. Aliquam erat volutpat. Pellentesque sagittis ligula eget metus.
6+
* Vestibulum commodo. Ut rhoncus gravida arcu.
7+
*/
8+
9+
package com.gohj99.telewatch
10+
11+
import android.os.Bundle
12+
import androidx.activity.ComponentActivity
13+
import androidx.activity.compose.setContent
14+
import androidx.activity.enableEdgeToEdge
15+
import com.gohj99.telewatch.ui.theme.TelewatchTheme
16+
17+
class UiTestActivity : ComponentActivity() {
18+
override fun onCreate(savedInstanceState: Bundle?) {
19+
super.onCreate(savedInstanceState)
20+
enableEdgeToEdge()
21+
22+
setContent {
23+
TelewatchTheme {
24+
25+
}
26+
}
27+
}
28+
}

‎app/src/main/java/com/gohj99/telewatch/WelcomeActivity.kt‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2024 gohj99. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
2+
* Copyright (c) 2024-2025 gohj99. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
33
* Morbi non lorem porttitor neque feugiat blandit. Ut vitae ipsum eget quam lacinia accumsan.
44
* Etiam sed turpis ac ipsum condimentum fringilla. Maecenas magna.
55
* Proin dapibus sapien vel ante. Aliquam erat volutpat. Pellentesque sagittis ligula eget metus.
@@ -8,7 +8,6 @@
88

99
package com.gohj99.telewatch
1010

11-
import android.content.Context
1211
import android.content.Intent
1312
import android.content.SharedPreferences
1413
import android.os.Bundle
@@ -46,7 +45,7 @@ class WelcomeActivity : ComponentActivity() {
4645
enableEdgeToEdge()
4746

4847
// 获取共享偏好设置
49-
sharedPref = getSharedPreferences("LoginPref", Context.MODE_PRIVATE)
48+
sharedPref = getSharedPreferences("LoginPref", MODE_PRIVATE)
5049
// 注册监听器
5150
getPreferences(MODE_PRIVATE).registerOnSharedPreferenceChangeListener(
5251
preferenceChangeListener

‎app/src/main/java/com/gohj99/telewatch/ui/chat/ChatScreen.kt‎

Lines changed: 110 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@
99
package com.gohj99.telewatch.ui.chat
1010

1111
import android.annotation.SuppressLint
12+
import android.content.ClipboardManager
1213
import android.content.Context
14+
import android.content.Context.CLIPBOARD_SERVICE
15+
import android.content.Intent
16+
import android.net.Uri
1317
import android.widget.Toast
1418
import androidx.compose.foundation.Image
1519
import androidx.compose.foundation.background
@@ -87,7 +91,6 @@ import com.gohj99.telewatch.ui.AutoScrollingText
8791
import com.gohj99.telewatch.ui.CustomButton
8892
import com.gohj99.telewatch.ui.InputBar
8993
import com.gohj99.telewatch.ui.animateScrollToItemCentered
90-
import com.gohj99.telewatch.ui.main.LinkText
9194
import com.gohj99.telewatch.ui.main.MainCard
9295
import com.gohj99.telewatch.ui.main.MessageView
9396
import com.gohj99.telewatch.ui.main.SplashLoadingScreen
@@ -121,6 +124,13 @@ fun getMessageContentTypeName(messageContent: TdApi.MessageContent): String {
121124
return messageContent::class.simpleName ?: "Unknown"
122125
}
123126

127+
// 复制对应内容
128+
fun copyText(text: String, context: Context) {
129+
val clipboardManager = context.getSystemService(CLIPBOARD_SERVICE) as ClipboardManager
130+
val clipData = android.content.ClipData.newPlainText("Copied Text", text)
131+
clipboardManager.setPrimaryClip(clipData)
132+
}
133+
124134
@SuppressLint("MutableCollectionMutableState")
125135
@Composable
126136
fun SplashChatScreen(
@@ -1068,7 +1078,11 @@ fun SplashChatScreen(
10681078
.fillMaxWidth()
10691079
.padding(start = 8.dp, end = 8.dp, top = 8.dp, bottom = 0.dp)
10701080
.verticalScroll(scrollState)
1071-
.verticalRotaryScroll(state = scrollState, pagerState = pagerState, pageCurrent = 1),
1081+
.verticalRotaryScroll(
1082+
state = scrollState,
1083+
pagerState = pagerState,
1084+
pageCurrent = 1
1085+
),
10721086
verticalArrangement = Arrangement.Top
10731087
) {
10741088
if (planEditMessage != null) {
@@ -1550,15 +1564,93 @@ fun messageDrawer(
15501564
showUnknownMessageType: Boolean,
15511565
modifier: Modifier = Modifier
15521566
) {
1567+
val context = LocalContext.current
1568+
1569+
val onEntityClick = { clickedText: String, entityType: TdApi.TextEntityType ->
1570+
// 根据 entityType 执行不同的操作
1571+
when (entityType) {
1572+
is TdApi.TextEntityTypeUrl -> {
1573+
// 打开链接
1574+
// context.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(clickedText)))
1575+
println("Clicked URL: $clickedText")
1576+
onLinkClick(clickedText)
1577+
}
1578+
is TdApi.TextEntityTypeTextUrl -> {
1579+
// 打开 TextUrl 中包含的链接
1580+
val url = entityType.url // 对于 TextUrl，需要获取其内部的 url 字段
1581+
try {
1582+
// val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
1583+
// context.startActivity(intent)
1584+
println("Attempted to open TextUrl: $url (display text: $clickedText)")
1585+
onLinkClick(url)
1586+
} catch (e: Exception) {
1587+
println("Failed to open TextUrl: $e")
1588+
// 显示错误提示
1589+
}
1590+
}
1591+
is TdApi.TextEntityTypeBotCommand -> {
1592+
// 执行机器人命令的逻辑，例如发送消息 "/start"
1593+
// 通常需要将这个命令发送回 Telegram API
1594+
println("Bot Command clicked: $clickedText. Implement sending command.")
1595+
copyText(clickedText, context)
1596+
}
1597+
is TdApi.TextEntityTypeMention -> {
1598+
println("Clicked Mention: $clickedText")
1599+
if (clickedText.startsWith("@")) {
1600+
onLinkClick("https://t.me/${clickedText}")
1601+
}
1602+
}
1603+
is TdApi.TextEntityTypeHashtag -> {
1604+
// 处理点击话题标签的逻辑，例如搜索该话题
1605+
println("Hashtag clicked: $clickedText. Implement searching hashtag.")
1606+
}
1607+
is TdApi.TextEntityTypeEmailAddress -> {
1608+
// 处理点击邮箱地址的逻辑，例如打开邮件应用
1609+
val emailUri = Uri.fromParts("mailto", clickedText, null)
1610+
try {
1611+
val intent = Intent(Intent.ACTION_SENDTO, emailUri)
1612+
context.startActivity(intent)
1613+
println("Attempted to send email to: $clickedText")
1614+
} catch (e: Exception) {
1615+
println("Failed to open email app: $e")
1616+
}
1617+
}
1618+
is TdApi.TextEntityTypePhoneNumber -> {
1619+
// 处理点击电话号码的逻辑，例如打开拨号应用
1620+
val telUri = Uri.fromParts("tel", clickedText.replace("[^\\d+]".toRegex(), ""), null) // 移除除数字和+号外的字符
1621+
try {
1622+
val intent = Intent(Intent.ACTION_DIAL, telUri)
1623+
context.startActivity(intent)
1624+
println("Attempted to dial number: $clickedText")
1625+
} catch (e: Exception) {
1626+
println("Failed to open dialer: $e")
1627+
}
1628+
}
1629+
is TdApi.TextEntityTypeBankCardNumber -> {
1630+
// 处理点击银行卡号的逻辑，例如复制到剪贴板
1631+
println("Bank Card Number clicked: $clickedText. Implement copy to clipboard.")
1632+
copyText(clickedText, context)
1633+
}
1634+
is TdApi.TextEntityTypeBlockQuote -> {
1635+
// 处理点击 BlockQuote 的逻辑 (如果它确实需要点击处理)
1636+
println("Block Quote clicked: $clickedText. Implement blockquote specific action if any.")
1637+
}
1638+
else -> {
1639+
// 默认处理或者不做任何事情
1640+
println("Clicked on entity type without specific handler: ${entityType::class.java.simpleName}")
1641+
}
1642+
}
1643+
}
1644+
15531645
when (content) {
15541646
is TdApi.MessageText -> {
15551647
SelectionContainer {
1556-
LinkText(
1648+
FormattedText(
15571649
text = content.text.text,
1558-
color = Color(0xFFFEFEFE),
1650+
entities = content.text.entities,
1651+
modifier = modifier,
15591652
style = MaterialTheme.typography.bodyMedium,
1560-
onLinkClick = onLinkClick,
1561-
modifier = modifier
1653+
onEntityClick = onEntityClick
15621654
)
15631655
}
15641656
}
@@ -1584,12 +1676,12 @@ fun messageDrawer(
15841676
// 图片文字
15851677
content.caption?.text?.let {
15861678
SelectionContainer {
1587-
LinkText(
1679+
FormattedText(
15881680
text = it,
1589-
color = Color(0xFFFEFEFE),
1590-
modifier = modifier.padding(top = 4.dp),
1681+
entities = content.caption.entities,
1682+
modifier = modifier,
15911683
style = MaterialTheme.typography.bodyMedium,
1592-
onLinkClick = onLinkClick
1684+
onEntityClick = onEntityClick
15931685
)
15941686
}
15951687
}
@@ -1651,12 +1743,12 @@ fun messageDrawer(
16511743
// 视频文字
16521744
content.caption?.text?.let {
16531745
SelectionContainer {
1654-
LinkText(
1746+
FormattedText(
16551747
text = it,
1656-
color = Color(0xFFFEFEFE),
1657-
modifier = modifier.padding(top = 4.dp),
1748+
entities = content.caption.entities,
1749+
modifier = modifier,
16581750
style = MaterialTheme.typography.bodyMedium,
1659-
onLinkClick = onLinkClick
1751+
onEntityClick = onEntityClick
16601752
)
16611753
}
16621754
}
@@ -1741,12 +1833,12 @@ fun messageDrawer(
17411833
// 文件文字
17421834
content.caption?.text?.let {
17431835
SelectionContainer {
1744-
LinkText(
1836+
FormattedText(
17451837
text = it,
1746-
color = Color(0xFFFEFEFE),
1747-
modifier = modifier.padding(top = 4.dp),
1838+
entities = content.caption.entities,
1839+
modifier = modifier,
17481840
style = MaterialTheme.typography.bodyMedium,
1749-
onLinkClick = onLinkClick
1841+
onEntityClick = onEntityClick
17501842
)
17511843
}
17521844
}

0 commit comments

Comments
 (0)