From a3cdc37efcccc94999b21337587f9fa5805defe8 Mon Sep 17 00:00:00 2001
From: Azuma Kasumi <azuma.kasumi@nttdata-sbc.co.jp>
Date: Tue, 19 Sep 2023 19:23:21 +0900
Subject: [PATCH] =?UTF-8?q?=E3=82=A6=E3=82=A3=E3=82=B8=E3=82=A7=E3=83=83?=
 =?UTF-8?q?=E3=83=88=E3=81=AE=E3=82=B5=E3=83=BC=E3=83=90=E3=83=BC=E8=AD=98?=
 =?UTF-8?q?=E5=88=A5=E5=90=8D=E8=A1=A8=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/misc.xml                                |  6 +++--
 .../jp/atled/agileworks/widget/AwAppWidget.kt |  3 +++
 .../shape_widget_systemname_background.xml    |  6 +++++
 app/src/main/res/layout/aw_app_widget.xml     | 23 +++++++++++++++----
 .../main/res/layout/aw_app_widget_onecell.xml | 22 ++++++++++++++----
 5 files changed, 49 insertions(+), 11 deletions(-)
 create mode 100644 app/src/main/res/drawable/shape_widget_systemname_background.xml

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 1a58fea7..75ced089 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -22,18 +22,20 @@
         <entry key="app/src/main/res/drawable/shape_server_menu.xml" value="0.1" />
         <entry key="app/src/main/res/drawable/shape_snackbar.xml" value="0.1" />
         <entry key="app/src/main/res/drawable/shape_widget_background.xml" value="0.1" />
+        <entry key="app/src/main/res/drawable/shape_widget_systemName_background.xml" value="0.163" />
+        <entry key="app/src/main/res/drawable/shape_widget_systemname_background.xml" value="0.1" />
         <entry key="app/src/main/res/drawable/style_button.xml" value="0.1" />
         <entry key="app/src/main/res/layout/activity_aw_app_widget_configuration.xml" value="0.1" />
         <entry key="app/src/main/res/layout/activity_direct_open_document.xml" value="0.13229166666666667" />
         <entry key="app/src/main/res/layout/activity_login.xml" value="0.3660013834635417" />
         <entry key="app/src/main/res/layout/activity_main.xml" value="0.1" />
         <entry key="app/src/main/res/layout/aw_app_widget.xml" value="0.1" />
-        <entry key="app/src/main/res/layout/aw_app_widget_cell.xml" value="0.13229166666666667" />
+        <entry key="app/src/main/res/layout/aw_app_widget_cell.xml" value="0.1" />
         <entry key="app/src/main/res/layout/aw_app_widget_onecell.xml" value="0.13229166666666667" />
         <entry key="app/src/main/res/layout/drawer_header_layout.xml" value="0.29923273657289" />
         <entry key="app/src/main/res/layout/fragment_login.xml" value="0.23669433593749997" />
         <entry key="app/src/main/res/layout/fragment_profile.xml" value="0.13229166666666667" />
-        <entry key="app/src/main/res/layout/fragment_server_switching.xml" value="0.1" />
+        <entry key="app/src/main/res/layout/fragment_server_switching.xml" value="0.37738342285156246" />
         <entry key="app/src/main/res/layout/fragment_webview_detail.xml" value="0.13229166666666667" />
         <entry key="app/src/main/res/layout/server_list_row.xml" value="0.2925201416015625" />
         <entry key="app/src/main/res/layout/server_switching_menu_layout.xml" value="0.13125" />
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 2ab1bda7..3eedbed6 100644
--- a/app/src/main/java/jp/atled/agileworks/widget/AwAppWidget.kt
+++ b/app/src/main/java/jp/atled/agileworks/widget/AwAppWidget.kt
@@ -15,6 +15,7 @@ import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.WorkManager
 import jp.atled.agileworks.R
 import jp.atled.agileworks.model.ApprovalInfo
+import jp.atled.agileworks.model.LoginRepository
 import jp.atled.agileworks.model.WidgetRepository
 import jp.atled.agileworks.view.ui.login.LoginActivity
 import java.util.concurrent.TimeUnit
@@ -122,7 +123,9 @@ sealed class AwAppWidgetBase(private val widgetLayoutId: Int) : AppWidgetProvide
                 putExtra(AwAppWidgetRemoteViewsFactory.SERVER_NUMBER, serverNumber)
                 data = Uri.parse(toUri(Intent.URI_INTENT_SCHEME))
             }
+            val systemName = LoginRepository(serverNumber).loadSystemName()
             views.setRemoteAdapter(R.id.widgetGridView, intent)
+            views.setTextViewText(R.id.systemName, systemName)
 
             //LoginActivityへ設定したサーバーを伝える
             val clickIntentTemplate = Intent(context, LoginActivity::class.java).apply {
diff --git a/app/src/main/res/drawable/shape_widget_systemname_background.xml b/app/src/main/res/drawable/shape_widget_systemname_background.xml
new file mode 100644
index 00000000..3c88f50b
--- /dev/null
+++ b/app/src/main/res/drawable/shape_widget_systemname_background.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:width="2dp" android:color="@color/white_trans_50" />
+    <corners android:radius="5dp" />
+</shape>
diff --git a/app/src/main/res/layout/aw_app_widget.xml b/app/src/main/res/layout/aw_app_widget.xml
index 6d636b77..1d61c150 100644
--- a/app/src/main/res/layout/aw_app_widget.xml
+++ b/app/src/main/res/layout/aw_app_widget.xml
@@ -1,10 +1,23 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent" >
-
-    <GridView
-        android:id="@+id/widgetGridView"
+    <LinearLayout
+        android:id="@+id/bottomSheetLayout"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:numColumns="2" />
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/systemName"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textStyle="bold"
+            android:background="@drawable/shape_widget_systemname_background"
+            android:textColor="@color/main_text_color"/>
+        <GridView
+            android:id="@+id/widgetGridView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:numColumns="2" />
+    </LinearLayout>
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/aw_app_widget_onecell.xml b/app/src/main/res/layout/aw_app_widget_onecell.xml
index f778e723..9b624db4 100644
--- a/app/src/main/res/layout/aw_app_widget_onecell.xml
+++ b/app/src/main/res/layout/aw_app_widget_onecell.xml
@@ -2,9 +2,23 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent" >
 
-    <GridView
-        android:id="@+id/widgetGridView"
+    <LinearLayout
+        android:id="@+id/bottomSheetLayout"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:numColumns="1" />
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/systemName"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textStyle="bold"
+            android:background="@drawable/shape_widget_systemname_background"
+            android:textColor="@color/main_text_color"/>
+        <GridView
+            android:id="@+id/widgetGridView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:numColumns="1" />
+    </LinearLayout>
 </RelativeLayout>
\ No newline at end of file
-- 
GitLab