Gitea/git-touch-android-ios-app
1
0
Fork 0
mirror of https://github.com/git-touch/git-touch synced 2025-03-05 19:57:42 +01:00
Code Issues Releases Wiki Activity

refactor: picker group

Browse Source
This commit is contained in:
Rongjian Zhang 2019-09-29 15:02:06 +08:00
parent 2c64179715
commit cba1173e30
3 changed files with 62 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/models/theme.dart
View File

@ -199,7 +199,7 @@ class ThemeModel with ChangeNotifier {
switch (theme) { switch (theme) {
case AppThemeType.cupertino: case AppThemeType.cupertino:
default: default:
await showCupertinoModalPopup<void>( await showCupertinoModalPopup(
context: context, context: context,
builder: (context) { builder: (context) {
return Container( return Container(
@ -213,10 +213,12 @@ class ThemeModel with ChangeNotifier {
.toList() .toList()
.indexWhere((v) => v.value == groupItem.value)), .indexWhere((v) => v.value == groupItem.value)),
onSelectedItemChanged: (index) { onSelectedItemChanged: (index) {
if (_debounce?.isActive ?? false) _debounce.cancel(); if (_debounce?.isActive ?? false) {
_debounce.cancel();
}
_debounce = Timer(const Duration(milliseconds: 500), () { _debounce = Timer(const Duration(milliseconds: 500), () {
return groupItem groupItem.onChange(groupItem.items[index].value);
.onChange(groupItem.items.toList()[index].value);
}); });
}, },
), ),

76
lib/screens/code_theme.dart
View File

@ -3,9 +3,11 @@ import 'package:flutter/material.dart';
import 'package:flutter_highlight/flutter_highlight.dart'; import 'package:flutter_highlight/flutter_highlight.dart';
import 'package:flutter_highlight/theme_map.dart'; import 'package:flutter_highlight/theme_map.dart';
import 'package:git_touch/models/code.dart'; import 'package:git_touch/models/code.dart';
import 'package:git_touch/models/theme.dart';
import 'package:git_touch/scaffolds/single.dart'; import 'package:git_touch/scaffolds/single.dart';
import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/app_bar_title.dart';
import 'package:git_touch/widgets/picker.dart'; import 'package:git_touch/widgets/picker.dart';
import 'package:git_touch/widgets/table_view.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
class CodeThemeScreen extends StatelessWidget { class CodeThemeScreen extends StatelessWidget {
@ -17,39 +19,69 @@ class CodeThemeScreen extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
var codeProvider = Provider.of<CodeModel>(context); var codeProvider = Provider.of<CodeModel>(context);
var themeProvider = Provider.of<ThemeModel>(context);
return SingleScaffold( return SingleScaffold(
title: AppBarTitle('Code theme'), title: AppBarTitle('Code theme'),
body: Column( body: Column(
crossAxisAlignment: CrossAxisAlignment.stretch, crossAxisAlignment: CrossAxisAlignment.stretch,
children: <Widget>[ children: <Widget>[
PickerGroup( TableView(
items: [ items: [
PickerGroupItem( TableViewItem(
title: 'Syntax Highlighting', text: Text('Syntax Highlighting'),
value: codeProvider.theme, rightWidget: Text(codeProvider.theme),
items: CodeModel.themes.map((v) => PickerItem(v, text: v)), onTap: () {
onChange: (value) { themeProvider.showPicker(
Provider.of<CodeModel>(context).setTheme(value); context,
PickerGroupItem(
value: codeProvider.theme,
items: CodeModel.themes
.map((v) => PickerItem(v, text: v))
.toList(),
onChange: (value) {
Provider.of<CodeModel>(context).setTheme(value);
},
),
);
}, },
), ),
PickerGroupItem( TableViewItem(
title: 'Font Size', text: Text('Font Size'),
value: codeProvider.fontSize.toString(), rightWidget: Text(codeProvider.fontSize.toString()),
items: CodeModel.fontSizes onTap: () {
.map((v) => PickerItem(v.toString(), text: v.toString())), themeProvider.showPicker(
onChange: (value) { context,
Provider.of<CodeModel>(context) PickerGroupItem(
.setFontSize(int.tryParse(value) ?? 16); value: codeProvider.fontSize.toString(),
items: CodeModel.fontSizes
.map((v) =>
PickerItem(v.toString(), text: v.toString()))
.toList(),
onChange: (value) {
Provider.of<CodeModel>(context)
.setFontSize(int.tryParse(value) ?? 16);
},
),
);
}, },
), ),
PickerGroupItem( TableViewItem(
title: 'Font Family', text: Text('Font Family'),
value: codeProvider.fontFamily, rightWidget: Text(codeProvider.fontFamily),
items: onTap: () {
CodeModel.fontFamilies.map((v) => PickerItem(v, text: v)), themeProvider.showPicker(
onChange: (String value) { context,
Provider.of<CodeModel>(context).setFontFamily(value); PickerGroupItem(
value: codeProvider.fontFamily,
items: CodeModel.fontFamilies
.map((v) => PickerItem(v, text: v))
.toList(),
onChange: (String value) {
Provider.of<CodeModel>(context).setFontFamily(value);
},
),
);
}, },
), ),
], ],

35
lib/widgets/picker.dart
View File

@ -1,8 +1,5 @@
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:git_touch/models/theme.dart';
import 'package:git_touch/widgets/table_view.dart';
import 'package:provider/provider.dart';
class PickerItem<T> { class PickerItem<T> {
final T value; final T value;
@ -11,41 +8,13 @@ class PickerItem<T> {
} }
class PickerGroupItem<T> { class PickerGroupItem<T> {
final String title;
final T value; final T value;
final Iterable<PickerItem<T>> items; final List<PickerItem<T>> items;
final Function(T value) onChange; final Function(T value) onChange;
PickerGroupItem({ PickerGroupItem({
@required this.title,
@required this.value, @required this.value,
@required this.items, @required this.items,
@required this.onChange, @required this.onChange,
}); });
} }
class PickerGroup extends StatelessWidget {
final Iterable<PickerGroupItem<String>> items;
PickerGroup({@required this.items});
@override
Widget build(BuildContext context) {
var themeProvider = Provider.of<ThemeModel>(context);
switch (themeProvider.theme) {
case AppThemeType.cupertino:
default:
// TODO: Material
return TableView(
items: items.map((item) {
return TableViewItem(
text: Text(item.title),
rightWidget: Text(item.value),
onTap: () {
themeProvider.showPicker(context, item);
},
);
}),
);
}
}
}