Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit c3223814 authored by cketti's avatar cketti Committed by GitHub
Browse files

Merge pull request #4775 from k9mail/ui_base_module 

Create UI base module
parents c0b9db46 21c14c49

app/k9mail-jmap/build.gradle

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ if (rootProject.testCoverage) { 
dependencies {

    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}"



    implementation project(":app:ui")

    implementation project(":app:ui:legacy")

    implementation project(":app:core")

    implementation project(":app:storage")

    implementation project(":app:crypto-openpgp")

app/k9mail-jmap/src/main/java/com/fsck/k9/App.kt

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ package com.fsck.k9 
import android.app.Application

import com.fsck.k9.activity.MessageCompose

import com.fsck.k9.controller.MessagingController

import com.fsck.k9.ui.ThemeManager

import com.fsck.k9.ui.base.ThemeManager

import org.koin.android.ext.android.inject



class App : Application() {

app/k9mail-jmap/src/main/java/com/fsck/k9/ui/addaccount/AddAccountActivity.kt

+1 −1
Original line number Diff line number Diff line
@@ -4,8 +4,8 @@ import android.os.Bundle 
import androidx.navigation.NavController

import androidx.navigation.ui.AppBarConfiguration

import androidx.navigation.ui.setupActionBarWithNavController

import com.fsck.k9.activity.K9Activity

import com.fsck.k9.jmap.R

import com.fsck.k9.ui.base.K9Activity

import com.fsck.k9.ui.findNavController



class AddAccountActivity : K9Activity() {

app/k9mail/build.gradle

+2 −2
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ if (rootProject.testCoverage) { 
dependencies {

    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}"



    implementation project(":app:ui")

    implementation project(":app:ui:legacy")

    implementation project(":app:core")

    implementation project(":app:storage")

    implementation project(":app:crypto-openpgp")
@@ -19,7 +19,7 @@ dependencies { 
    implementation project(":backend:webdav")



    implementation "androidx.appcompat:appcompat:${versions.androidxAppCompat}"

    implementation "androidx.core:core-ktx:${versions.coreKtx}"

    implementation "androidx.core:core-ktx:${versions.androidxCore}"

    implementation "com.takisoft.preferencex:preferencex:${versions.preferencesFix}"

    implementation "com.jakewharton.timber:timber:${versions.timber}"

    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:${versions.kotlinCoroutines}"

app/k9mail/src/main/java/com/fsck/k9/App.kt

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ import android.app.Application 
import com.fsck.k9.activity.MessageCompose

import com.fsck.k9.controller.MessagingController

import com.fsck.k9.external.MessageProvider

import com.fsck.k9.ui.ThemeManager

import com.fsck.k9.ui.base.ThemeManager

import org.koin.android.ext.android.inject



class App : Application() {