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

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

Merge pull request #4778 from k9mail/new_setup_screen 

Add Gradle module for new setup UI
parents c3223814 ca2c6b46

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

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ import androidx.navigation.ui.AppBarConfiguration 
import androidx.navigation.ui.setupActionBarWithNavController

import com.fsck.k9.jmap.R

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

import com.fsck.k9.ui.findNavController

import com.fsck.k9.ui.base.extensions.findNavController



class AddAccountActivity : K9Activity() {

    private lateinit var navController: NavController

app/ui/base/build.gradle

+2 −0
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ dependencies { 
    implementation project(":app:core")



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

    api "androidx.navigation:navigation-fragment-ktx:${versions.androidxNavigation}"

    api "androidx.navigation:navigation-ui-ktx:${versions.androidxNavigation}"



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

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

app/ui/legacy/src/main/java/com/fsck/k9/ui/NavigationExtensions.kt→app/ui/base/src/main/java/com/fsck/k9/ui/base/extensions/NavigationExtensions.kt

+1 −1
Original line number Diff line number Diff line 
package com.fsck.k9.ui

package com.fsck.k9.ui.base.extensions



import androidx.annotation.IdRes

import androidx.fragment.app.FragmentActivity

app/ui/legacy/build.gradle

+11 −2
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ dependencies { 
    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}"



    api project(":app:ui:base")

    debugImplementation project(":app:ui:setup")

    implementation project(":app:core")

    implementation project(":app:autodiscovery:api")

    implementation project(":app:autodiscovery:providersxml")
@@ -27,8 +28,6 @@ dependencies { 
    implementation "androidx.recyclerview:recyclerview:${versions.androidxRecyclerView}"

    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:${versions.androidxLifecycle}"

    implementation "androidx.lifecycle:lifecycle-livedata-ktx:${versions.androidxLifecycle}"

    implementation "androidx.navigation:navigation-fragment-ktx:${versions.androidxNavigation}"

    implementation "androidx.navigation:navigation-ui-ktx:${versions.androidxNavigation}"

    implementation "androidx.constraintlayout:constraintlayout:${versions.androidxConstraintLayout}"

    implementation "androidx.cardview:cardview:${versions.androidxCardView}"

    implementation "androidx.localbroadcastmanager:localbroadcastmanager:1.0.0"
@@ -75,6 +74,16 @@ android { 
        targetSdkVersion buildConfig.robolectricSdk

    }



    buildTypes {

        debug {

            def useNewSetupUi = project.hasProperty('k9mail.useNewSetupUi') ? project.property('k9mail.useNewSetupUi') : "false"

            buildConfigField "boolean", "USE_NEW_SETUP_UI_FOR_ONBOARDING", useNewSetupUi

        }

        release {

            buildConfigField "boolean", "USE_NEW_SETUP_UI_FOR_ONBOARDING", "false"

        }

    }



    lintOptions {

        abortOnError false

        lintConfig file("$rootProject.projectDir/config/lint/lint.xml")