forked from cwtch.im/cwtch-ui
Merge branch 'trunk' into fix297
This commit is contained in:
commit
4fd8075497
|
@ -218,7 +218,7 @@ class MainActivity: FlutterActivity() {
|
||||||
WorkManager.getInstance(this).enqueue(workRequest)
|
WorkManager.getInstance(this).enqueue(workRequest)
|
||||||
WorkManager.getInstance(applicationContext).getWorkInfoByIdLiveData(workRequest.id).observe(
|
WorkManager.getInstance(applicationContext).getWorkInfoByIdLiveData(workRequest.id).observe(
|
||||||
this, Observer { workInfo ->
|
this, Observer { workInfo ->
|
||||||
if (workInfo.state == WorkInfo.State.SUCCEEDED) {
|
if (workInfo != null && workInfo.state == WorkInfo.State.SUCCEEDED) {
|
||||||
val res = workInfo.outputData.keyValueMap.toString()
|
val res = workInfo.outputData.keyValueMap.toString()
|
||||||
result.success(workInfo.outputData.getString("result"))
|
result.success(workInfo.outputData.getString("result"))
|
||||||
}
|
}
|
||||||
|
|
|
@ -140,6 +140,7 @@ class _GlobalSettingsViewState extends State<GlobalSettingsView> {
|
||||||
trailing: Container(
|
trailing: Container(
|
||||||
width: MediaQuery.of(context).size.width / 4,
|
width: MediaQuery.of(context).size.width / 4,
|
||||||
child: DropdownButton(
|
child: DropdownButton(
|
||||||
|
isExpanded: true,
|
||||||
value: settings.uiColumnModeLandscape.toString(),
|
value: settings.uiColumnModeLandscape.toString(),
|
||||||
onChanged: (String? newValue) {
|
onChanged: (String? newValue) {
|
||||||
settings.uiColumnModeLandscape = Settings.uiColumnModeFromString(newValue!);
|
settings.uiColumnModeLandscape = Settings.uiColumnModeFromString(newValue!);
|
||||||
|
@ -197,6 +198,7 @@ class _GlobalSettingsViewState extends State<GlobalSettingsView> {
|
||||||
trailing: Container(
|
trailing: Container(
|
||||||
width: MediaQuery.of(context).size.width / 4,
|
width: MediaQuery.of(context).size.width / 4,
|
||||||
child: DropdownButton(
|
child: DropdownButton(
|
||||||
|
isExpanded: true,
|
||||||
value: settings.notificationContent,
|
value: settings.notificationContent,
|
||||||
onChanged: (NotificationContent? newValue) {
|
onChanged: (NotificationContent? newValue) {
|
||||||
settings.notificationContent = newValue!;
|
settings.notificationContent = newValue!;
|
||||||
|
|
Loading…
Reference in New Issue