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

Commit 4a6016ae authored by cketti's avatar cketti
Browse files

Introduce `BrandNameProvider`

parent 729d8a71

app-k9mail/src/main/kotlin/app/k9mail/K9KoinModule.kt

+3 −1
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ package app.k9mail 
import app.k9mail.auth.K9OAuthConfigurationFactory

import app.k9mail.core.common.oauth.OAuthConfigurationFactory

import app.k9mail.core.common.provider.AppNameProvider

import app.k9mail.core.common.provider.BrandNameProvider

import app.k9mail.core.featureflag.FeatureFlagFactory

import app.k9mail.core.ui.theme.api.FeatureThemeProvider

import app.k9mail.core.ui.theme.api.ThemeProvider
@@ -23,6 +24,7 @@ import com.fsck.k9.provider.UnreadWidgetProvider 
import com.fsck.k9.widget.list.MessageListWidgetProvider

import org.koin.android.ext.koin.androidContext

import org.koin.core.qualifier.named

import org.koin.dsl.binds

import org.koin.dsl.module



val appModule = module {
@@ -35,7 +37,7 @@ val appModule = module { 
    single(named("ClientInfoAppVersion")) { BuildConfig.VERSION_NAME }

    single<AppConfig> { appConfig }

    single<OAuthConfigurationFactory> { K9OAuthConfigurationFactory() }

    single<AppNameProvider> { K9AppNameProvider(androidContext()) }

    single { K9AppNameProvider(androidContext()) } binds arrayOf(AppNameProvider::class, BrandNameProvider::class)

    single<ThemeProvider> { K9ThemeProvider() }

    single<FeatureThemeProvider> { K9FeatureThemeProvider() }

    single<FeatureFlagFactory> { K9FeatureFlagFactory() }

app-k9mail/src/main/kotlin/app/k9mail/provider/K9AppNameProvider.kt

+6 −1
Original line number Diff line number Diff line
@@ -2,12 +2,17 @@ package app.k9mail.provider 


import android.content.Context

import app.k9mail.core.common.provider.AppNameProvider

import app.k9mail.core.common.provider.BrandNameProvider

import com.fsck.k9.R



class K9AppNameProvider(

    context: Context,

) : AppNameProvider {

) : AppNameProvider, BrandNameProvider {

    override val appName: String by lazy {

        context.getString(R.string.app_name)

    }



    override val brandName: String by lazy {

        context.getString(R.string.app_name)

    }

}

app-thunderbird/src/main/kotlin/net/thunderbird/android/ThunderbirdKoinModule.kt

+3 −1
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ package net.thunderbird.android 


import app.k9mail.core.common.oauth.OAuthConfigurationFactory

import app.k9mail.core.common.provider.AppNameProvider

import app.k9mail.core.common.provider.BrandNameProvider

import app.k9mail.core.featureflag.FeatureFlagFactory

import app.k9mail.core.ui.theme.api.FeatureThemeProvider

import app.k9mail.core.ui.theme.api.ThemeProvider
@@ -22,6 +23,7 @@ import net.thunderbird.android.widget.provider.MessageListWidgetProvider 
import net.thunderbird.android.widget.provider.UnreadWidgetProvider

import org.koin.android.ext.koin.androidContext

import org.koin.core.qualifier.named

import org.koin.dsl.binds

import org.koin.dsl.module



val appModule = module {
@@ -34,7 +36,7 @@ val appModule = module { 
    single(named("ClientInfoAppVersion")) { BuildConfig.VERSION_NAME }

    single<AppConfig> { appConfig }

    single<OAuthConfigurationFactory> { TbOAuthConfigurationFactory() }

    single<AppNameProvider> { TbAppNameProvider(androidContext()) }

    single { TbAppNameProvider(androidContext()) } binds arrayOf(AppNameProvider::class, BrandNameProvider::class)

    single<ThemeProvider> { TbThemeProvider() }

    single<FeatureThemeProvider> { TbFeatureThemeProvider() }

    single<FeatureFlagFactory> { TbFeatureFlagFactory() }

app-thunderbird/src/main/kotlin/net/thunderbird/android/provider/TbAppNameProvider.kt

+6 −1
Original line number Diff line number Diff line
@@ -2,12 +2,17 @@ package net.thunderbird.android.provider 


import android.content.Context

import app.k9mail.core.common.provider.AppNameProvider

import app.k9mail.core.common.provider.BrandNameProvider

import net.thunderbird.android.R



class TbAppNameProvider(

    context: Context,

) : AppNameProvider {

) : AppNameProvider, BrandNameProvider {

    override val appName: String by lazy {

        context.getString(R.string.app_name)

    }



    override val brandName: String by lazy {

        context.getString(R.string.brand_name)

    }

}

app-thunderbird/src/main/res/values/strings.xml

+1 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="app_name" translatable="false">Thunderbird</string>

    <string name="brand_name" translatable="false">Thunderbird</string>

</resources>