Skip to content

Commit

Permalink
add icons to dropdown items
Browse files Browse the repository at this point in the history
  • Loading branch information
Nov1kov committed Sep 29, 2019
1 parent 17166b0 commit ace6233
Show file tree
Hide file tree
Showing 10 changed files with 38 additions and 21 deletions.
Binary file added assets/buh.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/callcenter.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion assets/it_jobs.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"description": "Специалист обладает знаниями и навыками эффективного продвижения бренда в сети, медиапланирования, создания креативных концепций, мобильных продуктов и e-commerce. Выпускник программы – востребованный специалист с перспективой работы на позиции директора.",
"salary": "от 40 тыс руб до 80 тыс руб",
"image": "5.png",
"link_text": "ПРОГРАММА DIGITAL КОММУНИКАЦИИ",
"link_text": "DIGITAL.COM",
"links": [
"https://macs.school/departments/digital-communications/interactive-communications/"
]
Expand Down
Binary file added assets/rekruter.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions assets/routin_jobs.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[
{
"name": "Бухгалтер",
"image": "buh.png",
"predictions": [
{
"name": "Аналитик big data",
Expand All @@ -18,6 +19,7 @@
},
{
"name": "Оператор call cetner",
"image": "callcenter.png",
"predictions": [
{
"name": "Менджер digital коммуникациям",
Expand All @@ -35,6 +37,7 @@
},
{
"name": "специалист по закупкам",
"image": "zakupki.png",
"predictions": [
{
"name": "Сетевой юрист",
Expand Down
Binary file added assets/snabzenie.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/zakupki.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion lib/hellopage.dart
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class _HelloPageState extends State<HelloPage> {
children: <Widget>[
Container(
padding: EdgeInsets.fromLTRB(10, 0, 16, 0),
child: Image.asset('assets/auth_page_image.png'),
child: Image.asset('assets/' + job.image),
),
Container(
alignment: Alignment(0.0, 0.0),
Expand Down
4 changes: 3 additions & 1 deletion lib/repository.dart
Original file line number Diff line number Diff line change
Expand Up @@ -80,15 +80,17 @@ class Prediction{

class RoutineJob {
final String name;
final String image;
final List<Prediction> predictions;

RoutineJob({this.name, this.predictions});
RoutineJob({this.name, this.predictions, this.image});

factory RoutineJob.fromJson(Map<String, dynamic> json) {
var predictionsJson = json['predictions'];
var mapped = predictionsJson.map<Prediction>((j) => new Prediction.fromJson(j)).toList();
return new RoutineJob(
name: json['name'] as String,
image: json['image'] as String,
predictions: mapped,
);
}
Expand Down
48 changes: 30 additions & 18 deletions lib/resultpage.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter_web_browser/flutter_web_browser.dart';
import 'package:istart/quizpage.dart';

import 'Repository.dart';
import 'util.dart';
Expand Down Expand Up @@ -53,15 +54,18 @@ class _ResultPageState extends State<ResultPage> {
child: Image.asset("assets/back.png"))),
Container(
padding: EdgeInsets.fromLTRB(16, 10, 16, 0),
height: 110,
height: 130,
child: Column(
children: <Widget>[
Text(
"Вот, что тебе подходит",
style: TextStyle(
fontSize: 30,
fontWeight: FontWeight.bold,
color: CustomColors.TextHeader),
Container(
margin: EdgeInsets.fromLTRB(0, 0, 0, 8),
child: Text(
"Вот, что тебе подходит",
style: TextStyle(
fontSize: 30,
fontWeight: FontWeight.bold,
color: CustomColors.TextHeader),
),
),
Text(
'Освой новую профессию',
Expand All @@ -82,13 +86,13 @@ class _ResultPageState extends State<ResultPage> {
SizedBox(
height: 27,
),

],
);
if (selectedItJob != null){
if (selectedItJob != null) {
column.children.add(_buildJobDescription());
}else{
var filler = SizedBox(height: MediaQuery.of(context).size.height - 80 - 110 - 27 - 120);
} else {
var filler = SizedBox(
height: MediaQuery.of(context).size.height - 80 - 110 - 27 - 120);
column.children.add(filler);
}
return Scaffold(
Expand All @@ -114,7 +118,7 @@ class _ResultPageState extends State<ResultPage> {
Widget _buildNotMyButton() {
return Container(
width: MediaQuery.of(context).size.width / 1.2,
margin: EdgeInsets.fromLTRB(0, 18, 0, 50),
margin: EdgeInsets.fromLTRB(0, 36, 0, 50),
height: 58,
decoration: const BoxDecoration(
gradient: LinearGradient(
Expand All @@ -135,11 +139,18 @@ class _ResultPageState extends State<ResultPage> {
),
],
),
child: Center(
child: const Text(
'РАССКАЗАТЬ О СЕБЕ БОЛЬШЕ',
style: TextStyle(
color: Colors.white, fontSize: 16, fontWeight: FontWeight.bold),
child: InkWell(
onTap: () => {
Navigator.of(context).pushReplacement(MaterialPageRoute(
builder: (context) => QuizPage(),
))
},
child: Center(
child: const Text(
'РАССКАЗАТЬ О СЕБЕ БОЛЬШЕ',
style: TextStyle(
color: Colors.white, fontSize: 16, fontWeight: FontWeight.bold),
),
),
),
);
Expand Down Expand Up @@ -184,6 +195,7 @@ class _ResultPageState extends State<ResultPage> {
height: 1.6,
color: CustomColors.TextHeader))),
Container(
padding: EdgeInsets.all(8),
width: MediaQuery.of(context).size.width,
margin: EdgeInsets.fromLTRB(22, 0, 22, 0),
child: Text(
Expand Down Expand Up @@ -261,7 +273,7 @@ class PredictionsList extends StatelessWidget {

Widget _buildProductItem(BuildContext context, int index) {
if (index == 0) {
return SizedBox(width: 48);
return SizedBox(width: 44);
}
var itJob = predictionItJobs[index - 1];
return Container(
Expand Down

0 comments on commit ace6233

Please sign in to comment.