diff --git a/.idea/misc.xml b/.idea/misc.xml index 1a58fea70056103651120278163a0e9c06d7b58f..75ced089ede07afcea1139e518741714ef0bf4aa 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -22,18 +22,20 @@ + + - + - + 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 2ab1bda737ad89ccdc64389dc3d364f210494e78..3eedbed6ec13ab843dfdfb05ae753bce5da26fa1 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 0000000000000000000000000000000000000000..3c88f50b4fac53e53c683f0d9ae000b885c258d7 --- /dev/null +++ b/app/src/main/res/drawable/shape_widget_systemname_background.xml @@ -0,0 +1,6 @@ + + + + + diff --git a/app/src/main/res/layout/aw_app_widget.xml b/app/src/main/res/layout/aw_app_widget.xml index 6d636b77c6d794332a9d1d0e9cea484f5a9706aa..1d61c150f3e3fdda0f098bf92b2ee7102cce5502 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 @@ - - + android:layout_height="match_parent" + android:orientation="vertical"> + + + + \ 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 f778e72369adb7f2a9550e34e71e42b36997e7e8..9b624db4c3005982f2c330304882baea395e2508 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" > - + android:layout_height="match_parent" + android:orientation="vertical"> + + + + \ No newline at end of file