Benature/omnivore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Trim new labels when they are being created on iOS

Browse Source
This commit is contained in:
Jackson Harper
2023-08-11 10:28:13 +08:00
parent 923669ca97
commit fcd5bedd25
5 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/Omnivore/app/build.gradle
View File

@ -17,8 +17,8 @@ android {
applicationId "app.omnivore.omnivore"
minSdk 26
targetSdk 33
versionCode 92
versionName "0.0.92"
versionCode 93
versionName "0.0.93"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables {

3
apple/OmnivoreKit/Sources/App/AppExtensions/Share/Views/ShareExtensionView.swift
View File

@ -188,10 +188,11 @@ public struct ShareExtensionView: View {
action: { labelsViewModel.showCreateLabelModal = true },
label: {
HStack {
let trimmedLabelName = labelsViewModel.labelSearchFilter.trimmingCharacters(in: .whitespacesAndNewlines)
Image(systemName: "tag").foregroundColor(.blue)
Text(
labelsViewModel.labelSearchFilter.count > 0 ?
"Create: \"\(labelsViewModel.labelSearchFilter)\" label" :
"Create: \"\(trimmedLabelName)\" label" :
LocalText.createLabelMessage
).foregroundColor(.blue)
.font(Font.system(size: 14))

3
apple/OmnivoreKit/Sources/App/Views/Labels/ApplyLabelsView.swift
View File

@ -117,10 +117,11 @@ struct ApplyLabelsView: View {
action: { viewModel.showCreateLabelModal = true },
label: {
HStack {
let trimmedLabelName = viewModel.labelSearchFilter.trimmingCharacters(in: .whitespacesAndNewlines)
Image(systemName: "tag").foregroundColor(.blue)
Text(
viewModel.labelSearchFilter.count > 0 ?
"Create: \"\(viewModel.labelSearchFilter)\" label" :
"Create: \"\(trimmedLabelName)\" label" :
LocalText.createLabelMessage
).foregroundColor(.blue)
.font(Font.system(size: 14))

3
apple/OmnivoreKit/Sources/App/Views/Labels/LabelsView.swift
View File

@ -54,10 +54,11 @@ struct LabelsView: View {
action: { viewModel.showCreateLabelModal = true },
label: {
HStack {
let trimmedLabelName = viewModel.labelSearchFilter.trimmingCharacters(in: .whitespacesAndNewlines)
Image(systemName: "tag").foregroundColor(.blue)
Text(
viewModel.labelSearchFilter.count > 0 ?
"Create: \"\(viewModel.labelSearchFilter)\" label" :
"Create: \"\(trimmedLabelName)\" label" :
LocalText.createLabelMessage
).foregroundColor(.blue)
.font(Font.system(size: 14))

3
apple/OmnivoreKit/Sources/App/Views/Labels/LabelsViewModel.swift
View File

@ -84,8 +84,9 @@ import Views
func createLabel(dataService: DataService, name: String, color: Color, description: String?) {
isLoading = true
let trimmedName = name.trimmingCharacters(in: .whitespacesAndNewlines)
guard let labelObjectID = try? dataService.createLabel(
name: name,
name: trimmedName,
color: color.hex ?? "",
description: description
) else {