Commit 04e108be authored by Erfan Jazeb Nikoo's avatar Erfan Jazeb Nikoo
Browse files

Merge branch 'erfan/ui-3' into 'dev'

erfan/ui-3

See merge request !470
parents f78f3061 e2065c39
Pipeline #11483 passed with stages
in 10 minutes and 58 seconds
Showing with 25 additions and 17 deletions
+25 -17
......@@ -200,7 +200,7 @@ class _ProjectsAppPreviewScreen extends State<ProjectsPreviewAppScreen> {
Container(
width: MediaQuery.of(context).size.width,
constraints: BoxConstraints(minHeight: 256),
child: DataAppList(),
child: DataAppList(preview: true),
),
SizedBox(height: 50),
Wrap(
......
......@@ -8,7 +8,9 @@ import 'package:memri/widgets/data_app/data_app_row.dart';
import 'package:provider/provider.dart';
class DataAppList extends StatefulWidget {
const DataAppList({Key? key}) : super(key: key);
const DataAppList({Key? key, this.preview = false}) : super(key: key);
final bool preview;
@override
State<DataAppList> createState() => _DataAppListState();
......@@ -27,22 +29,28 @@ class _DataAppListState extends State<DataAppList> {
Expanded(
flex: 2,
child: Padding(
padding: EdgeInsets.symmetric(
horizontal: 30,
vertical: 20 +
(!ResponsiveHelper(context).isSmallScreen ? 20 : 0),
),
padding: widget.preview
? EdgeInsets.zero
: EdgeInsets.symmetric(
horizontal: 30,
vertical: 20 +
(!ResponsiveHelper(context).isSmallScreen
? 20
: 0),
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
provider.currentPlugin?.get('name') ??
'Untitled App',
style: app.styles.headline1,
),
if (provider.currentPlugin
?.get('pluginDescription') !=
null)
if (!widget.preview)
Text(
provider.currentPlugin?.get('name') ??
'Untitled App',
style: app.styles.headline1,
),
if (!widget.preview &&
provider.currentPlugin
?.get('pluginDescription') !=
null)
Padding(
padding: const EdgeInsets.only(top: 10),
child: Text(
......@@ -51,7 +59,7 @@ class _DataAppListState extends State<DataAppList> {
style: app.styles.bodyText1,
),
),
SizedBox(height: 50),
if (!widget.preview) SizedBox(height: 50),
...List.generate(
provider.currentDataAppItems.length,
(index) {
......
......@@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
# Read more about iOS versioning at
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
version: 3.0.13+0
version: 3.0.13+1
environment:
sdk: ">=2.12.0 <3.0.0"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment