Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[fixed] Change mouse hover #156 #160

Open
wants to merge 9 commits into
base: dev
Choose a base branch
from
Open

[fixed] Change mouse hover #156 #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ec6349c
Merge pull request #123 from CyBear-Jinni/dev
guyluz11 Oct 30, 2022
92afffb
Merge pull request #128 from CyBear-Jinni/dev
guyluz11 Oct 30, 2022
eaa2092
Merge pull request #130 from CyBear-Jinni/dev
guyluz11 Oct 30, 2022
4d1ed95
Merge pull request #149 from CyBear-Jinni/dev
guyluz11 Mar 10, 2023
7d65fd4
Merge pull request #153 from CyBear-Jinni/dev
guyluz11 Jul 29, 2023
8836fb8
cusrsor pointer setup on tabs
raonedev Oct 9, 2023
d57cbf3
homePageFirst code optimised and fixed all overflow
raonedev Oct 9, 2023
e1f19f0
home first overflow fixed for destop
raonedev Oct 9, 2023
7320c80
youtube width customized for overflow
raonedev Oct 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 24 additions & 26 deletions .idea/libraries/Flutter_Plugins.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions lib/presentation/home_page/widgets/supported_vendors_tile_grid_view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ class SupportedVendorsTileGridViewNetworkImage extends StatelessWidget {
return ColoredBox(
color: imageBackgroundColor,
child: CachedNetworkImage(
height: 70,
imageUrl: imageUrl,
fit: BoxFit.contain,
progressIndicatorBuilder: (context, url, downloadProgress) =>
Expand Down
253 changes: 89 additions & 164 deletions lib/presentation/new_home_page/widgets/home_page_first_part.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,192 +50,117 @@ class HomePageFirstPart extends StatelessWidget {
),
),
Column(
mainAxisAlignment: MainAxisAlignment.spaceAround,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Flexible(
flex: 3,
Expanded(
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Flexible(
flex: 4,
child: Container(
alignment: Alignment.bottomRight,
margin: const EdgeInsets.only(right: 10, left: 20),
child: Align(
alignment: Alignment.bottomCenter,
child: Container(
constraints: const BoxConstraints(maxWidth: 500),
height: screenSize.height / 2.3,
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Stack(
children: <Widget>[
Text(
'smart home',
style: TextStyle(
fontSize: 65,
foreground: Paint()
..style = PaintingStyle.stroke
..strokeWidth = 2.5
..color = HexColor('#000000'),
),
),
// Solid text as fill.
const Text(
'smart home',
style: TextStyle(
fontSize: 65,
color: Colors.white,
),
),
],
Container(
alignment: Alignment.center,
margin: const EdgeInsets.symmetric(horizontal: 20,vertical: 20),
constraints: const BoxConstraints(maxWidth: 500),
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Stack(
children: <Widget>[
Text(
'smart home',
style: TextStyle(
fontSize: 65,
foreground: Paint()
..style = PaintingStyle.stroke
..strokeWidth = 2.5
..color = HexColor('#000000'),
),
const SizedBox(height: 40),
const BorderTextWithShadow(
"If you're a person who values his time or freedom\nWe have the product for you.\n",
),
const BorderTextWithShadow(
'It automatically creates personalized automations to improved your performance in your daily activities.\n',
),
const BorderTextWithShadow(
'By setting a purpose for each area in the home CBJ will create the best automations to suite your needs.',
),
// Solid text as fill.
const Text(
'smart home',
style: TextStyle(
fontSize: 65,
color: Colors.white,
),
],
),
),
],
),
),
const SizedBox(height: 20),
const BorderTextWithShadow(
"If you're a person who values his time or freedom\nWe have the product for you.\n",
),
const BorderTextWithShadow(
'It automatically creates personalized automations to improved your performance in your daily activities.\n',
),
const BorderTextWithShadow(
'By setting a purpose for each area in the home CBJ will create the best automations to suite your needs.',
),
],
),
),
Flexible(
flex: 5,
child: Align(
alignment: Alignment.bottomLeft,
child: SizedBox(
width: screenSize.width / 2,
height: screenSize.height / 2.3,
child: const YoutubeVideoPlayer(
youtubeVideoId: 'o5owbiQahnY',
),
),
SizedBox(
height: screenSize.height / 2.3,
child: const YoutubeVideoPlayer(
youtubeVideoId: 'o5owbiQahnY',
),
),
],
),
),
Flexible(
flex: 2,
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
const Flexible(
flex: 18,
child: SizedBox(),
SizedBox(
height: MediaQuery.of(context).size.height*0.2,
child: TextButton(
style: ButtonStyle(
padding: MaterialStateProperty.all<EdgeInsets>(
EdgeInsets.zero,
),
Flexible(
flex: 16,
child: TextButton(
style: ButtonStyle(
padding: MaterialStateProperty.all<EdgeInsets>(
EdgeInsets.zero,
),
),
onPressed: () {
if (MySingleton.getCurrentPageName !=integrationsRoute) {
Navigator.pushNamed(context, integrationsRoute);
} else {
Navigator.pushReplacementNamed(
context,
integrationsRoute,
);
}
},
child: ClipRect(
child: BackdropFilter(
filter: ImageFilter.blur(
sigmaX: 5.0,
sigmaY: 2.0,
),
child: DecoratedBox(
decoration: BoxDecoration(
color: Colors.grey.shade200.withOpacity(0.5),
),
onPressed: () {
if (MySingleton.getCurrentPageName !=
integrationsRoute) {
Navigator.pushNamed(context, integrationsRoute);
} else {
Navigator.pushReplacementNamed(
context,
integrationsRoute,
);
}
},
child: ClipRect(
child: BackdropFilter(
filter: ImageFilter.blur(
sigmaX: 5.0,
sigmaY: 2.0,
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
const BorderTextWithShadow(
'Supported Vendors',
fontSize: 30,
),
child: DecoratedBox(
decoration: BoxDecoration(
color: Colors.grey.shade200.withOpacity(0.5),
),
child: Center(
child: Column(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [
Flexible(
child: Container(
margin: const EdgeInsets.only(top: 20),
child: const BorderTextWithShadow(
'Supported Vendors',
fontSize: 30,
),
),
),
Flexible(
flex: 2,
child: Align(
alignment: Alignment.topCenter,
child: Container(
margin: const EdgeInsets.only(
top: 20,
),
height: 60,
width: screenSize.width / 1.1,
child: Row(
mainAxisAlignment:
MainAxisAlignment.spaceEvenly,
children: [
SupportedVendorsTileGridViewNetworkImage(
companysLogs[0],
),
SupportedVendorsTileGridViewNetworkImage(
companysLogs[1],
),
SupportedVendorsTileGridViewNetworkImage(
companysLogs[2],
imageBackgroundColor: Colors.red,
),
SupportedVendorsTileGridViewNetworkImage(
companysLogs[3],
),
SupportedVendorsTileGridViewNetworkImage(
companysLogs[4],
imageBackgroundColor:
HexColor('#8F0000'),
),
SupportedVendorsTileGridViewNetworkImage(
companysLogs[5],
),
SupportedVendorsTileGridViewNetworkImage(
companysLogs[6],
),
SupportedVendorsTileGridViewNetworkImage(
companysLogs[7],
),
SupportedVendorsTileGridViewNetworkImage(
companysLogs[8],
),
SupportedVendorsTileGridViewNetworkImage(
companysLogs[9],
),
],
),
),
),
),
],
Padding(
padding: const EdgeInsets.all(10.0),
child: SizedBox(
width: MediaQuery.of(context).size.width,
child: Row(
// alignment: WrapAlignment.spaceEvenly,
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: List.generate(
companysLogs.length,
(index) => SupportedVendorsTileGridViewNetworkImage(companysLogs[index],),
),
),
),
),
),
],
),
),
),
],
),
),
),
],
Expand Down
Loading