Skip to content

Commit

Permalink
Merge pull request #35 from gohj99/develop
Browse files Browse the repository at this point in the history
Updated to 1.3.2
  • Loading branch information
gohj99 authored Jan 23, 2025
2 parents db3c566 + 162088a commit 1c333cc
Show file tree
Hide file tree
Showing 32 changed files with 1,965 additions and 1,103 deletions.
6 changes: 6 additions & 0 deletions .idea/AndroidProjectSystem.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 6 additions & 11 deletions .idea/deploymentTargetSelector.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions .idea/inspectionProfiles/Project_Default.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2024 gohj99. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
* Copyright (c) 2024-2025 gohj99. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
* Morbi non lorem porttitor neque feugiat blandit. Ut vitae ipsum eget quam lacinia accumsan.
* Etiam sed turpis ac ipsum condimentum fringilla. Maecenas magna.
* Proin dapibus sapien vel ante. Aliquam erat volutpat. Pellentesque sagittis ligula eget metus.
Expand All @@ -22,7 +22,7 @@ android {
//noinspection OldTargetApi
targetSdk = 34
versionCode = 22
versionName = "1.3.1"
versionName = "1.3.2"

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables {
Expand Down
12 changes: 11 additions & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright (c) 2024 gohj99. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
~ Copyright (c) 2024-2025 gohj99. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
~ Morbi non lorem porttitor neque feugiat blandit. Ut vitae ipsum eget quam lacinia accumsan.
~ Etiam sed turpis ac ipsum condimentum fringilla. Maecenas magna.
~ Proin dapibus sapien vel ante. Aliquam erat volutpat. Pellentesque sagittis ligula eget metus.
Expand Down Expand Up @@ -31,6 +31,16 @@
android:theme="@style/Theme.Telewatch"
tools:ignore="WearStandaloneAppFlag"
tools:targetApi="31">
<activity
android:name=".DonateActivity"
android:exported="true"
android:label="@string/donate_activity"
android:theme="@style/Theme.Telewatch" />
<activity
android:name=".RemindActivity"
android:exported="true"
android:label="@string/remind_activity"
android:theme="@style/Theme.Telewatch" />
<activity
android:name=".ChatInfoActivity"
android:exported="true"
Expand Down
4 changes: 3 additions & 1 deletion app/src/main/java/com/gohj99/telewatch/ChatActivity.kt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2024 gohj99. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
* Copyright (c) 2024-2025 gohj99. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
* Morbi non lorem porttitor neque feugiat blandit. Ut vitae ipsum eget quam lacinia accumsan.
* Etiam sed turpis ac ipsum condimentum fringilla. Maecenas magna.
* Proin dapibus sapien vel ante. Aliquam erat volutpat. Pellentesque sagittis ligula eget metus.
Expand Down Expand Up @@ -63,6 +63,7 @@ class ChatActivity : ComponentActivity() {

override fun onDestroy() {
super.onDestroy()
TgApiManager.tgApi!!.saveChatId = 0L
TgApiManager.tgApi?.exitChatPage()
}

Expand Down Expand Up @@ -177,6 +178,7 @@ class ChatActivity : ComponentActivity() {
lastReadOutboxMessageId.value = itChatObject.lastReadOutboxMessageId
lastReadInboxMessageId.value = itChatObject.lastReadInboxMessageId

TgApiManager.tgApi!!.saveChatId = itChatObject.id
runOnUiThread {
setContent {
TelewatchTheme {
Expand Down
256 changes: 256 additions & 0 deletions app/src/main/java/com/gohj99/telewatch/DonateActivity.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,256 @@
/*
* Copyright (c) 2025 gohj99. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
* Morbi non lorem porttitor neque feugiat blandit. Ut vitae ipsum eget quam lacinia accumsan.
* Etiam sed turpis ac ipsum condimentum fringilla. Maecenas magna.
* Proin dapibus sapien vel ante. Aliquam erat volutpat. Pellentesque sagittis ligula eget metus.
* Vestibulum commodo. Ut rhoncus gravida arcu.
*/

package com.gohj99.telewatch

import android.os.Bundle
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.activity.enableEdgeToEdge
import androidx.compose.foundation.Image
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.rememberLazyListState
import androidx.compose.foundation.text.selection.SelectionContainer
import androidx.compose.material3.Card
import androidx.compose.material3.CardDefaults
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import com.gohj99.telewatch.ui.main.LinkText
import com.gohj99.telewatch.ui.theme.TelewatchTheme
import com.gohj99.telewatch.ui.verticalRotaryScroll
import com.gohj99.telewatch.utils.urlHandle

class DonateActivity : ComponentActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
enableEdgeToEdge()
setContent {
TelewatchTheme {
SplashDonateScreen()
}
}
}
}

@Composable
fun SplashDonateScreen() {
Column(
modifier = Modifier
.fillMaxSize()
) {
// 包含 Row 的 Box
Box(
modifier = Modifier
.fillMaxWidth() // 只填充宽度
.padding(top = 14.dp) // 添加顶部填充
) {
Row(
modifier = Modifier
.align(Alignment.TopCenter) // 将 Row 对齐到顶部中央
.padding(horizontal = 20.dp),
verticalAlignment = Alignment.CenterVertically // 垂直方向居中对齐
) {
Text(
text = stringResource(id = R.string.Donate),
color = Color.White,
fontWeight = FontWeight.Bold,
fontSize = 18.sp
)
}
}

Spacer(modifier = Modifier.height(4.dp)) // 添加间距

DonateLazyColumn()
}
}

@Composable
fun DonateLazyColumn() {
val listState = rememberLazyListState()
val context = LocalContext.current
var donate1 by remember { mutableStateOf(context.getString(R.string.DonateL)) }

LazyColumn(
state = listState,
modifier = Modifier
.fillMaxSize()
.padding(horizontal = 16.dp)
.verticalRotaryScroll(listState)
) {
item {
Spacer(modifier = Modifier.height(8.dp))
}
item {
Card(
modifier = Modifier
.fillMaxWidth()
.padding(vertical = 6.dp)
.clickable {
donate1 = context.getString(R.string.Donate1)
},
elevation = CardDefaults.cardElevation(4.dp),
colors = CardDefaults.cardColors(
containerColor = Color(0xFF404953) // 设置 Card 的背景颜色
)
) {
Column(modifier = Modifier.padding(start = 12.dp, top = 6.dp, end = 14.dp, bottom = 9.dp)) {
Text (
text = donate1,
color = Color.White,
style = MaterialTheme.typography.titleMedium
)
}
}
}
item {
Card(
modifier = Modifier
.fillMaxWidth()
.padding(vertical = 6.dp)
.clickable { },
elevation = CardDefaults.cardElevation(4.dp),
colors = CardDefaults.cardColors(
containerColor = Color(0xFF404953) // 设置 Card 的背景颜色
)
) {
Column(
modifier = Modifier
.padding(start = 12.dp, top = 6.dp, end = 14.dp, bottom = 9.dp)
.fillMaxSize(),
horizontalAlignment = Alignment.CenterHorizontally
) {
SelectionContainer {
LinkText(
text = stringResource(id = R.string.Donate2),
color = Color.White,
style = MaterialTheme.typography.titleMedium,
onLinkClick = { url ->
urlHandle(url, context)
}
)
}
Spacer(modifier = Modifier.height(4.dp))
Image(
painter = painterResource(id = R.drawable.azz_qr),
contentDescription = "azz_qr",
modifier = Modifier
.size(120.dp)
.fillMaxSize(), // 确保 Image 填充整个 Box
contentScale = ContentScale.Crop
)
}
}
}
item {
Card(
modifier = Modifier
.fillMaxWidth()
.padding(vertical = 6.dp)
.clickable { },
elevation = CardDefaults.cardElevation(4.dp),
colors = CardDefaults.cardColors(
containerColor = Color(0xFF404953) // 设置 Card 的背景颜色
)
) {
Column(
modifier = Modifier
.padding(start = 12.dp, top = 6.dp, end = 14.dp, bottom = 9.dp)
.fillMaxSize(),
horizontalAlignment = Alignment.CenterHorizontally
) {
Text(
text = "Alipay",
color = Color.White,
style = MaterialTheme.typography.titleMedium
)
Spacer(modifier = Modifier.height(4.dp))
Image(
painter = painterResource(id = R.drawable.alipay),
contentDescription = "Alipay",
modifier = Modifier
.size(120.dp)
.fillMaxSize(), // 确保 Image 填充整个 Box
contentScale = ContentScale.Crop
)
}
}
}
item {
Card(
modifier = Modifier
.fillMaxWidth()
.padding(vertical = 6.dp)
.clickable { },
elevation = CardDefaults.cardElevation(4.dp),
colors = CardDefaults.cardColors(
containerColor = Color(0xFF404953) // 设置 Card 的背景颜色
)
) {
Column(
modifier = Modifier
.padding(start = 12.dp, top = 6.dp, end = 14.dp, bottom = 9.dp)
.fillMaxSize(),
horizontalAlignment = Alignment.CenterHorizontally
) {
Text(
text = "WeChat pay",
color = Color.White,
style = MaterialTheme.typography.titleMedium
)
Spacer(modifier = Modifier.height(4.dp))
Image(
painter = painterResource(id = R.drawable.wechat_pay),
contentDescription = "WeChat pay",
modifier = Modifier
.size(120.dp)
.fillMaxSize(), // 确保 Image 填充整个 Box
contentScale = ContentScale.Crop
)
}
}
}
item {
Spacer(modifier = Modifier.height(50.dp))
}
}
}

@Preview(showBackground = true)
@Composable
fun SplashDonateScreenPreview() {
TelewatchTheme {
SplashDonateScreen()
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2024 gohj99. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
* Copyright (c) 2024-2025 gohj99. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
* Morbi non lorem porttitor neque feugiat blandit. Ut vitae ipsum eget quam lacinia accumsan.
* Etiam sed turpis ac ipsum condimentum fringilla. Maecenas magna.
* Proin dapibus sapien vel ante. Aliquam erat volutpat. Pellentesque sagittis ligula eget metus.
Expand All @@ -8,7 +8,6 @@

package com.gohj99.telewatch

import android.content.Context
import android.content.Intent
import android.os.Bundle
import androidx.activity.ComponentActivity
Expand Down Expand Up @@ -46,7 +45,7 @@ class GoToCheckUpdateActivity : ComponentActivity() {
super.onCreate(savedInstanceState)
enableEdgeToEdge()

val settingsSharedPref = getSharedPreferences("app_settings", Context.MODE_PRIVATE)
val settingsSharedPref = getSharedPreferences("app_settings", MODE_PRIVATE)
if (settingsSharedPref.getBoolean("Skip_GoToCheckUpdateActivity", false)) {
startActivity(
Intent(
Expand Down
Loading

0 comments on commit 1c333cc

Please sign in to comment.