Fluffychat merge (#1186)
* feat: Sending multiple files at once * chore: Follow up sendfile snackbars * chore: Follow up send file snackbars * build: Update dependencies * chore: Follow up google services patch * chore: Improve message info dialog * build: Update emoji picker package * build: Increase iOS minimum deployment target to 13.0 * build(deps): bump webrick from 1.7.0 to 1.8.2 in /ios Bumps [webrick](https://github.com/ruby/webrick) from 1.7.0 to 1.8.2. - [Release notes](https://github.com/ruby/webrick/releases) - [Commits](https://github.com/ruby/webrick/compare/v1.7.0...v1.8.2) --- updated-dependencies: - dependency-name: webrick dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> * Translated using Weblate (Russian) Currently translated at 98.6% (654 of 663 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ru/ * Translated using Weblate (Arabic) Currently translated at 100.0% (670 of 670 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ar/ * Translated using Weblate (Estonian) Currently translated at 100.0% (670 of 670 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/et/ * Translated using Weblate (Basque) Currently translated at 99.5% (667 of 670 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/eu/ * Translated using Weblate (Galician) Currently translated at 100.0% (670 of 670 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/gl/ * Translated using Weblate (Turkish) Currently translated at 100.0% (670 of 670 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/tr/ * Translated using Weblate (Ukrainian) Currently translated at 100.0% (670 of 670 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/uk/ * Translated using Weblate (Chinese (Simplified Han script)) Currently translated at 100.0% (670 of 670 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/zh_Hans/ * Translated using Weblate (Latvian) Currently translated at 100.0% (670 of 670 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/lv/ * chore: Group notifications on android by first space parent * fix: Public rooms always publicly visible even when turned off on creation * chore: Nicer representation of invited DMs * build: Add unifiedpush_ui package Add unifiedpush_ui as part of unifiedpush was split off into it. * refactor: Reuse flutter local notifications object * build: Update flutter local notifications package * refactor: Remove duplicated navigator workaround * refactor: Use file selector on linux * chore: Follow up pick files with file selector * chore: Follow up file selector * build: migrate from deprecated appdelegate makro * chore: Follow up file selector * build: Update go router * refactor: Use non nullable localizations builder and lazy load on web * build: Update secure storage on linux * build: Update dependencies minor versions * Translated using Weblate (Czech) Currently translated at 80.4% (539 of 670 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/cs/ * Translated using Weblate (Ukrainian) Currently translated at 100.0% (670 of 670 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/uk/ * build: Update dart olm to 2.0.4 * build: Update olm sha in pubspec.lock * chore: Improve read marker design * Translated using Weblate (Indonesian) Currently translated at 100.0% (670 of 670 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/id/ * Translated using Weblate (German) Currently translated at 100.0% (670 of 670 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/de/ * feat: Display warning banner on unverified devices * refactor: Improve delete device UX flow * chore: Nicer batch for power level roles * refactor: Better future loading dialog without flickering * chore: Follow up powerlevel role badges * refactor: Use adaptive dialog action * fix: Wait for room invite before open in pushhelper * feat: Nicer room creation UI * chore: Follow up loading dialog * docs: fix snapstore badge on website * build: Update matrix dart sdk * feat: Add default chat wallpaper * Revert "feat: Add default chat wallpaper" This reverts commit7d8369ab30. * chore: Follow up new chat design * Revert "chore: Follow up new chat design" This reverts commit4ec70bd25c. * chore: Slightly update chat colors * feat: Swipe to archive rooms * chore: Follow up dismiss room * build: Update flutter web auth 2 package * chore: Change same enivornment to one hour * chore: Update pubspec.yaml * chore: Follow up sameEnvironment calc * build: Build on rpi for linux arm64 * build: Also build for arm64 for linux releases * Translated using Weblate (Russian) Currently translated at 97.6% (654 of 670 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ru/ * Translated using Weblate (Italian) Currently translated at 89.8% (602 of 670 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/it/ * Translated using Weblate (German) Currently translated at 99.8% (671 of 672 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/de/ * Translated using Weblate (Estonian) Currently translated at 100.0% (672 of 672 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/et/ * Translated using Weblate (Turkish) Currently translated at 100.0% (672 of 672 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/tr/ * Translated using Weblate (Ukrainian) Currently translated at 100.0% (672 of 672 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/uk/ * Translated using Weblate (Chinese (Simplified Han script)) Currently translated at 100.0% (672 of 672 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/zh_Hans/ * Translated using Weblate (Italian) Currently translated at 95.6% (643 of 672 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/it/ * Translated using Weblate (Indonesian) Currently translated at 100.0% (672 of 672 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/id/ * Translated using Weblate (Latvian) Currently translated at 100.0% (672 of 672 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/lv/ * Translated using Weblate (Basque) Currently translated at 100.0% (672 of 672 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/eu/ * Translated using Weblate (Ukrainian) Currently translated at 100.0% (672 of 672 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/uk/ * Translated using Weblate (Arabic) Currently translated at 100.0% (672 of 672 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ar/ * Translated using Weblate (Galician) Currently translated at 100.0% (672 of 672 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/gl/ * Translated using Weblate (Latvian) Currently translated at 100.0% (672 of 672 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/lv/ * Translated using Weblate (Italian) Currently translated at 100.0% (672 of 672 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/it/ * Translated using Weblate (German) Currently translated at 100.0% (672 of 672 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/de/ * chore: Nicer invite selection view * chore: Do not request thousands of users on invite page * build(deps): bump rexml from 3.3.6 to 3.3.9 in /ios Bumps [rexml](https://github.com/ruby/rexml) from 3.3.6 to 3.3.9. - [Release notes](https://github.com/ruby/rexml/releases) - [Changelog](https://github.com/ruby/rexml/blob/master/NEWS.md) - [Commits](https://github.com/ruby/rexml/compare/v3.3.6...v3.3.9) --- updated-dependencies: - dependency-name: rexml dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> * design: Highlight emoji only messages * chore: Follow up emoji only messages * Translated using Weblate (Galician) Currently translated at 100.0% (672 of 672 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/gl/ * Translated using Weblate (Russian) Currently translated at 99.7% (670 of 672 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ru/ * design: New login design * chore: Improve spaces design * chore: Improve spaces design * chore: Improved UX for creating groups and spaces * Translated using Weblate (German) Currently translated at 100.0% (672 of 672 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/de/ * feat: Better wallpapers with blur and opacity sliders and improved styles page * chore: Follow up wallpaper configs * chore: Add max length to state messages * chore: Follow up wallpaper design * feat: Open account manage url when using MAS * chore: follow up wellknown fetch * Translated using Weblate (Arabic) Currently translated at 100.0% (674 of 674 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ar/ * Translated using Weblate (Estonian) Currently translated at 100.0% (674 of 674 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/et/ * Translated using Weblate (Chinese (Simplified Han script)) Currently translated at 100.0% (674 of 674 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/zh_Hans/ * Translated using Weblate (Indonesian) Currently translated at 100.0% (674 of 674 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/id/ * Translated using Weblate (Finnish) Currently translated at 79.0% (533 of 674 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/fi/ * Translated using Weblate (Latvian) Currently translated at 100.0% (674 of 674 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/lv/ * build: Add links to snapcraft.yaml file * chore: Nicer empty page * chore: Polish chat bubble colors * chore: Follow up chat bubble design * refactor: Remove unnecessary builder widget * chore: Design adjustments * chore: Follow up design * refactor: Display two lines on new messages * chore: Design follow up * Translated using Weblate (Arabic) Currently translated at 100.0% (678 of 678 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ar/ * Translated using Weblate (German) Currently translated at 100.0% (678 of 678 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/de/ * Translated using Weblate (Estonian) Currently translated at 99.7% (676 of 678 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/et/ * Translated using Weblate (Basque) Currently translated at 100.0% (678 of 678 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/eu/ * Translated using Weblate (Ukrainian) Currently translated at 100.0% (678 of 678 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/uk/ * Translated using Weblate (Chinese (Simplified Han script)) Currently translated at 100.0% (678 of 678 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/zh_Hans/ * chore: Follow up message bubbles * chore: Follow up design * chore: Follow up design * chore: Follow up colors * chore: Follow up homeserverpicker UX * chore: Design follow up * feat: Add about server page * chore: Follow up update snackbar * chore: Polish login design * chore: Follow up login page * chore: Follow up homeserver picker * chore: Follow up appbar shadow * refactor: Performance boost for avatar widget * Revert "refactor: Performance boost for avatar widget" This reverts commit58577bb9e8. * Translated using Weblate (Estonian) Currently translated at 100.0% (678 of 678 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/et/ * Translated using Weblate (Ukrainian) Currently translated at 100.0% (678 of 678 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/uk/ * Translated using Weblate (Latvian) Currently translated at 100.0% (678 of 678 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/lv/ * Translated using Weblate (Arabic) Currently translated at 100.0% (687 of 687 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ar/ * Translated using Weblate (Estonian) Currently translated at 100.0% (687 of 687 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/et/ * Translated using Weblate (Basque) Currently translated at 100.0% (687 of 687 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/eu/ * Translated using Weblate (Galician) Currently translated at 100.0% (687 of 687 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/gl/ * Translated using Weblate (Chinese (Simplified Han script)) Currently translated at 100.0% (687 of 687 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/zh_Hans/ * Translated using Weblate (Indonesian) Currently translated at 100.0% (687 of 687 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/id/ * Translated using Weblate (Latvian) Currently translated at 100.0% (687 of 687 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/lv/ * Translated using Weblate (Ukrainian) Currently translated at 100.0% (687 of 687 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/uk/ * Translated using Weblate (Korean) Currently translated at 100.0% (687 of 687 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ko/ * chore: Follow up homeserver input field * refactor: Move to upstream geolocator * chore: Follow up send file dialog * Translated using Weblate (Spanish) Currently translated at 74.6% (513 of 687 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/es/ * refactor: Migrate to newer keyboard shortcuts package * refactor: Remove keyboard shortcuts This package right now makes the web app nearly unusable as it throws multiple errors on every key press. The package seems to be unmaintained. I tried two other packages and none of them worked. * build: Update matrix dart sdk to 0.35.0 * chore: Better FluffyChat Logo for PWA * build: (deps): bump samuelmeuli/action-snapcraft from 2 to 3 Bumps [samuelmeuli/action-snapcraft](https://github.com/samuelmeuli/action-snapcraft) from 2 to 3. - [Release notes](https://github.com/samuelmeuli/action-snapcraft/releases) - [Commits](https://github.com/samuelmeuli/action-snapcraft/compare/v2...v3) --- updated-dependencies: - dependency-name: samuelmeuli/action-snapcraft dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * chore: Follow up send file dialog * feat: Add markdown context actions for text input * build: Update flutter to 3.24.5 * build: Remove snapcraft build workaround * chore: Better error message when join room failed * chore: Follow up join room * chore: Make error dialog show full error * chore: Follow up loading dialog * chore: Follow up loading dialog * build: Snapcraft from local build file * chore: Follow up build snap * chore: Follow up snapcraft in ci * build: Revert build snapcraft changes * build: Try downgrading flutter web auth * chore: add hint in pubspec.yaml regarding flutter_web_auth_2 * Translated using Weblate (Estonian) Currently translated at 100.0% (688 of 688 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/et/ * Translated using Weblate (Galician) Currently translated at 100.0% (688 of 688 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/gl/ * Translated using Weblate (Chinese (Simplified Han script)) Currently translated at 100.0% (688 of 688 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/zh_Hans/ * Translated using Weblate (Indonesian) Currently translated at 100.0% (688 of 688 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/id/ * Translated using Weblate (Irish) Currently translated at 100.0% (688 of 688 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ga/ * Translated using Weblate (Arabic) Currently translated at 100.0% (688 of 688 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ar/ * Translated using Weblate (Basque) Currently translated at 100.0% (688 of 688 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/eu/ * Translated using Weblate (Ukrainian) Currently translated at 100.0% (688 of 688 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/uk/ * Translated using Weblate (Latvian) Currently translated at 100.0% (688 of 688 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/lv/ * Translated using Weblate (Italian) Currently translated at 100.0% (688 of 688 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/it/ * Translated using Weblate (Estonian) Currently translated at 100.0% (694 of 694 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/et/ * Translated using Weblate (Chinese (Simplified Han script)) Currently translated at 100.0% (694 of 694 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/zh_Hans/ * Translated using Weblate (Arabic) Currently translated at 100.0% (694 of 694 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ar/ * Translated using Weblate (Basque) Currently translated at 100.0% (694 of 694 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/eu/ * Translated using Weblate (Irish) Currently translated at 100.0% (694 of 694 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ga/ * Translated using Weblate (Indonesian) Currently translated at 100.0% (694 of 694 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/id/ * Translated using Weblate (Latvian) Currently translated at 100.0% (694 of 694 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/lv/ * Translated using Weblate (Arabic) Currently translated at 100.0% (695 of 695 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ar/ * Translated using Weblate (Estonian) Currently translated at 100.0% (695 of 695 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/et/ * Translated using Weblate (Chinese (Simplified Han script)) Currently translated at 100.0% (695 of 695 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/zh_Hans/ * Translated using Weblate (Irish) Currently translated at 99.8% (694 of 695 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ga/ * Translated using Weblate (German) Currently translated at 99.5% (692 of 695 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/de/ * fix: dont use thumbnails for emoticons * chore: Improve presence performance * Translated using Weblate (Basque) Currently translated at 100.0% (695 of 695 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/eu/ * Translated using Weblate (Galician) Currently translated at 100.0% (695 of 695 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/gl/ * Translated using Weblate (Italian) Currently translated at 100.0% (695 of 695 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/it/ * Translated using Weblate (Irish) Currently translated at 100.0% (695 of 695 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ga/ * Translated using Weblate (Russian) Currently translated at 100.0% (695 of 695 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ru/ * Translated using Weblate (Ukrainian) Currently translated at 100.0% (695 of 695 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/uk/ * Translated using Weblate (Catalan) Currently translated at 95.1% (661 of 695 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ca/ * build: Bump version * chore: Follow up send file dialog for images * chore: Follow up send multiple images * build: Add android build workaround for new flutter version * build: Use file selector to save files * chore: Follow up save file on desktop * chore: Adjust default linux window height * refactor: Update to new receive sharing intent package * chore: Do not display sender prefix for DM rooms in notification ticker * fluffychat merge --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: krille-chan <christian-kussowski@posteo.de> Co-authored-by: Krille <c.kussowski@famedly.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: v1s7 <v1s7@users.noreply.hosted.weblate.org> Co-authored-by: Rex_sa <rex.sa@pm.me> Co-authored-by: Priit Jõerüüt <hwlate@joeruut.com> Co-authored-by: xabirequejo <xabi.rn@gmail.com> Co-authored-by: josé m <correoxm@disroot.org> Co-authored-by: Oğuz Ersen <oguz@ersen.moe> Co-authored-by: Bezruchenko Simon <worcposj44@gmail.com> Co-authored-by: 大王叫我来巡山 <hamburger2048@users.noreply.hosted.weblate.org> Co-authored-by: Edgars Andersons <Edgars+Weblate@gaitenis.id.lv> Co-authored-by: baltevl <baltevl@disroot.org> Co-authored-by: Michal Bedáň <bedami.erik@gmail.com> Co-authored-by: Ihor Hordiichuk <igor_ck@outlook.com> Co-authored-by: Linerly <linerly@proton.me> Co-authored-by: Christian <christian-pauly@posteo.de> Co-authored-by: Pavel Kozhukhov <89pavel3@gmail.com> Co-authored-by: Angelo Schirinzi <muten619@hotmail.it> Co-authored-by: Ettore Atalan <atalanttore@googlemail.com> Co-authored-by: GGLVXD <me@gglvxd.eu.org> Co-authored-by: Bruno Roh <kane.roh429@gmail.com> Co-authored-by: Kimby <kimisaes@naver.com> Co-authored-by: Aindriú Mac Giolla Eoin <aindriu80@gmail.com> Co-authored-by: Marek Vospěl <marek@vospel.cz> Co-authored-by: Александр (Alexandr1995) <stupino19951406@gmail.com>
This commit is contained in:
ggurdin
GitHub
parent
7d79ed4c4f
commit
ddbe568ce6
16 changed files with 544 additions and 482 deletions
|
|
@ -94,4 +94,4 @@ dependencies {
|
|||
// configurations.all {
|
||||
// exclude group: 'com.google.android.gms'
|
||||
// }
|
||||
// Pangea#
|
||||
// Pangea#
|
||||
|
|
|
|||
|
|
@ -371,6 +371,17 @@ abstract class AppRoutes {
|
|||
},
|
||||
redirect: loggedOutRedirect,
|
||||
),
|
||||
GoRoute(
|
||||
path: 'homeserver',
|
||||
pageBuilder: (context, state) {
|
||||
return defaultPageBuilder(
|
||||
context,
|
||||
state,
|
||||
const SettingsHomeserver(),
|
||||
);
|
||||
},
|
||||
redirect: loggedOutRedirect,
|
||||
),
|
||||
GoRoute(
|
||||
path: 'security',
|
||||
redirect: loggedOutRedirect,
|
||||
|
|
|
|||
|
|
@ -145,7 +145,8 @@ class ChatInputRow extends StatelessWidget {
|
|||
// children: <Widget>[
|
||||
// Text(L10n.of(context).tryToSendAgain),
|
||||
// const SizedBox(width: 4),
|
||||
// const Icon(Icons.send_outlined, size: 16),
|
||||
// const Icon(Icons.send_outlined,
|
||||
// size: 16),
|
||||
// ],
|
||||
// ),
|
||||
// ),
|
||||
|
|
@ -326,15 +327,6 @@ class ChatInputRow extends StatelessWidget {
|
|||
// child: _ChatAccountPicker(controller),
|
||||
// ),
|
||||
// Pangea#
|
||||
if (Matrix.of(context).isMultiAccount &&
|
||||
Matrix.of(context).hasComplexBundles &&
|
||||
Matrix.of(context).currentBundle!.length > 1)
|
||||
Container(
|
||||
width: height,
|
||||
height: height,
|
||||
alignment: Alignment.center,
|
||||
child: _ChatAccountPicker(controller),
|
||||
),
|
||||
Expanded(
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.symmetric(vertical: 0.0),
|
||||
|
|
|
|||
|
|
@ -2,11 +2,15 @@ import 'dart:async';
|
|||
import 'dart:developer';
|
||||
import 'dart:io';
|
||||
|
||||
import 'package:fluffychat/config/app_config.dart';
|
||||
import 'package:fluffychat/config/themes.dart';
|
||||
import 'package:fluffychat/pangea/widgets/chat/message_audio_card.dart';
|
||||
import 'package:fluffychat/utils/error_reporter.dart';
|
||||
import 'package:fluffychat/utils/localized_exception_extension.dart';
|
||||
import 'package:fluffychat/utils/url_launcher.dart';
|
||||
import 'package:flutter/foundation.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_linkify/flutter_linkify.dart';
|
||||
import 'package:just_audio/just_audio.dart';
|
||||
import 'package:matrix/matrix.dart';
|
||||
import 'package:opus_caf_converter_dart/opus_caf_converter_dart.dart';
|
||||
|
|
@ -16,20 +20,20 @@ import '../../../utils/matrix_sdk_extensions/event_extension.dart';
|
|||
|
||||
class AudioPlayerWidget extends StatefulWidget {
|
||||
final Color color;
|
||||
final double fontSize;
|
||||
// #Pangea
|
||||
// final Event event;
|
||||
final Event? event;
|
||||
final PangeaAudioFile? matrixFile;
|
||||
final bool autoplay;
|
||||
final Function(bool)? setIsPlayingAudio;
|
||||
final double fontSize;
|
||||
// Pangea#
|
||||
|
||||
static String? currentId;
|
||||
|
||||
// #Pangea
|
||||
static const int wavesCount = 40;
|
||||
|
||||
// #Pangea
|
||||
final int? sectionStartMS;
|
||||
final int? sectionEndMS;
|
||||
// Pangea#
|
||||
|
|
@ -37,13 +41,13 @@ class AudioPlayerWidget extends StatefulWidget {
|
|||
const AudioPlayerWidget(
|
||||
this.event, {
|
||||
this.color = Colors.black,
|
||||
required this.fontSize,
|
||||
// #Pangea
|
||||
this.matrixFile,
|
||||
this.autoplay = false,
|
||||
this.sectionStartMS,
|
||||
this.sectionEndMS,
|
||||
this.setIsPlayingAudio,
|
||||
this.fontSize = 12,
|
||||
// Pangea#
|
||||
super.key,
|
||||
});
|
||||
|
|
@ -64,8 +68,8 @@ class AudioPlayerState extends State<AudioPlayerWidget> {
|
|||
StreamSubscription? onPlayerError;
|
||||
|
||||
String? statusText;
|
||||
int currentPosition = 0;
|
||||
double maxPosition = 0;
|
||||
double currentPosition = 0;
|
||||
double maxPosition = 1;
|
||||
|
||||
MatrixFile? matrixFile;
|
||||
File? audioFile;
|
||||
|
|
@ -83,23 +87,13 @@ class AudioPlayerState extends State<AudioPlayerWidget> {
|
|||
super.dispose();
|
||||
}
|
||||
|
||||
// #Pangea
|
||||
// @override
|
||||
// void didUpdateWidget(covariant oldWidget) {
|
||||
// if ((oldWidget.sectionEndMS != widget.sectionEndMS) ||
|
||||
// (oldWidget.sectionStartMS != widget.sectionStartMS)) {
|
||||
// debugPrint('selection changed');
|
||||
// if (widget.sectionStartMS != null) {
|
||||
// audioPlayer?.seek(Duration(milliseconds: widget.sectionStartMS!));
|
||||
// audioPlayer?.play();
|
||||
// } else {
|
||||
// audioPlayer?.stop();
|
||||
// audioPlayer?.seek(null);
|
||||
// }
|
||||
// }
|
||||
// super.didUpdateWidget(oldWidget);
|
||||
// }
|
||||
// Pangea#
|
||||
void _startAction() {
|
||||
if (status == AudioPlayerStatus.downloaded) {
|
||||
_playAction();
|
||||
} else {
|
||||
_downloadAction();
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _downloadAction() async {
|
||||
// #Pangea
|
||||
|
|
@ -185,20 +179,9 @@ class AudioPlayerState extends State<AudioPlayerWidget> {
|
|||
setState(() {
|
||||
statusText =
|
||||
'${state.inMinutes.toString().padLeft(2, '0')}:${(state.inSeconds % 60).toString().padLeft(2, '0')}';
|
||||
currentPosition = ((state.inMilliseconds.toDouble() / maxPosition) *
|
||||
AudioPlayerWidget.wavesCount)
|
||||
.round();
|
||||
currentPosition = state.inMilliseconds.toDouble();
|
||||
});
|
||||
// #Pangea
|
||||
// if (widget.sectionStartMS != null &&
|
||||
// widget.sectionEndMS != null &&
|
||||
// state.inMilliseconds.toDouble() >= widget.sectionEndMS!) {
|
||||
// audioPlayer.stop();
|
||||
// audioPlayer.seek(Duration(milliseconds: widget.sectionStartMS!));
|
||||
// } else
|
||||
if (state.inMilliseconds.toDouble() == maxPosition) {
|
||||
// if (state.inMilliseconds.toDouble() == maxPosition) {
|
||||
// Pangea#
|
||||
audioPlayer.stop();
|
||||
audioPlayer.seek(null);
|
||||
}
|
||||
|
|
@ -237,11 +220,6 @@ class AudioPlayerState extends State<AudioPlayerWidget> {
|
|||
}
|
||||
// Pangea#
|
||||
}
|
||||
// #Pangea
|
||||
// if (widget.sectionStartMS != null) {
|
||||
// audioPlayer.seek(Duration(milliseconds: widget.sectionStartMS!));
|
||||
// }
|
||||
// Pangea#
|
||||
audioPlayer.play().onError(
|
||||
ErrorReporter(context, 'Unable to play audio message')
|
||||
.onErrorCallback,
|
||||
|
|
@ -267,7 +245,7 @@ class AudioPlayerState extends State<AudioPlayerWidget> {
|
|||
return '${duration.inMinutes.toString().padLeft(2, '0')}:${(duration.inSeconds % 60).toString().padLeft(2, '0')}';
|
||||
}
|
||||
|
||||
List<int> _getWaveform() {
|
||||
List<int>? _getWaveform() {
|
||||
// #Pangea
|
||||
final eventWaveForm = widget.matrixFile?.waveform ??
|
||||
widget.event?.content
|
||||
|
|
@ -278,7 +256,7 @@ class AudioPlayerState extends State<AudioPlayerWidget> {
|
|||
// ?.tryGetList<int>('waveform');
|
||||
// Pangea#
|
||||
if (eventWaveForm == null || eventWaveForm.isEmpty) {
|
||||
return List<int>.filled(AudioPlayerWidget.wavesCount, 500);
|
||||
return null;
|
||||
}
|
||||
while (eventWaveForm.length < AudioPlayerWidget.wavesCount) {
|
||||
for (var i = 0; i < eventWaveForm.length; i = i + 2) {
|
||||
|
|
@ -294,7 +272,7 @@ class AudioPlayerState extends State<AudioPlayerWidget> {
|
|||
return eventWaveForm.map((i) => i > 1024 ? 1024 : i).toList();
|
||||
}
|
||||
|
||||
late final List<int> waveform;
|
||||
late final List<int>? _waveform;
|
||||
|
||||
void _toggleSpeed() async {
|
||||
final audioPlayer = this.audioPlayer;
|
||||
|
|
@ -339,7 +317,7 @@ class AudioPlayerState extends State<AudioPlayerWidget> {
|
|||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
waveform = _getWaveform();
|
||||
_waveform = _getWaveform();
|
||||
// #Pangea
|
||||
if (widget.matrixFile != null) {
|
||||
_downloadMatrixFile().then((_) {
|
||||
|
|
@ -357,189 +335,181 @@ class AudioPlayerState extends State<AudioPlayerWidget> {
|
|||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final theme = Theme.of(context);
|
||||
final waveform = _waveform;
|
||||
|
||||
final statusText = this.statusText ??= _durationString ?? '00:00';
|
||||
final audioPlayer = this.audioPlayer;
|
||||
|
||||
// #Pangea
|
||||
final msPerWave = (maxPosition / AudioPlayerWidget.wavesCount);
|
||||
final int? startWave = widget.sectionStartMS != null && msPerWave > 0
|
||||
? (widget.sectionStartMS! / msPerWave).floor()
|
||||
: null;
|
||||
final int? endWave = widget.sectionEndMS != null && msPerWave > 0
|
||||
? (widget.sectionEndMS! / msPerWave).ceil()
|
||||
: null;
|
||||
// Pangea#
|
||||
final body = widget.event?.content.tryGet<String>('body') ??
|
||||
widget.event?.content.tryGet<String>('filename');
|
||||
final displayBody = body != null &&
|
||||
body.isNotEmpty &&
|
||||
widget.event?.content['org.matrix.msc1767.audio'] == null;
|
||||
|
||||
final wavePosition =
|
||||
(currentPosition / maxPosition) * AudioPlayerWidget.wavesCount;
|
||||
|
||||
final fontSize = 12 * AppConfig.fontSizeFactor;
|
||||
|
||||
return Padding(
|
||||
// #Pangea
|
||||
// padding: const EdgeInsets.all(12.0),
|
||||
padding: const EdgeInsets.all(5.0),
|
||||
// Pangea#
|
||||
child: Row(
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: <Widget>[
|
||||
SizedBox(
|
||||
width: buttonSize,
|
||||
height: buttonSize,
|
||||
child: status == AudioPlayerStatus.downloading
|
||||
? CircularProgressIndicator(strokeWidth: 2, color: widget.color)
|
||||
: InkWell(
|
||||
borderRadius: BorderRadius.circular(64),
|
||||
child: Material(
|
||||
color: widget.color.withAlpha(64),
|
||||
borderRadius: BorderRadius.circular(64),
|
||||
child: Icon(
|
||||
audioPlayer?.playerState.playing == true
|
||||
? Icons.pause_outlined
|
||||
: Icons.play_arrow_outlined,
|
||||
color: widget.color,
|
||||
),
|
||||
),
|
||||
// #Pangea
|
||||
// onLongPress: () => widget.event.saveFile(context),
|
||||
onLongPress: () => widget.event?.saveFile(context),
|
||||
// Pangea#
|
||||
onTap: () {
|
||||
if (status == AudioPlayerStatus.downloaded) {
|
||||
_playAction();
|
||||
} else {
|
||||
_downloadAction();
|
||||
}
|
||||
},
|
||||
),
|
||||
),
|
||||
// #Pangea
|
||||
// const SizedBox(width: 8),
|
||||
const SizedBox(width: 5),
|
||||
// Row(
|
||||
// mainAxisSize: MainAxisSize.min,
|
||||
// children: [
|
||||
// for (var i = 0; i < AudioPlayerWidget.wavesCount; i++)
|
||||
// GestureDetector(
|
||||
// onTapDown: (_) => audioPlayer?.seek(
|
||||
// Duration(
|
||||
// milliseconds:
|
||||
// (maxPosition / AudioPlayerWidget.wavesCount).round() *
|
||||
// i,
|
||||
// ),
|
||||
// ),
|
||||
// child: Container(
|
||||
// height: 32,
|
||||
// color: widget.color.withAlpha(0),
|
||||
// alignment: Alignment.center,
|
||||
// child: Opacity(
|
||||
// opacity: currentPosition > i ? 1 : 0.5,
|
||||
// child: Container(
|
||||
// margin: const EdgeInsets.symmetric(horizontal: 1),
|
||||
// decoration: BoxDecoration(
|
||||
// color: widget.color,
|
||||
// borderRadius: BorderRadius.circular(2),
|
||||
// ),
|
||||
// // #Pangea
|
||||
// // width: 2,
|
||||
// width: 1,
|
||||
// // Pangea#
|
||||
// height: 32 * (waveform[i] / 1024),
|
||||
// ),
|
||||
// ),
|
||||
// ),
|
||||
// ),
|
||||
// ],
|
||||
// ),
|
||||
// const SizedBox(width: 8),
|
||||
Row(
|
||||
children: [
|
||||
for (var i = 0; i < AudioPlayerWidget.wavesCount; i++)
|
||||
Builder(
|
||||
builder: (context) {
|
||||
final double barOpacity = currentPosition > i ? 1 : 0.5;
|
||||
return GestureDetector(
|
||||
onTapDown: (_) {
|
||||
audioPlayer?.seek(
|
||||
Duration(
|
||||
milliseconds:
|
||||
(maxPosition / AudioPlayerWidget.wavesCount)
|
||||
.round() *
|
||||
i,
|
||||
),
|
||||
);
|
||||
},
|
||||
child: Stack(
|
||||
children: [
|
||||
Container(
|
||||
margin: const EdgeInsets.symmetric(
|
||||
horizontal: 0.5,
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
ConstrainedBox(
|
||||
constraints:
|
||||
const BoxConstraints(maxWidth: FluffyThemes.columnWidth),
|
||||
child: Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: <Widget>[
|
||||
SizedBox(
|
||||
width: buttonSize,
|
||||
height: buttonSize,
|
||||
child: status == AudioPlayerStatus.downloading
|
||||
? CircularProgressIndicator(
|
||||
strokeWidth: 2,
|
||||
color: widget.color,
|
||||
)
|
||||
: InkWell(
|
||||
borderRadius: BorderRadius.circular(64),
|
||||
// #Pangea
|
||||
// onLongPress: () => widget.event.saveFile(context),
|
||||
onLongPress: () => widget.event?.saveFile(context),
|
||||
// Pangea#
|
||||
onTap: _startAction,
|
||||
child: Material(
|
||||
color: widget.color.withAlpha(64),
|
||||
borderRadius: BorderRadius.circular(64),
|
||||
child: Icon(
|
||||
audioPlayer?.playerState.playing == true
|
||||
? Icons.pause_outlined
|
||||
: Icons.play_arrow_outlined,
|
||||
color: widget.color,
|
||||
),
|
||||
decoration: BoxDecoration(
|
||||
color: widget.color.withOpacity(barOpacity),
|
||||
borderRadius: BorderRadius.circular(2),
|
||||
),
|
||||
height: 32 * (waveform[i] / 1024),
|
||||
width: 3,
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
// return Container(
|
||||
// height: 32,
|
||||
// width: 2,
|
||||
// alignment: Alignment.center,
|
||||
// child: Opacity(
|
||||
// opacity: barOpacity,
|
||||
// child: Container(
|
||||
// margin: const EdgeInsets.symmetric(
|
||||
// horizontal: 1,
|
||||
// ),
|
||||
// decoration: BoxDecoration(
|
||||
// color: widget.color,
|
||||
// borderRadius: BorderRadius.circular(2),
|
||||
// ),
|
||||
// height: 32 * (waveform[i] / 1024),
|
||||
// width: 2,
|
||||
// ),
|
||||
// ),
|
||||
// );
|
||||
},
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
const SizedBox(width: 5),
|
||||
// SizedBox(
|
||||
// width: 36,
|
||||
// child:
|
||||
// Pangea#
|
||||
Text(
|
||||
statusText,
|
||||
style: TextStyle(
|
||||
color: widget.color,
|
||||
fontSize: 12,
|
||||
const SizedBox(width: 8),
|
||||
Expanded(
|
||||
child: Stack(
|
||||
children: [
|
||||
if (waveform != null)
|
||||
Padding(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 16.0),
|
||||
child: Row(
|
||||
children: [
|
||||
for (var i = 0;
|
||||
i < AudioPlayerWidget.wavesCount;
|
||||
i++)
|
||||
Expanded(
|
||||
child: Container(
|
||||
height: 32,
|
||||
alignment: Alignment.center,
|
||||
child: Container(
|
||||
margin: const EdgeInsets.symmetric(
|
||||
horizontal: 1,
|
||||
),
|
||||
decoration: BoxDecoration(
|
||||
color: i < wavePosition
|
||||
? widget.color
|
||||
: widget.color.withAlpha(128),
|
||||
borderRadius: BorderRadius.circular(64),
|
||||
),
|
||||
height: 32 * (waveform[i] / 1024),
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
SizedBox(
|
||||
height: 32,
|
||||
child: Slider(
|
||||
thumbColor: widget.event?.senderId ==
|
||||
widget.event?.room.client.userID
|
||||
? theme.colorScheme.onPrimary
|
||||
: theme.colorScheme.primary,
|
||||
activeColor: waveform == null
|
||||
? widget.color
|
||||
: Colors.transparent,
|
||||
inactiveColor: waveform == null
|
||||
? widget.color.withAlpha(128)
|
||||
: Colors.transparent,
|
||||
max: maxPosition,
|
||||
value: currentPosition,
|
||||
onChanged: (position) => audioPlayer == null
|
||||
? _startAction()
|
||||
: audioPlayer.seek(
|
||||
Duration(milliseconds: position.round()),
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
// #Pangea
|
||||
// const SizedBox(width: 8),
|
||||
const SizedBox(width: 5),
|
||||
// SizedBox(
|
||||
// width: 36,
|
||||
// child:
|
||||
// Pangea#
|
||||
Text(
|
||||
statusText,
|
||||
style: TextStyle(
|
||||
color: widget.color,
|
||||
fontSize: 12,
|
||||
),
|
||||
),
|
||||
// #Pangea
|
||||
// ),
|
||||
// const SizedBox(width: 8),
|
||||
// Badge(
|
||||
// isLabelVisible: audioPlayer != null,
|
||||
// label: audioPlayer == null
|
||||
// ? null
|
||||
// : Text(
|
||||
// '${audioPlayer.speed.toString()}x',
|
||||
// ),
|
||||
// backgroundColor: theme.colorScheme.secondary,
|
||||
// textColor: theme.colorScheme.onSecondary,
|
||||
// child: InkWell(
|
||||
// splashColor: widget.color.withAlpha(128),
|
||||
// borderRadius: BorderRadius.circular(64),
|
||||
// onTap: audioPlayer == null ? null : _toggleSpeed,
|
||||
// child: Icon(
|
||||
// Icons.mic_none_outlined,
|
||||
// color: widget.color,
|
||||
// ),
|
||||
// ),
|
||||
// ),
|
||||
// const SizedBox(width: 8),
|
||||
// Pangea#
|
||||
],
|
||||
),
|
||||
),
|
||||
// #Pangea
|
||||
// ),
|
||||
// const SizedBox(width: 8),
|
||||
// Badge(
|
||||
// isLabelVisible: audioPlayer != null,
|
||||
// label: audioPlayer == null
|
||||
// ? null
|
||||
// : Text(
|
||||
// '${audioPlayer.speed.toString()}x',
|
||||
// ),
|
||||
// backgroundColor: theme.colorScheme.secondary,
|
||||
// textColor: theme.colorScheme.onSecondary,
|
||||
// child: InkWell(
|
||||
// splashColor: widget.color.withAlpha(128),
|
||||
// borderRadius: BorderRadius.circular(64),
|
||||
// onTap: audioPlayer == null ? null : _toggleSpeed,
|
||||
// child: Icon(
|
||||
// Icons.mic_none_outlined,
|
||||
// color: widget.color,
|
||||
// ),
|
||||
// ),
|
||||
// ),
|
||||
// const SizedBox(width: 8),
|
||||
// Pangea#
|
||||
if (displayBody) ...[
|
||||
const SizedBox(height: 8),
|
||||
Linkify(
|
||||
text: body,
|
||||
style: TextStyle(
|
||||
color: widget.color,
|
||||
fontSize: fontSize,
|
||||
),
|
||||
options: const LinkifyOptions(humanize: false),
|
||||
linkStyle: TextStyle(
|
||||
color: widget.color.withAlpha(150),
|
||||
fontSize: fontSize,
|
||||
decoration: TextDecoration.underline,
|
||||
decorationColor: widget.color.withAlpha(150),
|
||||
),
|
||||
onOpen: (url) => UrlLauncher(context, url.url).launchUrl(),
|
||||
),
|
||||
],
|
||||
],
|
||||
),
|
||||
);
|
||||
|
|
@ -584,4 +554,4 @@ class BytesAudioSource extends StreamAudioSource {
|
|||
);
|
||||
}
|
||||
}
|
||||
// Pangea#
|
||||
// Pangea#
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@ import 'package:fluffychat/utils/platform_infos.dart';
|
|||
import 'package:fluffychat/utils/show_update_snackbar.dart';
|
||||
import 'package:fluffychat/utils/tor_stub.dart'
|
||||
if (dart.library.html) 'package:tor_detector_web/tor_detector_web.dart';
|
||||
import 'package:fluffychat/utils/url_launcher.dart';
|
||||
import 'package:fluffychat/widgets/avatar.dart';
|
||||
import 'package:fluffychat/widgets/future_loading_dialog.dart';
|
||||
import 'package:flutter/foundation.dart';
|
||||
|
|
@ -34,7 +35,6 @@ import 'package:uni_links/uni_links.dart';
|
|||
|
||||
import '../../../utils/account_bundles.dart';
|
||||
import '../../config/setting_keys.dart';
|
||||
import '../../utils/url_launcher.dart';
|
||||
import '../../utils/voip/callkeep_manager.dart';
|
||||
import '../../widgets/fluffy_chat_app.dart';
|
||||
import '../../widgets/matrix.dart';
|
||||
|
|
|
|||
|
|
@ -34,16 +34,16 @@ class ChatPermissionsSettingsView extends StatelessWidget {
|
|||
final powerLevelsContent = Map<String, Object?>.from(
|
||||
room.getState(EventTypes.RoomPowerLevels)?.content ?? {},
|
||||
);
|
||||
final powerLevels = Map<String, dynamic>.from(powerLevelsContent)
|
||||
// #Pangea
|
||||
// ..removeWhere((k, v) => v is! int);
|
||||
..removeWhere(
|
||||
(k, v) =>
|
||||
v is! int ||
|
||||
k.equals("m.call.invite") ||
|
||||
k.equals("historical") ||
|
||||
k.equals("state_default"),
|
||||
);
|
||||
final powerLevels =
|
||||
Map<String, dynamic>.from(powerLevelsContent) // #Pangea
|
||||
// ..removeWhere((k, v) => v is! int);
|
||||
..removeWhere(
|
||||
(k, v) =>
|
||||
v is! int ||
|
||||
k.equals("m.call.invite") ||
|
||||
k.equals("historical") ||
|
||||
k.equals("state_default"),
|
||||
);
|
||||
// Pangea#
|
||||
final eventsPowerLevels = Map<String, int?>.from(
|
||||
powerLevelsContent.tryGetMap<String, int?>('events') ?? {},
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
import 'package:adaptive_dialog/adaptive_dialog.dart';
|
||||
import 'package:collection/collection.dart';
|
||||
import 'package:fluffychat/pangea/utils/logout.dart';
|
||||
import 'package:fluffychat/utils/file_selector.dart';
|
||||
import 'package:fluffychat/utils/platform_infos.dart';
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
import 'package:adaptive_dialog/adaptive_dialog.dart';
|
||||
import 'package:archive/archive.dart'
|
||||
if (dart.library.io) 'package:archive/archive_io.dart';
|
||||
import 'package:collection/collection.dart';
|
||||
import 'package:fluffychat/utils/client_manager.dart';
|
||||
import 'package:fluffychat/utils/file_selector.dart';
|
||||
import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_file_extension.dart';
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ import 'package:url_launcher/url_launcher_string.dart';
|
|||
import '../../widgets/matrix.dart';
|
||||
import 'settings_homeserver.dart';
|
||||
|
||||
/// MERGE TODO
|
||||
class SettingsHomeserverView extends StatelessWidget {
|
||||
final SettingsHomeserverController controller;
|
||||
|
||||
|
|
|
|||
|
|
@ -197,6 +197,8 @@ class MessageAudioCardState extends State<MessageAudioCard> {
|
|||
sectionEndMS: sectionEndMS,
|
||||
color: Theme.of(context).colorScheme.onPrimaryContainer,
|
||||
setIsPlayingAudio: widget.setIsPlayingAudio,
|
||||
fontSize:
|
||||
AppConfig.messageFontSize * AppConfig.fontSizeFactor,
|
||||
)
|
||||
: const CardErrorWidget(
|
||||
error: "Null audio file in message_audio_card",
|
||||
|
|
|
|||
|
|
@ -14,15 +14,7 @@ class ErrorReporter {
|
|||
// #Pangea
|
||||
try {
|
||||
// Attempt to retrieve the L10n instance using the current context
|
||||
final L10n? l10n = L10n.of(context);
|
||||
|
||||
// Check if the L10n instance is null
|
||||
if (l10n == null) {
|
||||
// Log an error message saying that the localization object is null
|
||||
Logs().e('Localization object is null, cannot show error message.');
|
||||
// Exits early to prevent further execution
|
||||
return;
|
||||
}
|
||||
final L10n l10n = L10n.of(context);
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
SnackBar(
|
||||
content: Text(
|
||||
|
|
|
|||
|
|
@ -268,7 +268,7 @@ Future<void> _tryPushHelper(
|
|||
ticker: event.calcLocalizedBodyFallback(
|
||||
matrixLocals,
|
||||
plaintextBody: true,
|
||||
withSenderNamePrefix: true,
|
||||
withSenderNamePrefix: !event.room.isDirectChat,
|
||||
hideReply: true,
|
||||
hideEdit: true,
|
||||
removeMarkdown: true,
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@
|
|||
#include <flutter_secure_storage_linux/flutter_secure_storage_linux_plugin.h>
|
||||
#include <flutter_webrtc/flutter_web_r_t_c_plugin.h>
|
||||
#include <handy_window/handy_window_plugin.h>
|
||||
#include <open_file_linux/open_file_linux_plugin.h>
|
||||
#include <pasteboard/pasteboard_plugin.h>
|
||||
#include <record_linux/record_linux_plugin.h>
|
||||
#include <sentry_flutter/sentry_flutter_plugin.h>
|
||||
|
|
@ -38,6 +39,9 @@ void fl_register_plugins(FlPluginRegistry* registry) {
|
|||
g_autoptr(FlPluginRegistrar) handy_window_registrar =
|
||||
fl_plugin_registry_get_registrar_for_plugin(registry, "HandyWindowPlugin");
|
||||
handy_window_plugin_register_with_registrar(handy_window_registrar);
|
||||
g_autoptr(FlPluginRegistrar) open_file_linux_registrar =
|
||||
fl_plugin_registry_get_registrar_for_plugin(registry, "OpenFileLinuxPlugin");
|
||||
open_file_linux_plugin_register_with_registrar(open_file_linux_registrar);
|
||||
g_autoptr(FlPluginRegistrar) pasteboard_registrar =
|
||||
fl_plugin_registry_get_registrar_for_plugin(registry, "PasteboardPlugin");
|
||||
pasteboard_plugin_register_with_registrar(pasteboard_registrar);
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ list(APPEND FLUTTER_PLUGIN_LIST
|
|||
flutter_secure_storage_linux
|
||||
flutter_webrtc
|
||||
handy_window
|
||||
open_file_linux
|
||||
pasteboard
|
||||
record_linux
|
||||
sentry_flutter
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@ import in_app_purchase_storekit
|
|||
import just_audio
|
||||
import macos_ui
|
||||
import macos_window_utils
|
||||
import open_file_mac
|
||||
import package_info_plus
|
||||
import pasteboard
|
||||
import path_provider_foundation
|
||||
|
|
@ -34,7 +35,7 @@ import rive_common
|
|||
import sentry_flutter
|
||||
import share_plus
|
||||
import shared_preferences_foundation
|
||||
import sqflite
|
||||
import sqflite_darwin
|
||||
import sqlcipher_flutter_libs
|
||||
import text_to_speech_macos
|
||||
import url_launcher_macos
|
||||
|
|
@ -64,6 +65,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
|
|||
JustAudioPlugin.register(with: registry.registrar(forPlugin: "JustAudioPlugin"))
|
||||
MacOSUiPlugin.register(with: registry.registrar(forPlugin: "MacOSUiPlugin"))
|
||||
MacOSWindowUtilsPlugin.register(with: registry.registrar(forPlugin: "MacOSWindowUtilsPlugin"))
|
||||
OpenFilePlugin.register(with: registry.registrar(forPlugin: "OpenFilePlugin"))
|
||||
FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))
|
||||
PasteboardPlugin.register(with: registry.registrar(forPlugin: "PasteboardPlugin"))
|
||||
PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
|
||||
|
|
|
|||
561
pubspec.lock
561
pubspec.lock
File diff suppressed because it is too large
Load diff
Loading…
Add table
Reference in a new issue