From 73de0b57b2fc9a8d1b181e0cdd6a2986619633d7 Mon Sep 17 00:00:00 2001 From: S-6203-ATLED Date: Wed, 25 May 2022 17:29:18 +0900 Subject: [PATCH 1/4] =?UTF-8?q?#81=20=E3=83=AD=E3=82=B0=E3=82=A2=E3=82=A6?= =?UTF-8?q?=E3=83=88=E4=B8=AD=E3=81=AE=E3=82=A6=E3=82=A3=E3=82=B8=E3=82=A7?= =?UTF-8?q?=E3=83=83=E3=83=88=E3=81=AE=E7=AE=B1=E3=81=AE=E6=95=B0=E3=82=92?= =?UTF-8?q?8=E3=81=B8=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/jp/atled/agileworks/widget/AwAppWidget.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 149c85f3..2e3b4096 100644 --- a/app/src/main/java/jp/atled/agileworks/widget/AwAppWidget.kt +++ b/app/src/main/java/jp/atled/agileworks/widget/AwAppWidget.kt @@ -112,7 +112,7 @@ class AwAppWidget : AwAppWidgetBase( ApprovalInfo.REMAND, ApprovalInfo.CHECK_REPORT, ApprovalInfo.DEMAND, - ApprovalInfo.FUTURE_PASS, + // ApprovalInfo.FUTURE_PASS, ApprovalInfo.SHARE, ApprovalInfo.SHARED)) class AwAppWidgetApproveOnly : AwAppWidgetBase( -- GitLab From 57bd8aaa5fe8f06020f00db6ed097a5aa7234597 Mon Sep 17 00:00:00 2001 From: S-6203-ATLED Date: Thu, 26 May 2022 13:21:14 +0900 Subject: [PATCH 2/4] =?UTF-8?q?#81=20widget=E3=81=AE=E7=AE=B1=E3=81=AE?= =?UTF-8?q?=E6=95=B0=E3=82=928=E3=81=AB=E3=80=81=E3=83=AD=E3=82=B0?= =?UTF-8?q?=E3=82=A4=E3=83=B3=E6=99=82=E3=81=AE=E5=9B=9E=E4=BB=98=E4=BA=88?= =?UTF-8?q?=E5=AE=9A=E8=A1=A8=E7=A4=BA=E3=81=AB=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/jp/atled/agileworks/widget/AwAppWidget.kt | 2 +- .../atled/agileworks/widget/AwAppWidgetRemoteViewsFactory.kt | 3 ++- app/src/main/res/xml/aw_app_widget_info.xml | 2 +- 3 files changed, 4 insertions(+), 3 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 2e3b4096..149c85f3 100644 --- a/app/src/main/java/jp/atled/agileworks/widget/AwAppWidget.kt +++ b/app/src/main/java/jp/atled/agileworks/widget/AwAppWidget.kt @@ -112,7 +112,7 @@ class AwAppWidget : AwAppWidgetBase( ApprovalInfo.REMAND, ApprovalInfo.CHECK_REPORT, ApprovalInfo.DEMAND, - // ApprovalInfo.FUTURE_PASS, + ApprovalInfo.FUTURE_PASS, ApprovalInfo.SHARE, ApprovalInfo.SHARED)) class AwAppWidgetApproveOnly : AwAppWidgetBase( diff --git a/app/src/main/java/jp/atled/agileworks/widget/AwAppWidgetRemoteViewsFactory.kt b/app/src/main/java/jp/atled/agileworks/widget/AwAppWidgetRemoteViewsFactory.kt index 88d9bc69..7d7f4399 100644 --- a/app/src/main/java/jp/atled/agileworks/widget/AwAppWidgetRemoteViewsFactory.kt +++ b/app/src/main/java/jp/atled/agileworks/widget/AwAppWidgetRemoteViewsFactory.kt @@ -119,7 +119,7 @@ class AwAppWidgetRemoteViewsFactory(applicationContext: Context, intent: Intent? override fun getCount(): Int { Log.d(TAG, "call getCount(): " + (widgetItems?.count() ?: 0)) - return widgetItems?.count() ?: approvalFilterCodes.size + return widgetItems?.count() ?: 8 } override fun getViewTypeCount(): Int { @@ -147,6 +147,7 @@ class AwAppWidgetRemoteViewsFactory(applicationContext: Context, intent: Intent? itemList.add(item) } widgetItems = itemList.toImmutableList() + Log.d(TAG,widgetItems.toString()) } else { // 取得できなかった時は widgetItems 更新をしない (すぐにエラー表示にさせないため) Log.d(TAG, "widget items was not updated.") diff --git a/app/src/main/res/xml/aw_app_widget_info.xml b/app/src/main/res/xml/aw_app_widget_info.xml index 6ab9c9fa..8534c758 100644 --- a/app/src/main/res/xml/aw_app_widget_info.xml +++ b/app/src/main/res/xml/aw_app_widget_info.xml @@ -3,7 +3,7 @@ android:initialKeyguardLayout="@layout/aw_app_widget" android:initialLayout="@layout/aw_app_widget" android:minWidth="230dp" - android:minHeight="230dp" + android:minHeight="200dp" android:previewImage="@drawable/appwidget_preview" android:resizeMode="horizontal|vertical" android:updatePeriodMillis="60000" -- GitLab From 711f331420f20d46da8c92d5e90e7846e1915b44 Mon Sep 17 00:00:00 2001 From: S-6203-ATLED Date: Thu, 26 May 2022 13:22:52 +0900 Subject: [PATCH 3/4] =?UTF-8?q?#81=20widget=E3=81=AE=E7=AE=B1=E3=81=AE?= =?UTF-8?q?=E6=95=B0=E3=82=928=E3=81=AB=E3=80=81=E3=83=AD=E3=82=B0?= =?UTF-8?q?=E3=82=A4=E3=83=B3=E6=99=82=E3=81=AE=E5=9B=9E=E4=BB=98=E4=BA=88?= =?UTF-8?q?=E5=AE=9A=E8=A1=A8=E7=A4=BA=E3=81=AB=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jp/atled/agileworks/widget/AwAppWidgetRemoteViewsFactory.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/java/jp/atled/agileworks/widget/AwAppWidgetRemoteViewsFactory.kt b/app/src/main/java/jp/atled/agileworks/widget/AwAppWidgetRemoteViewsFactory.kt index 7d7f4399..8c486a16 100644 --- a/app/src/main/java/jp/atled/agileworks/widget/AwAppWidgetRemoteViewsFactory.kt +++ b/app/src/main/java/jp/atled/agileworks/widget/AwAppWidgetRemoteViewsFactory.kt @@ -147,7 +147,6 @@ class AwAppWidgetRemoteViewsFactory(applicationContext: Context, intent: Intent? itemList.add(item) } widgetItems = itemList.toImmutableList() - Log.d(TAG,widgetItems.toString()) } else { // 取得できなかった時は widgetItems 更新をしない (すぐにエラー表示にさせないため) Log.d(TAG, "widget items was not updated.") -- GitLab From 8cc9d1267a6813d983e72f17f30724fc40b9a765 Mon Sep 17 00:00:00 2001 From: S-6203-ATLED Date: Thu, 26 May 2022 14:39:27 +0900 Subject: [PATCH 4/4] =?UTF-8?q?#81=20=E3=82=A6=E3=82=A3=E3=82=B8=E3=82=A7?= =?UTF-8?q?=E3=83=83=E3=83=88=E3=81=AE=E5=80=8B=E6=95=B0=E3=82=928?= =?UTF-8?q?=E3=81=AB=E4=BF=AE=E6=AD=A3=E3=80=81=E5=9B=9E=E4=BB=98=E4=BA=88?= =?UTF-8?q?=E5=AE=9A=E3=81=AB=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/xml/aw_app_widget_info.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/xml/aw_app_widget_info.xml b/app/src/main/res/xml/aw_app_widget_info.xml index 8534c758..85a7216d 100644 --- a/app/src/main/res/xml/aw_app_widget_info.xml +++ b/app/src/main/res/xml/aw_app_widget_info.xml @@ -3,7 +3,7 @@ android:initialKeyguardLayout="@layout/aw_app_widget" android:initialLayout="@layout/aw_app_widget" android:minWidth="230dp" - android:minHeight="200dp" + android:minHeight="150dp" android:previewImage="@drawable/appwidget_preview" android:resizeMode="horizontal|vertical" android:updatePeriodMillis="60000" -- GitLab