dandri/simplex-chat
1
0
Fork 0
mirror of https://github.com/simplex-chat/simplex-chat.git synced 2026-04-09 01:45:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #690 from simplex-chat/master (version 2.1.0, ios 48/android 33)

Browse Source
This commit is contained in:
JRoberts
2022-05-23 15:33:09 +04:00
committed by GitHub
parent e057f9e407 79dcada757
commit 3fe005e252
4 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/android/app/build.gradle
View File

@@ -11,7 +11,7 @@ android {
applicationId "chat.simplex.app"
minSdk 29
targetSdk 32
versionCode 32
versionCode 33
versionName "2.1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

5
apps/android/app/src/main/java/chat/simplex/app/views/chat/ComposeView.kt
View File

@@ -326,6 +326,7 @@ fun ComposeView(
mc = updateMsgContent(oldMsgContent)
)
if (updatedItem != null) chatModel.upsertChatItem(cInfo, updatedItem.chatItem)
clearState()
}
}
}
@@ -369,11 +370,13 @@ fun ComposeView(
mc = mc
)
if (aChatItem != null) chatModel.addChatItem(cInfo, aChatItem.chatItem)
clearState()
}
} else {
clearState()
}
}
}
clearState()
}
fun onMessageChange(s: String) {

10
apps/ios/Shared/Views/UserSettings/SettingsView.swift
View File

@@ -126,12 +126,12 @@ struct SettingsView: View {
// notificationsToggle(token)
// }
// }
NavigationLink {
CallViewDebug()
.frame(maxHeight: .infinity, alignment: .top)
} label: {
// NavigationLink {
// CallViewDebug()
// .frame(maxHeight: .infinity, alignment: .top)
// } label: {
Text("v\(appVersion ?? "?") (\(appBuild ?? "?"))")
}
// }
}
}
.navigationTitle("Your settings")

8
apps/ios/SimpleX.xcodeproj/project.pbxproj
View File

@@ -923,7 +923,7 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = "SimpleX (iOS).entitlements";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 47;
CURRENT_PROJECT_VERSION = 48;
DEVELOPMENT_TEAM = 5NN7GUYB6T;
ENABLE_BITCODE = NO;
ENABLE_PREVIEWS = YES;
@@ -965,7 +965,7 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = "SimpleX (iOS).entitlements";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 47;
CURRENT_PROJECT_VERSION = 48;
DEVELOPMENT_TEAM = 5NN7GUYB6T;
ENABLE_BITCODE = NO;
ENABLE_PREVIEWS = YES;
@@ -1046,7 +1046,7 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = "SimpleX NSE/SimpleX NSE.entitlements";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 47;
CURRENT_PROJECT_VERSION = 48;
DEVELOPMENT_TEAM = 5NN7GUYB6T;
ENABLE_BITCODE = NO;
GENERATE_INFOPLIST_FILE = YES;
@@ -1086,7 +1086,7 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = "SimpleX NSE/SimpleX NSE.entitlements";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 47;
CURRENT_PROJECT_VERSION = 48;
DEVELOPMENT_TEAM = 5NN7GUYB6T;
ENABLE_BITCODE = NO;
GENERATE_INFOPLIST_FILE = YES;