moved Unlock component from MainWindow to FxApplication component

This commit is contained in:
Sebastian Stenzel
2019-07-31 11:44:39 +02:00
parent 1f6b94003e
commit 1b7a7060a8
2 changed files with 4 additions and 4 deletions

View File

@@ -11,14 +11,15 @@ import dagger.Provides;
import javafx.application.Application;
import javafx.beans.property.ObjectProperty;
import javafx.beans.property.SimpleObjectProperty;
import org.cryptomator.common.vaults.Vault;
import org.cryptomator.keychain.KeychainModule;
import org.cryptomator.ui.mainwindow.MainWindowComponent;
import org.cryptomator.common.vaults.Vault;
import org.cryptomator.ui.preferences.PreferencesComponent;
import org.cryptomator.ui.unlock.UnlockComponent;
import java.util.ResourceBundle;
@Module(includes = {KeychainModule.class}, subcomponents = {MainWindowComponent.class, PreferencesComponent.class})
@Module(includes = {KeychainModule.class}, subcomponents = {MainWindowComponent.class, PreferencesComponent.class, UnlockComponent.class})
abstract class FxApplicationModule {
@Binds

View File

@@ -13,13 +13,12 @@ import org.cryptomator.ui.common.FxController;
import org.cryptomator.ui.common.FxControllerKey;
import org.cryptomator.ui.common.FxmlFile;
import org.cryptomator.ui.common.FxmlScene;
import org.cryptomator.ui.unlock.UnlockComponent;
import javax.inject.Provider;
import java.util.Map;
import java.util.ResourceBundle;
@Module(subcomponents = {AddVaultWizardComponent.class, UnlockComponent.class})
@Module(subcomponents = {AddVaultWizardComponent.class})
abstract class MainWindowModule {
@Provides