narayana/another.im-ios
7
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

wip

Browse source
This commit is contained in:
fmodf 2024-10-03 14:54:15 +02:00
parent 8fb9ef52d8
commit 5fe8762e1f
3 changed files with 40 additions and 147 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ConversationsClassic/Resources/Strings/Localizable.strings
View file

@ -67,14 +67,10 @@
"Conversation.settings.title.channel" = "Channel settings"; "Conversation.settings.title.channel" = "Channel settings";
"Conversation.settings.enableOmemo" = "Enable OMEMO"; "Conversation.settings.enableOmemo" = "Enable OMEMO";
// MARK: Create chats
"Chats.Create.Main.createGroup" = "Create public group";
"Chats.Create.Main.createPrivateGroup" = "Create private group";
"Chats.Create.Main.createChannel" = "Create channel";
"Chats.Create.Main.findChannel" = "Find channel";
//"Chats.Create.Main.createGroup" = "Create public group";
//"Chats.Create.Main.createPrivateGroup" = "Create private group";
//"Chats.Create.Main.findGroup" = "Find public group";

2
ConversationsClassic/View/Entering/LoginScreen.swift
View file

@ -14,7 +14,7 @@ struct LoginScreen: View {
@FocusState private var focus: Field? @FocusState private var focus: Field?
#if DEBUG #if DEBUG
@State private var jidStr: String = "omemotest3@test.anal.company" @State private var jidStr: String = "grouptest1@test.anal.company"
@State private var pass: String = "12345" @State private var pass: String = "12345"
// @State private var jidStr: String = "nartest1@conversations.im" // @State private var jidStr: String = "nartest1@conversations.im"
// @State private var pass: String = "nartest12345" // @State private var pass: String = "nartest12345"

171
ConversationsClassic/View/Main/ChatList/ChatsCreateScreenMain.swift
View file

@ -24,22 +24,40 @@ struct ChatsCreateScreenMain: View {
// List // List
List { List {
Text("test") // Groups creation buttons
// ChatsCreateRowButton( SharedListRow(
// title: L10n.Chats.Create.Main.createGroup, iconType: .image(Image(systemName: "person.2.fill"), .Material.Elements.active),
// image: "person.2.fill", text: L10n.Chats.Create.Main.createGroup,
// action: {} controlType: .none
// ) )
// ChatsCreateRowButton( .onTapGesture {
// title: L10n.Chats.Create.Main.createPrivateGroup, print("Tapped createGroup")
// image: "person.2.fill", }
// action: {}
// ) SharedListRow(
// ChatsCreateRowButton( iconType: .image(Image(systemName: "person.2.fill"), .Material.Elements.active),
// title: L10n.Chats.Create.Main.findGroup, text: L10n.Chats.Create.Main.createPrivateGroup,
// image: "magnifyingglass", controlType: .none
// action: {} ).onTapGesture {
// ) print("Tapped createPrivateGroup")
}
// Channel buttons
SharedListRow(
iconType: .image(Image(systemName: "globe.americas"), .Material.Elements.active),
text: L10n.Chats.Create.Main.createChannel,
controlType: .none
).onTapGesture {
print("Tapped createChannel")
}
SharedListRow(
iconType: .image(Image(systemName: "magnifyingglass"), .Material.Elements.active),
text: L10n.Chats.Create.Main.findChannel,
controlType: .none
).onTapGesture {
print("Tapped findChannel")
}
// for contacts list // for contacts list
// let rosters = store.state.rostersState.rosters.filter { !$0.locallyDeleted } // let rosters = store.state.rostersState.rosters.filter { !$0.locallyDeleted }
@ -55,129 +73,8 @@ struct ChatsCreateScreenMain: View {
} }
} }
// private struct ChatsCreateRowButton: View {
// var title: String
// var image: String
// var action: () -> Void
//
// var body: some View {
// VStack(alignment: .center, spacing: 0) {
// Spacer()
// HStack(alignment: .center, spacing: 16) {
// Image(systemName: image)
// .font(.head2)
// .foregroundColor(.Material.Elements.active)
// .padding(.leading, 16)
// Text(title)
// .font(.body1)
// .foregroundColor(.Material.Text.main)
// Spacer()
// }
// Spacer()
// Rectangle()
// .frame(maxWidth: .infinity)
// .frame(height: 1)
// .foregroundColor(.Material.Background.dark)
// }
// .sharedListRow()
// .frame(height: 48)
// .onTapGesture {
// action()
// }
// }
// }
private struct ChatsCreateRowSeparator: View { private struct ChatsCreateRowSeparator: View {
var body: some View { var body: some View {
Text("aa") Text("aa")
} }
} }
// import SwiftUI
//
// struct CreateConversationMainScreen: View {
// @EnvironmentObject var store: AppStore
//
// var body: some View {
// ZStack {
// // Background color
// Color.Material.Background.light
// .ignoresSafeArea()
//
// // Content
// VStack(spacing: 0) {
// // Header
// CreateConversationHeader()
//
// // Chats list
// // if !store.state.chatsState.chats.isEmpty {
// // List {
// // ForEach(store.state.chatsState.chats) { chat in
// // ChatsRow(chat: chat)
// // }
// // }
// // .listStyle(.plain)
// // .background(Color.Material.Background.light)
// // } else {
// // Spacer()
// // }
// //
// // // Tab bar
// // SharedTabBar()
// }
// }
// }
// }
//
// private struct CreateConversationHeader: View {
// @EnvironmentObject var store: AppStore
//
// var body: some View {
// ZStack {
// // bg
// Color.Material.Background.dark
// .ignoresSafeArea()
//
// HStack(spacing: 0) {
// Image(systemName: "arrow.left")
// .foregroundColor(.Material.Elements.active)
// .padding(.leading, 16)
// .tappablePadding(.symmetric(12)) {
// store.dispatch(.changeFlow(store.state.previousFlow))
// }
// Spacer()
// }
//
// // title
// Text("New conversation")
// .font(.head2)
// .foregroundColor(Color.Material.Text.main)
// }
// }
// }
//
// Preview
// #if DEBUG
// struct ChatsCreateMainScreen_Previews: PreviewProvider {
// static var previews: some View {
// ChatsCreateMainScreen(isPresented: .constant(true))
// .environmentObject(pStore)
// }
//
// static var pStore: AppStore {
// let state = pState
// return AppStore(initialState: state, reducer: AppState.reducer, middlewares: [])
// }
//
// static var pState: AppState {
// var state = AppState()
//
// state.rostersState.rosters = [
// .init(contactBareJid: "test@me.com", subscription: "both", ask: true, data: .init(groups: [], annotations: []))
// ]
//
// return state
// }
// }
// #endif