diff --git a/apps/android/app/build.gradle b/apps/android/app/build.gradle index 3c3057d957..7ae480de72 100644 --- a/apps/android/app/build.gradle +++ b/apps/android/app/build.gradle @@ -11,7 +11,7 @@ android { applicationId "chat.simplex.app" minSdk 29 targetSdk 32 - versionCode 15 + versionCode 16 versionName "1.3" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/chatlist/ChatHelpView.kt b/apps/android/app/src/main/java/chat/simplex/app/views/chatlist/ChatHelpView.kt index c12239f580..306797e628 100644 --- a/apps/android/app/src/main/java/chat/simplex/app/views/chatlist/ChatHelpView.kt +++ b/apps/android/app/src/main/java/chat/simplex/app/views/chatlist/ChatHelpView.kt @@ -32,7 +32,7 @@ fun ChatHelpView(addContact: (() -> Unit)? = null) { buildAnnotatedString { append("You can ") withStyle(SpanStyle(color = MaterialTheme.colors.primary)) { - append("connect to SimpleX team") + append("connect to SimpleX Chat founder") } append(".") }, diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/SettingsView.kt b/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/SettingsView.kt index 0013f2df35..0734965898 100644 --- a/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/SettingsView.kt +++ b/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/SettingsView.kt @@ -17,6 +17,7 @@ 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.dp +import chat.simplex.app.BuildConfig import chat.simplex.app.R import chat.simplex.app.model.ChatModel import chat.simplex.app.model.Profile @@ -116,7 +117,7 @@ fun SettingsLayout( ) Spacer(Modifier.padding(horizontal = 4.dp)) Text( - "Get help & advice via chat", + "Chat with the founder", color = MaterialTheme.colors.primary ) } @@ -128,7 +129,7 @@ fun SettingsLayout( ) Spacer(Modifier.padding(horizontal = 4.dp)) Text( - "Ask questions via email", + "Send us email", color = MaterialTheme.colors.primary ) } @@ -167,6 +168,10 @@ fun SettingsLayout( } ) } + Divider(Modifier.padding(horizontal = 8.dp)) + SettingsSectionView(click = {}) { + Text("v${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE})") + } } } } diff --git a/apps/ios/Shared/Views/ChatList/ChatHelp.swift b/apps/ios/Shared/Views/ChatList/ChatHelp.swift index c1b5e1492c..58a43eb6cf 100644 --- a/apps/ios/Shared/Views/ChatList/ChatHelp.swift +++ b/apps/ios/Shared/Views/ChatList/ChatHelp.swift @@ -18,7 +18,7 @@ struct ChatHelp: View { HStack(spacing: 4) { Text("You can") - Button("connect to SimpleX team.") { + Button("connect to SimpleX Chat founder.") { showSettings = false DispatchQueue.main.async { UIApplication.shared.open(simplexTeamURL) diff --git a/apps/ios/Shared/Views/UserSettings/SettingsView.swift b/apps/ios/Shared/Views/UserSettings/SettingsView.swift index 193e014db6..f16c8cf5a5 100644 --- a/apps/ios/Shared/Views/UserSettings/SettingsView.swift +++ b/apps/ios/Shared/Views/UserSettings/SettingsView.swift @@ -10,6 +10,10 @@ import SwiftUI let simplexTeamURL = URL(string: "simplex:/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23MCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%3D")! +let appVersion = Bundle.main.object(forInfoDictionaryKey: "CFBundleShortVersionString") as? String + +let appBuild = Bundle.main.object(forInfoDictionaryKey: "CFBundleVersion") as? String + struct SettingsView: View { @Environment(\.colorScheme) var colorScheme @EnvironmentObject var chatModel: ChatModel @@ -93,13 +97,13 @@ struct SettingsView: View { UIApplication.shared.open(simplexTeamURL) } } label: { - Text("Get help & advice via chat") + Text("Chat with the founder") } } HStack { Image(systemName: "envelope") .padding(.trailing, 4) - Text("[Ask questions via email](mailto:chat@simplex.chat)") + Text("[Send us email](mailto:chat@simplex.chat)") } } @@ -121,11 +125,8 @@ struct SettingsView: View { .padding(.trailing, 8) Text("Install [SimpleX Chat for terminal](https://github.com/simplex-chat/simplex-chat)") } + Text("v\(appVersion ?? "?") (\(appBuild ?? "?"))") } - -// Section("Your SimpleX servers") { -// -// } } .navigationTitle("Your settings") } diff --git a/apps/ios/SimpleX.xcodeproj/project.pbxproj b/apps/ios/SimpleX.xcodeproj/project.pbxproj index ce0be6fefb..c1a27a3222 100644 --- a/apps/ios/SimpleX.xcodeproj/project.pbxproj +++ b/apps/ios/SimpleX.xcodeproj/project.pbxproj @@ -851,7 +851,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = "SimpleX (iOS).entitlements"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 27; + CURRENT_PROJECT_VERSION = 28; DEVELOPMENT_TEAM = 5NN7GUYB6T; ENABLE_BITCODE = NO; ENABLE_PREVIEWS = YES; @@ -891,7 +891,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = "SimpleX (iOS).entitlements"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 27; + CURRENT_PROJECT_VERSION = 28; DEVELOPMENT_TEAM = 5NN7GUYB6T; ENABLE_BITCODE = NO; ENABLE_PREVIEWS = YES;