button widget and preparing help cards
This commit is contained in:
parent
4f92555399
commit
2e9ff13ed4
@ -14,6 +14,7 @@ import '../../common/formatter/id_formatter.dart';
|
|||||||
import '../../common/widgets/peer_tab_page.dart';
|
import '../../common/widgets/peer_tab_page.dart';
|
||||||
import '../../common/widgets/peers_view.dart';
|
import '../../common/widgets/peers_view.dart';
|
||||||
import '../../models/platform_model.dart';
|
import '../../models/platform_model.dart';
|
||||||
|
import '../widgets/button.dart';
|
||||||
|
|
||||||
/// Connection page for connecting to a remote peer.
|
/// Connection page for connecting to a remote peer.
|
||||||
class ConnectionPage extends StatefulWidget {
|
class ConnectionPage extends StatefulWidget {
|
||||||
@ -109,10 +110,6 @@ class _ConnectionPageState extends State<ConnectionPage> {
|
|||||||
/// UI for the remote ID TextField.
|
/// UI for the remote ID TextField.
|
||||||
/// Search for a peer and connect to it if the id exists.
|
/// Search for a peer and connect to it if the id exists.
|
||||||
Widget _buildRemoteIDTextField(BuildContext context) {
|
Widget _buildRemoteIDTextField(BuildContext context) {
|
||||||
RxBool ftHover = false.obs;
|
|
||||||
RxBool ftPressed = false.obs;
|
|
||||||
RxBool connHover = false.obs;
|
|
||||||
RxBool connPressed = false.obs;
|
|
||||||
RxBool inputFocused = false.obs;
|
RxBool inputFocused = false.obs;
|
||||||
FocusNode focusNode = FocusNode();
|
FocusNode focusNode = FocusNode();
|
||||||
focusNode.addListener(() {
|
focusNode.addListener(() {
|
||||||
@ -189,84 +186,17 @@ class _ConnectionPageState extends State<ConnectionPage> {
|
|||||||
child: Row(
|
child: Row(
|
||||||
mainAxisAlignment: MainAxisAlignment.end,
|
mainAxisAlignment: MainAxisAlignment.end,
|
||||||
children: [
|
children: [
|
||||||
Obx(() => InkWell(
|
Button(
|
||||||
onTapDown: (_) => ftPressed.value = true,
|
isOutline: true,
|
||||||
onTapUp: (_) => ftPressed.value = false,
|
onTap: () {
|
||||||
onTapCancel: () => ftPressed.value = false,
|
onConnect(isFileTransfer: true);
|
||||||
onHover: (value) => ftHover.value = value,
|
},
|
||||||
onTap: () {
|
text: "Transfer File",
|
||||||
onConnect(isFileTransfer: true);
|
),
|
||||||
},
|
|
||||||
child: Container(
|
|
||||||
height: 27,
|
|
||||||
alignment: Alignment.center,
|
|
||||||
decoration: BoxDecoration(
|
|
||||||
color: ftPressed.value
|
|
||||||
? MyTheme.accent
|
|
||||||
: Colors.transparent,
|
|
||||||
border: Border.all(
|
|
||||||
color: ftPressed.value
|
|
||||||
? MyTheme.accent
|
|
||||||
: ftHover.value
|
|
||||||
? MyTheme.hoverBorder
|
|
||||||
: MyTheme.border,
|
|
||||||
),
|
|
||||||
borderRadius: BorderRadius.circular(5),
|
|
||||||
),
|
|
||||||
child: Text(
|
|
||||||
translate(
|
|
||||||
"Transfer File",
|
|
||||||
),
|
|
||||||
style: TextStyle(
|
|
||||||
fontSize: 12,
|
|
||||||
color: ftPressed.value
|
|
||||||
? MyTheme.color(context).bg
|
|
||||||
: MyTheme.color(context).text),
|
|
||||||
).marginSymmetric(horizontal: 12),
|
|
||||||
),
|
|
||||||
)),
|
|
||||||
const SizedBox(
|
const SizedBox(
|
||||||
width: 17,
|
width: 17,
|
||||||
),
|
),
|
||||||
Obx(
|
Button(onTap: onConnect, text: "Connect"),
|
||||||
() => InkWell(
|
|
||||||
onTapDown: (_) => connPressed.value = true,
|
|
||||||
onTapUp: (_) => connPressed.value = false,
|
|
||||||
onTapCancel: () => connPressed.value = false,
|
|
||||||
onHover: (value) => connHover.value = value,
|
|
||||||
onTap: onConnect,
|
|
||||||
child: ConstrainedBox(
|
|
||||||
constraints: BoxConstraints(
|
|
||||||
minWidth: 80.0,
|
|
||||||
),
|
|
||||||
child: Container(
|
|
||||||
height: 27,
|
|
||||||
decoration: BoxDecoration(
|
|
||||||
color: connPressed.value
|
|
||||||
? MyTheme.accent
|
|
||||||
: MyTheme.button,
|
|
||||||
border: Border.all(
|
|
||||||
color: connPressed.value
|
|
||||||
? MyTheme.accent
|
|
||||||
: connHover.value
|
|
||||||
? MyTheme.hoverBorder
|
|
||||||
: MyTheme.button,
|
|
||||||
),
|
|
||||||
borderRadius: BorderRadius.circular(5),
|
|
||||||
),
|
|
||||||
child: Center(
|
|
||||||
child: Text(
|
|
||||||
translate(
|
|
||||||
"Connect",
|
|
||||||
),
|
|
||||||
style: TextStyle(
|
|
||||||
fontSize: 12,
|
|
||||||
color: MyTheme.color(context).bg),
|
|
||||||
),
|
|
||||||
).marginSymmetric(horizontal: 12),
|
|
||||||
)),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
@ -26,6 +26,7 @@ class _DesktopHomePageState extends State<DesktopHomePage>
|
|||||||
with TrayListener, WindowListener, AutomaticKeepAliveClientMixin {
|
with TrayListener, WindowListener, AutomaticKeepAliveClientMixin {
|
||||||
@override
|
@override
|
||||||
bool get wantKeepAlive => true;
|
bool get wantKeepAlive => true;
|
||||||
|
var updateUrl = '';
|
||||||
|
|
||||||
@override
|
@override
|
||||||
void onWindowClose() async {
|
void onWindowClose() async {
|
||||||
@ -74,6 +75,7 @@ class _DesktopHomePageState extends State<DesktopHomePage>
|
|||||||
buildTip(context),
|
buildTip(context),
|
||||||
buildIDBoard(context),
|
buildIDBoard(context),
|
||||||
buildPasswordBoard(context),
|
buildPasswordBoard(context),
|
||||||
|
buildHelpCards(),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
@ -288,6 +290,46 @@ class _DesktopHomePageState extends State<DesktopHomePage>
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Widget buildHelpCards() {
|
||||||
|
if (Platform.isWindows) {
|
||||||
|
if (!bind.mainIsInstalled()) {
|
||||||
|
return buildInstallCard();
|
||||||
|
} else if (bind.mainIsInstalledLowerVersion()) {
|
||||||
|
return buildUpgradeCard();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (updateUrl.isNotEmpty) {
|
||||||
|
return buildUpdateCard();
|
||||||
|
}
|
||||||
|
if (Platform.isMacOS) {}
|
||||||
|
if (bind.mainIsInstalledLowerVersion()) {}
|
||||||
|
return Container();
|
||||||
|
}
|
||||||
|
|
||||||
|
Widget buildUpdateCard() {
|
||||||
|
return Container();
|
||||||
|
}
|
||||||
|
|
||||||
|
Widget buildUpgradeCard() {
|
||||||
|
return Container();
|
||||||
|
}
|
||||||
|
|
||||||
|
Widget buildInstallCard() {
|
||||||
|
return Container(
|
||||||
|
margin: EdgeInsets.only(top: 20),
|
||||||
|
child: Column(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.start,
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
Text(
|
||||||
|
translate("install_tip"),
|
||||||
|
style: TextStyle(fontWeight: FontWeight.normal, fontSize: 19),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
void onTrayMenuItemClick(MenuItem menuItem) {
|
void onTrayMenuItemClick(MenuItem menuItem) {
|
||||||
debugPrint('click ${menuItem.key}');
|
debugPrint('click ${menuItem.key}');
|
||||||
@ -305,6 +347,10 @@ class _DesktopHomePageState extends State<DesktopHomePage>
|
|||||||
@override
|
@override
|
||||||
void initState() {
|
void initState() {
|
||||||
super.initState();
|
super.initState();
|
||||||
|
Timer(const Duration(seconds: 5), () async {
|
||||||
|
updateUrl = await bind.mainGetSoftwareUpdateUrl();
|
||||||
|
if (updateUrl.isNotEmpty) setState(() {});
|
||||||
|
});
|
||||||
trayManager.addListener(this);
|
trayManager.addListener(this);
|
||||||
windowManager.addListener(this);
|
windowManager.addListener(this);
|
||||||
rustDeskWinManager.setMethodHandler((call, fromWindowId) async {
|
rustDeskWinManager.setMethodHandler((call, fromWindowId) async {
|
||||||
|
73
flutter/lib/desktop/widgets/button.dart
Normal file
73
flutter/lib/desktop/widgets/button.dart
Normal file
@ -0,0 +1,73 @@
|
|||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:get/get.dart';
|
||||||
|
|
||||||
|
import '../../common.dart';
|
||||||
|
|
||||||
|
class Button extends StatefulWidget {
|
||||||
|
GestureTapCallback onTap;
|
||||||
|
String text;
|
||||||
|
double? minWidth;
|
||||||
|
bool isOutline;
|
||||||
|
|
||||||
|
Button({
|
||||||
|
Key? key,
|
||||||
|
this.minWidth,
|
||||||
|
this.isOutline = false,
|
||||||
|
required this.onTap,
|
||||||
|
required this.text,
|
||||||
|
}) : super(key: key);
|
||||||
|
|
||||||
|
@override
|
||||||
|
State<Button> createState() => _ButtonState();
|
||||||
|
}
|
||||||
|
|
||||||
|
class _ButtonState extends State<Button> {
|
||||||
|
RxBool hover = false.obs;
|
||||||
|
RxBool pressed = false.obs;
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
return Obx(() => InkWell(
|
||||||
|
onTapDown: (_) => pressed.value = true,
|
||||||
|
onTapUp: (_) => pressed.value = false,
|
||||||
|
onTapCancel: () => pressed.value = false,
|
||||||
|
onHover: (value) => hover.value = value,
|
||||||
|
onTap: widget.onTap,
|
||||||
|
child: ConstrainedBox(
|
||||||
|
constraints: BoxConstraints(
|
||||||
|
minWidth: widget.minWidth ?? 80.0,
|
||||||
|
),
|
||||||
|
child: Container(
|
||||||
|
height: 27,
|
||||||
|
alignment: Alignment.center,
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
color: pressed.value
|
||||||
|
? MyTheme.accent
|
||||||
|
: (widget.isOutline
|
||||||
|
? Colors.transparent
|
||||||
|
: MyTheme.button),
|
||||||
|
border: Border.all(
|
||||||
|
color: pressed.value
|
||||||
|
? MyTheme.accent
|
||||||
|
: hover.value
|
||||||
|
? MyTheme.hoverBorder
|
||||||
|
: (widget.isOutline
|
||||||
|
? MyTheme.border
|
||||||
|
: MyTheme.button),
|
||||||
|
),
|
||||||
|
borderRadius: BorderRadius.circular(5),
|
||||||
|
),
|
||||||
|
child: Text(
|
||||||
|
translate(
|
||||||
|
widget.text,
|
||||||
|
),
|
||||||
|
style: TextStyle(
|
||||||
|
fontSize: 12,
|
||||||
|
color: pressed.value || !widget.isOutline
|
||||||
|
? MyTheme.color(context).bg
|
||||||
|
: MyTheme.color(context).text),
|
||||||
|
).marginSymmetric(horizontal: 12),
|
||||||
|
)),
|
||||||
|
));
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user