wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Create a separate Gradle module for the message list widget

Browse source
This commit is contained in:
cketti 2022-10-17 17:52:11 +02:00
parent cb64dd5953
commit c9d89657b0
21 changed files with 72 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/k9mail/build.gradle
View file

@ -7,6 +7,7 @@ if (rootProject.testCoverage) {
dependencies {
implementation project(":app:ui:legacy")
implementation project(":app:ui:message-list-widget")
implementation project(":app:core")
implementation project(":app:storage")
implementation project(":app:crypto-openpgp")

7
app/k9mail/src/main/AndroidManifest.xml
View file

@ -315,7 +315,7 @@
</receiver>
<receiver
android:name=".widget.list.MessageListWidgetProvider"
android:name="app.k9mail.ui.widget.list.MessageListWidgetProvider"
android:icon="@drawable/message_list_widget_preview"
android:label="@string/mail_list_widget_text"
android:exported="false">
@ -336,11 +336,6 @@
</intent-filter>
</receiver>
<service
android:name=".widget.list.MessageListWidgetService"
android:enabled="true"
android:permission="android.permission.BIND_REMOTEVIEWS" />
<service
android:name=".notification.NotificationActionService"
android:enabled="true"/>

4
app/k9mail/src/main/java/com/fsck/k9/Dependencies.kt
View file

@ -1,5 +1,7 @@
package com.fsck.k9
import app.k9mail.ui.widget.list.MessageListWidgetUpdateListener
import app.k9mail.ui.widget.list.messageListWidgetModule
import com.fsck.k9.auth.createOAuthConfigurationProvider
import com.fsck.k9.backends.backendsModule
import com.fsck.k9.controller.ControllerExtension
@ -10,8 +12,6 @@ import com.fsck.k9.preferences.K9StoragePersister
import com.fsck.k9.preferences.StoragePersister
import com.fsck.k9.resources.resourcesModule
import com.fsck.k9.storage.storageModule
import com.fsck.k9.widget.list.MessageListWidgetUpdateListener
import com.fsck.k9.widget.list.messageListWidgetModule
import com.fsck.k9.widget.unread.UnreadWidgetUpdateListener
import com.fsck.k9.widget.unread.unreadWidgetModule
import org.koin.core.qualifier.named

44
app/ui/message-list-widget/build.gradle Normal file
View file

@ -0,0 +1,44 @@
apply plugin: 'com.android.library'
apply plugin: 'org.jetbrains.kotlin.android'
dependencies {
implementation project(":app:ui:legacy")
implementation project(":app:core")
implementation "com.jakewharton.timber:timber:${versions.timber}"
}
android {
namespace 'app.k9mail.ui.widget.list'
compileSdkVersion buildConfig.compileSdk
buildToolsVersion buildConfig.buildTools
defaultConfig {
minSdkVersion buildConfig.minSdk
targetSdkVersion buildConfig.robolectricSdk
}
buildTypes {
debug {
manifestPlaceholders = ['appAuthRedirectScheme': 'FIXME: override this in your app project']
}
release {
manifestPlaceholders = ['appAuthRedirectScheme': 'FIXME: override this in your app project']
}
}
lintOptions {
abortOnError false
lintConfig file("$rootProject.projectDir/config/lint/lint.xml")
}
compileOptions {
sourceCompatibility javaVersion
targetCompatibility javaVersion
}
kotlinOptions {
jvmTarget = kotlinJvmVersion
}
}

11
app/ui/message-list-widget/src/main/AndroidManifest.xml Normal file
View file

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application>
<service
android:name=".MessageListWidgetService"
android:enabled="true"
android:permission="android.permission.BIND_REMOTEVIEWS" />
</application>
</manifest>

2
app/k9mail/src/main/java/com/fsck/k9/widget/list/KoinModule.kt → app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/KoinModule.kt
View file

@ -1,4 +1,4 @@
package com.fsck.k9.widget.list
package app.k9mail.ui.widget.list
import org.koin.dsl.module

2
app/k9mail/src/main/java/com/fsck/k9/widget/list/MessageListConfig.kt → app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/MessageListConfig.kt
View file

@ -1,4 +1,4 @@
package com.fsck.k9.widget.list
package app.k9mail.ui.widget.list
import com.fsck.k9.Account.SortType
import com.fsck.k9.search.LocalSearch

2
app/k9mail/src/main/java/com/fsck/k9/widget/list/MessageListItem.kt → app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/MessageListItem.kt
View file

@ -1,4 +1,4 @@
package com.fsck.k9.widget.list
package app.k9mail.ui.widget.list
import android.net.Uri

2
app/k9mail/src/main/java/com/fsck/k9/widget/list/MessageListItemMapper.kt → app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/MessageListItemMapper.kt
View file

@ -1,4 +1,4 @@
package com.fsck.k9.widget.list
package app.k9mail.ui.widget.list
import android.net.Uri
import com.fsck.k9.Account

2
app/k9mail/src/main/java/com/fsck/k9/widget/list/MessageListLoader.kt → app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/MessageListLoader.kt
View file

@ -1,4 +1,4 @@
package com.fsck.k9.widget.list
package app.k9mail.ui.widget.list
import com.fsck.k9.Account
import com.fsck.k9.Account.SortType

3
app/k9mail/src/main/java/com/fsck/k9/widget/list/MessageListRemoteViewFactory.kt → app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/MessageListRemoteViewFactory.kt
View file

@ -1,4 +1,4 @@
package com.fsck.k9.widget.list
package app.k9mail.ui.widget.list
import android.content.Context
import android.content.Intent
@ -11,7 +11,6 @@ import android.widget.RemoteViewsService.RemoteViewsFactory
import androidx.core.content.ContextCompat
import com.fsck.k9.Account.SortType
import com.fsck.k9.K9
import com.fsck.k9.R
import com.fsck.k9.search.LocalSearch
import com.fsck.k9.search.SearchAccount
import org.koin.core.component.KoinComponent

8
app/k9mail/src/main/java/com/fsck/k9/widget/list/MessageListWidgetProvider.kt → app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/MessageListWidgetProvider.kt
View file

@ -1,4 +1,4 @@
package com.fsck.k9.widget.list
package app.k9mail.ui.widget.list
import android.app.PendingIntent
import android.appwidget.AppWidgetManager
@ -8,15 +8,15 @@ import android.content.Context
import android.content.Intent
import android.net.Uri
import android.widget.RemoteViews
import com.fsck.k9.R
import com.fsck.k9.activity.MessageCompose
import com.fsck.k9.activity.MessageList
import com.fsck.k9.activity.MessageList.Companion.intentDisplaySearch
import com.fsck.k9.helper.PendingIntentCompat.FLAG_IMMUTABLE
import com.fsck.k9.helper.PendingIntentCompat.FLAG_MUTABLE
import com.fsck.k9.search.SearchAccount.Companion.createUnifiedInboxAccount
import com.fsck.k9.ui.R as UiR
class MessageListWidgetProvider : AppWidgetProvider() {
open class MessageListWidgetProvider : AppWidgetProvider() {
override fun onUpdate(context: Context, appWidgetManager: AppWidgetManager, appWidgetIds: IntArray) {
for (appWidgetId in appWidgetIds) {
updateAppWidget(context, appWidgetManager, appWidgetId)
@ -26,7 +26,7 @@ class MessageListWidgetProvider : AppWidgetProvider() {
private fun updateAppWidget(context: Context, appWidgetManager: AppWidgetManager, appWidgetId: Int) {
val views = RemoteViews(context.packageName, R.layout.message_list_widget_layout)
views.setTextViewText(R.id.folder, context.getString(com.fsck.k9.ui.R.string.integrated_inbox_title))
views.setTextViewText(R.id.folder, context.getString(UiR.string.integrated_inbox_title))
val intent = Intent(context, MessageListWidgetService::class.java).apply {
putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId)

2
app/k9mail/src/main/java/com/fsck/k9/widget/list/MessageListWidgetService.kt → app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/MessageListWidgetService.kt
View file

@ -1,4 +1,4 @@
package com.fsck.k9.widget.list
package app.k9mail.ui.widget.list
import android.content.Intent
import android.widget.RemoteViewsService

2
app/k9mail/src/main/java/com/fsck/k9/widget/list/MessageListWidgetUpdateListener.kt → app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/MessageListWidgetUpdateListener.kt
View file

@ -1,4 +1,4 @@
package com.fsck.k9.widget.list
package app.k9mail.ui.widget.list
import android.content.Context
import com.fsck.k9.Account

0
app/k9mail/src/main/res/drawable-xxhdpi/message_list_widget_preview.png → app/ui/message-list-widget/src/main/res/drawable-xxhdpi/message_list_widget_preview.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 94 KiB

After

Width:  |  Height:  |  Size: 94 KiB

0
app/k9mail/src/main/res/layout/message_list_widget_layout.xml → app/ui/message-list-widget/src/main/res/layout/message_list_widget_layout.xml
View file

0
app/k9mail/src/main/res/layout/message_list_widget_list_item.xml → app/ui/message-list-widget/src/main/res/layout/message_list_widget_list_item.xml
View file

0
app/k9mail/src/main/res/layout/message_list_widget_loading.xml → app/ui/message-list-widget/src/main/res/layout/message_list_widget_loading.xml
View file

0
app/k9mail/src/main/res/values/message_list_widget_colors.xml → app/ui/message-list-widget/src/main/res/values/colors.xml
View file

0
app/k9mail/src/main/res/xml/message_list_widget_info.xml → app/ui/message-list-widget/src/main/res/xml/message_list_widget_info.xml
View file

1
settings.gradle
View file

@ -2,6 +2,7 @@ include ':app:k9mail'
include ':app:ui:base'
include ':app:ui:setup'
include ':app:ui:legacy'
include ':app:ui:message-list-widget'
include ':app:core'
include ':app:storage'
include ':app:crypto-openpgp'