Merge pull request 'font-scaling' (#672) from font-scaling into trunk
continuous-integration/drone/push Build is pending Details

Reviewed-on: #672
Reviewed-by: Dan Ballard <dan@openprivacy.ca>
deploy-fixes
Sarah Jamie Lewis 3 weeks ago
commit 7e74421a3d

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

@ -0,0 +1,202 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions.
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright [yyyy] [name of copyright owner]
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

@ -0,0 +1,93 @@
Copyright 2020 The Inter Project Authors (https://github.com/rsms/inter)
This Font Software is licensed under the SIL Open Font License, Version 1.1.
This license is copied below, and is also available with a FAQ at:
http://scripts.sil.org/OFL
-----------------------------------------------------------
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------
PREAMBLE
The goals of the Open Font License (OFL) are to stimulate worldwide
development of collaborative font projects, to support the font creation
efforts of academic and linguistic communities, and to provide a free and
open framework in which fonts may be shared and improved in partnership
with others.
The OFL allows the licensed fonts to be used, studied, modified and
redistributed freely as long as they are not sold by themselves. The
fonts, including any derivative works, can be bundled, embedded,
redistributed and/or sold with any software provided that any reserved
names are not used by derivative works. The fonts and derivatives,
however, cannot be released under any other type of license. The
requirement for fonts to remain under this license does not apply
to any document created using the fonts or their derivatives.
DEFINITIONS
"Font Software" refers to the set of files released by the Copyright
Holder(s) under this license and clearly marked as such. This may
include source files, build scripts and documentation.
"Reserved Font Name" refers to any names specified as such after the
copyright statement(s).
"Original Version" refers to the collection of Font Software components as
distributed by the Copyright Holder(s).
"Modified Version" refers to any derivative made by adding to, deleting,
or substituting -- in part or in whole -- any of the components of the
Original Version, by changing formats or by porting the Font Software to a
new environment.
"Author" refers to any designer, engineer, programmer, technical
writer or other person who contributed to the Font Software.
PERMISSION & CONDITIONS
Permission is hereby granted, free of charge, to any person obtaining
a copy of the Font Software, to use, study, copy, merge, embed, modify,
redistribute, and sell modified and unmodified copies of the Font
Software, subject to the following conditions:
1) Neither the Font Software nor any of its individual components,
in Original or Modified Versions, may be sold by itself.
2) Original or Modified Versions of the Font Software may be bundled,
redistributed and/or sold with any software, provided that each copy
contains the above copyright notice and this license. These can be
included either as stand-alone text files, human-readable headers or
in the appropriate machine-readable metadata fields within text or
binary files as long as those fields can be easily viewed by the user.
3) No Modified Version of the Font Software may use the Reserved Font
Name(s) unless explicit written permission is granted by the corresponding
Copyright Holder. This restriction only applies to the primary font name as
presented to the users.
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
Software shall not be used to promote, endorse or advertise any
Modified Version, except to acknowledge the contribution(s) of the
Copyright Holder(s) and the Author(s) or with their explicit written
permission.
5) The Font Software, modified or unmodified, in part or in whole,
must be distributed entirely under this license, and must not be
distributed under any other license. The requirement for fonts to
remain under this license does not apply to any document created
using the Font Software.
TERMINATION
This license becomes null and void if any of the above conditions are
not met.
DISCLAIMER
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
OTHER DEALINGS IN THE FONT SOFTWARE.

@ -410,6 +410,5 @@ class CwtchGomobile implements Cwtch {
@override
void AttemptReconnection(String profile, String onion) {
cwtchPlatform.invokeMethod("PeerWithOnion", {"ProfileOnion": profile, "onion": onion});
}
}

@ -1,6 +1,8 @@
{
"@@locale": "cy",
"@@last_modified": "2023-05-11T23:17:05+02:00",
"@@last_modified": "2023-05-15T21:16:36+02:00",
"fontScalingDescription": "Adjust the relative font scaling factor applied to text and widgets.",
"defaultScalingText": "Testun maint rhagosodedig (ffactor graddfa:",
"localeJa": "Japanese \/ 日本語",
"retryConnectionTooltip": "Cwtch retries peers regularly, but you can tell Cwtch to try sooner by pushing this button.",
"retryConnection": "Retry",
@ -103,7 +105,6 @@
"settingUIColumnLandscape": "Colofnau UI yn y Modd Tirwedd",
"settingUIColumnPortrait": "Colofnau UI yn y Modd Portread",
"addNewItem": "Ychwanegu eitem newydd at y rhestr",
"defaultScalingText": "Testun maint rhagosodedig (ffactor graddfa:",
"zoomLabel": "Chwyddo rhyngwyneb (yn effeithio ar faint testun a botymau yn bennaf)",
"torSettingsEnabledAdvancedDescription": "Defnyddiwch wasanaeth Tor presennol ar eich system, neu newidiwch baramedrau Gwasanaeth Cwtch Tor",
"torSettingsCustomControlPortDescription": "Defnyddiwch borthladd wedi'i deilwra ar gyfer cysylltiadau rheoli i'r dirprwy Tor",

@ -1,6 +1,8 @@
{
"@@locale": "da",
"@@last_modified": "2023-05-11T23:17:05+02:00",
"@@last_modified": "2023-05-15T21:16:36+02:00",
"fontScalingDescription": "Adjust the relative font scaling factor applied to text and widgets.",
"defaultScalingText": "Standard størrelse tekst (skaleringsfaktor:",
"localeJa": "Japanese \/ 日本語",
"retryConnectionTooltip": "Cwtch retries peers regularly, but you can tell Cwtch to try sooner by pushing this button.",
"retryConnection": "Retry",
@ -282,7 +284,6 @@
"viewGroupMembershipTooltip": "Se gruppe-medlemsskab",
"loadingTor": "Åbner Tor...",
"smallTextLabel": "Lille",
"defaultScalingText": "Standard størrelse tekst (skaleringsfaktor:",
"builddate": "Bygget den: %2",
"version": "Version %1",
"versionTor": "Version %1 med tor %2",

@ -1,6 +1,8 @@
{
"@@locale": "de",
"@@last_modified": "2023-05-11T23:17:05+02:00",
"@@last_modified": "2023-05-15T21:16:36+02:00",
"fontScalingDescription": "Adjust the relative font scaling factor applied to text and widgets.",
"defaultScalingText": "Text in Standardgröße (Skalierungsfaktor:",
"localeJa": "Japanese \/ 日本語",
"retryConnectionTooltip": "Cwtch retries peers regularly, but you can tell Cwtch to try sooner by pushing this button.",
"retryConnection": "Retry",
@ -163,7 +165,6 @@
"version": "Version %1",
"versionTor": "Version %1 mit Tor %2",
"builddate": "Erstellt am: %2",
"defaultScalingText": "Text in Standardgröße (Skalierungsfaktor:",
"smallTextLabel": "Klein",
"viewGroupMembershipTooltip": "Gruppenmitgliedschaft anzeigen",
"loadingTor": "Tor wird geladen...",

@ -1,6 +1,8 @@
{
"@@locale": "el",
"@@last_modified": "2023-05-11T23:17:05+02:00",
"@@last_modified": "2023-05-15T21:16:36+02:00",
"fontScalingDescription": "Adjust the relative font scaling factor applied to text and widgets.",
"defaultScalingText": "Font Scaling",
"localeJa": "Japanese \/ 日本語",
"retryConnectionTooltip": "Cwtch retries peers regularly, but you can tell Cwtch to try sooner by pushing this button.",
"retryConnection": "Retry",
@ -286,7 +288,6 @@
"viewGroupMembershipTooltip": "View Group Membership",
"loadingTor": "Loading tor...",
"smallTextLabel": "Small",
"defaultScalingText": "Default size text (scale factor:",
"builddate": "Built on: %2",
"version": "Version %1",
"versionTor": "Version %1 with tor %2",

@ -1,6 +1,8 @@
{
"@@locale": "en",
"@@last_modified": "2023-05-11T23:17:05+02:00",
"@@last_modified": "2023-05-15T21:16:36+02:00",
"fontScalingDescription": "Adjust the relative font scaling factor applied to text and widgets.",
"defaultScalingText": "Font Scaling",
"localeJa": "Japanese \/ 日本語",
"retryConnectionTooltip": "Cwtch retries peers regularly, but you can tell Cwtch to try sooner by pushing this button.",
"retryConnection": "Retry",
@ -295,7 +297,6 @@
"viewGroupMembershipTooltip": "View Group Membership",
"loadingTor": "Loading tor...",
"smallTextLabel": "Small",
"defaultScalingText": "Default size text (scale factor:",
"builddate": "Built on: %2",
"version": "Version %1",
"versionTor": "Version %1 with tor %2",

@ -1,6 +1,8 @@
{
"@@locale": "es",
"@@last_modified": "2023-05-11T23:17:05+02:00",
"@@last_modified": "2023-05-15T21:16:36+02:00",
"fontScalingDescription": "Adjust the relative font scaling factor applied to text and widgets.",
"defaultScalingText": "Tamaño predeterminado de texto (factor de escala:",
"localeJa": "Japanese \/ 日本語",
"retryConnectionTooltip": "Cwtch retries peers regularly, but you can tell Cwtch to try sooner by pushing this button.",
"retryConnection": "Retry",
@ -290,7 +292,6 @@
"addPeer": "Agregar Contacto",
"blocked": "Bloqueado",
"addPeerTab": "Agregar Contacto",
"defaultScalingText": "Tamaño predeterminado de texto (factor de escala:",
"todoPlaceholder": "Por hacer...",
"bulletinsBtn": "Boletines",
"radioNoPassword": "Sin cifrado (sin contraseña)",

@ -1,6 +1,8 @@
{
"@@locale": "fr",
"@@last_modified": "2023-05-11T23:17:05+02:00",
"@@last_modified": "2023-05-15T21:16:36+02:00",
"fontScalingDescription": "Adjust the relative font scaling factor applied to text and widgets.",
"defaultScalingText": "Taille par défaut du texte (échelle:",
"localeJa": "Japanese \/ 日本語",
"retryConnectionTooltip": "Cwtch retries peers regularly, but you can tell Cwtch to try sooner by pushing this button.",
"retryConnection": "Retry",
@ -359,7 +361,6 @@
"notificationNewMessageFromPeer": "Nouveau message d'un contact !",
"notificationNewMessageFromGroup": "Nouveau message dans un groupe !",
"smallTextLabel": "Petit",
"defaultScalingText": "Taille par défaut du texte (échelle:",
"largeTextLabel": "Large",
"cwtchSettingsTitle": "Préférences Cwtch",
"saveBtn": "Sauvegarder",

@ -1,6 +1,8 @@
{
"@@locale": "it",
"@@last_modified": "2023-05-11T23:17:05+02:00",
"@@last_modified": "2023-05-15T21:16:36+02:00",
"fontScalingDescription": "Adjust the relative font scaling factor applied to text and widgets.",
"defaultScalingText": "Testo di dimensioni predefinite (fattore di scala:",
"localeJa": "Japanese \/ 日本語",
"retryConnectionTooltip": "Cwtch retries peers regularly, but you can tell Cwtch to try sooner by pushing this button.",
"retryConnection": "Retry",
@ -378,7 +380,6 @@
"largeTextLabel": "Grande",
"themeLight": "Chiaro",
"themeDark": "Scuro",
"defaultScalingText": "Testo di dimensioni predefinite (fattore di scala:",
"smallTextLabel": "Piccolo",
"loadingTor": "Caricamento di tor...",
"networkStatusDisconnected": "Disconnesso da Internet, controlla la tua connessione",

@ -1,6 +1,8 @@
{
"@@locale": "ja",
"@@last_modified": "2023-05-11T23:17:05+02:00",
"@@last_modified": "2023-05-15T21:16:36+02:00",
"fontScalingDescription": "Adjust the relative font scaling factor applied to text and widgets.",
"defaultScalingText": "Font Scaling",
"localeJa": "Japanese \/ 日本語",
"retryConnectionTooltip": "Cwtch retries peers regularly, but you can tell Cwtch to try sooner by pushing this button.",
"retryConnection": "Retry",
@ -300,7 +302,6 @@
"viewGroupMembershipTooltip": "View Group Membership",
"loadingTor": "Loading tor...",
"smallTextLabel": "Small",
"defaultScalingText": "Default size text (scale factor:",
"builddate": "Built on: %2",
"version": "Version %1",
"versionTor": "Version %1 with tor %2",

@ -1,6 +1,8 @@
{
"@@locale": "ko",
"@@last_modified": "2023-05-11T23:17:05+02:00",
"@@last_modified": "2023-05-15T21:16:36+02:00",
"fontScalingDescription": "Adjust the relative font scaling factor applied to text and widgets.",
"defaultScalingText": "Font Scaling",
"localeJa": "Japanese \/ 日本語",
"retryConnectionTooltip": "Cwtch retries peers regularly, but you can tell Cwtch to try sooner by pushing this button.",
"retryConnection": "Retry",
@ -280,7 +282,6 @@
"viewGroupMembershipTooltip": "View Group Membership",
"loadingTor": "Loading tor...",
"smallTextLabel": "Small",
"defaultScalingText": "Default size text (scale factor:",
"builddate": "Built on: %2",
"version": "Version %1",
"versionTor": "Version %1 with tor %2",

@ -1,6 +1,8 @@
{
"@@locale": "lb",
"@@last_modified": "2023-05-11T23:17:05+02:00",
"@@last_modified": "2023-05-15T21:16:36+02:00",
"fontScalingDescription": "Adjust the relative font scaling factor applied to text and widgets.",
"defaultScalingText": "Font Scaling",
"localeJa": "Japanese \/ 日本語",
"retryConnectionTooltip": "Cwtch retries peers regularly, but you can tell Cwtch to try sooner by pushing this button.",
"retryConnection": "Retry",
@ -364,7 +366,6 @@
"networkStatusDisconnected": "Disconnected from the internet, check your connection",
"viewGroupMembershipTooltip": "View Group Membership",
"loadingTor": "Loading tor...",
"defaultScalingText": "Default size text (scale factor:",
"experimentsEnabled": "Enable Experiments",
"settingTheme": "Use Light Themes",
"blockUnknownLabel": "Block Unknown Contacts",

@ -1,6 +1,8 @@
{
"@@locale": "nl",
"@@last_modified": "2023-05-11T23:17:05+02:00",
"@@last_modified": "2023-05-15T21:16:36+02:00",
"fontScalingDescription": "Adjust the relative font scaling factor applied to text and widgets.",
"defaultScalingText": "Standaardtekstgrootte (schaalfactor:",
"localeJa": "Japanese \/ 日本語",
"retryConnectionTooltip": "Cwtch retries peers regularly, but you can tell Cwtch to try sooner by pushing this button.",
"retryConnection": "Retry",
@ -61,7 +63,6 @@
"serverAutostartDescription": "Bepaalt of de applicatie de server automatisch start bij het opstarten",
"serverDescriptionDescription": "Je beschrijving van de server alleen voor persoonlijk beheer, zal nooit worden gedeeld",
"membershipDescription": "Hieronder staat een lijst met gebruikers die berichten naar de groep hebben gestuurd. Deze lijst bevat mogelijk niet alle gebruikers die toegang hebben tot de groep.",
"defaultScalingText": "Standaardtekstgrootte (schaalfactor:",
"fileSharingSettingsDownloadFolderTooltip": "Bladeren om een andere standaardmap voor gedownloade bestanden te selecteren.",
"fileDownloadUnavailable": "Dit bestand lijkt niet beschikbaar om te downloaden. Het kan zijn dat de verzender downlaoden voor dit bestand heeft uitgeschakeld.",
"errorDownloadDirectoryDoesNotExist": "Bestanden delen kan niet worden ingeschakeld omdat de downloadmap niet is ingesteld of is ingesteld op een map die niet bestaat.",

@ -1,6 +1,8 @@
{
"@@locale": "no",
"@@last_modified": "2023-05-11T23:17:05+02:00",
"@@last_modified": "2023-05-15T21:16:36+02:00",
"fontScalingDescription": "Adjust the relative font scaling factor applied to text and widgets.",
"defaultScalingText": "Standard tekststørrelse (skaleringsfaktor:",
"localeJa": "Japanese \/ 日本語",
"retryConnectionTooltip": "Cwtch retries peers regularly, but you can tell Cwtch to try sooner by pushing this button.",
"retryConnection": "Retry",
@ -283,7 +285,6 @@
"viewGroupMembershipTooltip": "Vis gruppemedlemskap",
"loadingTor": "Laster tor...",
"smallTextLabel": "Liten",
"defaultScalingText": "Standard tekststørrelse (skaleringsfaktor:",
"builddate": "Bygget på: %2",
"version": "Versjon %1",
"versionTor": "Versjon %1 med tor %2",

@ -1,6 +1,8 @@
{
"@@locale": "pl",
"@@last_modified": "2023-05-11T23:17:05+02:00",
"@@last_modified": "2023-05-15T21:16:36+02:00",
"fontScalingDescription": "Adjust the relative font scaling factor applied to text and widgets.",
"defaultScalingText": "Domyślny rozmiar tekstu (skalowanie:",
"localeJa": "Japanese \/ 日本語",
"retryConnectionTooltip": "Cwtch retries peers regularly, but you can tell Cwtch to try sooner by pushing this button.",
"retryConnection": "Retry",
@ -330,7 +332,6 @@
"viewGroupMembershipTooltip": "Wyświetl członków grupy",
"loadingTor": "Ładowanie Tor...",
"smallTextLabel": "Mały",
"defaultScalingText": "Domyślny rozmiar tekstu (skalowanie:",
"builddate": "Zbudowana: %2",
"version": "Wersja %1",
"versionTor": "Wersja %1 , wersja Tor %2",

@ -1,6 +1,8 @@
{
"@@locale": "pt",
"@@last_modified": "2023-05-11T23:17:05+02:00",
"@@last_modified": "2023-05-15T21:16:36+02:00",
"fontScalingDescription": "Adjust the relative font scaling factor applied to text and widgets.",
"defaultScalingText": "Texto tamanho padrão (fator de escala: ",
"localeJa": "Japanese \/ 日本語",
"retryConnectionTooltip": "Cwtch retries peers regularly, but you can tell Cwtch to try sooner by pushing this button.",
"retryConnection": "Retry",
@ -278,7 +280,6 @@
"viewGroupMembershipTooltip": "View Group Membership",
"loadingTor": "Loading tor...",
"smallTextLabel": "Pequeno",
"defaultScalingText": "Texto tamanho padrão (fator de escala: ",
"builddate": "Built on: %2",
"version": "Version %1",
"versionTor": "Version %1 with tor %2",

@ -1,6 +1,8 @@
{
"@@locale": "pt_BR",
"@@last_modified": "2023-05-11T23:17:05+02:00",
"@@last_modified": "2023-05-15T21:16:36+02:00",
"fontScalingDescription": "Adjust the relative font scaling factor applied to text and widgets.",
"defaultScalingText": "Texto tamanho padrão (fator de escala: ",
"localeJa": "Japanese \/ 日本語",
"retryConnectionTooltip": "Cwtch retries peers regularly, but you can tell Cwtch to try sooner by pushing this button.",
"retryConnection": "Retry",
@ -274,7 +276,6 @@
"viewGroupMembershipTooltip": "Ver Participação em Grupo",
"loadingTor": "Carregando Tor...",
"smallTextLabel": "Pequeno",
"defaultScalingText": "Texto tamanho padrão (fator de escala: ",
"builddate": "Construído em: %2",
"version": "Versão %1",
"versionTor": "Versão %1 com Tor %2",

@ -1,6 +1,8 @@
{
"@@locale": "ro",
"@@last_modified": "2023-05-11T23:17:05+02:00",
"@@last_modified": "2023-05-15T21:16:36+02:00",
"fontScalingDescription": "Adjust the relative font scaling factor applied to text and widgets.",
"defaultScalingText": "Dimensiunea implicită a textului (factor de scară:",
"localeJa": "Japanese \/ 日本語",
"retryConnectionTooltip": "Cwtch retries peers regularly, but you can tell Cwtch to try sooner by pushing this button.",
"retryConnection": "Retry",
@ -192,7 +194,6 @@
"experimentsEnabled": "Activați experimentele",
"versionTor": "Versiunea %1 cu tor %2",
"version": "Versiunea %1",
"defaultScalingText": "Dimensiunea implicită a textului (factor de scară:",
"smallTextLabel": "Mic",
"loadingTor": "Se încarcă tor...",
"viewGroupMembershipTooltip": "Vizualizați membrii grupului",

@ -1,6 +1,8 @@
{
"@@locale": "ru",
"@@last_modified": "2023-05-11T23:17:05+02:00",
"@@last_modified": "2023-05-15T21:16:36+02:00",
"fontScalingDescription": "Adjust the relative font scaling factor applied to text and widgets.",
"defaultScalingText": "Размер текста по умолчанию (коэффициент масштабирования:",
"localeJa": "Japanese \/ 日本語",
"retryConnectionTooltip": "Cwtch retries peers regularly, but you can tell Cwtch to try sooner by pushing this button.",
"retryConnection": "Retry",
@ -296,7 +298,6 @@
"viewGroupMembershipTooltip": "Просмотр членства в группе",
"loadingTor": "Загрузка Tor...",
"smallTextLabel": "Маленький",
"defaultScalingText": "Размер текста по умолчанию (коэффициент масштабирования:",
"builddate": "Построен на: %2",
"version": "Версия %1",
"versionTor": "Версия %1 c tor %2",

@ -1,6 +1,8 @@
{
"@@locale": "sk",
"@@last_modified": "2023-05-11T23:17:05+02:00",
"@@last_modified": "2023-05-15T21:16:36+02:00",
"fontScalingDescription": "Adjust the relative font scaling factor applied to text and widgets.",
"defaultScalingText": "Predvolená veľkosť textu (mierka):",
"localeJa": "Japanese \/ 日本語",
"retryConnectionTooltip": "Cwtch retries peers regularly, but you can tell Cwtch to try sooner by pushing this button.",
"retryConnection": "Retry",
@ -276,7 +278,6 @@
"viewGroupMembershipTooltip": "Zobraziť Členstvo v Skupine",
"loadingTor": "Načítavam tor...",
"smallTextLabel": "Malé",
"defaultScalingText": "Predvolená veľkosť textu (mierka):",
"builddate": "Vyrobené: %2",
"version": "Verzia %1",
"versionTor": "Verzia %1 s tor %2",

@ -1,6 +1,8 @@
{
"@@locale": "tr",
"@@last_modified": "2023-05-11T23:17:05+02:00",
"@@last_modified": "2023-05-15T21:16:36+02:00",
"fontScalingDescription": "Adjust the relative font scaling factor applied to text and widgets.",
"defaultScalingText": "Varsayılan metin boyutu (ölçek faktörü: ",
"localeJa": "Japanese \/ 日本語",
"retryConnectionTooltip": "Cwtch retries peers regularly, but you can tell Cwtch to try sooner by pushing this button.",
"retryConnection": "Retry",
@ -177,7 +179,6 @@
"versionTor": "Sürüm %1 ve tor %2",
"version": "Sürüm %1",
"builddate": "Derlendiği tarih: %2",
"defaultScalingText": "Varsayılan metin boyutu (ölçek faktörü: ",
"smallTextLabel": "Küçük",
"loadingTor": "Tor yükleniyor...",
"viewGroupMembershipTooltip": "Grup Üyeliğini Görüntüle",

@ -167,7 +167,7 @@ SOFTWARE.''');
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.''');
yield LicenseEntryWithLineBreaks(["connectivity_plus"], '''
* Copyright (c) 2013-2020, The PurpleI2P Project
*
@ -549,6 +549,103 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
This Source Code Form is "Incompatible With Secondary Licenses", as
defined by the Mozilla Public License, v. 2.0.''');
yield LicenseEntryWithLineBreaks(["Inter Fonts"], '''
Copyright 2020 The Inter Project Authors (https://github.com/rsms/inter)
This Font Software is licensed under the SIL Open Font License, Version 1.1.
This license is copied below, and is also available with a FAQ at:
http://scripts.sil.org/OFL
-----------------------------------------------------------
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------
PREAMBLE
The goals of the Open Font License (OFL) are to stimulate worldwide
development of collaborative font projects, to support the font creation
efforts of academic and linguistic communities, and to provide a free and
open framework in which fonts may be shared and improved in partnership
with others.
The OFL allows the licensed fonts to be used, studied, modified and
redistributed freely as long as they are not sold by themselves. The
fonts, including any derivative works, can be bundled, embedded,
redistributed and/or sold with any software provided that any reserved
names are not used by derivative works. The fonts and derivatives,
however, cannot be released under any other type of license. The
requirement for fonts to remain under this license does not apply
to any document created using the fonts or their derivatives.
DEFINITIONS
"Font Software" refers to the set of files released by the Copyright
Holder(s) under this license and clearly marked as such. This may
include source files, build scripts and documentation.
"Reserved Font Name" refers to any names specified as such after the
copyright statement(s).
"Original Version" refers to the collection of Font Software components as
distributed by the Copyright Holder(s).
"Modified Version" refers to any derivative made by adding to, deleting,
or substituting -- in part or in whole -- any of the components of the
Original Version, by changing formats or by porting the Font Software to a
new environment.
"Author" refers to any designer, engineer, programmer, technical
writer or other person who contributed to the Font Software.
PERMISSION & CONDITIONS
Permission is hereby granted, free of charge, to any person obtaining
a copy of the Font Software, to use, study, copy, merge, embed, modify,
redistribute, and sell modified and unmodified copies of the Font
Software, subject to the following conditions:
1) Neither the Font Software nor any of its individual components,
in Original or Modified Versions, may be sold by itself.
2) Original or Modified Versions of the Font Software may be bundled,
redistributed and/or sold with any software, provided that each copy
contains the above copyright notice and this license. These can be
included either as stand-alone text files, human-readable headers or
in the appropriate machine-readable metadata fields within text or
binary files as long as those fields can be easily viewed by the user.
3) No Modified Version of the Font Software may use the Reserved Font
Name(s) unless explicit written permission is granted by the corresponding
Copyright Holder. This restriction only applies to the primary font name as
presented to the users.
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
Software shall not be used to promote, endorse or advertise any
Modified Version, except to acknowledge the contribution(s) of the
Copyright Holder(s) and the Author(s) or with their explicit written
permission.
5) The Font Software, modified or unmodified, in part or in whole,
must be distributed entirely under this license, and must not be
distributed under any other license. The requirement for fonts to
remain under this license does not apply to any document created
using the Font Software.
TERMINATION
This license becomes null and void if any of the above conditions are
not met.
DISCLAIMER
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
OTHER DEALINGS IN THE FONT SOFTWARE.
''');
yield LicenseEntryWithLineBreaks(["Roboto fonts"], '''
Apache License

@ -32,7 +32,6 @@ import 'themes/opaque.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:connectivity_plus/connectivity_plus.dart';
import 'package:intl/intl.dart' as intl;
var globalSettings = Settings(Locale("en", ''), CwtchDark());
@ -59,7 +58,6 @@ class Flwtch extends StatefulWidget {
enum ConnectivityState { assumed_online, confirmed_offline, confirmed_online }
class FlwtchState extends State<Flwtch> with WindowListener {
final TextStyle biggerFont = const TextStyle(fontSize: 18);
late Cwtch cwtch;
late ProfileListState profs;
final MethodChannel notificationClickChannel = MethodChannel('im.cwtch.flwtch/notificationClickHandler');
@ -95,39 +93,15 @@ class FlwtchState extends State<Flwtch> with WindowListener {
shutdownLinuxMethodChannel.setMethodCallHandler(shutdownDirect);
print("initState: creating cwtchnotifier, ffi");
if (Platform.isAndroid) {
var cwtchNotifier = new CwtchNotifier(
profs,
globalSettings,
globalErrorHandler,
globalTorStatus,
NullNotificationsManager(),
globalAppState,
globalServersList,
this);
var cwtchNotifier = new CwtchNotifier(profs, globalSettings, globalErrorHandler, globalTorStatus, NullNotificationsManager(), globalAppState, globalServersList, this);
cwtch = CwtchGomobile(cwtchNotifier);
} else if (Platform.isLinux) {
var cwtchNotifier =
new CwtchNotifier(
profs,
globalSettings,
globalErrorHandler,
globalTorStatus,
newDesktopNotificationsManager(_notificationSelectConvo),
globalAppState,
globalServersList,
this);
new CwtchNotifier(profs, globalSettings, globalErrorHandler, globalTorStatus, newDesktopNotificationsManager(_notificationSelectConvo), globalAppState, globalServersList, this);
cwtch = CwtchFfi(cwtchNotifier);
} else {
var cwtchNotifier =
new CwtchNotifier(
profs,
globalSettings,
globalErrorHandler,
globalTorStatus,
newDesktopNotificationsManager(_notificationSelectConvo),
globalAppState,
globalServersList,
this);
new CwtchNotifier(profs, globalSettings, globalErrorHandler, globalTorStatus, newDesktopNotificationsManager(_notificationSelectConvo), globalAppState, globalServersList, this);
cwtch = CwtchFfi(cwtchNotifier);
}
startConnectivityListener();
@ -139,7 +113,7 @@ class FlwtchState extends State<Flwtch> with WindowListener {
// connectivity listening is an optional enhancement feature that tries to listen for OS events about the network
// and if it detects coming back online, restarts the ACN/tor
// gracefully fails and NOPs, as it's not a required functionality
startConnectivityListener() async {
startConnectivityListener() async {
try {
connectivityStream = await Connectivity().onConnectivityChanged.listen((ConnectivityResult result) {
// Got a new connectivity status!

@ -45,8 +45,8 @@ class QuotedMessage extends Message {
linkifiers: [UrlLinkifier()],
onOpen: null,
textAlign: TextAlign.left,
style: TextStyle(overflow: TextOverflow.ellipsis),
codeStyle: TextStyle(overflow: TextOverflow.ellipsis),
style: TextStyle(fontSize: 12.0 * Provider.of<Settings>(context).fontScaling, fontWeight: FontWeight.normal, fontFamily: "Inter", overflow: TextOverflow.ellipsis),
codeStyle: TextStyle(fontSize: 12.0 * Provider.of<Settings>(context).fontScaling, fontWeight: FontWeight.normal, fontFamily: "Inter", overflow: TextOverflow.ellipsis),
textWidthBasis: TextWidthBasis.longestLine);
} catch (e) {
return MalformedBubble();

@ -31,8 +31,12 @@ class TextMessage extends Message {
linkifiers: [UrlLinkifier()],
onOpen: null,
textAlign: TextAlign.left,
style: TextStyle(overflow: TextOverflow.fade),
codeStyle: TextStyle(overflow: TextOverflow.ellipsis),
style: TextStyle(overflow: TextOverflow.fade, fontFamily: "Inter", fontSize: 12.0 * Provider.of<Settings>(context).fontScaling),
linkStyle: TextStyle(overflow: TextOverflow.fade, fontFamily: "Inter", fontSize: 12.0 * Provider.of<Settings>(context).fontScaling),
codeStyle: TextStyle(
overflow: TextOverflow.ellipsis,
fontFamily: "RobotoMono",
),
textWidthBasis: TextWidthBasis.parent,
);
});

@ -66,6 +66,7 @@ class Settings extends ChangeNotifier {
bool _useTorCache = false;
String _torCacheDir = "";
bool _useSemanticDebugger = false;
double _fontScaling = 1.0;
String get torCacheDir => _torCacheDir;
@ -129,6 +130,9 @@ class Settings extends ChangeNotifier {
// Set Locale and notify listeners
switchLocaleByCode(settings["Locale"]);
// Decide whether to enable Experiments
_fontScaling = double.parse(settings["FontScaling"].toString()).clamp(0.5, 2.0);
blockUnknownConnections = settings["BlockUnknownConnections"] ?? false;
streamerMode = settings["StreamerMode"] ?? false;
@ -180,6 +184,14 @@ class Settings extends ChangeNotifier {
}
}
/// Handle Font Scaling
set fontScaling(double newFontScaling) {
this._fontScaling = newFontScaling;
notifyListeners();
}
double get fontScaling => _fontScaling;
/// Switch the Locale of the App
switchLocale(Locale newLocale) {
locale = newLocale;
@ -454,7 +466,8 @@ class Settings extends ChangeNotifier {
"CustomAuth": _customTorAuth,
"UseTorCache": _useTorCache,
"TorCacheDir": _torCacheDir,
"BlodeuweddPath": _blodeuweddPath
"BlodeuweddPath": _blodeuweddPath,
"FontScaling": _fontScaling
};
}
}

@ -120,7 +120,6 @@ abstract class OpaqueThemeType {
get messageFromOtherTextColor => red;
// Sizes
double contactOnionTextSize() {
return 18;
}
@ -154,9 +153,7 @@ ThemeData mkThemeData(Settings opaque) {
iconTheme: IconThemeData(
color: opaque.current().mainTextColor,
),
titleTextStyle: TextStyle(
color: opaque.current().mainTextColor,
),
titleTextStyle: TextStyle(fontWeight: FontWeight.bold, fontFamily: "Inter", color: opaque.current().mainTextColor, fontSize: opaque.fontScaling * 18.0),
actionsIconTheme: IconThemeData(
color: opaque.current().mainTextColor,
)),
@ -186,6 +183,7 @@ ThemeData mkThemeData(Settings opaque) {
)),
),
),
scrollbarTheme: ScrollbarThemeData(isAlwaysShown: false, thumbColor: MaterialStateProperty.all(opaque.current().scrollbarDefaultColor)),
tabBarTheme: TabBarTheme(
labelColor: opaque.current().mainTextColor,
@ -193,24 +191,30 @@ ThemeData mkThemeData(Settings opaque) {
indicator: UnderlineTabIndicator(borderSide: BorderSide(color: opaque.current().defaultButtonActiveColor))),
dialogTheme: DialogTheme(
backgroundColor: opaque.current().backgroundPaneColor,
titleTextStyle: TextStyle(color: opaque.current().mainTextColor),
titleTextStyle: TextStyle(fontFamily: "Inter", fontWeight: FontWeight.bold, color: opaque.current().mainTextColor),
contentTextStyle: TextStyle(
fontFamily: "Inter",
color: opaque.current().mainTextColor,
)),
textTheme: TextTheme(
headline1: TextStyle(color: opaque.current().mainTextColor),
headline2: TextStyle(color: opaque.current().mainTextColor),
headline3: TextStyle(color: opaque.current().mainTextColor),
headline4: TextStyle(color: opaque.current().mainTextColor),
headline5: TextStyle(color: opaque.current().mainTextColor),
headline6: TextStyle(color: opaque.current().mainTextColor),
bodyText1: TextStyle(color: opaque.current().mainTextColor),
bodyText2: TextStyle(color: opaque.current().mainTextColor),
subtitle1: TextStyle(color: opaque.current().mainTextColor),
subtitle2: TextStyle(color: opaque.current().mainTextColor),
caption: TextStyle(color: opaque.current().mainTextColor),
button: TextStyle(color: opaque.current().mainTextColor),
overline: TextStyle(color: opaque.current().mainTextColor)),
// NOTE: The following font scales were arrived at after consulting the material text scale
// docs: https://m3.material.io/styles/typography/type-scale-tokens and some trial and error
displayMedium: TextStyle(fontFamily: "Inter", fontSize: opaque.fontScaling * 16.0, color: opaque.current().mainTextColor),
displaySmall: TextStyle(fontFamily: "Inter", fontSize: opaque.fontScaling * 14.0, color: opaque.current().mainTextColor),
displayLarge: TextStyle(fontFamily: "Inter", fontSize: opaque.fontScaling * 18.0, color: opaque.current().mainTextColor),
titleSmall: TextStyle(fontFamily: "Inter", fontWeight: FontWeight.bold, fontSize: opaque.fontScaling * 16.0, color: opaque.current().mainTextColor),
titleLarge: TextStyle(fontFamily: "Inter", fontWeight: FontWeight.bold, fontSize: opaque.fontScaling * 18.0, color: opaque.current().mainTextColor),
titleMedium: TextStyle(fontFamily: "Inter", fontWeight: FontWeight.bold, fontSize: opaque.fontScaling * 20.0, color: opaque.current().mainTextColor),
bodySmall: TextStyle(fontFamily: "Inter", fontSize: opaque.fontScaling * 12.0, color: opaque.current().mainTextColor),
bodyMedium: TextStyle(fontFamily: "Inter", fontSize: opaque.fontScaling * 14.0, color: opaque.current().mainTextColor),
bodyLarge: TextStyle(fontFamily: "Inter", fontSize: opaque.fontScaling * 16.0, color: opaque.current().mainTextColor),
headlineSmall: TextStyle(fontFamily: "Inter", fontWeight: FontWeight.bold, fontSize: opaque.fontScaling * 24.0, color: opaque.current().mainTextColor),
headlineMedium: TextStyle(fontFamily: "Inter", fontWeight: FontWeight.bold, fontSize: opaque.fontScaling * 26.0, color: opaque.current().mainTextColor),
headlineLarge: TextStyle(fontFamily: "Inter", fontWeight: FontWeight.bold, fontSize: opaque.fontScaling * 28.0, color: opaque.current().mainTextColor),
labelSmall: TextStyle(fontFamily: "Inter", fontWeight: FontWeight.w100, fontSize: opaque.fontScaling * 14.0, color: opaque.current().mainTextColor),
labelLarge: TextStyle(fontFamily: "Inter", fontWeight: FontWeight.w200, fontSize: opaque.fontScaling * 16.0, color: opaque.current().mainTextColor),
labelMedium: TextStyle(fontFamily: "Inter", fontWeight: FontWeight.w300, fontSize: opaque.fontScaling * 18.0, color: opaque.current().mainTextColor),
),
switchTheme: SwitchThemeData(
overlayColor: MaterialStateProperty.all(opaque.current().defaultButtonActiveColor),
thumbColor: MaterialStateProperty.all(opaque.current().mainTextColor),

@ -7,8 +7,7 @@ import 'dart:async';
import 'package:connectivity_plus_platform_interface/connectivity_plus_platform_interface.dart';
// Export enums from the platform_interface so plugin users can use them directly.
export 'package:connectivity_plus_platform_interface/connectivity_plus_platform_interface.dart'
show ConnectivityResult;
export 'package:connectivity_plus_platform_interface/connectivity_plus_platform_interface.dart' show ConnectivityResult;
export 'src/connectivity_plus_linux.dart';

@ -45,7 +45,6 @@ abstract class ConnectivityPlatform extends PlatformInterface {
/// Returns a Stream of ConnectivityResults changes.
Stream<ConnectivityResult> get onConnectivityChanged {
throw UnimplementedError(
'get onConnectivityChanged has not been implemented.');
throw UnimplementedError('get onConnectivityChanged has not been implemented.');
}
}

@ -14,30 +14,23 @@ import 'src/utils.dart';
class MethodChannelConnectivity extends ConnectivityPlatform {
/// The method channel used to interact with the native platform.
@visibleForTesting
MethodChannel methodChannel =
const MethodChannel('dev.fluttercommunity.plus/connectivity');
MethodChannel methodChannel = const MethodChannel('dev.fluttercommunity.plus/connectivity');
/// The event channel used to receive ConnectivityResult changes from the native platform.
@visibleForTesting
EventChannel eventChannel =
const EventChannel('dev.fluttercommunity.plus/connectivity_status');
EventChannel eventChannel = const EventChannel('dev.fluttercommunity.plus/connectivity_status');
Stream<ConnectivityResult>? _onConnectivityChanged;
/// Fires whenever the connectivity state changes.
@override
Stream<ConnectivityResult> get onConnectivityChanged {
_onConnectivityChanged ??= eventChannel
.receiveBroadcastStream()
.map((dynamic result) => result.toString())
.map(parseConnectivityResult);
_onConnectivityChanged ??= eventChannel.receiveBroadcastStream().map((dynamic result) => result.toString()).map(parseConnectivityResult);
return _onConnectivityChanged!;
}
@override
Future<ConnectivityResult> checkConnectivity() {
return methodChannel
.invokeMethod<String>('check')
.then((value) => parseConnectivityResult(value ?? ''));
return methodChannel.invokeMethod<String>('check').then((value) => parseConnectivityResult(value ?? ''));
}
}

@ -1,6 +1,5 @@
/// Connection status check result.
enum ConnectivityResult {
/// WiFi: Device connected via Wi-Fi
wifi,

@ -59,12 +59,10 @@ NetworkManagerConnectivityState _decodeConnectivityState(int value) {
class _NetworkManagerInterface {
final Map<String, DBusValue> properties;
final propertiesChangedStreamController =
StreamController<List<String>>.broadcast();
final propertiesChangedStreamController = StreamController<List<String>>.broadcast();
/// Stream of property names as their values change.
Stream<List<String>> get propertiesChanged =>
propertiesChangedStreamController.stream;
Stream<List<String>> get propertiesChanged => propertiesChangedStreamController.stream;
_NetworkManagerInterface(this.properties);
@ -77,8 +75,7 @@ class _NetworkManagerInterface {
class _NetworkManagerObject extends DBusRemoteObject {
final interfaces = <String, _NetworkManagerInterface>{};
void updateInterfaces(
Map<String, Map<String, DBusValue>> interfacesAndProperties) {
void updateInterfaces(Map<String, Map<String, DBusValue>> interfacesAndProperties) {
interfacesAndProperties.forEach((interfaceName, properties) {
interfaces[interfaceName] = _NetworkManagerInterface(properties);
});
@ -100,8 +97,7 @@ class _NetworkManagerObject extends DBusRemoteObject {
}
}
void updateProperties(
String interfaceName, Map<String, DBusValue> changedProperties) {
void updateProperties(String interfaceName, Map<String, DBusValue> changedProperties) {
var interface = interfaces[interfaceName];
if (interface != null) {
interface.updateProperties(changedProperties);
@ -210,10 +206,7 @@ class _NetworkManagerObject extends DBusRemoteObject {
if (value.signature != DBusSignature('as')) {
return null;
}
return (value as DBusArray)
.children
.map((e) => (e as DBusString).value)
.toList();
return (value as DBusArray).children.map((e) => (e as DBusString).value).toList();
}
/// Gets a cached object path property, or returns null if not present or not the correct type.
@ -229,8 +222,7 @@ class _NetworkManagerObject extends DBusRemoteObject {
}
/// Gets a cached object path array property, or returns null if not present or not the correct type.
List<DBusObjectPath>? getObjectPathArrayProperty(
String interface, String name) {
List<DBusObjectPath>? getObjectPathArrayProperty(String interface, String name) {
var value = getCachedProperty(interface, name);
if (value == null) {
return null;
@ -238,15 +230,11 @@ class _NetworkManagerObject extends DBusRemoteObject {
if (value.signature != DBusSignature('ao')) {
return null;
}
return (value as DBusArray)
.children
.map((e) => (e as DBusObjectPath))
.toList();
return (value as DBusArray).children.map((e) => (e as DBusObjectPath)).toList();
}
/// Gets a cached list of data property, or returns null if not present or not the correct type.
List<Map<String, dynamic>>? getDataListProperty(
String interface, String name) {
List<Map<String, dynamic>>? getDataListProperty(String interface, String name) {
var value = getCachedProperty(interface, name);
if (value == null) {
return null;
@ -261,22 +249,16 @@ class _NetworkManagerObject extends DBusRemoteObject {
));
}
return (value as DBusArray)
.children
.map((value) => convertData(value))
.toList();
return (value as DBusArray).children.map((value) => convertData(value)).toList();
}
_NetworkManagerObject(DBusClient client, DBusObjectPath path,
Map<String, Map<String, DBusValue>> interfacesAndProperties)
: super(client, name: 'org.freedesktop.NetworkManager', path: path) {
_NetworkManagerObject(DBusClient client, DBusObjectPath path, Map<String, Map<String, DBusValue>> interfacesAndProperties) : super(client, name: 'org.freedesktop.NetworkManager', path: path) {
updateInterfaces(interfacesAndProperties);
}
}
/// A client that connects to NetworkManager.
class NetworkManagerClient {
/// The bus this client is connected to.
final DBusClient _bus;
final bool _closeBus;
@ -302,10 +284,7 @@ class NetworkManagerClient {
}
/// Stream of property names as their values change.
Stream<List<String>> get propertiesChanged =>
_manager?.interfaces[_managerInterfaceName]
?.propertiesChangedStreamController.stream ??
Stream<List<String>>.empty();
Stream<List<String>> get propertiesChanged => _manager?.interfaces[_managerInterfaceName]?.propertiesChangedStreamController.stream ?? Stream<List<String>>.empty();
/// Connects to the NetworkManager D-Bus objects.
/// Must be called before accessing methods and properties.
@ -333,8 +312,7 @@ class NetworkManagerClient {
if (object != null) {
object.updateInterfaces(signal.interfacesAndProperties);
} else {
object = _NetworkManagerObject(
_bus, signal.changedPath, signal.interfacesAndProperties);
object = _NetworkManagerObject(_bus, signal.changedPath, signal.interfacesAndProperties);
_objects[signal.changedPath] = object;
}
} else if (signal is DBusObjectManagerInterfacesRemovedSignal) {
@ -351,8 +329,7 @@ class NetworkManagerClient {
} else if (signal is DBusPropertiesChangedSignal) {
var object = _objects[signal.path];
if (object != null) {
object.updateProperties(
signal.propertiesInterface, signal.changedProperties);
object.updateProperties(signal.propertiesInterface, signal.changedProperties);
}
}
});
@ -360,8 +337,7 @@ class NetworkManagerClient {
// Find all the objects exported.
var objects = await _root.getManagedObjects();
objects.forEach((objectPath, interfacesAndProperties) {
_objects[objectPath] =
_NetworkManagerObject(_bus, objectPath, interfacesAndProperties);
_objects[objectPath] = _NetworkManagerObject(_bus, objectPath, interfacesAndProperties);
});
}
@ -376,8 +352,7 @@ class NetworkManagerClient {
/// True is NetworkManager is still starting up.
bool get startup {
return _manager?.getBooleanProperty(_managerInterfaceName, 'Startup') ??
false;
return _manager?.getBooleanProperty(_managerInterfaceName, 'Startup') ?? false;
}
/// The version of NetworkManager running.
@ -387,20 +362,17 @@ class NetworkManagerClient {
/// The result of the last connectivity check.
NetworkManagerConnectivityState get connectivity {
var value =
_manager?.getUint32Property(_managerInterfaceName, 'Connectivity') ?? 0;
var value = _manager?.getUint32Property(_managerInterfaceName, 'Connectivity') ?? 0;
return _decodeConnectivityState(value);
}