Skip to content
GitLab
Explore
Projects
Groups
Snippets
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Memri
Flutter App for Memri
Commits
29d7b312
Commit
29d7b312
authored
4 years ago
by
Azat Alimov
Browse files
Options
Download
Email Patches
Plain Diff
fixed BottomBarView/TopBarView style
parent
8ee7908c
dev
0.0.1
0.0.2
178-generate-random-database-key-on-the-device-2
209-longtext-wrapping-in-messages
291-cvu-storeddefinitions
CU-28dter0_refactore_assets_styles
CU-2j3z95c_Building-app-in-desktop-mode
CU-2wfh1b8_1200_apps_open--predictions-dont-show-when-opening-app-for-the-first-time_Erfan
PROD_SC-845_Flutter-Switcheroo--ARCHT---Implement-all-app-screens-without-CVU_Erfan-Jazeb-Nikoo
android-release
appbar_drawer
aziz/2fa
aziz/colab
aziz/demo/images
aziz/developers-mode
aziz/fix/gitlab
aziz/oauth
aziz/offboarding
charts-d3
ci-publish-web-pages
ci-web
cvu_docs
dart-optimization
db-stream
demo-plugins
erfan/client-app
erfan/visualization
histogram-koen
hotfix-3.0.24
hotfix-login
koen/histogram3
legacy_local_db
main
merge-client-app
merge-providers
multi-env
new-desktop
pin-pod-version-via-prebuilt
plugin_cvu_test
prod
projects
projectsv2
readme_update
release-0.0.1
release-0.0.3
release-0.0.4
release-0.0.5
release-0.0.6
release-0.0.8
release-2.0.16
release-2.0.18
release-2.0.19
release-2.0.22
release-2.1.10
release-2.1.11
release-2.1.12
release-2.1.13
release-2.1.14
release-2.1.15
release-2.1.7
release-2.1.8
release-2.1.8.1
release-2.1.9
release-2.2.1
release-2.2.11
release-2.2.14
release-2.2.2
release-2.2.8
release-2.2.9
release-3.0.12
release-3.0.13
release-3.0.17
release-3.0.22
release-3.0.23
release-3.0.24
release-3.0.8
release-3.0.9
release/0.0.2
setup-screen-ui-improve
several-release-fixes
switcheroo/labeller
sz/using_oauth2_from_pod
telegram
timer
triggers
twitter_feed_setup_sketch
windows-build
2 merge requests
!18
WIP: Publish the Web application in GitLab Pages
,
!4
UI
Pipeline
#2083
failed with stages
in 31 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
lib/MemriApp/UI/Chrome/BottomBarView.dart
+37
-28
lib/MemriApp/UI/Chrome/BottomBarView.dart
lib/MemriApp/UI/Chrome/TopBarView.dart
+1
-1
lib/MemriApp/UI/Chrome/TopBarView.dart
with
38 additions
and
29 deletions
+38
-29
lib/MemriApp/UI/Chrome/BottomBarView.dart
+
37
-
28
View file @
29d7b312
...
...
@@ -4,6 +4,7 @@
import
'package:flutter/cupertino.dart'
;
import
'package:flutter/material.dart'
;
import
'package:memri/MemriApp/UI/CVUComponents/types/CVUColor.dart'
;
import
'../ViewContextController.dart'
;
...
...
@@ -25,37 +26,45 @@ class BottomBarView extends StatelessWidget {
Widget
build
(
BuildContext
context
)
{
var
filter
=
currentFilter
;
return
Column
(
children:
[
Divider
(),
//
Divider(),
Padding
(
padding:
EdgeInsets
.
symmetric
(
horizontal:
10
),
child:
Row
(
/*spacing: 4, */
children:
[
Row
(
/*spacing: 4, */
children:
[
ElevatedButton
(
onPressed:
onSearchPressed
,
child:
Padding
(
padding:
EdgeInsets
.
fromLTRB
(
10
,
10
,
0
,
10
),
child:
Row
(
children:
[
Padding
(
padding:
EdgeInsets
.
only
(
left:
7
),
child:
Icon
(
Icons
.
search
),
),
if
(
filter
!=
null
)
Text
(
filter
)
//TODO style
],
child:
ColoredBox
(
color:
CVUColor
.
system
(
"secondarySystemBackground"
),
child:
Row
(
/*spacing: 4, */
children:
[
Row
(
/*spacing: 4, */
children:
[
TextButton
(
onPressed:
onSearchPressed
,
child:
Padding
(
padding:
EdgeInsets
.
fromLTRB
(
10
,
10
,
0
,
10
),
child:
ClipRect
(
child:
Row
(
children:
[
Padding
(
padding:
EdgeInsets
.
only
(
right:
7
),
child:
Icon
(
Icons
.
search
),
),
if
(
filter
!=
null
)
Text
(
filter
)
//TODO style
],
),
)),
),
),
),
if
(
filter
!=
null
)
ElevatedButton
(
onPressed:
()
=
>
viewContext
.
searchString
=
null
,
child:
Icon
(
Icons
.
clear
))
//TODO style
]),
Spacer
(),
ElevatedButton
(
onPressed:
onFilterButtonPressed
,
child:
Icon
(
Icons
.
menu
),
)
]))
if
(
filter
!=
null
)
TextButton
(
onPressed:
()
=
>
viewContext
.
searchString
=
null
,
child:
Icon
(
Icons
.
clear
))
//TODO style
]),
Spacer
(),
Padding
(
padding:
EdgeInsets
.
all
(
10
),
child:
ClipRect
(
child:
TextButton
(
onPressed:
onFilterButtonPressed
,
child:
Icon
(
Icons
.
filter_list
),
),
),
)
])))
]);
}
}
This diff is collapsed.
Click to expand it.
lib/MemriApp/UI/Chrome/TopBarView.dart
+
1
-
1
View file @
29d7b312
...
...
@@ -81,7 +81,7 @@ class TopBarView extends StatelessWidget {
},
valueListenable:
sceneController
.
shouldUpdate
,
),
Divider
()
//
Divider()
],
),
);
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Snippets