tret2003/checker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed bug with logout menu item

Browse Source
This commit is contained in:
Semyon Babushkin
2017-11-22 19:12:10 +03:00
parent 5e9455a0f7
commit eee57e727a
3 changed files with 37 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
android/app/app.iml
View File

@@ -145,21 +145,25 @@
<orderEntry type="library" exported="" name="okio-1.13.0" level="project" /> <orderEntry type="library" exported="" name="okio-1.13.0" level="project" />
<orderEntry type="library" exported="" name="zxing-1.9.8" level="project" /> <orderEntry type="library" exported="" name="zxing-1.9.8" level="project" />
<orderEntry type="library" exported="" name="core-3.3.0" level="project" /> <orderEntry type="library" exported="" name="core-3.3.0" level="project" />
<orderEntry type="library" exported="" name="support-core-ui-25.3.1" level="project" /> <orderEntry type="library" exported="" name="support-core-ui-25.4.0" level="project" />
<orderEntry type="library" exported="" name="okhttp-3.8.1" level="project" /> <orderEntry type="library" exported="" name="okhttp-3.8.1" level="project" />
<orderEntry type="library" exported="" name="flutter" level="project" /> <orderEntry type="library" exported="" name="flutter" level="project" />
<orderEntry type="library" exported="" name="support-v4-25.3.1" level="project" /> <orderEntry type="library" exported="" name="support-v4-25.4.0" level="project" />
<orderEntry type="library" exported="" name="support-media-compat-25.3.1" level="project" /> <orderEntry type="library" exported="" name="support-media-compat-25.4.0" level="project" />
<orderEntry type="library" exported="" name="flutter-x86" level="project" /> <orderEntry type="library" exported="" name="flutter-x86" level="project" />
<orderEntry type="library" exported="" name="imagepicker-1.5.0" level="project" />
<orderEntry type="library" exported="" name="core-1.9.8" level="project" /> <orderEntry type="library" exported="" name="core-1.9.8" level="project" />
<orderEntry type="library" exported="" name="support-annotations-25.3.1" level="project" /> <orderEntry type="library" exported="" name="recyclerview-v7-25.4.0" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-25.3.1" level="project" /> <orderEntry type="library" exported="" name="support-annotations-25.4.0" level="project" />
<orderEntry type="library" exported="" name="support-vector-drawable-25.3.1" level="project" /> <orderEntry type="library" exported="" name="appcompat-v7-25.4.0" level="project" />
<orderEntry type="library" exported="" name="support-compat-25.3.1" level="project" /> <orderEntry type="library" exported="" name="support-vector-drawable-25.4.0" level="project" />
<orderEntry type="library" exported="" name="support-core-utils-25.3.1" level="project" /> <orderEntry type="library" exported="" name="support-compat-25.4.0" level="project" />
<orderEntry type="library" exported="" name="support-fragment-25.3.1" level="project" /> <orderEntry type="library" exported="" name="support-core-utils-25.4.0" level="project" />
<orderEntry type="library" exported="" name="animated-vector-drawable-25.3.1" level="project" /> <orderEntry type="library" exported="" name="support-fragment-25.4.0" level="project" />
<orderEntry type="library" exported="" name="animated-vector-drawable-25.4.0" level="project" />
<orderEntry type="module" module-name="path_provider" exported="" /> <orderEntry type="module" module-name="path_provider" exported="" />
<orderEntry type="module" module-name="sqflite" exported="" /> <orderEntry type="module" module-name="sqflite" exported="" />
<orderEntry type="module" module-name="image_picker" exported="" />
<orderEntry type="library" exported="" name="image_picker-1.0-SNAPSHOT" level="project" />
</component> </component>
</module> </module>

32
lib/base/base_state.dart
View File

@@ -58,20 +58,32 @@ abstract class BaseState<T extends StatefulWidget> extends State<T> {
} }
List<Widget> getMenuButtons() { List<Widget> getMenuButtons() {
List<Widget> menuItemList = [];
menuItemList.add(new PopupMenuItem(
value: 0,
child: getMenuItem(settings_png, StringsLocalization.settings())
));
menuItemList.add(new PopupMenuItem(
value: 1,
child: getMenuItem(settings_png, StringsLocalization.help())
));
helper.getToken().then((token){
if (token != null) { // пользователь авторизован
menuItemList.add(new PopupMenuItem(
value: 2,
child: getMenuItem(settings_png, StringsLocalization.logout())
));
}
});
return <Widget>[ return <Widget>[
new PopupMenuButton<int>( new PopupMenuButton<int>(
onSelected: onOptionsItemClick, onSelected: onOptionsItemClick,
itemBuilder: (BuildContext context) { itemBuilder: (BuildContext context) {
return [new PopupMenuItem( return menuItemList;
value: 0,
child: getMenuItem(settings_png, StringsLocalization.settings())),
new PopupMenuItem(
value: 1,
child: getMenuItem(help_png, StringsLocalization.help())),
new PopupMenuItem(
value: 2,
child: getMenuItem(logout_png, StringsLocalization.logout()))
];
} }
) )
]; ];

2
lib/common.dart
View File

@@ -216,6 +216,6 @@ getLocaleTitle(String code) {
} }
// Добавил вызов, что-бы AOT компилер не выкинул либу. // Добавил вызов, что-бы AOT компилер не выкинул либу.
getImage() { getImage() async {
return await ImagePicker.pickImage(); return await ImagePicker.pickImage();
} }