Skip to content

Commit

Permalink
Merge pull request #45 from K-shir0/fix/#38
Browse files Browse the repository at this point in the history
配布されたデザイン7の実装(途中経過)
  • Loading branch information
K-shir0 authored Aug 22, 2021
2 parents 11e0895 + d8e7a16 commit 960db9a
Show file tree
Hide file tree
Showing 9 changed files with 495 additions and 261 deletions.
1 change: 1 addition & 0 deletions lib/domain/operation.dart
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ class Operation with _$Operation {
@Default([]) List<String> args,
}) = _Operation;

// ignore: prefer_constructors_over_static_methods
static Operation next(String ideaId, String? currentIdeaId) {
return Operation(
id: const Uuid().v4(),
Expand Down
239 changes: 94 additions & 145 deletions lib/pages/home_menu.dart

Large diffs are not rendered by default.

105 changes: 105 additions & 0 deletions lib/pages/mainmenuserch.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
import 'package:alexander/addIcon/web_icon_app_icons.dart';
import 'package:alexander/pages/theme/palette.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';

//検索バー
class Mainmenuserch extends StatelessWidget {
const Mainmenuserch({Key? key}) : super(key: key);

@override
Widget build(BuildContext context) {
return const SizedBox(
width: 437,
height: 32,
child: TextField(
textAlignVertical: TextAlignVertical.center,
decoration: InputDecoration(
border: OutlineInputBorder(
borderRadius: BorderRadius.all(Radius.circular(20)),
borderSide: BorderSide(
color: Palette.borderColor,
),
),
prefixIcon: Icon(Icons.search),
hintText: '検索',
),
),
);
}
}

//チームを抜けるボタン
class Exitteambutton extends StatelessWidget {
const Exitteambutton({Key? key}) : super(key: key);

@override
Widget build(BuildContext context) {
return Padding(
padding: const EdgeInsets.all(15),
child: Container(
alignment: Alignment.center,
width: 121,
height: 32,
decoration: BoxDecoration(
color: Palette.bgContentsColor,
// 角丸
borderRadius: BorderRadius.circular(5),
),
child: InkWell(
//ボタンのクリックイベント
onTap: () {},
child: const Text(
'チームを抜ける',
style: TextStyle(color: Palette.mainTextColor),
textAlign: TextAlign.center,
),
),
),
);
}
}

//整理整頓ボタン表示
class Tidybutton extends StatelessWidget {
const Tidybutton({Key? key}) : super(key: key);

@override
Widget build(BuildContext context) {
return Container(
alignment: Alignment.center,
width: 178,
height: 32,
decoration: BoxDecoration(
color: Palette.inviteandborder,
// 角丸
borderRadius: BorderRadius.circular(5),
),
child: InkWell(
//ボタンのクリックイベント
onTap: () {},
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [
const Padding(
padding: EdgeInsets.only(bottom: 5),
child: Text(
'整理整頓をする',
style: TextStyle(
color: Palette.bgContentsLightColor, fontSize: 16),
textAlign: TextAlign.center,
),
),
const Padding(
padding: EdgeInsets.only(top: 4),
child: Icon(
WebIconApp.keyboardarrowdown,
color: Palette.bgContentsLightColor,
),
),
],
),
),
);
}
}
70 changes: 36 additions & 34 deletions lib/pages/notemenuinfo.dart
Original file line number Diff line number Diff line change
Expand Up @@ -8,31 +8,30 @@ class Notemenu extends StatelessWidget {
@override
Widget build(BuildContext context) {
//ノート名を格納する変数
final List<String> noteName = [
'ここに',
];
final List<String> noteName = ['ノートサンプル', 'ノートサンプル2', 'ノートサンプル3'];
return //ノート追加の部分のウィジェット
Container(
width: 280,
height: 788,
color: Palette.bgContentsLightColor,
child: Column(
children: [
const Padding(padding: EdgeInsets.all(5)),
Row(
children: [
Container(
margin: const EdgeInsets.only(left: 24),
width: 32,
height: 32,
decoration: BoxDecoration(
shape: BoxShape.circle,
border: Border.all(color: Palette.titleTextColor, width: 2),
),
child: InkWell(
//ボタンのクリックイベント
onTap: () {},
child: const Icon(Icons.add),
Padding(
padding: const EdgeInsets.only(top: 30, bottom: 30, left: 24),
child: Container(
width: 32,
height: 32,
decoration: BoxDecoration(
shape: BoxShape.circle,
border: Border.all(color: Palette.titleTextColor, width: 2),
),
child: InkWell(
//ボタンのクリックイベント
onTap: () {},
child: const Icon(Icons.add),
),
),
),
const SingleChildScrollView(
Expand All @@ -49,30 +48,33 @@ class Notemenu extends StatelessWidget {
),
],
),
const Padding(padding: EdgeInsets.all(20)),
// 区切り線
const Divider(
thickness: 2,
color: Palette.borderColor,
),
//配列noteNameの要素が全てTextで表示される
ListView.builder(
shrinkWrap: true,
itemCount: noteName.length,
itemBuilder: (BuildContext context, int index) {
return Container(
padding: const EdgeInsets.all(10),
child: Row(
mainAxisAlignment: MainAxisAlignment.end,
children: [
Container(
margin: const EdgeInsets.only(right: 24),
child: Text(
Padding(
padding: const EdgeInsets.only(left: 24),
child: ListView.builder(
shrinkWrap: true,
itemCount: noteName.length,
itemBuilder: (BuildContext context, int index) {
return Padding(
padding: const EdgeInsets.only(top: 40),
child: Row(
children: [
Text(
noteName[index],
textAlign: TextAlign.right,
style: const TextStyle(
fontSize: 15, color: Palette.titleTextColor),
),
),
],
),
);
},
],
),
);
},
),
),
],
),
Expand Down
138 changes: 138 additions & 0 deletions lib/pages/selectchangebutton.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,138 @@
import 'package:alexander/pages/theme/palette.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';

class SelectChangeButton extends StatelessWidget {
const SelectChangeButton({Key? key}) : super(key: key);

@override
Widget build(BuildContext context) {
return Padding(
padding: const EdgeInsets.only(left: 56, top: 25),
child: Row(
children: [
//マンダラ
Padding(
padding: const EdgeInsets.only(right: 15),
child: Column(
children: [
Container(
height: 48,
width: 48,
decoration: BoxDecoration(
border: Border.all(color: Palette.borderColor),
borderRadius: BorderRadius.circular(5),
),
child: InkWell(
//マンダラボタンクリックイベント
onTap: () {},
),
),
const Padding(
padding: EdgeInsets.only(top: 10),
child: Text(
'マンダラ',
style:
TextStyle(fontSize: 12, color: Palette.accentTextColor),
),
)
],
),
),
//履歴
Padding(
padding: const EdgeInsets.only(right: 15),
child: Column(
children: [
Container(
height: 48,
width: 48,
decoration: BoxDecoration(
border: Border.all(color: Palette.borderColor),
borderRadius: BorderRadius.circular(5),
),
child: InkWell(
//履歴ボタンのクリックイベント
onTap: () {},
child: const Icon(
Icons.access_time,
color: Palette.accentTextColor,
),
),
),
const Padding(
padding: EdgeInsets.only(top: 10),
child: Text(
'履歴',
style:
TextStyle(fontSize: 12, color: Palette.accentTextColor),
),
)
],
),
),
//ミックス
Padding(
padding: const EdgeInsets.only(right: 15),
child: Column(
children: [
Container(
height: 48,
width: 48,
decoration: BoxDecoration(
border: Border.all(color: Palette.borderColor),
borderRadius: BorderRadius.circular(5),
),
child: InkWell(
//ミックスボタンクリックイベント
onTap: () {},
),
),
const Padding(
padding: EdgeInsets.only(top: 10),
child: Text(
'ミックス',
style:
TextStyle(fontSize: 12, color: Palette.accentTextColor),
),
)
],
),
),
//消去
Padding(
padding: const EdgeInsets.only(right: 15),
child: Column(
children: [
Container(
height: 48,
width: 48,
decoration: BoxDecoration(
border: Border.all(color: Palette.borderColor),
borderRadius: BorderRadius.circular(5),
),
child: InkWell(
//消去ボタンクリックイベント
onTap: () {},
child: const Icon(
Icons.delete_outline,
color: Palette.accentTextColor,
),
),
),
const Padding(
padding: EdgeInsets.only(top: 10),
child: Text(
'消去',
style:
TextStyle(fontSize: 12, color: Palette.accentTextColor),
),
)
],
),
)
],
),
);
}
}
Loading

0 comments on commit 960db9a

Please sign in to comment.