diff --git a/build.gradle.kts b/build.gradle.kts
index 006fc3bb7e2fcd38aedbbf8984a81b849721e73b..04454a24543f9cf83a0a6a1ed887a1699465f07b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -10,7 +10,7 @@ plugins {
id("idea")
}
-group = "app.briar.compose"
+group = "app.briar.desktop"
version = "0.1"
repositories {
@@ -42,8 +42,8 @@ compose.desktop {
mainClass = "MainKt"
nativeDistributions {
targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb)
- packageName = "Briar"
+ packageName = "app.briar.desktop"
packageVersion = "1.0.0"
}
}
-}
\ No newline at end of file
+}
diff --git a/src/main/kotlin/org/briarproject/briar/compose/BriarService.kt b/src/main/kotlin/org/briarproject/briar/compose/BriarService.kt
index 9a5912a716ec8774ec79bfd920785eb66fd815db..5a017de5a52445b191e110682931e3f9b13dc25f 100644
--- a/src/main/kotlin/org/briarproject/briar/compose/BriarService.kt
+++ b/src/main/kotlin/org/briarproject/briar/compose/BriarService.kt
@@ -1,19 +1,13 @@
package org.briarproject.briar.compose
-//import com.github.ajalt.clikt.core.UsageError
-//import com.github.ajalt.clikt.output.TermUi.echo
import org.briarproject.bramble.api.account.AccountManager
import org.briarproject.bramble.api.crypto.DecryptionException
import org.briarproject.bramble.api.crypto.PasswordStrengthEstimator
import org.briarproject.bramble.api.lifecycle.LifecycleManager
-//import org.briarproject.briar.swing.AccountUtil.Companion.check
-//import org.briarproject.briar.swing.dialogs.NewAccountPrompt
-//import org.briarproject.briar.swing.dialogs.PasswordPrompt
import javax.annotation.concurrent.Immutable
import javax.inject.Inject
import javax.inject.Singleton
import javax.swing.JOptionPane
-import kotlin.system.exitProcess
interface BriarService {
fun start()
diff --git a/src/main/kotlin/org/briarproject/briar/compose/MainUI.java b/src/main/kotlin/org/briarproject/briar/compose/MainUI.java
deleted file mode 100644
index e583ad5c71dc162a634d7ff58ed1b23693fb20bc..0000000000000000000000000000000000000000
--- a/src/main/kotlin/org/briarproject/briar/compose/MainUI.java
+++ /dev/null
@@ -1,215 +0,0 @@
-package org.briarproject.briar.compose;
-
-import org.briarproject.bramble.api.account.AccountManager;
-import org.briarproject.bramble.api.contact.Contact;
-import org.briarproject.bramble.api.contact.ContactManager;
-import org.briarproject.bramble.api.contact.event.ContactAddedEvent;
-import org.briarproject.bramble.api.crypto.PasswordStrengthEstimator;
-import org.briarproject.bramble.api.db.DbException;
-import org.briarproject.bramble.api.event.Event;
-import org.briarproject.bramble.api.event.EventBus;
-import org.briarproject.bramble.api.event.EventListener;
-import org.briarproject.briar.api.conversation.ConversationManager;
-import org.briarproject.briar.api.conversation.ConversationMessageHeader;
-import org.briarproject.briar.api.introduction.IntroductionManager;
-import org.briarproject.briar.api.messaging.MessagingManager;
-import org.briarproject.briar.api.messaging.PrivateMessageFactory;
-//import org.briarproject.briar.swing.actions.AboutAction;
-//import org.briarproject.briar.swing.actions.AddContactAction;
-//import org.briarproject.briar.swing.actions.ChangePasswordAction;
-//import org.briarproject.briar.swing.actions.CloseChatAction;
-//import org.briarproject.briar.swing.actions.QuitAction;
-//import org.briarproject.briar.swing.actions.SettingsAction;
-//import org.briarproject.briar.swing.chat.Chat;
-import org.briarproject.briar.compose.config.Configuration;
-//import org.briarproject.briar.swing.contactlist.ContactList;
-//import org.briarproject.briar.swing.contactlist.ContactListModel;
-//import org.briarproject.briar.swing.contactlist.ContactWithMeta;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.awt.BorderLayout;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.util.Collection;
-
-import javax.swing.JFrame;
-import javax.swing.JPanel;
-import javax.swing.JToolBar;
-import javax.swing.UIManager;
-
-//import de.topobyte.awt.util.GridBagConstraintsEditor;
-
-public class MainUI extends JFrame implements EventListener {
-
- final static Logger logger = LoggerFactory.getLogger(MainUI.class);
-
- private final BriarService briarService;
- private final AccountManager accountManager;
- private final ContactManager contactManager;
- private final ConversationManager conversationManager;
- private final MessagingManager messagingManager;
- private final IntroductionManager introductionManager;
- private final PrivateMessageFactory privateMessageFactory;
- private final EventBus eventBus;
- private final PasswordStrengthEstimator passwordStrengthEstimator;
-// private final Configuration configuration;
-
- private JPanel mainPanel;
- private JPanel contentPanel;
-// private ContactList contactList;
-// private Chat chat;
-
-// private ContactListModel contactListModel;
-
- public MainUI(BriarService briarService,
- AccountManager accountManager,
- ContactManager contactManager,
- ConversationManager conversationManager,
- MessagingManager messagingManager,
- IntroductionManager introductionManager,
- PrivateMessageFactory privateMessageFactory,
- EventBus eventBus,
- PasswordStrengthEstimator passwordStrengthEstimator
- /*Configuration configuration*/) {
- this.briarService = briarService;
- this.accountManager = accountManager;
- this.contactManager = contactManager;
- this.conversationManager = conversationManager;
- this.messagingManager = messagingManager;
- this.introductionManager = introductionManager;
- this.privateMessageFactory = privateMessageFactory;
- this.eventBus = eventBus;
- this.passwordStrengthEstimator = passwordStrengthEstimator;
-// this.configuration = configuration;
-
-// String lookAndFeel = configuration.getLookAndFeel();
-// if (lookAndFeel != null) {
-// try {
-// UIManager.setLookAndFeel(lookAndFeel);
-// } catch (Exception e) {
-// logger.error("error while setting look and feel", e);
-// }
-// }
-
- setTitle("Briar Swing");
-// setJMenuBar(new MainMenu(this));
-
- JToolBar toolbar = new JToolBar();
- toolbar.setFloatable(false);
-// toolbar.add(new AddContactAction(this));
-// toolbar.add(new ChangePasswordAction(this));
-// toolbar.add(new SettingsAction(this));
-// toolbar.add(new CloseChatAction(this));
-// toolbar.add(new QuitAction());
-// toolbar.add(new AboutAction(this));
-
- mainPanel = new JPanel(new BorderLayout());
- setContentPane(mainPanel);
-
- contentPanel = new JPanel(new GridBagLayout());
- addComponents();
-
- mainPanel.add(toolbar, BorderLayout.NORTH);
- mainPanel.add(contentPanel, BorderLayout.CENTER);
-
-// EventBusConnector eventBusConnector =
-// new EventBusConnector(messagingManager);
-// eventBus.addListener(eventBusConnector);
-// eventBus.addListener(this);
- }
-
-// public Configuration getConfiguration() {
-// return configuration;
-// }
-
- public AccountManager getAccountManager() {
- return accountManager;
- }
-
- public ContactManager getContactManager() {
- return contactManager;
- }
-
- public PasswordStrengthEstimator getPasswordStrengthEstimator() {
- return passwordStrengthEstimator;
- }
-
- private void addComponents() {
- GridBagConstraints c = new GridBagConstraints();
-// GridBagConstraintsEditor ce =
-// new GridBagConstraintsEditor(c);
-//
-// contactList = new ContactList();
-// chat = new Chat(conversationManager, messagingManager,
-// introductionManager, privateMessageFactory, eventBus);
-//
-// ce.fill(GridBagConstraints.BOTH);
-//
-// ce.gridPos(0, 0);
-// ce.weight(3, 1);
-// contentPanel.add(contactList, c);
-//
-// ce.gridPos(1, 0);
-// ce.weight(7, 1);
-// contentPanel.add(chat, c);
-//
-// reloadContactList();
-//
-// contactList.addContactSelectedListener(this::displayChatHistory);
- }
-
- public void closeChat() {
-// chat.displayNone();
-// contactList.selectNone();
- }
-
- private void displayChatHistory(Contact contact) {
-// chat.displayHistory(contact);
- }
-
- private void tryListContacts() {
- try {
- listContacts();
- } catch (DbException e) {
- e.printStackTrace();
- }
- }
-
- private void listContacts() throws DbException {
-// Collection<Contact> contacts = contactManager.getContacts();
-// for (Contact contact : contacts) {
-// contactListModel.add(new ContactWithMeta(contact), 0);
-// }
-// for (int i = 0; i < contactListModel.getSize(); i++) {
-// ContactWithMeta entry = contactListModel.getElementAt(i);
-// Contact contact = entry.getContact();
-// logger.debug(
-// String.format("%s (%s)", contact.getAuthor().getName(),
-// contact.getAlias()));
-// Collection<ConversationMessageHeader> messageHeaders =
-// conversationManager.getMessageHeaders(contact.getId());
-// int unread = 0;
-// for (ConversationMessageHeader header : messageHeaders) {
-// if (!header.isRead()) {
-// unread += 1;
-// }
-// }
-// entry.setNumUnreadMessages(unread);
-// }
- }
-
- @Override
- public void eventOccurred(Event e) {
- if (e instanceof ContactAddedEvent) {
- reloadContactList();
- }
- }
-
- private void reloadContactList() {
-// contactListModel = new ContactListModel();
-// tryListContacts();
-// contactList.setModel(contactListModel);
- }
-
-}
diff --git a/src/main/kotlin/org/briarproject/briar/compose/config/Configuration.java b/src/main/kotlin/org/briarproject/briar/compose/config/Configuration.java
deleted file mode 100644
index 9822305f81c58c27d146968f82956394e92d7b2e..0000000000000000000000000000000000000000
--- a/src/main/kotlin/org/briarproject/briar/compose/config/Configuration.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.briarproject.briar.compose.config;
-
-public class Configuration {
-
- private String lookAndFeel;
-
- public String getLookAndFeel() {
- return lookAndFeel;
- }
-
- public void setLookAndFeel(String lookAndFeel) {
- this.lookAndFeel = lookAndFeel;
- }
-
-}
diff --git a/src/main/resources/images/header.png b/src/main/resources/images/header.png
deleted file mode 100644
index 528c9c3effcc26c4a77915ed5fc124b509577ca4..0000000000000000000000000000000000000000
Binary files a/src/main/resources/images/header.png and /dev/null differ
diff --git a/src/main/resources/images/ic_launcher.xml b/src/main/resources/images/ic_launcher.xml
deleted file mode 100644
index 7353dbd1fd82487df2d06121f85f7994728f1070..0000000000000000000000000000000000000000
--- a/src/main/resources/images/ic_launcher.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
- <background android:drawable="@color/ic_launcher_background"/>
- <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>
\ No newline at end of file