chore: merge dev to main (#1289)

This commit is contained in:
Benjamin 2023-09-20 20:04:10 -07:00 committed by GitHub
commit c0760b1347
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions

View file

@ -90,7 +90,7 @@ class _DynamicThemeBuilderState extends State<DynamicThemeBuilder> with WidgetsB
4: darkCustomTheme, 4: darkCustomTheme,
5: darkDynamicTheme, 5: darkDynamicTheme,
}, },
fallbackTheme: brightness == Brightness.light ? lightCustomTheme : darkCustomTheme, fallbackTheme: PlatformDispatcher.instance.platformBrightness == Brightness.light ? lightCustomTheme : darkCustomTheme,
), ),
builder: (context, theme) => MaterialApp( builder: (context, theme) => MaterialApp(
debugShowCheckedModeBanner: false, debugShowCheckedModeBanner: false,

View file

@ -157,6 +157,7 @@ class SUpdateThemeUI extends StatelessWidget {
label: sUpdateTheme.getThemeModeName(), label: sUpdateTheme.getThemeModeName(),
onPressed: () => { sUpdateTheme.showThemeDialog(context) }, onPressed: () => { sUpdateTheme.showThemeDialog(context) },
), ),
onTap: () => { sUpdateTheme.showThemeDialog(context) },
), ),
FutureBuilder<int>( FutureBuilder<int>(
future: _settingViewModel.getSdkVersion(), future: _settingViewModel.getSdkVersion(),