diff --git a/app/src/main/java/jp/atled/agileworks/widget/AwAppWidget.kt b/app/src/main/java/jp/atled/agileworks/widget/AwAppWidget.kt index 032e84dbfa16913b20d9fd39893145bec3083108..54ab2fc2674c66b790a49cf99ca607867f3e0afc 100644 --- a/app/src/main/java/jp/atled/agileworks/widget/AwAppWidget.kt +++ b/app/src/main/java/jp/atled/agileworks/widget/AwAppWidget.kt @@ -148,30 +148,6 @@ sealed class AwAppWidgetBase(private val widgetLayoutId: Int) : AppWidgetProvide ) views.setPendingIntentTemplate(R.id.widgetGridView, clickPendingIntentTemplate) - appWidgetManager.updateAppWidget(appWidgetId, views) - } - // Widget 上部の SystemName ラベルの更新 - internal fun updateWidgetSystemName(context: Context, - appWidgetManager: AppWidgetManager, - appWidgetId: Int) { - val widgetLayoutId = appWidgetManager.getAppWidgetInfo(appWidgetId).initialLayout - - val views = RemoteViews( - context.packageName, - widgetLayoutId - ) - - val serverNumber = WidgetRepository().loadWidgetLayoutIdPref(appWidgetId) - // ログイン状態を判別し、ウィジェットのsystemNameを出しわけ - var systemName = "" - if (AuthStateRepository(serverNumber).loadAuthState().isAuthorized) { - // ログイン中の場合、SystemName 取得 - systemName = LoginRepository(serverNumber).loadSystemName() - } else { - //ログインしていない場合、表示しない - } - views.setTextViewText(R.id.systemName, systemName) - appWidgetManager.updateAppWidget(appWidgetId, views) } } diff --git a/app/src/main/java/jp/atled/agileworks/widget/WidgetUpdate.kt b/app/src/main/java/jp/atled/agileworks/widget/WidgetUpdate.kt index 96117161c6adf4e783746efeec642860a6386779..593b995183f7881ee6b090ad5c6d46182a5406fb 100644 --- a/app/src/main/java/jp/atled/agileworks/widget/WidgetUpdate.kt +++ b/app/src/main/java/jp/atled/agileworks/widget/WidgetUpdate.kt @@ -4,7 +4,7 @@ import android.appwidget.AppWidgetManager import android.content.ComponentName import jp.atled.agileworks.R import jp.atled.agileworks.AwApp -import jp.atled.agileworks.widget.AwAppWidgetBase.Companion.updateWidgetSystemName +import jp.atled.agileworks.widget.AwAppWidgetBase.Companion.updateAppWidget object WidgetUpdate { private val WIDGET_CLASSES: List> = listOf( @@ -18,9 +18,9 @@ object WidgetUpdate { val myWidget = ComponentName(AwApp.instance.applicationContext, widgetClass) val appWidgetIds: IntArray = manager.getAppWidgetIds(myWidget) manager.notifyAppWidgetViewDataChanged(appWidgetIds, R.id.widgetGridView) - // Widget 上部の SystemName ラベルの更新 + // Widget の更新 for(appWidgetId in appWidgetIds) { - updateWidgetSystemName(AwApp.instance.applicationContext, manager, appWidgetId) + updateAppWidget(AwApp.instance.applicationContext, manager, appWidgetId) } } }