From 068af8bacaf01684c01ecbae37cfaaadb431d607 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A0=A4=E6=82=A0=E8=8E=89?=
 <tsutsumi.yuri@nttdata-sbc.co.jp>
Date: Fri, 19 Jan 2024 16:52:18 +0900
Subject: [PATCH] =?UTF-8?q?=E8=A4=87=E6=95=B0=E3=82=A6=E3=82=A3=E3=82=B8?=
 =?UTF-8?q?=E3=82=A7=E3=83=83=E3=83=88=E8=A8=AD=E7=BD=AE=E6=99=82=E3=80=81?=
 =?UTF-8?q?=E3=82=A6=E3=82=A3=E3=82=B8=E3=82=A7=E3=83=83=E3=83=88=E3=82=92?=
 =?UTF-8?q?=E7=A7=BB=E5=8B=95=E3=81=95=E3=81=9B=E3=82=8B=E3=81=A8=E8=A6=8B?=
 =?UTF-8?q?=E3=81=88=E3=81=AA=E3=81=8F=E3=81=AA=E3=82=8B=E4=B8=8D=E5=85=B7?=
 =?UTF-8?q?=E5=90=88=E3=81=AE=E8=A7=A3=E6=B6=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jp/atled/agileworks/widget/AwAppWidget.kt | 24 -------------------
 .../atled/agileworks/widget/WidgetUpdate.kt   |  6 ++---
 2 files changed, 3 insertions(+), 27 deletions(-)

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 032e84db..54ab2fc2 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 96117161..593b9951 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<Class<out AwAppWidgetBase>> = 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)
             }
         }
     }
-- 
GitLab