cwtch.im
/
cwtch-ui
10
11
Fork 17
Code Issues 87 Pull Requests 1 Projects 2 Releases 28 Wiki Activity

Merge pull request 'Ensure all Scrollbars have dedicated Controllers' (#613) from scrollbars into trunk
continuous-integration/drone/push Build is pending Details 

Reviewed-on: #613
This commit is contained in:
Dan Ballard 2022-12-30 23:16:00 +00:00
parent 119e683d3d 723b0eb04d
commit 7bcde5a1fa
10 changed files with 40 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/views/addcontactview.dart
View File

@ -114,9 +114,12 @@ class _AddContactViewState extends State<AddContactView> {
/// The Add Peer Tab allows a peer to add a specific non-group peer to their contact lists
/// We also provide a convenient way to copy their onion.
Widget addPeerTab(bcontext) {
ScrollController controller = ScrollController();
return Scrollbar(
controller: controller,
child: SingleChildScrollView(
clipBehavior: Clip.antiAlias,
controller: controller,
child: Container(
margin: EdgeInsets.all(30),
padding: EdgeInsets.all(20),
@ -187,10 +190,12 @@ class _AddContactViewState extends State<AddContactView> {
if (Provider.of<ProfileInfoState>(bcontext).serverList.servers.isEmpty) {
return Text(AppLocalizations.of(bcontext)!.addServerFirst);
}
ScrollController controller = ScrollController();
return Scrollbar(
controller: controller,
child: SingleChildScrollView(
clipBehavior: Clip.antiAlias,
controller: controller,
child: Container(
margin: EdgeInsets.all(30),
padding: EdgeInsets.all(20),

5
lib/views/addeditprofileview.dart
View File

@ -38,6 +38,7 @@ class _AddEditProfileViewState extends State<AddEditProfileView> {
final ctrlrPass = TextEditingController(text: "");
final ctrlrPass2 = TextEditingController(text: "");
final ctrlrOnion = TextEditingController(text: "");
ScrollController controller = ScrollController();
late bool usePassword;
late bool deleted;
@ -75,8 +76,10 @@ class _AddEditProfileViewState extends State<AddEditProfileView> {
return Consumer<Settings>(builder: (context, theme, child) {
return LayoutBuilder(builder: (BuildContext context, BoxConstraints viewportConstraints) {
return Scrollbar(
isAlwaysShown: true,
trackVisibility: true,
controller: controller,
child: SingleChildScrollView(
controller: controller,
clipBehavior: Clip.antiAlias,
child: ConstrainedBox(
constraints: BoxConstraints(

5
lib/views/addeditservers.dart
View File

@ -67,11 +67,14 @@ class _AddEditServerViewState extends State<AddEditServerView> {
}
Widget _buildSettingsList() {
ScrollController controller = ScrollController();
return Consumer2<ServerInfoState, Settings>(builder: (context, serverInfoState, settings, child) {
return LayoutBuilder(builder: (BuildContext context, BoxConstraints viewportConstraints) {
return Scrollbar(
isAlwaysShown: true,
trackVisibility: true,
controller: controller,
child: SingleChildScrollView(
controller: controller,
clipBehavior: Clip.antiAlias,
child: ConstrainedBox(
constraints: BoxConstraints(

6
lib/views/globalsettingsview.dart
View File

@ -36,6 +36,8 @@ class _GlobalSettingsViewState extends State<GlobalSettingsView> {
static const androidSettingsChangeChannel = const MethodChannel('androidSettingsChanged');
bool powerExempt = false;
ScrollController settingsListScrollController = ScrollController();
@override
void dispose() {
super.dispose();
@ -95,9 +97,11 @@ class _GlobalSettingsViewState extends State<GlobalSettingsView> {
var appIcon = Icon(Icons.info, color: settings.current().mainTextColor);
return Scrollbar(
key: Key("SettingsView"),
isAlwaysShown: true,
trackVisibility: true,
controller: settingsListScrollController,
child: SingleChildScrollView(
clipBehavior: Clip.antiAlias,
controller: settingsListScrollController,
padding: EdgeInsets.all(20),
child: ConstrainedBox(
constraints: BoxConstraints(

5
lib/views/groupsettingsview.dart
View File

@ -27,6 +27,7 @@ class _GroupSettingsViewState extends State<GroupSettingsView> {
final ctrlrNick = TextEditingController(text: "");
final ctrlrGroupAddr = TextEditingController(text: "");
ScrollController groupSettingsScrollController = ScrollController();
@override
void initState() {
@ -55,9 +56,11 @@ class _GroupSettingsViewState extends State<GroupSettingsView> {
return Consumer<Settings>(builder: (context, settings, child) {
return LayoutBuilder(builder: (BuildContext context, BoxConstraints viewportConstraints) {
return Scrollbar(
isAlwaysShown: true,
trackVisibility: true,
controller: groupSettingsScrollController,
child: SingleChildScrollView(
clipBehavior: Clip.antiAlias,
controller: groupSettingsScrollController,
child: ConstrainedBox(
constraints: BoxConstraints(
minHeight: viewportConstraints.maxHeight,

5
lib/views/peersettingsview.dart
View File

@ -28,6 +28,7 @@ class _PeerSettingsViewState extends State<PeerSettingsView> {
}
final ctrlrNick = TextEditingController(text: "");
ScrollController peerSettingsScrollController = ScrollController();
@override
void initState() {
@ -83,9 +84,11 @@ class _PeerSettingsViewState extends State<PeerSettingsView> {
}
return Scrollbar(
isAlwaysShown: true,
trackVisibility: true,
controller: peerSettingsScrollController,
child: SingleChildScrollView(
clipBehavior: Clip.antiAlias,
controller: peerSettingsScrollController,
child: ConstrainedBox(
constraints: BoxConstraints(
minHeight: viewportConstraints.maxHeight,

5
lib/views/profileserversview.dart
View File

@ -76,10 +76,13 @@ class _ProfileServersView extends State<ProfileServersView> {
)));
return LayoutBuilder(builder: (BuildContext context, BoxConstraints viewportConstraints) {
ScrollController controller = ScrollController();
return Scrollbar(
isAlwaysShown: true,
trackVisibility: true,
controller: controller,
child: SingleChildScrollView(
clipBehavior: Clip.antiAlias,
controller: controller,
child: Container(
margin: EdgeInsets.fromLTRB(5, 0, 5, 10),
padding: EdgeInsets.fromLTRB(5, 0, 5, 10),

4
lib/views/torstatusview.dart
View File

@ -21,6 +21,7 @@ class _TorStatusView extends State<TorStatusView> {
TextEditingController torSocksPortController = TextEditingController();
TextEditingController torControlPortController = TextEditingController();
TextEditingController torConfigController = TextEditingController();
ScrollController torScrollContoller = ScrollController();
@override
void dispose() {
@ -52,7 +53,8 @@ class _TorStatusView extends State<TorStatusView> {
return Consumer<TorStatus>(builder: (context, torStatus, child) {
return LayoutBuilder(builder: (BuildContext context, BoxConstraints viewportConstraints) {
return Scrollbar(
isAlwaysShown: true,
trackVisibility: true,
controller: torScrollContoller,
child: SingleChildScrollView(
clipBehavior: Clip.antiAlias,
child: ConstrainedBox(

4
lib/widgets/messagerow.dart
View File

@ -371,6 +371,7 @@ void modalShowReplies(
context: ctx,
builder: (BuildContext bcontext) {
List<Message> replies = getReplies(cache, messageID);
ScrollController controller = ScrollController();
return ChangeNotifierProvider.value(
value: profile,
@ -432,7 +433,8 @@ void modalShowReplies(
}
return Scrollbar(
isAlwaysShown: true,
trackVisibility: true,
controller: controller,
child: SingleChildScrollView(
clipBehavior: Clip.antiAlias,
child: ConstrainedBox(

6
lib/widgets/remoteserverrow.dart
View File

@ -40,9 +40,9 @@ class _RemoteServerRowState extends State<RemoteServerRow> {
Visibility(
visible: !running,
child: Icon(
CwtchIcons.negative_heart_24px,
color: Provider.of<Settings>(context).theme.portraitOfflineBorderColor,
)),
CwtchIcons.negative_heart_24px,
color: Provider.of<Settings>(context).theme.portraitOfflineBorderColor,
)),
])),
Expanded(
child: Column(