Compare commits

...

204 commits

Author SHA1 Message Date
ae2a6b8b32 feature/prepare-1.6.4-22-release (#135)
All checks were successful
/ build (push) Successful in 4m46s
Reviewed-on: #135
2024-11-01 14:36:36 +00:00
dce3c916a2 chore(release): prepare release of 1.6.4.+22
All checks were successful
/ build (push) Successful in 4m19s
2024-11-01 15:31:20 +01:00
58141fe646 chore(deps,build): move to latest gradle wrapper and AGP, apply all possible updates
All checks were successful
/ build (push) Successful in 4m23s
2024-11-01 15:21:38 +01:00
dd5abc48f9 fix(deps): update all patch dependencies (#127)
All checks were successful
/ build (push) Successful in 4m27s
file_picker (source) 	dependencies 	patch 	8.0.3 -> 8.0.5
stacked 	dependencies 	patch 	3.4.2 -> 3.4.3
Co-authored-by: Renovate Bot <renovate@myservermanager.com>
Co-committed-by: Renovate Bot <renovate@myservermanager.com>
2024-07-01 07:16:42 +00:00
bf1f1e3295 chore(deps,ci): Updates and group renovate updates together
All checks were successful
/ build (push) Successful in 5m55s
2024-06-08 10:35:06 +02:00
e7463ffaef Upgrades #noissue
All checks were successful
/ build (push) Successful in 5m10s
2024-05-01 09:45:22 +02:00
ae454abb3a Update dependency url_launcher to v6.2.6 (#115)
All checks were successful
/ build (push) Successful in 5m19s
Co-authored-by: Renovate Bot <renovate@myservermanager.com>
Co-committed-by: Renovate Bot <renovate@myservermanager.com>
2024-04-28 14:29:09 +00:00
34bcd2ee92 Update ghcr.io/cirruslabs/flutter Docker tag to v3.19.6 (#116)
All checks were successful
/ build (push) Successful in 5m24s
Co-authored-by: Renovate Bot <renovate@myservermanager.com>
Co-committed-by: Renovate Bot <renovate@myservermanager.com>
2024-04-26 19:46:10 +00:00
d2485a91cd Upgrades #noissue
All checks were successful
/ build (push) Successful in 5m6s
2024-04-02 09:04:43 +02:00
e8c8808c0e Change Renovate schedule to be monthly #noissue
All checks were successful
/ build (push) Successful in 5m19s
2024-03-06 23:40:45 +01:00
b544003941 Update dependency provider to v6.1.2 (#98)
All checks were successful
/ build (push) Successful in 5m20s
Co-authored-by: Renovate Bot <renovate@myservermanager.com>
Co-committed-by: Renovate Bot <renovate@myservermanager.com>
2024-03-02 09:03:30 +00:00
5668c15547 Update ghcr.io/cirruslabs/flutter Docker tag to v3.19.2 (#99)
All checks were successful
/ build (push) Successful in 5m25s
Co-authored-by: Renovate Bot <renovate@myservermanager.com>
Co-committed-by: Renovate Bot <renovate@myservermanager.com>
2024-03-02 08:19:56 +00:00
7f145f6960 Some upgrades #noissue
All checks were successful
/ build (push) Successful in 5m23s
2024-02-26 22:56:03 +01:00
d0dd798008 Update dependency device_info_plus to v9.1.2 (#93)
All checks were successful
/ build (push) Successful in 5m55s
Co-authored-by: Renovate Bot <renovate@myservermanager.com>
Co-committed-by: Renovate Bot <renovate@myservermanager.com>
2024-02-05 23:07:48 +00:00
f16ee08079 Update dependency share_plus to v7.2.2 (#94)
All checks were successful
/ build (push) Successful in 5m40s
Co-authored-by: Renovate Bot <renovate@myservermanager.com>
Co-committed-by: Renovate Bot <renovate@myservermanager.com>
2024-02-05 22:14:38 +00:00
a4a3c2e5dc Build per-abi in fdroid fastlane script #noissue
All checks were successful
/ build (push) Successful in 5m33s
2024-02-05 22:52:45 +01:00
a5e9597207 Update dependency stacked to v3.4.2 (#92)
All checks were successful
/ build (push) Successful in 5m34s
Co-authored-by: Renovate Bot <renovate@myservermanager.com>
Co-committed-by: Renovate Bot <renovate@myservermanager.com>
2024-02-01 22:03:47 +00:00
f460c68339 Fix renovate schedule #noissue
All checks were successful
/ build (push) Successful in 5m33s
2024-01-26 13:46:49 +01:00
c7af6a874d Bump Flutter in pipeline; adapt renovate to provide separated pull requests for all dependencies and ignore intl and path as they are bound to underlying flutter version (or the test dependency) #noissue
All checks were successful
/ build (push) Successful in 5m31s
2024-01-26 09:28:02 +01:00
e0973735d8 Update dependencies
All checks were successful
/ build (push) Successful in 6m3s
2024-01-25 20:40:48 +01:00
dc715e38d1 Update all patch dependencies (#87)
All checks were successful
/ build (push) Successful in 6m5s
get_it 	dependencies 	patch 	7.6.4 -> 7.6.6
ghcr.io/cirruslabs/flutter 	container 	patch 	3.16.4 -> 3.16.6
url_launcher (source) 	dependencies 	patch 	6.2.2 -> 6.2.3
Co-authored-by: Renovate Bot <renovate@myservermanager.com>
Co-committed-by: Renovate Bot <renovate@myservermanager.com>
2024-01-10 22:16:53 +00:00
eb1d949af8 release/prepare-next-dev-cycle (#86)
All checks were successful
/ build (push) Successful in 5m17s
Reviewed-on: #86
2023-12-16 18:47:43 +00:00
4a715aba48 Prepare next dev cycle
All checks were successful
/ build (push) Successful in 5m42s
2023-12-16 19:37:55 +01:00
c48c16d63d release/1.6.3 (#85)
All checks were successful
/ build (push) Successful in 5m30s
Reviewed-on: #85
2023-12-16 18:29:59 +00:00
57db10e912 Prepare release of 1.6.3
All checks were successful
/ build (push) Successful in 5m43s
2023-12-16 19:23:38 +01:00
a4defff982 Fixed not receiving sharing intents, reduced renovate frequency (#84)
All checks were successful
/ build (push) Successful in 5m36s
2023-12-16 18:59:00 +01:00
3ae2c37813 Update ghcr.io/cirruslabs/flutter Docker tag to v3.16.4 (#83)
All checks were successful
/ build (push) Successful in 5m52s
Co-authored-by: Renovate Bot <renovate@myservermanager.com>
Co-committed-by: Renovate Bot <renovate@myservermanager.com>
2023-12-15 00:50:41 +00:00
d9b33feac9 Update dependency built_value_generator to v8.8.1 (#82)
All checks were successful
/ build (push) Successful in 5m30s
Co-authored-by: Renovate Bot <renovate@myservermanager.com>
Co-committed-by: Renovate Bot <renovate@myservermanager.com>
2023-12-12 21:55:16 +00:00
941b7c81ad Update dependency url_launcher to v6.2.2 (#81)
All checks were successful
/ build (push) Successful in 5m34s
Co-authored-by: Renovate Bot <renovate@myservermanager.com>
Co-committed-by: Renovate Bot <renovate@myservermanager.com>
2023-12-09 09:10:32 +00:00
5bc02638f7 Update ghcr.io/cirruslabs/flutter Docker tag to v3.16.3 (#80)
All checks were successful
/ build (push) Successful in 5m35s
Co-authored-by: Renovate Bot <renovate@myservermanager.com>
Co-committed-by: Renovate Bot <renovate@myservermanager.com>
2023-12-08 14:55:39 +00:00
477e557d31 Update ghcr.io/cirruslabs/flutter Docker tag to v3.16.2 (#78)
All checks were successful
/ build (push) Successful in 5m23s
Co-authored-by: Renovate Bot <renovate@myservermanager.com>
Co-committed-by: Renovate Bot <renovate@myservermanager.com>
2023-12-06 23:43:44 +00:00
c917e478a6 release/prepare-next-dev-cycle (#77)
All checks were successful
/ build (push) Successful in 5m42s
Reviewed-on: #77
2023-12-01 18:35:41 +00:00
8b96610fa6 Prepare next dev cycle #noissue
All checks were successful
/ build (push) Successful in 5m29s
2023-12-01 19:20:13 +01:00
df40808bd7 release/1.6.2+20 (#76)
All checks were successful
/ build (push) Successful in 5m57s
Reviewed-on: #76
2023-12-01 18:15:51 +00:00
dfc5772b93 Prepare release of 1.6.2+20 #noissue
All checks were successful
/ build (push) Successful in 5m32s
2023-12-01 19:09:33 +01:00
3d6ae1a9ef Update ghcr.io/cirruslabs/flutter Docker tag to v3.16.1 (#75)
All checks were successful
/ build (push) Successful in 5m14s
Co-authored-by: Renovate Bot <renovate@myservermanager.com>
Co-committed-by: Renovate Bot <renovate@myservermanager.com>
2023-11-29 21:08:49 +00:00
e49dd86347 Update dependency build_runner to v2.4.7 (#74)
All checks were successful
/ build (push) Successful in 5m24s
Co-authored-by: Renovate Bot <renovate@myservermanager.com>
Co-committed-by: Renovate Bot <renovate@myservermanager.com>
2023-11-28 21:46:18 +00:00
4cd6165d9b Update dependency http to v1.1.2 (#71)
All checks were successful
/ build (push) Successful in 5m24s
This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [http](https://github.com/dart-lang/http) | dependencies | patch | `1.1.0` -> `1.1.2` |
Co-authored-by: Renovate Bot <renovate@myservermanager.com>
Co-committed-by: Renovate Bot <renovate@myservermanager.com>
2023-11-27 18:48:53 +00:00
e661171fd2 Various improvements and #noissue
All checks were successful
/ build (push) Successful in 5m17s
- Bumped Android minSdk to 30 (Android 11)
- Fixed permission service not handling Android SDK 33 correctly
- Fixed permission service not being started during application start
2023-11-26 23:53:17 +01:00
c99df89cb0 Update transitive dependencies #noissue 2023-11-26 20:48:47 +01:00
03d61dcdd0 Merge pull request 'Update dependency package_info_plus to v5' (#73) from renovate/package_info_plus-5.x into develop
All checks were successful
/ build (push) Successful in 5m42s
Reviewed-on: #73
2023-11-26 19:34:57 +00:00
f2d1083620 Update dependency package_info_plus to v5
All checks were successful
/ build (push) Successful in 5m17s
2023-11-25 00:01:06 +00:00
b5694ae9c6 Merge pull request 'Update all minor dependencies' (#72) from renovate/all-minor-deps into develop
All checks were successful
/ build (push) Successful in 5m37s
Reviewed-on: #72
2023-11-24 23:32:04 +00:00
9dd84b20a9 Update all minor dependencies
All checks were successful
/ build (push) Successful in 5m31s
2023-11-24 23:01:08 +00:00
8bb310fb40 Update lock file #noissue
All checks were successful
/ build (push) Successful in 5m17s
2023-11-18 14:10:44 +01:00
47987b8dad Merge pull request 'Update ghcr.io/cirruslabs/flutter Docker tag to v3.16.0' (#70) from renovate/all-minor-deps into develop
All checks were successful
/ build (push) Successful in 5m18s
Reviewed-on: #70
2023-11-18 12:54:36 +00:00
3d68dcefab Update ghcr.io/cirruslabs/flutter Docker tag to v3.16.0
All checks were successful
/ build (push) Successful in 6m8s
2023-11-17 23:00:15 +00:00
b51131de8f Merge pull request 'Update dependency flutter_lints to v3' (#65) from renovate/flutter_lints-3.x into develop
All checks were successful
/ build (push) Successful in 5m0s
Reviewed-on: #65
2023-11-14 19:27:35 +00:00
7e871bb4b1 Fix flutter lints for next major version #noissue
All checks were successful
/ build (push) Successful in 5m5s
2023-11-14 20:22:12 +01:00
88b9d81bc2 Update dependency flutter_lints to v3
Some checks failed
/ build (push) Failing after 1m39s
2023-11-14 00:01:15 +00:00
7c7befe071 Merge pull request 'Update dependency file_picker to v6' (#61) from renovate/file_picker-6.x into develop
All checks were successful
/ build (push) Successful in 5m5s
Reviewed-on: #61
2023-11-13 23:30:24 +00:00
2461a02f9d Update dependency file_picker to v6
All checks were successful
/ build (push) Successful in 5m4s
2023-11-13 22:01:15 +00:00
15104d7e40 Renovate: bundle minor versions
All checks were successful
/ build (push) Successful in 5m7s
2023-11-13 21:54:08 +00:00
733f09baab Merge pull request 'Update dependency share_plus to v7.2.1' (#63) from renovate/share_plus-7.x into develop
All checks were successful
/ build (push) Successful in 4m56s
Reviewed-on: #63
2023-11-13 21:42:27 +00:00
1758eeed18 Update dependency share_plus to v7.2.1
All checks were successful
/ build (push) Successful in 4m58s
2023-11-12 17:01:17 +00:00
c9764e780b Merge pull request 'Update dependency provider to v6.1.1' (#69) from renovate/provider-6.x into develop
All checks were successful
/ build (push) Successful in 5m11s
Reviewed-on: #69
2023-11-12 16:06:07 +00:00
3754d71dec Update dependency provider to v6.1.1
All checks were successful
/ build (push) Successful in 5m0s
2023-11-10 23:01:11 +00:00
8904d49eb2 Merge pull request 'Update dependency package_info_plus to v4.2.0' (#62) from renovate/package_info_plus-4.x into develop
All checks were successful
/ build (push) Successful in 4m54s
Reviewed-on: #62
2023-11-07 00:18:34 +00:00
0e7bc55bef Update dependency package_info_plus to v4.2.0
All checks were successful
/ build (push) Successful in 4m58s
2023-10-31 08:01:12 +00:00
089d07846d Merge pull request 'Update dependency url_launcher to v6.2.1' (#67) from renovate/url_launcher-6.x into develop
All checks were successful
/ build (push) Successful in 4m38s
Reviewed-on: #67
2023-10-31 07:38:36 +00:00
3f64f86acf Update dependency url_launcher to v6.2.1
All checks were successful
/ build (push) Successful in 4m49s
2023-10-31 00:01:21 +00:00
7c91d8b6ca Merge pull request 'Update dependency built_value_generator to v8.7.0' (#68) from renovate/built_value_generator-8.x into develop
All checks were successful
/ build (push) Successful in 4m39s
Reviewed-on: #68
2023-10-30 23:07:49 +00:00
df1b038782 Update dependency built_value_generator to v8.7.0
All checks were successful
/ build (push) Successful in 4m43s
2023-10-30 23:01:11 +00:00
c9ef125abb Merge pull request 'Update ghcr.io/cirruslabs/flutter Docker tag to v3.13.9' (#66) from renovate/all-patch-deps into develop
All checks were successful
/ build (push) Successful in 4m58s
Reviewed-on: #66
2023-10-30 22:42:52 +00:00
5a8750b877 Update ghcr.io/cirruslabs/flutter Docker tag to v3.13.9
All checks were successful
/ build (push) Successful in 5m15s
2023-10-26 20:00:17 +00:00
8c10e42c0f Merge pull request 'Update all patch dependencies' (#64) from renovate/all-patch-deps into develop
All checks were successful
/ build (push) Successful in 4m47s
Reviewed-on: #64
2023-10-22 11:50:21 +00:00
96d8cbea99 Update all patch dependencies
All checks were successful
/ build (push) Successful in 5m16s
2023-10-20 22:01:12 +00:00
685b140135 Merge pull request 'Update dependency shared_preferences to v2.2.2' (#60) from renovate/all-patch-deps into develop
All checks were successful
/ build (push) Successful in 4m43s
Reviewed-on: #60
2023-10-12 07:48:57 +00:00
f51e781a9f Update dependency shared_preferences to v2.2.2
All checks were successful
/ build (push) Successful in 4m45s
2023-10-12 00:01:22 +00:00
16c1a597fc Merge pull request 'Update dependency permission_handler to v11.0.1' (#59) from renovate/all-patch-deps into develop
All checks were successful
/ build (push) Successful in 4m39s
Reviewed-on: #59
2023-10-08 11:14:45 +00:00
71ac72a6cc Update dependency permission_handler to v11.0.1
All checks were successful
/ build (push) Successful in 4m40s
2023-10-06 22:01:13 +00:00
0bc3ae1da8 Merge pull request 'Update ghcr.io/cirruslabs/flutter Docker tag to v3.13.6' (#58) from renovate/all-patch-deps into develop
All checks were successful
/ build (push) Successful in 5m4s
Reviewed-on: #58
2023-10-02 07:02:40 +00:00
fc5b8783d3 Update ghcr.io/cirruslabs/flutter Docker tag to v3.13.6
All checks were successful
/ build (push) Successful in 6m35s
2023-09-29 22:00:18 +00:00
5492fed0b5 Updated internal dependencies and moved progress indicator of Show Configuration into button #noissue
All checks were successful
/ build (push) Successful in 5m55s
2023-09-24 17:43:37 +02:00
30810868b2 Merge pull request 'Update all patch dependencies' (#57) from renovate/all-patch-deps into develop
All checks were successful
/ build (push) Successful in 5m24s
Reviewed-on: #57
2023-09-23 16:44:40 +00:00
a889a6fbee Update all patch dependencies
All checks were successful
/ build (push) Successful in 6m32s
2023-09-22 22:01:09 +00:00
36e5bcab1f Merge pull request 'Update dependency dynamic_color to v1.6.7' (#56) from renovate/all-patch-deps into develop
All checks were successful
/ build (push) Successful in 5m29s
Reviewed-on: #56
2023-09-16 07:09:22 +00:00
3b06c2b80b Update dependency dynamic_color to v1.6.7
All checks were successful
/ build (push) Successful in 5m19s
2023-09-15 10:01:11 +00:00
e4cfa81672 Merge pull request 'Update ghcr.io/cirruslabs/flutter Docker tag to v3.13.4' (#55) from renovate/all-patch-deps into develop
All checks were successful
/ build (push) Successful in 5m18s
Reviewed-on: #55
2023-09-14 16:22:19 +00:00
2837054383 Update ghcr.io/cirruslabs/flutter Docker tag to v3.13.4
All checks were successful
/ build (push) Successful in 5m51s
2023-09-14 10:00:21 +00:00
4deb9b92cb Merge pull request 'Update dependency permission_handler to v11' (#54) from renovate/permission_handler-11.x into develop
All checks were successful
/ build (push) Successful in 6m13s
Reviewed-on: #54
2023-09-11 17:13:37 +00:00
b0edda0432 Update dependency permission_handler to v11
All checks were successful
/ build (push) Successful in 6m9s
2023-09-11 09:01:11 +00:00
886632957d Merge pull request 'Update dependency permission_handler to v10.4.5' (#53) from renovate/all-patch-deps into develop
All checks were successful
/ build (push) Successful in 6m3s
Reviewed-on: #53
2023-09-06 22:08:45 +00:00
264609dff3 Update dependency permission_handler to v10.4.5
All checks were successful
/ build (push) Successful in 6m5s
2023-09-06 14:01:23 +00:00
d87796f47b Merge pull request 'Update dependency get_it to v7.6.4' (#52) from renovate/all-patch-deps into develop
All checks were successful
/ build (push) Successful in 6m10s
Reviewed-on: #52
2023-09-04 14:57:28 +00:00
42f40d52d2 Update dependency get_it to v7.6.4
All checks were successful
/ build (push) Successful in 6m5s
2023-09-04 14:01:23 +00:00
292660a970 Merge pull request 'Update dependency logger to v2.0.2' (#51) from renovate/all-patch-deps into develop
All checks were successful
/ build (push) Successful in 6m8s
Reviewed-on: #51
2023-09-04 00:08:04 +00:00
51e2c476c7 Update dependency logger to v2.0.2
All checks were successful
/ build (push) Successful in 6m1s
2023-09-03 22:01:17 +00:00
44cc8bac28 Merge pull request 'Update dependency flutter_sharing_intent to v1.1.0' (#50) from renovate/flutter_sharing_intent-1.x into develop
All checks were successful
/ build (push) Successful in 6m5s
Reviewed-on: #50
2023-09-03 08:18:45 +00:00
9b571fb1a4 Update dependency flutter_sharing_intent to v1.1.0
All checks were successful
/ build (push) Successful in 6m12s
2023-09-03 08:01:14 +00:00
d63ef288eb Merge pull request 'Update all patch dependencies' (#49) from renovate/all-patch-deps into develop
All checks were successful
/ build (push) Successful in 6m5s
Reviewed-on: #49
2023-08-31 21:47:36 +00:00
549b218922 Update all patch dependencies
All checks were successful
/ build (push) Successful in 6m5s
2023-08-31 20:01:12 +00:00
f61c5a4a1b Merge pull request 'Update dependency file_picker to v5.5.0' (#48) from renovate/file_picker-5.x into develop
All checks were successful
/ build (push) Successful in 6m28s
Reviewed-on: #48
2023-08-30 22:33:32 +00:00
a06bbf6751 Update dependency file_picker to v5.5.0
All checks were successful
/ build (push) Successful in 6m9s
2023-08-30 20:14:30 +00:00
e980f1ae53 Merge pull request 'Update all patch dependencies' (#47) from renovate/all-patch-deps into develop
All checks were successful
/ build (push) Successful in 6m1s
Reviewed-on: #47
2023-08-30 20:14:19 +00:00
66a5f4e9af Update all patch dependencies
All checks were successful
/ build (push) Successful in 5m56s
2023-08-30 16:01:16 +00:00
39b1465efc Merge pull request 'Update dependency flutter_lints to v2.0.3' (#46) from renovate/all-patch-deps into develop
All checks were successful
/ build (push) Successful in 6m2s
Reviewed-on: #46
2023-08-29 18:40:21 +00:00
22d096ae43 Update dependency flutter_lints to v2.0.3
All checks were successful
/ build (push) Successful in 6m6s
2023-08-29 18:01:20 +00:00
08d935284d Merge pull request 'Update dependency file_picker to v5.3.4' (#45) from renovate/all-patch-deps into develop
All checks were successful
/ build (push) Successful in 5m57s
Reviewed-on: #45
2023-08-29 06:39:29 +00:00
6b87873cc7 Update dependency file_picker to v5.3.4
All checks were successful
/ build (push) Successful in 6m4s
2023-08-26 00:01:18 +00:00
41987331b0 Merge pull request 'Update dependency built_value_generator to v8.6.2' (#44) from renovate/all-patch-deps into develop
All checks were successful
/ build (push) Successful in 5m58s
Reviewed-on: #44
2023-08-24 11:04:38 +00:00
f19d23a757 Update dependency built_value_generator to v8.6.2
All checks were successful
/ build (push) Successful in 6m45s
2023-08-24 09:01:25 +00:00
67076779a3 Upgrade Flutter to 3.13.0 and Dart to 3.1 #noissue (#43)
All checks were successful
/ build (push) Successful in 5m54s
Reviewed-on: #43
Co-authored-by: Varakh <varakh@varakh.de>
Co-committed-by: Varakh <varakh@varakh.de>
2023-08-17 21:56:23 +00:00
6d302c4392 Merge pull request 'Move to Forgejo as pipeline #noissue' (#41) from feature/move-to-forgejo into develop
All checks were successful
/ build (push) Successful in 5m56s
Reviewed-on: #41
2023-08-15 19:54:47 +00:00
53cd587a42 Update renovate.json
All checks were successful
/ build (push) Successful in 5m56s
2023-08-15 19:28:25 +00:00
769dd7e513 Move to Forgejo as pipeline and configure Renovate to update all patch dependencies in one PR #noissue
All checks were successful
/ build (push) Successful in 5m52s
2023-08-15 19:05:29 +00:00
a3ee146e25 Merge pull request 'Update dependency package_info_plus to v4.1.0' (#39) from renovate/package_info_plus-4.x into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #39
2023-08-10 18:53:51 +00:00
5e9947969e Update dependency package_info_plus to v4.1.0
All checks were successful
continuous-integration/drone/push Build is passing
2023-08-02 13:02:12 +00:00
689c8b4408 Update renovate config to align with recommendations #noissue
All checks were successful
continuous-integration/drone/push Build is passing
2023-07-28 21:36:47 +00:00
7cee219b19 Merge pull request 'Update ghcr.io/cirruslabs/flutter Docker tag to v3.12.0' (#34) from renovate/ghcr.io-cirruslabs-flutter-3.x into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #34
2023-07-27 19:24:16 +00:00
803cd11cc4 Upgrade docker image for pipeline #noissue
All checks were successful
continuous-integration/drone/push Build is passing
2023-07-27 21:12:56 +02:00
a99662af3c Update ghcr.io/cirruslabs/flutter Docker tag to v3.12.0
Some checks failed
continuous-integration/drone/push Build is failing
2023-07-27 18:17:48 +00:00
3d11fde4e9 Add back ignoring intl as it depends on underlying flutter engine #noissue
All checks were successful
continuous-integration/drone/push Build is passing
2023-07-27 18:17:18 +00:00
43cb6472f2 Remove ignoring intl for renovate #noissue
All checks were successful
continuous-integration/drone/push Build is passing
2023-07-27 07:15:53 +00:00
67dafa615f Merge pull request 'Update dependency logger to v2' (#36) from renovate/logger-2.x into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #36
2023-07-26 20:51:54 +00:00
fc0fe31b70 Fix signature change in upgraded logger #noissue
All checks were successful
continuous-integration/drone/push Build is passing
2023-07-26 22:42:51 +02:00
0e4dcbde22 Update dependency logger to v2
Some checks failed
continuous-integration/drone/push Build is failing
2023-07-26 19:01:45 +00:00
65a0a294a6 Merge pull request 'Update dependency http to v1' (#35) from renovate/http-1.x into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #35
2023-07-26 18:28:53 +00:00
548d02362b Update dependency http to v1
All checks were successful
continuous-integration/drone/push Build is passing
2023-07-26 07:01:45 +00:00
c50e9ec7ba Merge pull request 'Update dependency shared_preferences to v2.2.0' (#32) from renovate/shared_preferences-2.x into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #32
2023-07-26 06:24:09 +00:00
e5518b4ade Merge pull request 'Update dependency share_plus to v7.0.2' (#28) from renovate/share_plus-7.x into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #28
2023-07-26 06:24:01 +00:00
0b093302ec Merge pull request 'Update dependency json_serializable to v6.7.1' (#26) from renovate/json_serializable-6.x into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #26
2023-07-26 06:23:53 +00:00
4114feb56e Update dependency shared_preferences to v2.2.0
All checks were successful
continuous-integration/drone/push Build is passing
2023-07-25 23:01:56 +00:00
d8c9027509 Update dependency share_plus to v7.0.2
All checks were successful
continuous-integration/drone/push Build is passing
2023-07-25 23:01:52 +00:00
e1075f5725 Update dependency json_serializable to v6.7.1
All checks were successful
continuous-integration/drone/push Build is passing
2023-07-25 23:01:47 +00:00
b49f10c875 Merge pull request 'Update dependency stacked to v3.4.1' (#33) from renovate/stacked-3.x into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #33
2023-07-25 22:01:45 +00:00
494420cbd3 Merge pull request 'Update dependency logger to v1.4.0' (#30) from renovate/logger-1.x into develop
Some checks reported errors
continuous-integration/drone/push Build was killed
Reviewed-on: #30
2023-07-25 22:01:36 +00:00
aedc7f2bbb Merge pull request 'Update dependency flutter_lints to v2.0.2' (#25) from renovate/flutter_lints-2.x into develop
Some checks reported errors
continuous-integration/drone/push Build was killed
Reviewed-on: #25
2023-07-25 22:01:21 +00:00
9ac363070b Merge pull request 'Update dependency package_info_plus to v4.0.2' (#27) from renovate/package_info_plus-4.x into develop
Some checks reported errors
continuous-integration/drone/push Build was killed
Reviewed-on: #27
2023-07-25 22:01:10 +00:00
580099856f Merge pull request 'Update dependency url_launcher to v6.1.12' (#29) from renovate/url_launcher-6.x into develop
Some checks reported errors
continuous-integration/drone/push Build was killed
Reviewed-on: #29
2023-07-25 22:00:34 +00:00
d56d717de0 Merge pull request 'Update dependency file_picker to v5.3.3' (#24) from renovate/file_picker-5.x into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #24
2023-07-25 21:59:59 +00:00
3cf96ad5ab Update dependency stacked to v3.4.1
All checks were successful
continuous-integration/drone/push Build is passing
2023-07-25 17:02:38 +00:00
26d0e0851b Update dependency logger to v1.4.0
All checks were successful
continuous-integration/drone/push Build is passing
2023-07-25 17:02:29 +00:00
c772d950e2 Update dependency url_launcher to v6.1.12
All checks were successful
continuous-integration/drone/push Build is passing
2023-07-25 17:02:25 +00:00
0630035e45 Update dependency package_info_plus to v4.0.2
All checks were successful
continuous-integration/drone/push Build is passing
2023-07-25 17:02:17 +00:00
3fb46fc766 Update dependency flutter_lints to v2.0.2
All checks were successful
continuous-integration/drone/push Build is passing
2023-07-25 17:02:08 +00:00
53c65ce54f Update dependency file_picker to v5.3.3
All checks were successful
continuous-integration/drone/push Build is passing
2023-07-25 17:02:02 +00:00
9a1db51f23 Merge pull request 'Update dependency permission_handler to v10.4.3' (#31) from renovate/permission_handler-10.x into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #31
2023-07-25 16:19:36 +00:00
664b734544 Merge pull request 'Update dependency dynamic_color to v1.6.6' (#23) from renovate/dynamic_color-1.x into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #23
2023-07-25 06:02:38 +00:00
0e69e904b4 Update dependency permission_handler to v10.4.3
All checks were successful
continuous-integration/drone/push Build is passing
2023-07-25 05:53:58 +00:00
09b608a168 Update dependency dynamic_color to v1.6.6
All checks were successful
continuous-integration/drone/push Build is passing
2023-07-25 05:53:17 +00:00
091e344831 Merge pull request 'Update dependency built_value_generator to v8.6.1' (#21) from renovate/built_value_generator-8.x into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #21
2023-07-25 05:50:47 +00:00
0f9e8b398f Update dependency built_value_generator to v8.6.1
All checks were successful
continuous-integration/drone/push Build is passing
2023-07-25 05:40:26 +00:00
88d85257a7 Merge pull request 'Update dependency build_runner to v2.4.6' (#20) from renovate/build_runner-2.x into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #20
2023-07-25 05:36:06 +00:00
06566d3d6e Update dependency build_runner to v2.4.6
All checks were successful
continuous-integration/drone/push Build is passing
2023-07-25 05:25:33 +00:00
35bdd06f72 Merge pull request 'Configure Renovate' (#19) from renovate/configure into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #19
2023-07-25 05:23:40 +00:00
e59164e803 Ignore android and ios folders
All checks were successful
continuous-integration/drone/push Build is passing
2023-07-25 07:17:04 +02:00
eec38b455c Add renovate config
All checks were successful
continuous-integration/drone/push Build is passing
2023-07-25 07:12:13 +02:00
ee6230399a Add renovate.json
All checks were successful
continuous-integration/drone/push Build is passing
2023-07-25 05:04:32 +00:00
31d91bafc1 Remove renovate pipeline step #noissue
All checks were successful
continuous-integration/drone/push Build is passing
2023-07-25 07:00:55 +02:00
82f9ab5535 Merge pull request 'Add fdroid build instructions and fastlane script #noissue' (#18) from feature/add-izzy-on-droid into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #18
2023-07-24 21:51:24 +00:00
66493cff91 Add fdroid build instructions and fastlane script #noissue
All checks were successful
continuous-integration/drone/push Build is passing
2023-07-24 23:42:08 +02:00
210c3e7aa4 Add renovate pipeline step #noissue
All checks were successful
continuous-integration/drone/push Build is passing
2023-07-24 23:39:21 +02:00
d6b645112e Merge pull request 'feature/prepare-next-dev' (#16) from feature/prepare-next-dev into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #16
2023-05-29 14:23:17 +00:00
713d8f57be Bump version to next develop #noissue
All checks were successful
continuous-integration/drone/push Build is passing
2023-05-29 16:14:59 +02:00
bc777d4826 Add documentation for release with bundler and fastlane #noissue
All checks were successful
continuous-integration/drone/push Build is passing
2023-05-29 15:59:59 +02:00
ad9a3a15f5 Prepare next develop cycle #noissue
All checks were successful
continuous-integration/drone/push Build is passing
2023-05-29 15:47:12 +02:00
dbb4929939 Merge pull request 'Prepare release of 1.6.1+19' (#15) from develop into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #15
2023-05-29 13:43:26 +00:00
adb55fd73b Prepare release of latest develop
All checks were successful
continuous-integration/drone/push Build is passing
2023-05-29 15:35:47 +02:00
004133f0c0 Restore to initial state #noissue
All checks were successful
continuous-integration/drone/push Build is passing
2023-05-29 15:25:57 +02:00
67903d1331 Try out larger executor #noissue
Some checks reported errors
continuous-integration/drone/push Build was killed
2023-05-29 15:10:34 +02:00
0a0fbe039b Try out larger executor #noissue
Some checks reported errors
continuous-integration/drone/push Build encountered an error
2023-05-29 15:09:53 +02:00
6ef8a9daa0 Restore old state for pipeline #noissue
Some checks failed
continuous-integration/drone/push Build is failing
2023-05-29 15:04:37 +02:00
47b45a9084 Enforce runner #noissue
Some checks are pending
continuous-integration/drone/push Build is pending
2023-05-29 15:03:30 +02:00
06dab63e05 Enforce runner #noissue
Some checks reported errors
continuous-integration/drone/push Build was killed
2023-05-29 14:53:38 +02:00
9c331cf6d3 Enforce runner #noissue
Some checks reported errors
continuous-integration/drone/push Build was killed
2023-05-29 14:35:45 +02:00
40451dbabc Determine runner size #noissue
Some checks reported errors
continuous-integration/drone/push Build was killed
2023-05-29 14:26:27 +02:00
6bb4c177e2 Merge pull request 'Upgrade dependencies and minSdk version #noissue' (#14) from feature/upgrade-deps into develop
Some checks failed
continuous-integration/drone/push Build is failing
Reviewed-on: #14
2023-05-28 20:37:08 +00:00
81eb1af2bd Upgrade dependencies and minSdk version #noissue
Some checks reported errors
continuous-integration/drone/push Build was killed
2023-05-28 18:20:18 +02:00
3e7bc379f1 Only trigger main build pipeline for push and pull requests #noissue
All checks were successful
continuous-integration/drone/push Build is passing
2023-03-20 18:58:25 +01:00
e9929bd3c3 Remove drone signing and rename pipeline stage to build #noissue
All checks were successful
continuous-integration/drone/push Build is passing
2023-03-20 18:18:16 +01:00
9386661adb Enforce drone yml signing #noissue
All checks were successful
continuous-integration/drone/push Build is passing
2023-03-20 09:03:18 +01:00
46a6df9f80 Merge pull request 'Upgrade dependencies #noissue' (#13) from feature/upgrade-dependencies into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #13
2023-03-17 20:22:02 +00:00
577f9cd42c Upgrade dependencies #noissue
All checks were successful
continuous-integration/drone Build is passing
2023-03-17 21:10:41 +01:00
d8d89167a9 Merge pull request 'Prepare next dev cycle #noissue' (#12) from release/prepare-next-dev-cycle into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #12
2023-01-16 18:47:13 +00:00
6d75672add Prepare next dev cycle #noissue
All checks were successful
continuous-integration/drone/push Build is passing
2023-01-16 19:39:18 +01:00
fc88d5c22f Merge pull request 'bugfix/10-library-prevents-compile-and-wrong-color-in-login' (#11) from bugfix/10-library-prevents-compile-and-wrong-color-in-login into master
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/tag Build is passing
Reviewed-on: #11
2023-01-16 18:32:59 +00:00
a2ee915463 #10 Adapt changelog
All checks were successful
continuous-integration/drone/push Build is passing
2023-01-16 19:22:35 +01:00
6e5fa0eaa8 #10 Increase semantic version
All checks were successful
continuous-integration/drone/push Build is passing
2023-01-16 19:14:56 +01:00
8c3bf06b87 10: update dependencies
All checks were successful
continuous-integration/drone/push Build is passing
2023-01-16 01:53:34 +01:00
5e9ac38ca0 10: Reformat code 2023-01-16 01:44:51 +01:00
a5dab51765 10: Fixed input colors in login view when using dark theme; Added removal of individual files selected for upload; Added size for individual files selected for upload; Replaced intent sharing library with flutter_sharing_intent 2023-01-16 01:43:37 +01:00
a65c7d9253 Merge pull request 'Added proper linting #noissue' (#9) from feature/implement-linting into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #9
2023-01-04 20:42:53 +00:00
bac39aebdf Update build runner #noissue
All checks were successful
continuous-integration/drone/push Build is passing
2023-01-04 21:23:21 +01:00
b55e932204 Added proper linting #noissue
All checks were successful
continuous-integration/drone/push Build is passing
2023-01-04 21:17:54 +01:00
f9a2bb0df7 Add license exception for app store distribution #noissue
All checks were successful
continuous-integration/drone/push Build is passing
2022-12-27 12:28:49 +01:00
a0789e6883 Prepare next dev cycle 1.5.2+18 #noissue
All checks were successful
continuous-integration/drone/push Build is passing
2022-12-16 22:57:10 +01:00
2e7778926a Release 1.5.1+17 #noissue
All checks were successful
continuous-integration/drone/tag Build is passing
2022-12-16 22:53:59 +01:00
c2c8ffc5c5 Prepare next dev cycle for 1.5.1+17 #noissue
All checks were successful
continuous-integration/drone/push Build is passing
2022-12-16 17:20:09 +01:00
b18d63ce1e Prepare release of 1.5.0+16 #noissue
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/tag Build is passing
2022-12-16 17:15:40 +01:00
06db805f82 Merge pull request 'Prepare release of 1.5.0+16 #7' (#8) from release/7-release-1.5.0+16 into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #8

Closes #7
2022-12-16 15:56:40 +00:00
3f927328f0 Prepare release of 1.5.0+16 #7
All checks were successful
continuous-integration/drone/push Build is passing
2022-12-16 16:50:22 +01:00
8d11584811 Merge pull request 'feature/5-use-material-3-material-you #2 #5' (#6) from feature/5-use-material-3-material-you into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #6

Closes #2 #5
2022-12-16 15:46:52 +00:00
db9fef6798 Adapt min dart sdk version for pipeline #5
All checks were successful
continuous-integration/drone/push Build is passing
2022-12-16 16:33:01 +01:00
6fedb8c661 Update dependencies and flutter 3.3, use Material You and remove unsupported swipe for Material You navigation bar #5
Some checks failed
continuous-integration/drone/push Build is failing
2022-12-16 16:30:07 +01:00
d3e54eb1d5 Merge pull request 'Update dependencies #noissue' (#5) from feature/update-dependencies into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #5
2022-08-17 15:26:26 +00:00
874d734c80 Update dependencies #noissue
All checks were successful
continuous-integration/drone Build is passing
2022-08-17 17:18:51 +02:00
a6cdd407c0 Update links for main git repository #noissue
All checks were successful
continuous-integration/drone/push Build is passing
2022-07-05 22:03:43 +02:00
583520ea7c Merge pull request 'Changed links for moving away from GitHub #noissue' (#3) from feature/move-away-from-github into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #3
2022-07-05 17:50:47 +00:00
77fee6ae32 Changed links for moving away from GitHub #noissue
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2022-07-05 18:58:27 +02:00
cd07b2fba2 Ensure pipeline uses same tested Flutter version
Some checks reported errors
continuous-integration/drone/push Build is passing
continuous-integration/drone Build is passing
continuous-integration/drone/tag Build was killed
2022-06-23 00:49:08 +02:00
011113d72b Reformat code with latest Flutter 3 linting 2022-06-23 00:44:08 +02:00
7ef179906d Increased target SDK to 33, Increased dart to 2.17.3, Indicate configuration loading in profile view 2022-06-23 00:42:37 +02:00
c8007e8415 Prepare next release cycle 1.4.2+16
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone Build is passing
2022-05-03 09:28:43 +02:00
79 changed files with 1653 additions and 1212 deletions

View file

@ -1,13 +0,0 @@
kind: pipeline
name: default
steps:
- name: build
image: cirrusci/flutter:stable
commands:
- flutter doctor
- flutter pub get
- flutter pub upgrade
- flutter packages pub run build_runner build --delete-conflicting-outputs
- flutter analyze --no-pub --no-current-package lib/
- flutter build apk --debug

View file

@ -0,0 +1,21 @@
on: [ push ]
jobs:
build:
runs-on: docker
container:
image: ghcr.io/cirruslabs/flutter:3.24.4
steps:
- name: Prepare requirements
run: |
apt-get update
apt-get install -y nodejs npm git
rm -rf /var/lib/apt/lists/*
- uses: actions/checkout@v3
- name: Build
run: |
flutter doctor
flutter pub get
flutter pub outdated
flutter packages pub run build_runner build --delete-conflicting-outputs
flutter analyze --no-pub --no-current-package lib/
flutter build apk --debug

1
.gitignore vendored
View file

@ -1,6 +1,7 @@
# Miscellaneous
*.class
*.lock
!Gemfile.lock
!pubspec.lock
*.log
*.pyc

View file

@ -1,5 +1,43 @@
# CHANGELOG
## 1.6.4+22 - 2024/11/01
* Dependency updates
* Internal build updates
## 1.6.3+21
* Fixed not receiving share requests from other applications
## 1.6.2+20
* Updated internal dependencies
* Moved progress indicator of _Show Configuration_ into the underlying button
* Bumped Android minSdk to `30` (Android 11)
* Bumped Android targetSdk to `34` (Android 14)
* Fixed permission service not handling Android SDK 33 correctly
* Fixed permission service not being started during application start
## 1.6.1+19
* Updated internal dependencies
## 1.6.0+18
* Fixed input colors in login view when using dark theme
* Added removal of individual files selected for upload
* Added size for individual files selected for upload
* Replaced intent sharing library with `flutter_sharing_intent`
* Added proper linting to project
## 1.5.1+17
* Fixed white background button in AppBar when light theme enabled
* Cleaned up login screen and added icon
## 1.5.0+16
* Switched to Material You defaulting to blue swatch colors respecting dark mode
* Switched to Material You navigation bar and removed unsupported swipe navigation
* Increased target SDK to `33`
* Increased dart to `>= 2.18.5`
* Indicate configuration loading in profile view
* Switched linked git repository away from GitHub
* Updated internal dependencies
## 1.4.2+15
* Minor cleanup
* Added external drone CI

View file

@ -404,6 +404,14 @@ where to find the applicable terms.
form of a separately written license, or stated as exceptions;
the above requirements apply either way.
7.1 Exceptions
7.1.1 As additional permission under section 7, you are allowed to distribute
the software through an app store, even if that store has restrictive
terms and conditions that are incompatible with the GPL, provided that the
source is also available under the GPL with or without this permission through
a channel without those restrictive terms and conditions.
8. Termination.
You may not propagate or modify a covered work except as expressly

View file

@ -1,8 +1,14 @@
# README
A mobile flutter app for [FileBin](https://github.com/Bluewind/filebin).
A mobile flutter app for [FileBin](https://git.server-speed.net/users/flo/filebin/).
Available on the [Play Store](https://play.google.com/store/apps/details?id=de.varakh.fbmobile).
Available on the [Play Store](https://play.google.com/store/apps/details?id=de.varakh.fbmobile) and
[IzzyOnDroid](https://apt.izzysoft.de/fdroid/index/apk/de.varakh.fbmobile/).
The main git repository is hosted at **[https://git.myservermanager.com/varakh/fbmobile](https://git.myservermanager.com/varakh/fbmobile)**.
Other repositories are mirrors and pull requests, issues, and planning are managed there.
Contributions are very welcome!
## Getting Started
@ -29,13 +35,6 @@ This project is a starting point for a Flutter application.
Start by installing dependencies and generating entities!
### Working versions for SDK
```
Flutter version 2.10.5
Dart version 2.16.2
```
## Dependencies
* Run `flutter packages pub get` in project root folder to get dependencies or open the `pubspec.yaml` and click on the buttons provided by the IDE plugins
@ -96,7 +95,7 @@ profiles. They're stored in a separate git repository and are encrypted.
You need access to the git repository in which those private files reside.
#### Usage
#### Usage / doing the actual release
Go into the platform directory you want to build for, e.g. `ios/` or `android/` and then look into the
`Fastlane` file which lanes are present. Run a lane via `fastlane <platform> <lane>`, e.g. use the
@ -106,13 +105,37 @@ following to build for Android `fastlane android build`.
##### Android
Use `fastlane android beta` to build and upload a new beta version to the Play Store.
It's recommended you set up `fastlane` via `bundler` (you need this to be installed on your machine).
Go into the `android/` sub-directory of the project
```shell
bundle config set --local path 'vendor/bundle'
bundle install
# update fastlane when needed
bundle update fastlane
# build only
bundle exec fastlane android build
# deploy (push BETA to app store)
bundle exec fastlane android beta
# deploy (push to app store)
bundle exec fastlane android deploy
# deploy (build signed fdroid large bundle [no target and abi split])
bundle exec fastlane android build_production_fdroid
```
##### iOS
For iOS you need to execute `fastlane ios build` before uploading to testflight with
`fastlane ios beta`.
Probably do the same Ruby/fastlane setup as mentioned under the _Android_ section.
### Release manually (not recommended)
See the following links on how to setup:

30
analysis_options.yaml Normal file
View file

@ -0,0 +1,30 @@
# This file configures the analyzer, which statically analyzes Dart code to
# check for errors, warnings, and lints.
#
# The issues identified by the analyzer are surfaced in the UI of Dart-enabled
# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be
# invoked from the command line by running `flutter analyze`.
# The following line activates a set of recommended lints for Flutter apps,
# packages, and plugins designed to encourage good coding practices.
include: package:flutter_lints/flutter.yaml
linter:
# The lint rules applied to this project can be customized in the
# section below to disable rules from the `package:flutter_lints/flutter.yaml`
# included above or to enable additional rules. A list of all available lints
# and their documentation is published at
# https://dart-lang.github.io/linter/lints/index.html.
#
# Instead of disabling a lint rule for the entire project in the
# section below, it can also be suppressed for a single line of code
# or a specific dart file by using the `// ignore: name_of_lint` and
# `// ignore_for_file: name_of_lint` syntax on the line or in the file
# producing the lint.
rules:
library_private_types_in_public_api: false
# avoid_print: false # Uncomment to disable the `avoid_print` rule
# prefer_single_quotes: true # Uncomment to enable the `prefer_single_quotes` rule
# Additional information about this file can be found at
# https://dart.dev/guides/language/analysis-options

2
android/.gitignore vendored
View file

@ -5,3 +5,5 @@ gradle-wrapper.jar
/gradlew.bat
/local.properties
GeneratedPluginRegistrant.java
.bundle
vendor/

222
android/Gemfile.lock Normal file
View file

@ -0,0 +1,222 @@
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.7)
base64
nkf
rexml
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
artifactory (3.0.17)
atomos (0.1.3)
aws-eventstream (1.3.0)
aws-partitions (1.1000.0)
aws-sdk-core (3.211.0)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.992.0)
aws-sigv4 (~> 1.9)
jmespath (~> 1, >= 1.6.1)
aws-sdk-kms (1.95.0)
aws-sdk-core (~> 3, >= 3.210.0)
aws-sigv4 (~> 1.5)
aws-sdk-s3 (1.169.0)
aws-sdk-core (~> 3, >= 3.210.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.5)
aws-sigv4 (1.10.1)
aws-eventstream (~> 1, >= 1.0.2)
babosa (1.0.4)
base64 (0.2.0)
claide (1.1.0)
colored (1.2)
colored2 (3.1.2)
commander (4.6.0)
highline (~> 2.0.0)
declarative (0.0.20)
digest-crc (0.6.5)
rake (>= 12.0.0, < 14.0.0)
domain_name (0.6.20240107)
dotenv (2.8.1)
emoji_regex (3.2.3)
excon (0.112.0)
faraday (1.10.4)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1)
faraday-httpclient (~> 1.0)
faraday-multipart (~> 1.0)
faraday-net_http (~> 1.0)
faraday-net_http_persistent (~> 1.0)
faraday-patron (~> 1.0)
faraday-rack (~> 1.0)
faraday-retry (~> 1.0)
ruby2_keywords (>= 0.0.4)
faraday-cookie_jar (0.0.7)
faraday (>= 0.8.0)
http-cookie (~> 1.0.0)
faraday-em_http (1.0.0)
faraday-em_synchrony (1.0.0)
faraday-excon (1.1.0)
faraday-httpclient (1.0.1)
faraday-multipart (1.0.4)
multipart-post (~> 2)
faraday-net_http (1.0.2)
faraday-net_http_persistent (1.2.0)
faraday-patron (1.0.0)
faraday-rack (1.0.0)
faraday-retry (1.0.3)
faraday_middleware (1.2.1)
faraday (~> 1.0)
fastimage (2.3.1)
fastlane (2.225.0)
CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.8, < 3.0.0)
artifactory (~> 3.0)
aws-sdk-s3 (~> 1.0)
babosa (>= 1.0.3, < 2.0.0)
bundler (>= 1.12.0, < 3.0.0)
colored (~> 1.2)
commander (~> 4.6)
dotenv (>= 2.1.1, < 3.0.0)
emoji_regex (>= 0.1, < 4.0)
excon (>= 0.71.0, < 1.0.0)
faraday (~> 1.0)
faraday-cookie_jar (~> 0.0.6)
faraday_middleware (~> 1.0)
fastimage (>= 2.1.0, < 3.0.0)
fastlane-sirp (>= 1.0.0)
gh_inspector (>= 1.1.2, < 2.0.0)
google-apis-androidpublisher_v3 (~> 0.3)
google-apis-playcustomapp_v1 (~> 0.1)
google-cloud-env (>= 1.6.0, < 2.0.0)
google-cloud-storage (~> 1.31)
highline (~> 2.0)
http-cookie (~> 1.0.5)
json (< 3.0.0)
jwt (>= 2.1.0, < 3)
mini_magick (>= 4.9.4, < 5.0.0)
multipart-post (>= 2.0.0, < 3.0.0)
naturally (~> 2.2)
optparse (>= 0.1.1, < 1.0.0)
plist (>= 3.1.0, < 4.0.0)
rubyzip (>= 2.0.0, < 3.0.0)
security (= 0.1.5)
simctl (~> 1.6.3)
terminal-notifier (>= 2.0.0, < 3.0.0)
terminal-table (~> 3)
tty-screen (>= 0.6.3, < 1.0.0)
tty-spinner (>= 0.8.0, < 1.0.0)
word_wrap (~> 1.0.0)
xcodeproj (>= 1.13.0, < 2.0.0)
xcpretty (~> 0.3.0)
xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
fastlane-sirp (1.0.0)
sysrandom (~> 1.0)
gh_inspector (1.1.3)
google-apis-androidpublisher_v3 (0.54.0)
google-apis-core (>= 0.11.0, < 2.a)
google-apis-core (0.11.3)
addressable (~> 2.5, >= 2.5.1)
googleauth (>= 0.16.2, < 2.a)
httpclient (>= 2.8.1, < 3.a)
mini_mime (~> 1.0)
representable (~> 3.0)
retriable (>= 2.0, < 4.a)
rexml
google-apis-iamcredentials_v1 (0.17.0)
google-apis-core (>= 0.11.0, < 2.a)
google-apis-playcustomapp_v1 (0.13.0)
google-apis-core (>= 0.11.0, < 2.a)
google-apis-storage_v1 (0.31.0)
google-apis-core (>= 0.11.0, < 2.a)
google-cloud-core (1.7.1)
google-cloud-env (>= 1.0, < 3.a)
google-cloud-errors (~> 1.0)
google-cloud-env (1.6.0)
faraday (>= 0.17.3, < 3.0)
google-cloud-errors (1.4.0)
google-cloud-storage (1.47.0)
addressable (~> 2.8)
digest-crc (~> 0.4)
google-apis-iamcredentials_v1 (~> 0.1)
google-apis-storage_v1 (~> 0.31.0)
google-cloud-core (~> 1.6)
googleauth (>= 0.16.2, < 2.a)
mini_mime (~> 1.0)
googleauth (1.8.1)
faraday (>= 0.17.3, < 3.a)
jwt (>= 1.4, < 3.0)
multi_json (~> 1.11)
os (>= 0.9, < 2.0)
signet (>= 0.16, < 2.a)
highline (2.0.3)
http-cookie (1.0.7)
domain_name (~> 0.5)
httpclient (2.8.3)
jmespath (1.6.2)
json (2.7.5)
jwt (2.9.3)
base64
mini_magick (4.13.2)
mini_mime (1.1.5)
multi_json (1.15.0)
multipart-post (2.4.1)
nanaimo (0.4.0)
naturally (2.2.1)
nkf (0.2.0)
optparse (0.5.0)
os (1.1.4)
plist (3.7.1)
public_suffix (6.0.1)
rake (13.2.1)
representable (3.2.0)
declarative (< 0.1.0)
trailblazer-option (>= 0.1.1, < 0.2.0)
uber (< 0.2.0)
retriable (3.1.2)
rexml (3.3.9)
rouge (2.0.7)
ruby2_keywords (0.0.5)
rubyzip (2.3.2)
security (0.1.5)
signet (0.19.0)
addressable (~> 2.8)
faraday (>= 0.17.5, < 3.a)
jwt (>= 1.5, < 3.0)
multi_json (~> 1.10)
simctl (1.6.10)
CFPropertyList
naturally
sysrandom (1.0.5)
terminal-notifier (2.0.0)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
trailblazer-option (0.1.2)
tty-cursor (0.7.1)
tty-screen (0.8.2)
tty-spinner (0.9.3)
tty-cursor (~> 0.7)
uber (0.1.0)
unicode-display_width (2.6.0)
word_wrap (1.0.0)
xcodeproj (1.27.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.4.0)
rexml (>= 3.3.6, < 4.0)
xcpretty (0.3.0)
rouge (~> 2.0.7)
xcpretty-travis-formatter (1.0.1)
xcpretty (~> 0.2, >= 0.0.7)
PLATFORMS
ruby
x86_64-linux
DEPENDENCIES
fastlane
BUNDLED WITH
2.5.16

View file

@ -1,3 +1,9 @@
plugins {
id "com.android.application"
id "kotlin-android"
id "dev.flutter.flutter-gradle-plugin"
}
def localProperties = new Properties()
def localPropertiesFile = rootProject.file('local.properties')
if (localPropertiesFile.exists()) {
@ -6,11 +12,6 @@ if (localPropertiesFile.exists()) {
}
}
def flutterRoot = localProperties.getProperty('flutter.sdk')
if (flutterRoot == null) {
throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
}
def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
if (flutterVersionCode == null) {
flutterVersionCode = '1'
@ -21,9 +22,6 @@ if (flutterVersionName == null) {
flutterVersionName = '1.0'
}
apply plugin: 'com.android.application'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
def keystoreProperties = new Properties()
def keystorePropertiesFile = rootProject.file('key.properties')
if (keystorePropertiesFile.exists()) {
@ -31,7 +29,9 @@ if (keystorePropertiesFile.exists()) {
}
android {
compileSdkVersion 31
compileSdkVersion 34
namespace "de.varakh.fbmobile"
lintOptions {
disable 'InvalidPackage'
@ -39,8 +39,8 @@ android {
defaultConfig {
applicationId "de.varakh.fbmobile"
minSdkVersion 16
targetSdkVersion 31
minSdkVersion 30
targetSdkVersion 34
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

View file

@ -4,7 +4,10 @@
to allow setting breakpoints, to provide hot reload, etc.
-->
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32" />
<uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
<uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
<uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
<queries>
<intent>

View file

@ -21,36 +21,31 @@
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.SEND" />
<category android:name="android.intent.category.DEFAULT" />
<data android:mimeType="text/*" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.SEND" />
<category android:name="android.intent.category.DEFAULT" />
<data android:mimeType="image/*" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.SEND_MULTIPLE" />
<category android:name="android.intent.category.DEFAULT" />
<data android:mimeType="image/*" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.SEND" />
<action android:name="android.intent.action.SEND_MULTIPLE" />
<category android:name="android.intent.category.DEFAULT" />
<data android:mimeType="video/*" />
<data android:mimeType="image/*" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.SEND_MULTIPLE" />
<category android:name="android.intent.category.DEFAULT" />
<data android:mimeType="video/*" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.SEND" />
<category android:name="android.intent.category.DEFAULT" />
@ -70,7 +65,10 @@
</application>
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32" />
<uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
<uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
<uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
<queries>
<intent>

View file

@ -4,7 +4,10 @@
to allow setting breakpoints, to provide hot reload, etc.
-->
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32" />
<uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
<uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
<uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
<queries>
<intent>

View file

@ -1,14 +1,3 @@
buildscript {
repositories {
google()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.0.4'
}
}
allprojects {
repositories {
google()
@ -24,6 +13,6 @@ subprojects {
project.evaluationDependsOn(':app')
}
task clean(type: Delete) {
tasks.register("clean", Delete) {
delete rootProject.buildDir
}

View file

@ -11,6 +11,11 @@ platform :android do
sh("#{ENV['PWD']}/fastlane/buildAndroidProduction.sh")
end
desc "Build Production fdroid"
lane :build_production_fdroid do
sh("#{ENV['PWD']}/fastlane/buildAndroidProductionFdroid.sh")
end
desc "Build"
lane :build do
sh("#{ENV['PWD']}/fastlane/buildAndroid.sh")

View file

@ -31,6 +31,14 @@ Build Debug
Build Production
### android build_production_fdroid
```sh
[bundle exec] fastlane android build_production_fdroid
```
Build Production fdroid
### android build
```sh

View file

@ -0,0 +1,9 @@
#!/usr/bin/env sh
cd ../../;
flutter clean && \
flutter pub get &&
flutter packages pub run build_runner build --delete-conflicting-outputs;
flutter build apk --release;
flutter build apk --split-per-abi --release;

View file

@ -1,4 +1,6 @@
agpVersion=8.7.2
kotlinVersion=1.7.10
org.gradle.jvmargs=-Xmx1536M
android.enableR8=true
android.useAndroidX=true
android.enableJetifier=true

View file

@ -1,6 +1,7 @@
#Fri Jun 23 08:50:38 CEST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip

View file

@ -1,15 +1,25 @@
include ':app'
pluginManagement {
def flutterSdkPath = {
def properties = new Properties()
file("local.properties").withInputStream { properties.load(it) }
def flutterSdkPath = properties.getProperty("flutter.sdk")
assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
return flutterSdkPath
}()
def flutterProjectRoot = rootProject.projectDir.parentFile.toPath()
includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
def plugins = new Properties()
def pluginsFile = new File(flutterProjectRoot.toFile(), '.flutter-plugins')
if (pluginsFile.exists()) {
pluginsFile.withReader('UTF-8') { reader -> plugins.load(reader) }
repositories {
google()
mavenCentral()
gradlePluginPortal()
}
}
plugins.each { name, path ->
def pluginDirectory = flutterProjectRoot.resolve(path).resolve('android').toFile()
include ":$name"
project(":$name").projectDir = pluginDirectory
plugins {
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
id "com.android.application" version "${agpVersion}" apply false
id "org.jetbrains.kotlin.android" version "${kotlinVersion}" apply false
}
include ":app"

View file

@ -18,12 +18,6 @@
"about": "About",
"upload": "Upload"
},
"tabs": {
"login": "Login",
"history": "History",
"profile": "Profile",
"upload": "New"
},
"upload": {
"and_or": "and/or",
"open_file_explorer": "Select file(s)...",
@ -45,7 +39,6 @@
"start_services": "Starting services..."
},
"login": {
"help": "Login",
"compatibility_dialog": {
"title": "How to login?",
"body": "A FileBin instance >= 3.5.0 is required. Enter valid user and password or switch to API key login by clicking on the icons right next to this help icon."
@ -99,12 +92,13 @@
"faq_headline": "F.A.Q",
"faq": "- How do I login?\nInsert your instance URL and valid credentials you also use in the web interface of FileBin.\n\n- Why is storage permission required?\nIt's not required, but highly advised to grant it. Otherwise sharing files with the app won't work correctly and you might think that sharing has no effect.\n\n- When I am logged out, sharing files via share with the app won't list all files I selected after I login.\nPlease login before you start using the app. Account information are persisted. You only need to do it once.",
"contact_us": "Feedback? Issues?",
"website": "https://github.com/Bluewind/filebin and https://github.com/v4rakh/fbmobile"
"website": "https://git.server-speed.net/users/flo/filebin and https://git.myservermanager.com/varakh/fbmobile"
},
"profile": {
"instance": "Instance",
"connection": "{url}",
"show_config": "Show configuration",
"show_config_loading": "Loading configuration...",
"shown_config": {
"title": "Configuration",
"description": "Upload max size: {uploadMaxSize}\n\nMax files per request: {maxFilesPerRequest}\n\nMax inputs vars: {maxInputVars}\n\nRequest max size: {requestMaxSize}",
@ -132,14 +126,6 @@
"description": "Could not open '{link}'. Please ensure that you have an application installed which handles opening such link types."
}
},
"permission_service": {
"dialog": {
"title": "Storage permission",
"description": "Storage permission should be granted to the app so that it can work properly. Do you want to grant permission or ignore this message permanently in the future?",
"grant": "Grant",
"ignore": "Ignore"
}
},
"dialog": {
"confirm": "OK",
"cancel": "Cancel"

View file

@ -60,7 +60,7 @@
</dict>
<dict/>
</array>
// TODO follow steps 2) on create share extension (https://pub.dev/packages/receive_sharing_intent)
// TODO follow steps on create share extension (https://pub.dev/packages/flutter_sharing_intent)
<key>NSPhotoLibraryUsageDescription</key>
<string>Allow to select photos and upload them via the app</string>
<key>LSApplicationQueriesSchemes</key>

View file

@ -1,9 +1,10 @@
import 'package:dynamic_color/dynamic_color.dart';
import 'package:flutter/material.dart';
import 'package:flutter_translate/flutter_translate.dart';
import 'package:intl/date_symbol_data_local.dart';
import 'package:provider/provider.dart';
import 'core/enums/refresh_event.dart';
import 'core/enums/swipe_event.dart';
import 'core/manager/dialog_manager.dart';
import 'core/manager/lifecycle_manager.dart';
import 'core/models/session.dart';
@ -11,49 +12,60 @@ import 'core/services/dialog_service.dart';
import 'core/services/navigation_service.dart';
import 'core/services/refresh_service.dart';
import 'core/services/session_service.dart';
import 'core/services/swipe_service.dart';
import 'locator.dart';
import 'ui/app_router.dart';
import 'ui/shared/app_colors.dart';
import 'ui/views/startup_view.dart';
class MyApp extends StatelessWidget {
static final _defaultLightColorScheme = ColorScheme.fromSwatch(
primarySwatch: myColor, brightness: Brightness.light);
static final _defaultDarkColorScheme = ColorScheme.fromSwatch(
primarySwatch: myColor, brightness: Brightness.dark);
MyApp({super.key}) {
initializeDateFormatting('en');
}
@override
Widget build(BuildContext context) {
var localizationDelegate = LocalizedApp.of(context).delegate;
return LocalizationProvider(
state: LocalizationProvider.of(context).state,
child: StreamProvider<SwipeEvent?>(
child: StreamProvider<RefreshEvent?>(
initialData: null,
create: (context) =>
locator<SwipeService>().swipeEventController.stream,
child: StreamProvider<RefreshEvent?>(
initialData: null,
create: (context) =>
locator<RefreshService>().refreshEventController.stream,
child: StreamProvider<Session?>(
initialData: Session.initial(),
create: (context) =>
locator<SessionService>().sessionController.stream,
child: LifeCycleManager(
child: MaterialApp(
title: translate('app.title'),
builder: (context, child) => Navigator(
key: locator<DialogService>().dialogNavigationKey,
onGenerateRoute: (settings) => MaterialPageRoute(
builder: (context) => DialogManager(child: child)),
),
theme: ThemeData(
brightness: Brightness.light,
primarySwatch: primaryAccentColor as MaterialColor?,
primaryColor: primaryAccentColor),
onGenerateRoute: AppRouter.generateRoute,
navigatorKey: locator<NavigationService>().navigationKey,
home: StartUpView(),
supportedLocales: localizationDelegate.supportedLocales,
locale: localizationDelegate.currentLocale,
)),
))));
locator<RefreshService>().refreshEventController.stream,
child: StreamProvider<Session?>(
initialData: Session.initial(),
create: (context) =>
locator<SessionService>().sessionController.stream,
child: LifeCycleManager(child: DynamicColorBuilder(
builder: (lightColorScheme, darkColorScheme) {
return MaterialApp(
debugShowCheckedModeBanner: false,
title: translate('app.title'),
builder: (context, child) => Navigator(
key: locator<DialogService>().dialogNavigationKey,
onGenerateRoute: (settings) => MaterialPageRoute(
builder: (context) => DialogManager(child: child)),
),
theme: ThemeData(
useMaterial3: true,
brightness: Brightness.light,
colorScheme:
lightColorScheme ?? _defaultLightColorScheme),
darkTheme: ThemeData(
useMaterial3: true,
colorScheme: darkColorScheme ?? _defaultDarkColorScheme),
onGenerateRoute: AppRouter.generateRoute,
navigatorKey: locator<NavigationService>().navigationKey,
home: const StartUpView(),
supportedLocales: localizationDelegate.supportedLocales,
locale: localizationDelegate.currentLocale,
);
})),
)));
}
}

View file

@ -1,15 +1,15 @@
/// Enums for error codes
enum ErrorCode {
/// A generic error
GENERAL_ERROR,
generalError,
/// Errors related to connections
SOCKET_ERROR,
SOCKET_TIMEOUT,
socketError,
socketTimeout,
/// A REST error (response code wasn't 200 or 204)
REST_ERROR,
restError,
/// Custom errors
INVALID_API_KEY
invalidApiKey
}

View file

@ -1 +1 @@
enum RefreshEvent { RefreshHistory }
enum RefreshEvent { refreshHistory }

View file

@ -1 +0,0 @@
enum SwipeEvent { Start, Left, Right, End }

View file

@ -1 +1 @@
enum ViewState { Idle, Busy }
enum ViewState { idle, busy }

View file

@ -5,9 +5,10 @@ class RestServiceException extends ServiceException {
final int statusCode;
final dynamic responseBody;
RestServiceException(this.statusCode, {this.responseBody, String? message})
: super(code: ErrorCode.REST_ERROR, message: message);
RestServiceException(this.statusCode, {this.responseBody, super.message = null})
: super(code: ErrorCode.restError);
@override
String toString() {
return "$code $statusCode $message";
}

View file

@ -4,8 +4,9 @@ class ServiceException implements Exception {
final ErrorCode code;
final String? message;
ServiceException({this.code = ErrorCode.GENERAL_ERROR, this.message = ''});
ServiceException({this.code = ErrorCode.generalError, this.message = ''});
@override
String toString() {
return "$code: $message";
}

View file

@ -8,13 +8,14 @@ import '../services/dialog_service.dart';
class DialogManager extends StatefulWidget {
final Widget? child;
DialogManager({Key? key, this.child}) : super(key: key);
const DialogManager({super.key, this.child});
@override
_DialogManagerState createState() => _DialogManagerState();
}
class _DialogManagerState extends State<DialogManager> {
DialogService _dialogService = locator<DialogService>();
final DialogService _dialogService = locator<DialogService>();
@override
void initState() {

View file

@ -11,8 +11,9 @@ import '../util/logger.dart';
class LifeCycleManager extends StatefulWidget {
final Widget? child;
LifeCycleManager({Key? key, this.child}) : super(key: key);
const LifeCycleManager({super.key, this.child});
@override
_LifeCycleManagerState createState() => _LifeCycleManagerState();
}
@ -33,13 +34,13 @@ class _LifeCycleManagerState extends State<LifeCycleManager>
@override
void initState() {
super.initState();
WidgetsBinding.instance!.addObserver(this);
WidgetsBinding.instance.addObserver(this);
}
@override
void dispose() {
super.dispose();
WidgetsBinding.instance!.removeObserver(this);
WidgetsBinding.instance.removeObserver(this);
}
@override
@ -47,12 +48,12 @@ class _LifeCycleManagerState extends State<LifeCycleManager>
logger.d('LifeCycle event ${state.toString()}');
super.didChangeAppLifecycleState(state);
servicesToManage.forEach((service) {
for (var service in servicesToManage) {
if (state == AppLifecycleState.resumed) {
service.start();
} else {
service.stop();
}
});
}
}
}

View file

@ -11,7 +11,7 @@ import '../models/rest/uploaded_response.dart';
import '../services/api.dart';
class FileRepository {
Api _api = locator<Api>();
final Api _api = locator<Api>();
Future<History> getHistory() async {
var response = await _api.post('/file/history');
@ -41,12 +41,12 @@ class FileRepository {
}
Future<UploadedMultiResponse> postCreateMultiPaste(List<String> ids) async {
Map<String, String> multiPasteIds = Map();
Map<String, String> multiPasteIds = {};
ids.forEach((element) {
for (var element in ids) {
multiPasteIds.putIfAbsent(
"ids[${ids.indexOf(element) + 1}]", () => element);
});
}
var response =
await _api.post('/file/create_multipaste', fields: multiPasteIds);

View file

@ -6,7 +6,7 @@ import '../models/rest/create_apikey_response.dart';
import '../services/api.dart';
class UserRepository {
Api _api = locator<Api>();
final Api _api = locator<Api>();
Future<CreateApiKeyResponse> postApiKey(String url, String username,
String password, String accessLevel, String comment) async {

View file

@ -24,11 +24,11 @@ class Api implements ApiErrorConverter {
String _url = "";
String _apiKey = "";
Map<String, String> _headers = {
final Map<String, String> _headers = {
"Content-Type": _applicationJson,
"Accept": _applicationJson
};
Duration _timeout = Duration(seconds: Constants.apiRequestTimeoutLimit);
Duration _timeout = const Duration(seconds: Constants.apiRequestTimeoutLimit);
Future<http.Response> fetch<T>(String route) async {
try {
@ -41,10 +41,10 @@ class Api implements ApiErrorConverter {
return response;
} on TimeoutException {
throw ServiceException(
code: ErrorCode.SOCKET_TIMEOUT, message: _errorTimeout);
code: ErrorCode.socketTimeout, message: _errorTimeout);
} on SocketException {
throw ServiceException(
code: ErrorCode.SOCKET_ERROR, message: _errorNoConnection);
code: ErrorCode.socketError, message: _errorNoConnection);
}
}
@ -67,13 +67,13 @@ class Api implements ApiErrorConverter {
}
if (files != null && files.isNotEmpty) {
files.forEach((element) async {
for (var element in files) {
request.files.add(await http.MultipartFile.fromPath(
'file[${files.indexOf(element) + 1}]', element.path));
});
}
}
if (additionalFiles != null && additionalFiles.length > 0) {
if (additionalFiles != null && additionalFiles.isNotEmpty) {
List<String> keys = additionalFiles.keys.toList();
additionalFiles.forEach((key, value) {
var index = files != null
@ -92,10 +92,10 @@ class Api implements ApiErrorConverter {
return response;
} on TimeoutException {
throw ServiceException(
code: ErrorCode.SOCKET_TIMEOUT, message: _errorTimeout);
code: ErrorCode.socketTimeout, message: _errorTimeout);
} on SocketException {
throw ServiceException(
code: ErrorCode.SOCKET_ERROR, message: _errorNoConnection);
code: ErrorCode.socketError, message: _errorNoConnection);
}
}
@ -132,12 +132,12 @@ class Api implements ApiErrorConverter {
if (ContentType.json.primaryType == responseContentType.primaryType &&
ContentType.json.subType == responseContentType.subType) {
var parsedBody = convert(response);
throw new RestServiceException(response.statusCode,
throw RestServiceException(response.statusCode,
responseBody: parsedBody);
}
}
throw new RestServiceException(response.statusCode);
throw RestServiceException(response.statusCode);
}
}

View file

@ -7,7 +7,8 @@ import '../datamodels/dialog_request.dart';
import '../datamodels/dialog_response.dart';
class DialogService {
GlobalKey<NavigatorState> _dialogNavigationKey = GlobalKey<NavigatorState>();
final GlobalKey<NavigatorState> _dialogNavigationKey =
GlobalKey<NavigatorState>();
late Function(DialogRequest) _showDialogListener;
Completer<DialogResponse>? _dialogCompleter;

View file

@ -19,7 +19,8 @@ class LinkService {
_logger.e('Could not launch link $link');
_dialogService.showDialog(
title: translate('link.dialog.title'),
description: translate('link.dialog.description', args: {'link': link}));
description:
translate('link.dialog.description', args: {'link': link}));
}
}
}

View file

@ -4,7 +4,7 @@ import 'package:logger/logger.dart';
import '../util/logger.dart';
class NavigationService {
GlobalKey<NavigatorState> _navigationKey = GlobalKey<NavigatorState>();
final GlobalKey<NavigatorState> _navigationKey = GlobalKey<NavigatorState>();
GlobalKey<NavigatorState> get navigationKey => _navigationKey;
@ -17,11 +17,13 @@ class NavigationService {
Future<dynamic> navigateTo(String routeName, {dynamic arguments}) {
logger.d('NavigationService: navigateTo $routeName');
return _navigationKey.currentState!.pushNamed(routeName, arguments: arguments);
return _navigationKey.currentState!
.pushNamed(routeName, arguments: arguments);
}
Future<dynamic> navigateAndReplaceTo(String routeName, {dynamic arguments}) {
logger.d('NavigationService: navigateAndReplaceTo $routeName');
return _navigationKey.currentState!.pushReplacementNamed(routeName, arguments: arguments);
return _navigationKey.currentState!
.pushReplacementNamed(routeName, arguments: arguments);
}
}

View file

@ -1,117 +1,109 @@
import 'dart:async';
import 'dart:io' show Platform;
import 'package:flutter_translate/flutter_translate.dart';
import 'package:device_info_plus/device_info_plus.dart';
import 'package:logger/logger.dart';
import 'package:permission_handler/permission_handler.dart';
import '../../constants.dart';
import '../../core/datamodels/dialog_response.dart';
import '../../core/services/dialog_service.dart';
import '../../core/services/stoppable_service.dart';
import '../../core/util/logger.dart';
import '../../locator.dart';
import 'storage_service.dart';
class PermissionService extends StoppableService {
final Logger _logger = getLogger();
final DialogService _dialogService = locator<DialogService>();
final StorageService _storageService = locator<StorageService>();
Timer? _serviceCheckTimer;
PermissionStatus? _permissionStatus;
bool _permanentlyIgnored = false;
bool _devicePermissionDialogActive = false;
bool _ownPermissionDialogActive = false;
PermissionService() {
_devicePermissionDialogActive = true;
bool _deviceInformationInitialized = false;
bool _useStoragePermission = true;
Permission.storage.request().then((status) {
_permissionStatus = status;
if (PermissionStatus.permanentlyDenied == status) {
_permanentlyIgnored = true;
}
}).whenComplete(() {
_logger.d('Initial device request permission finished');
_devicePermissionDialogActive = false;
});
}
PermissionService();
Future checkEnabledAndPermission() async {
if (_permanentlyIgnored) {
await _storageService.storeStoragePermissionDialogIgnored();
_permanentlyIgnored = false;
_logger.d('Set permanently ignored permission request');
stop();
}
if (_devicePermissionDialogActive) {
_logger.d('Device permission dialog active, skipping');
return;
}
if (_ownPermissionDialogActive) {
_logger.d('Own permission dialog already active, skipping');
return;
bool allGranted = false;
bool anyPermanentlyDenied = false;
// Since Android compileSdk >= 33, "storage" is deprecated
// Instead, request access to all of
// - Permission.photos
// - Permission.videos
// - Permission.audio
//
// For iOS and Android < 33, keep using "storage"
if (_useStoragePermission) {
PermissionStatus storagePermission = await Permission.storage.status;
allGranted = PermissionStatus.granted == storagePermission;
anyPermanentlyDenied =
PermissionStatus.permanentlyDenied == storagePermission;
} else {
PermissionStatus photosPermission = await Permission.photos.status;
PermissionStatus videosPermission = await Permission.videos.status;
PermissionStatus audioPermission = await Permission.audio.status;
allGranted = PermissionStatus.granted == photosPermission &&
PermissionStatus.granted == videosPermission &&
PermissionStatus.granted == audioPermission;
anyPermanentlyDenied =
PermissionStatus.permanentlyDenied == photosPermission ||
PermissionStatus.permanentlyDenied == videosPermission ||
PermissionStatus.permanentlyDenied == audioPermission;
}
var ignoredDialog =
await _storageService.hasStoragePermissionDialogIgnored();
if (ignoredDialog) {
_logger.d('Permanently ignored permission request, skipping');
// show warning to user to manually handle, don't enforce it over and over again
if (anyPermanentlyDenied) {
_logger.w(
"At least one required permission has been denied permanently, stopping service");
stop();
return;
}
_permissionStatus = await Permission.storage.status;
if (_permissionStatus != PermissionStatus.granted) {
if (_permissionStatus == PermissionStatus.permanentlyDenied) {
await _storageService.storeStoragePermissionDialogIgnored();
return;
}
// all good, stop the permission service
if (allGranted) {
_logger.d("All permissions have been granted, stopping service");
stop();
return;
}
_ownPermissionDialogActive = true;
DialogResponse response = await _dialogService.showConfirmationDialog(
title: translate('permission_service.dialog.title'),
description: translate('permission_service.dialog.description'),
buttonTitleAccept: translate('permission_service.dialog.grant'),
buttonTitleDeny: translate('permission_service.dialog.ignore'));
// not all have been granted, show OS dialog
_logger.d(
"Not all permissions have been granted yet, initializing permission dialog");
_devicePermissionDialogActive = true;
if (!response.confirmed!) {
await _storageService.storeStoragePermissionDialogIgnored();
} else {
_devicePermissionDialogActive = true;
Permission.storage.request().then((status) async {
if (PermissionStatus.permanentlyDenied == status) {
await _storageService.storeStoragePermissionDialogIgnored();
}
}).whenComplete(() {
_logger.d('Device request permission finished');
_devicePermissionDialogActive = false;
});
}
_ownPermissionDialogActive = false;
if (_useStoragePermission) {
await [Permission.storage].request().whenComplete(() {
_logger.d('Device request permission finished');
_devicePermissionDialogActive = false;
});
} else {
await _storageService.storeStoragePermissionDialogIgnored();
await [Permission.photos, Permission.videos, Permission.audio]
.request()
.whenComplete(() {
_logger.d('Device request permission finished');
_devicePermissionDialogActive = false;
});
}
}
@override
Future start() async {
super.start();
await _determineDeviceInfo();
await checkEnabledAndPermission();
_serviceCheckTimer = Timer.periodic(
Duration(milliseconds: Constants.mediaPermissionCheckInterval),
(_serviceTimer) async {
const Duration(milliseconds: Constants.mediaPermissionCheckInterval),
(serviceTimer) async {
if (!super.serviceStopped) {
await checkEnabledAndPermission();
} else {
_serviceTimer.cancel();
serviceTimer.cancel();
}
});
_logger.d('PermissionService started');
@ -124,6 +116,29 @@ class PermissionService extends StoppableService {
_logger.d('PermissionService stopped');
}
Future _determineDeviceInfo() async {
if (_deviceInformationInitialized) {
_logger.d('Device information already initialized, skipping');
return;
}
DeviceInfoPlugin deviceInfoPlugin = DeviceInfoPlugin();
if (Platform.isAndroid) {
final androidInfo = await deviceInfoPlugin.androidInfo;
if (androidInfo.version.sdkInt >= 33) {
_useStoragePermission = false;
}
}
if (_useStoragePermission) {
_logger.d('Device requires [storage] permission');
} else {
_logger.d('Device requires [photos,videos,audio] permission');
}
_deviceInformationInitialized = true;
}
void _removeServiceCheckTimer() {
if (_serviceCheckTimer != null) {
_serviceCheckTimer!.cancel();

View file

@ -3,7 +3,8 @@ import 'dart:async';
import '../enums/refresh_event.dart';
class RefreshService {
StreamController<RefreshEvent> refreshEventController = StreamController<RefreshEvent>.broadcast();
StreamController<RefreshEvent> refreshEventController =
StreamController<RefreshEvent>.broadcast();
void addEvent(RefreshEvent event) {
if (refreshEventController.hasListener) {

View file

@ -31,7 +31,7 @@ class SessionService extends StoppableService {
Future<bool> login(String url, String apiKey) async {
setApiConfig(url, apiKey);
var session = new Session(url: url, apiKey: apiKey);
var session = Session(url: url, apiKey: apiKey);
sessionController.add(session);
await _storageService.storeSession(session);
_logger.d('Session created');

View file

@ -5,45 +5,36 @@ import 'package:shared_preferences/shared_preferences.dart';
import '../models/session.dart';
class StorageService {
static const _SESSION_KEY = 'session';
static const _LAST_URL_KEY = 'last_url';
static const _STORAGE_PERMISSION_DIALOG_IGNORED = 'storage_permission_ignored';
static const _sessionKey = 'session';
static const _lastUrlKey = 'last_url';
Future<bool> storeLastUrl(String url) {
return _store(_LAST_URL_KEY, url);
return _store(_lastUrlKey, url);
}
Future<String?> retrieveLastUrl() async {
return await _retrieve(_LAST_URL_KEY);
return await _retrieve(_lastUrlKey);
}
Future<bool> hasLastUrl() async {
return await _exists(_LAST_URL_KEY);
return await _exists(_lastUrlKey);
}
Future<bool> storeSession(Session session) {
return _store(_SESSION_KEY, json.encode(session));
return _store(_sessionKey, json.encode(session));
}
Future<Session> retrieveSession() async {
var retrieve = await _retrieve(_SESSION_KEY);
var retrieve = await _retrieve(_sessionKey);
return Session.fromJson(json.decode(retrieve!));
}
Future<bool> hasSession() {
return _exists(_SESSION_KEY);
return _exists(_sessionKey);
}
Future<bool> removeSession() {
return _remove(_SESSION_KEY);
}
Future<bool> storeStoragePermissionDialogIgnored() {
return _store(_STORAGE_PERMISSION_DIALOG_IGNORED, true.toString());
}
Future<bool> hasStoragePermissionDialogIgnored() {
return _exists(_STORAGE_PERMISSION_DIALOG_IGNORED);
return _remove(_sessionKey);
}
Future<bool> _exists(String key) async {

View file

@ -1,13 +0,0 @@
import 'dart:async';
import '../enums/swipe_event.dart';
class SwipeService {
StreamController<SwipeEvent> swipeEventController = StreamController<SwipeEvent>.broadcast();
void addEvent(SwipeEvent event) {
if (swipeEventController.hasListener) {
swipeEventController.add(event);
}
}
}

View file

@ -27,8 +27,7 @@ class UserService {
try {
await _fileService.getHistory();
} on ServiceException catch (e) {
throw new ServiceException(
code: ErrorCode.INVALID_API_KEY, message: e.message);
throw ServiceException(code: ErrorCode.invalidApiKey, message: e.message);
}
}
}

View file

@ -6,13 +6,14 @@ class FormatterUtil {
/// Format epoch timestamp
static String formatEpoch(num millis) {
DateFormat dateFormat = DateFormat().add_yMEd().add_Hm();
return dateFormat.format(DateTime.fromMillisecondsSinceEpoch(millis as int));
return dateFormat
.format(DateTime.fromMillisecondsSinceEpoch(millis as int));
}
static String formatBytes(int bytes, int decimals) {
if (bytes <= 0) return "0 B";
const suffixes = ["B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"];
var i = (log(bytes) / log(1024)).floor();
return ((bytes / pow(1024, i)).toStringAsFixed(decimals)) + ' ' + suffixes[i];
return '${(bytes / pow(1024, i)).toStringAsFixed(decimals)} ${suffixes[i]}';
}
}

View file

@ -20,10 +20,10 @@ class AboutModel extends BaseModel {
}
Future<void> _initPackageInfo() async {
setStateView(ViewState.Busy);
setStateView(ViewState.busy);
final PackageInfo info = await PackageInfo.fromPlatform();
packageInfo = info;
setStateView(ViewState.Idle);
setStateView(ViewState.idle);
}
void openLink(String link) {

View file

@ -5,20 +5,56 @@ import '../../core/util/logger.dart';
import '../enums/viewstate.dart';
class BaseModel extends ChangeNotifier {
static const String STATE_VIEW = 'viewState';
static const String STATE_MESSAGE = 'viewMessage';
static const String stateViewKey = 'viewState';
static const String stateMessageKey = 'viewMessage';
final Logger _logger = getLogger();
bool _isDisposed = false;
Map<String, Object?> _stateMap = {STATE_VIEW: ViewState.Idle, STATE_MESSAGE: null};
final Map<String, Object?> _stateMap = {
stateViewKey: ViewState.idle,
stateMessageKey: null
};
ViewState? get state => _stateMap[STATE_VIEW] as ViewState?;
ViewState? get state => _stateMap[stateViewKey] as ViewState?;
String? get stateMessage => _stateMap[STATE_MESSAGE] as String?;
String? get stateMessage => _stateMap[stateMessageKey] as String?;
void setStateValue(String key, Object? stateValue) {
bool getStateValueAsBoolean(String key) {
if (_stateMap.containsKey(key) && _stateMap[key] is bool) {
return _stateMap[key] as bool;
}
return false;
}
String? getStateValueAsString(String key) {
if (_stateMap.containsKey(key) && _stateMap[key] is String) {
return _stateMap[key] as String;
}
return null;
}
int? getStateValueAsInt(String key) {
if (_stateMap.containsKey(key) && _stateMap[key] is int) {
return _stateMap[key] as int;
}
return null;
}
void setStateBoolValue(String key, bool stateValue) =>
_setStateValue(key, stateValue);
void setStateIntValue(String key, int? stateValue) =>
_setStateValue(key, stateValue);
void setStateStringValue(String key, String? stateValue) =>
_setStateValue(key, stateValue);
void _setStateValue(String key, Object? stateValue) {
if (_stateMap.containsKey(key)) {
_stateMap.update(key, (value) => stateValue);
} else {
@ -27,7 +63,8 @@ class BaseModel extends ChangeNotifier {
if (!_isDisposed) {
notifyListeners();
_logger.d("Notified state value update '($key, ${stateValue.toString()})'");
_logger
.d("Notified state value update '($key, ${stateValue.toString()})'");
}
}
@ -41,15 +78,16 @@ class BaseModel extends ChangeNotifier {
}
void setStateView(ViewState stateView) {
setStateValue(STATE_VIEW, stateView);
_setStateValue(stateViewKey, stateView);
}
void setStateMessage(String? stateMessage) {
setStateValue(STATE_MESSAGE, stateMessage);
_setStateValue(stateMessageKey, stateMessage);
}
@override
void dispose() {
_logger.d("Calling dispose");
super.dispose();
_isDisposed = true;
}

View file

@ -36,7 +36,7 @@ class HistoryModel extends BaseModel {
void init() {
_refreshTriggerSubscription =
_refreshService.refreshEventController.stream.listen((event) {
if (event == RefreshEvent.RefreshHistory) {
if (event == RefreshEvent.refreshHistory) {
_logger.d('History needs a refresh');
getHistory();
}
@ -44,13 +44,13 @@ class HistoryModel extends BaseModel {
}
Future getHistory() async {
setStateView(ViewState.Busy);
setStateView(ViewState.busy);
try {
pastes.clear();
History _history = await _fileService.getHistory();
if (_history.items.isNotEmpty) {
_history.items.forEach((key, value) {
History history = await _fileService.getHistory();
if (history.items.isNotEmpty) {
history.items.forEach((key, value) {
var millisecondsSinceEpoch = int.parse(value.date) * 1000;
pastes.add(
UploadedPaste(
@ -68,8 +68,8 @@ class HistoryModel extends BaseModel {
});
}
if (_history.multipasteItems.isNotEmpty) {
_history.multipasteItems.forEach((key, multiPaste) {
if (history.multipasteItems.isNotEmpty) {
history.multipasteItems.forEach((key, multiPaste) {
var millisecondsSinceEpoch = int.parse(multiPaste.date) * 1000;
pastes.add(UploadedPaste(
id: key,
@ -101,19 +101,19 @@ class HistoryModel extends BaseModel {
} else {
errorMessage = translate('api.general_rest_error');
}
} else if (e is ServiceException && e.code == ErrorCode.SOCKET_ERROR) {
} else if (e is ServiceException && e.code == ErrorCode.socketError) {
errorMessage = translate('api.socket_error');
} else if (e is ServiceException && e.code == ErrorCode.SOCKET_TIMEOUT) {
} else if (e is ServiceException && e.code == ErrorCode.socketTimeout) {
errorMessage = translate('api.socket_timeout');
} else {
errorMessage = translate('app.unknown_error');
setStateView(ViewState.Idle);
_logger.e('An unknown error occurred', e);
throw e;
setStateView(ViewState.idle);
_logger.e('An unknown error occurred', error: e);
rethrow;
}
}
setStateView(ViewState.Idle);
setStateView(ViewState.idle);
}
Future deletePaste(String id) async {
@ -128,7 +128,7 @@ class HistoryModel extends BaseModel {
return;
}
setStateView(ViewState.Busy);
setStateView(ViewState.busy);
try {
await _fileService.deletePaste(id);
@ -149,19 +149,19 @@ class HistoryModel extends BaseModel {
} else {
errorMessage = translate('api.general_rest_error');
}
} else if (e is ServiceException && e.code == ErrorCode.SOCKET_ERROR) {
} else if (e is ServiceException && e.code == ErrorCode.socketError) {
errorMessage = translate('api.socket_error');
} else if (e is ServiceException && e.code == ErrorCode.SOCKET_TIMEOUT) {
} else if (e is ServiceException && e.code == ErrorCode.socketTimeout) {
errorMessage = translate('api.socket_timeout');
} else {
errorMessage = translate('app.unknown_error');
setStateView(ViewState.Idle);
_logger.e('An unknown error occurred', e);
throw e;
setStateView(ViewState.idle);
_logger.e('An unknown error occurred', error: e);
rethrow;
}
}
setStateView(ViewState.Idle);
setStateView(ViewState.idle);
}
void openLink(String link) {

View file

@ -20,12 +20,12 @@ import '../util/logger.dart';
import 'base_model.dart';
class LoginModel extends BaseModel {
TextEditingController _uriController = new TextEditingController();
TextEditingController _uriController = TextEditingController();
final TextEditingController _userNameController = new TextEditingController();
final TextEditingController _passwordController = new TextEditingController();
final TextEditingController _userNameController = TextEditingController();
final TextEditingController _passwordController = TextEditingController();
final TextEditingController _apiKeyController = new TextEditingController();
final TextEditingController _apiKeyController = TextEditingController();
TextEditingController get uriController => _uriController;
@ -44,23 +44,23 @@ class LoginModel extends BaseModel {
String? errorMessage;
void toggleLoginMethod() {
setStateView(ViewState.Busy);
setStateView(ViewState.busy);
useCredentialsLogin = !useCredentialsLogin;
setStateView(ViewState.Idle);
setStateView(ViewState.idle);
}
void init() async {
bool hasLastUrl = await _storageService.hasLastUrl();
if (hasLastUrl) {
setStateView(ViewState.Busy);
setStateView(ViewState.busy);
var s = await (_storageService.retrieveLastUrl() as FutureOr<String>);
if (s.isNotEmpty) {
_uriController = new TextEditingController(text: s);
_uriController = TextEditingController(text: s);
}
setStateView(ViewState.Idle);
setStateView(ViewState.idle);
}
}
@ -70,45 +70,45 @@ class LoginModel extends BaseModel {
var password = passwordController.text;
var apiKey = apiKeyController.text;
setStateView(ViewState.Busy);
setStateView(ViewState.busy);
url = trim(url);
username = trim(username);
if (url.isEmpty) {
errorMessage = translate('login.errors.empty_url');
setStateView(ViewState.Idle);
setStateView(ViewState.idle);
return false;
}
if (!url.contains("https://") && !url.contains("http://")) {
errorMessage = translate('login.errors.no_protocol');
setStateView(ViewState.Idle);
setStateView(ViewState.idle);
return false;
}
bool validUri = Uri.parse(url).isAbsolute;
if (!validUri || !isURL(url)) {
errorMessage = translate('login.errors.invalid_url');
setStateView(ViewState.Idle);
setStateView(ViewState.idle);
return false;
}
if (useCredentialsLogin) {
if (username.isEmpty) {
errorMessage = translate('login.errors.empty_username');
setStateView(ViewState.Idle);
setStateView(ViewState.idle);
return false;
}
if (password.isEmpty) {
errorMessage = translate('login.errors.empty_password');
setStateView(ViewState.Idle);
setStateView(ViewState.idle);
return false;
}
} else {
if (apiKey.isEmpty) {
errorMessage = translate('login.errors.empty_apikey');
setStateView(ViewState.Idle);
setStateView(ViewState.idle);
return false;
}
}
@ -121,14 +121,14 @@ class LoginModel extends BaseModel {
username,
password,
'apikey',
'fbmobile-${new DateTime.now().millisecondsSinceEpoch}');
'fbmobile-${DateTime.now().millisecondsSinceEpoch}');
var newKey = apiKeyResponse.data['new_key'];
if (newKey != null) {
success = await _sessionService.login(url, newKey);
} else {
throw new ServiceException(
code: ErrorCode.INVALID_API_KEY,
throw ServiceException(
code: ErrorCode.invalidApiKey,
message: translate('login.errors.invalid_api_key'));
}
} else {
@ -153,25 +153,25 @@ class LoginModel extends BaseModel {
} else {
errorMessage = translate('api.general_rest_error');
}
} else if (e is ServiceException && e.code == ErrorCode.INVALID_API_KEY) {
} else if (e is ServiceException && e.code == ErrorCode.invalidApiKey) {
errorMessage = translate('login.errors.invalid_api_key');
} else if (e is ServiceException && e.code == ErrorCode.SOCKET_ERROR) {
} else if (e is ServiceException && e.code == ErrorCode.socketError) {
errorMessage = translate('api.socket_error');
} else if (e is ServiceException && e.code == ErrorCode.SOCKET_TIMEOUT) {
} else if (e is ServiceException && e.code == ErrorCode.socketTimeout) {
errorMessage = translate('api.socket_timeout');
} else {
errorMessage = translate('app.unknown_error');
_sessionService.logout();
setStateView(ViewState.Idle);
_logger.e('An unknown error occurred', e);
throw e;
setStateView(ViewState.idle);
_logger.e('An unknown error occurred', error: e);
rethrow;
}
if (errorMessage!.isNotEmpty) {
_sessionService.logout();
}
setStateView(ViewState.Idle);
setStateView(ViewState.idle);
return success;
}

View file

@ -6,7 +6,6 @@ import 'package:logger/logger.dart';
import '../../core/services/session_service.dart';
import '../../locator.dart';
import '../enums/error_code.dart';
import '../enums/viewstate.dart';
import '../error/rest_service_exception.dart';
import '../error/service_exception.dart';
import '../models/rest/config.dart';
@ -18,12 +17,16 @@ import '../util/logger.dart';
import 'base_model.dart';
class ProfileModel extends BaseModel {
static const _configurationButtonLoading = 'configurationButtonLoading';
final SessionService _sessionService = locator<SessionService>();
final DialogService _dialogService = locator<DialogService>();
final LinkService _linkService = locator<LinkService>();
final FileService _fileService = locator<FileService>();
final Logger _logger = getLogger();
bool get configLoading => getStateValueAsBoolean(_configurationButtonLoading);
String? errorMessage;
Future logout() async {
@ -44,7 +47,7 @@ class ProfileModel extends BaseModel {
}
Future showConfig(String url) async {
setStateView(ViewState.Busy);
setStateBoolValue(_configurationButtonLoading, true);
Config? config;
try {
config = await _fileService.getConfig(url);
@ -65,21 +68,21 @@ class ProfileModel extends BaseModel {
} else {
errorMessage = translate('api.general_rest_error');
}
} else if (e is ServiceException && e.code == ErrorCode.SOCKET_ERROR) {
} else if (e is ServiceException && e.code == ErrorCode.socketError) {
errorMessage = translate('api.socket_error');
} else if (e is ServiceException && e.code == ErrorCode.SOCKET_TIMEOUT) {
} else if (e is ServiceException && e.code == ErrorCode.socketTimeout) {
errorMessage = translate('api.socket_timeout');
} else {
errorMessage = translate('app.unknown_error');
setStateView(ViewState.Idle);
setStateBoolValue(_configurationButtonLoading, false);
_sessionService.logout();
setStateView(ViewState.Idle);
_logger.e('An unknown error occurred', e);
throw e;
setStateBoolValue(_configurationButtonLoading, false);
_logger.e('An unknown error occurred', error: e);
rethrow;
}
}
setStateView(ViewState.Idle);
setStateBoolValue(_configurationButtonLoading, false);
if (config != null && errorMessage == null) {
await _dialogService.showDialog(

View file

@ -1,3 +1,4 @@
import 'package:fbmobile/core/services/permission_service.dart';
import 'package:flutter_translate/flutter_translate.dart';
import '../../locator.dart';
@ -9,19 +10,21 @@ import 'base_model.dart';
class StartUpViewModel extends BaseModel {
final SessionService _sessionService = locator<SessionService>();
final PermissionService _permissionService = locator<PermissionService>();
final NavigationService _navigationService = locator<NavigationService>();
Future handleStartUpLogic() async {
setStateView(ViewState.Busy);
setStateView(ViewState.busy);
setStateMessage(translate('startup.init'));
await Future.delayed(Duration(milliseconds: 150));
await Future.delayed(const Duration(milliseconds: 100));
setStateMessage(translate('startup.start_services'));
await _sessionService.start();
await Future.delayed(Duration(milliseconds: 150));
await _permissionService.start();
await Future.delayed(const Duration(milliseconds: 100));
_navigationService.navigateAndReplaceTo(HomeView.routeName);
setStateView(ViewState.Idle);
setStateView(ViewState.idle);
}
}

View file

@ -4,15 +4,15 @@ import 'dart:io';
import 'package:file_picker/file_picker.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_sharing_intent/flutter_sharing_intent.dart';
import 'package:flutter_sharing_intent/model/sharing_file.dart';
import 'package:flutter_translate/flutter_translate.dart';
import 'package:logger/logger.dart';
import 'package:path/path.dart';
import 'package:receive_sharing_intent/receive_sharing_intent.dart';
import '../../locator.dart';
import '../enums/error_code.dart';
import '../enums/refresh_event.dart';
import '../enums/swipe_event.dart';
import '../enums/viewstate.dart';
import '../error/rest_service_exception.dart';
import '../error/service_exception.dart';
@ -22,7 +22,6 @@ import '../models/rest/uploaded_response.dart';
import '../services/file_service.dart';
import '../services/link_service.dart';
import '../services/refresh_service.dart';
import '../services/swipe_service.dart';
import '../util/logger.dart';
import '../util/paste_util.dart';
import 'base_model.dart';
@ -32,9 +31,8 @@ class UploadModel extends BaseModel {
final FileService _fileService = locator<FileService>();
final LinkService _linkService = locator<LinkService>();
final RefreshService _refreshService = locator<RefreshService>();
final SwipeService _swipeService = locator<SwipeService>();
TextEditingController _pasteTextController = TextEditingController();
final TextEditingController _pasteTextController = TextEditingController();
bool pasteTextTouched = false;
late StreamSubscription _intentDataStreamSubscription;
@ -48,94 +46,75 @@ class UploadModel extends BaseModel {
TextEditingController get pasteTextController => _pasteTextController;
void _parseIntentFiles(List<SharedFile> files) {
if (files.isNotEmpty) {
setStateView(ViewState.busy);
paths = files.map((sharedFile) {
_logger.d("Shared file name: ${basename(sharedFile.value ?? '')}");
_logger.d("Shared file path: ${sharedFile.value}");
_logger.d(
"Shared file size: ${File(sharedFile.value ?? '').lengthSync()}");
_logger.d("Shared file type: ${sharedFile.type}");
return PlatformFile.fromMap({
'path': sharedFile.value,
'name': basename(sharedFile.value!),
'size': File(sharedFile.value!).lengthSync(),
'bytes': null
});
}).toList();
setStateView(ViewState.idle);
}
}
void deleteIntentFile(String path) {
setStateView(ViewState.busy);
_logger.d("Removing path '$path' from $paths");
paths?.removeWhere((element) => element.path == path);
int length = paths!.length;
if (length == 0) {
paths = null;
}
setStateView(ViewState.idle);
}
void init() {
_pasteTextController.addListener(() {
pasteTextTouched = pasteTextController.text.isNotEmpty;
setStateValue("PASTE_TEXT_TOUCHED", pasteTextTouched);
setStateBoolValue("PASTE_TEXT_TOUCHED", pasteTextTouched);
});
// For sharing images coming from outside the app while the app is in the memory
_intentDataStreamSubscription = ReceiveSharingIntent.getMediaStream()
.listen((List<SharedMediaFile> value) {
if (value.length > 0) {
setStateView(ViewState.Busy);
paths = value.map((sharedFile) {
return PlatformFile.fromMap({
'path': sharedFile.path,
'name': basename(sharedFile.path),
'size': File(sharedFile.path).lengthSync(),
'bytes': null
});
}).toList();
setStateView(ViewState.Idle);
if (paths!.isNotEmpty && paths!.length > 0) {
_swipeService.addEvent(SwipeEvent.Start);
}
}
_intentDataStreamSubscription = FlutterSharingIntent.instance
.getMediaStream()
.listen((List<SharedFile> value) {
_logger.d("Retrieved ${value.length} files from intent");
_parseIntentFiles(value);
}, onError: (err) {
_errorIntentHandle(err);
});
// For sharing images coming from outside the app while the app is closed
ReceiveSharingIntent.getInitialMedia().then((List<SharedMediaFile> value) {
if (value.length > 0) {
setStateView(ViewState.Busy);
paths = value.map((sharedFile) {
return PlatformFile.fromMap({
'path': sharedFile.path,
'name': basename(sharedFile.path),
'size': File(sharedFile.path).lengthSync(),
'bytes': null
});
}).toList();
setStateView(ViewState.Idle);
if (paths!.isNotEmpty && paths!.length > 0) {
_swipeService.addEvent(SwipeEvent.Start);
}
}
}, onError: (err) {
_errorIntentHandle(err);
});
// For sharing or opening urls/text coming from outside the app while the app is in the memory
_intentDataStreamSubscription =
ReceiveSharingIntent.getTextStream().listen((String value) {
if (value.isNotEmpty) {
setStateView(ViewState.Busy);
pasteTextController.text = value;
setStateView(ViewState.Idle);
_swipeService.addEvent(SwipeEvent.Start);
}
}, onError: (err) {
_errorIntentHandle(err);
});
// For sharing or opening urls/text coming from outside the app while the app is closed
ReceiveSharingIntent.getInitialText().then((String? value) {
if (value != null && value.isNotEmpty) {
setStateView(ViewState.Busy);
pasteTextController.text = value;
setStateView(ViewState.Idle);
if (paths!.isNotEmpty && paths!.length > 0) {
_swipeService.addEvent(SwipeEvent.Start);
}
}
}, onError: (err) {
_errorIntentHandle(err);
FlutterSharingIntent.instance
.getInitialSharing()
.then((List<SharedFile> value) {
_logger.d("Retrieved ${value.length} files from inactive intent");
_parseIntentFiles(value);
});
}
void _errorIntentHandle(err) {
setStateView(ViewState.Busy);
setStateView(ViewState.busy);
errorMessage = translate('upload.retrieval_intent');
_logger.e('Error while retrieving shared data: $err');
setStateView(ViewState.Idle);
_swipeService.addEvent(SwipeEvent.Start);
setStateView(ViewState.idle);
}
String? generatePasteLinks(Map<String, bool>? uploads, String url) {
if (uploads != null && uploads.length > 0) {
if (uploads != null && uploads.isNotEmpty) {
var links = '';
uploads.forEach((id, isMulti) {
@ -151,13 +130,13 @@ class UploadModel extends BaseModel {
}
void toggleCreateMulti() {
setStateView(ViewState.Busy);
setStateView(ViewState.busy);
createMulti = !createMulti;
setStateView(ViewState.Idle);
setStateView(ViewState.idle);
}
void openFileExplorer() async {
setStateView(ViewState.Busy);
setStateView(ViewState.busy);
setStateMessage(translate('upload.file_explorer_open'));
loadingPath = true;
@ -173,52 +152,52 @@ class UploadModel extends BaseModel {
))
?.files;
} on PlatformException catch (e) {
_logger.e('Unsupported operation', e);
_logger.e('Unsupported operation', error: e);
} catch (ex) {
_logger.e('An unknown error occurred', ex);
_logger.e('An unknown error occurred', error: ex);
}
loadingPath = false;
fileName = paths != null ? paths!.map((e) => e.name).toString() : '...';
setStateMessage(null);
setStateView(ViewState.Idle);
setStateView(ViewState.idle);
}
void clearCachedFiles() async {
setStateView(ViewState.Busy);
setStateView(ViewState.busy);
await FilePicker.platform.clearTemporaryFiles();
paths = null;
fileName = null;
errorMessage = null;
setStateView(ViewState.Idle);
setStateView(ViewState.idle);
}
Future<Map<String, bool>?> upload() async {
setStateView(ViewState.Busy);
setStateView(ViewState.busy);
setStateMessage(translate('upload.uploading_now'));
Map<String, bool> uploadedPasteIds = new Map();
Map<String, bool> uploadedPasteIds = {};
try {
List<File>? files;
Map<String, String>? additionalFiles;
if (pasteTextController.text.isNotEmpty) {
additionalFiles = Map.from({
'paste-${(new DateTime.now().millisecondsSinceEpoch / 1000).round()}.txt':
'paste-${(DateTime.now().millisecondsSinceEpoch / 1000).round()}.txt':
pasteTextController.text
});
}
if (paths != null && paths!.length > 0) {
files = paths!.map((e) => new File(e.path!)).toList();
if (paths != null && paths!.isNotEmpty) {
files = paths!.map((e) => File(e.path!)).toList();
}
UploadedResponse response =
await _fileService.uploadPaste(files, additionalFiles);
response.data.ids.forEach((element) {
for (var element in response.data.ids) {
uploadedPasteIds.putIfAbsent(element, () => false);
});
}
if (createMulti && response.data.ids.length > 1) {
UploadedMultiResponse multiResponse =
@ -228,7 +207,7 @@ class UploadModel extends BaseModel {
clearCachedFiles();
_pasteTextController.clear();
_refreshService.addEvent(RefreshEvent.RefreshHistory);
_refreshService.addEvent(RefreshEvent.refreshHistory);
errorMessage = null;
return uploadedPasteIds;
} catch (e) {
@ -251,21 +230,21 @@ class UploadModel extends BaseModel {
} else {
errorMessage = translate('api.general_rest_error');
}
} else if (e is ServiceException && e.code == ErrorCode.SOCKET_ERROR) {
} else if (e is ServiceException && e.code == ErrorCode.socketError) {
errorMessage = translate('api.socket_error');
} else if (e is ServiceException && e.code == ErrorCode.SOCKET_TIMEOUT) {
} else if (e is ServiceException && e.code == ErrorCode.socketTimeout) {
errorMessage = translate('api.socket_timeout');
} else {
errorMessage = translate('app.unknown_error');
setStateMessage(null);
setStateView(ViewState.Idle);
_logger.e('An unknown error occurred', e);
throw e;
setStateView(ViewState.idle);
_logger.e('An unknown error occurred', error: e);
rethrow;
}
}
setStateMessage(null);
setStateView(ViewState.Idle);
setStateView(ViewState.idle);
return null;
}
@ -277,6 +256,8 @@ class UploadModel extends BaseModel {
void dispose() {
_pasteTextController.dispose();
_intentDataStreamSubscription.cancel();
FlutterSharingIntent.instance.reset();
paths = null;
super.dispose();
}
}

View file

@ -11,7 +11,6 @@ import 'core/services/permission_service.dart';
import 'core/services/refresh_service.dart';
import 'core/services/session_service.dart';
import 'core/services/storage_service.dart';
import 'core/services/swipe_service.dart';
import 'core/services/user_service.dart';
import 'core/viewmodels/about_model.dart';
import 'core/viewmodels/history_model.dart';
@ -42,7 +41,6 @@ void setupLocator() {
locator.registerLazySingleton(() => LinkService());
locator.registerLazySingleton(() => PermissionService());
locator.registerLazySingleton(() => RefreshService());
locator.registerLazySingleton(() => SwipeService());
/// view models
locator.registerFactory(() => StartUpViewModel());

View file

@ -9,10 +9,11 @@ import 'locator.dart';
/// main entry point used to configure log level, locales, ...
void main() async {
setupLogger(Level.info);
// setupLogger(Level.debug);
setupLocator();
var delegate = await LocalizationDelegate.create(fallbackLocale: 'en', supportedLocales: ['en']);
var delegate = await LocalizationDelegate.create(
fallbackLocale: 'en', supportedLocales: ['en', 'en_US']);
WidgetsFlutterBinding.ensureInitialized();
runApp(LocalizedApp(delegate, MyApp()));
}

View file

@ -14,15 +14,15 @@ class AppRouter {
static Route<dynamic> generateRoute(RouteSettings settings) {
switch (settings.name) {
case StartUpView.routeName:
return MaterialPageRoute(builder: (_) => StartUpView());
return MaterialPageRoute(builder: (_) => const StartUpView());
case AboutView.routeName:
return MaterialPageRoute(builder: (_) => AboutView());
return MaterialPageRoute(builder: (_) => const AboutView());
case HomeView.routeName:
return MaterialPageRoute(builder: (_) => TabBarContainerView());
return MaterialPageRoute(builder: (_) => const TabBarContainerView());
case LoginView.routeName:
return MaterialPageRoute(builder: (_) => LoginView());
case ProfileView.routeName:
return MaterialPageRoute(builder: (_) => ProfileView());
return MaterialPageRoute(builder: (_) => const ProfileView());
default:
return MaterialPageRoute(
builder: (_) => Scaffold(

View file

@ -1,10 +1,5 @@
import 'package:flutter/material.dart';
const Color backgroundColor = whiteColor;
/// Colors
const Color primaryBackgroundColor = whiteColor;
const Map<int, Color> colors = {
50: Color.fromRGBO(63, 69, 75, .1),
100: Color.fromRGBO(63, 69, 75, .2),
@ -19,8 +14,6 @@ const Map<int, Color> colors = {
};
const MaterialColor myColor = MaterialColor(0xFF3F454B, colors);
const Color primaryAccentColor = myColor;
const Color buttonBackgroundColor = primaryAccentColor;
const Color buttonForegroundColor = whiteColor;
const Color blueColor = Colors.blue;
const Color whiteColor = Colors.white;

View file

@ -1,4 +1,3 @@
import 'package:flutter/material.dart';
const headerStyle = TextStyle(fontSize: 35, fontWeight: FontWeight.w900);
const subHeaderStyle = TextStyle(fontSize: 16.0, fontWeight: FontWeight.w500);

View file

@ -1,27 +1,27 @@
import 'package:flutter/material.dart';
class UIHelper {
static const double _VerticalSpaceSmall = 10.0;
static const double _VerticalSpaceMedium = 20.0;
static const double _VerticalSpaceLarge = 60.0;
static const double _verticalSpaceSmall = 10.0;
static const double _verticalSpaceMedium = 20.0;
static const double _verticalSpaceLarge = 60.0;
static const double _HorizontalSpaceSmall = 10.0;
static const double _HorizontalSpaceMedium = 20.0;
static const double HorizontalSpaceLarge = 60.0;
static const double _horizontalSpaceSmall = 10.0;
static const double _horizontalSpaceMedium = 20.0;
static const double _horizontalSpaceLarge = 60.0;
/// Returns a vertical space with height set to [_VerticalSpaceSmall]
/// Returns a vertical space with height set to [_verticalSpaceSmall]
static Widget verticalSpaceSmall() {
return verticalSpace(_VerticalSpaceSmall);
return verticalSpace(_verticalSpaceSmall);
}
/// Returns a vertical space with height set to [_VerticalSpaceMedium]
/// Returns a vertical space with height set to [_verticalSpaceMedium]
static Widget verticalSpaceMedium() {
return verticalSpace(_VerticalSpaceMedium);
return verticalSpace(_verticalSpaceMedium);
}
/// Returns a vertical space with height set to [_VerticalSpaceLarge]
/// Returns a vertical space with height set to [_verticalSpaceLarge]
static Widget verticalSpaceLarge() {
return verticalSpace(_VerticalSpaceLarge);
return verticalSpace(_verticalSpaceLarge);
}
/// Returns a vertical space equal to the [height] supplied
@ -29,19 +29,19 @@ class UIHelper {
return Container(height: height);
}
/// Returns a vertical space with height set to [_HorizontalSpaceSmall]
/// Returns a vertical space with height set to [_horizontalSpaceSmall]
static Widget horizontalSpaceSmall() {
return horizontalSpace(_HorizontalSpaceSmall);
return horizontalSpace(_horizontalSpaceSmall);
}
/// Returns a vertical space with height set to [_HorizontalSpaceMedium]
/// Returns a vertical space with height set to [_horizontalSpaceMedium]
static Widget horizontalSpaceMedium() {
return horizontalSpace(_HorizontalSpaceMedium);
return horizontalSpace(_horizontalSpaceMedium);
}
/// Returns a vertical space with height set to [HorizontalSpaceLarge]
/// Returns a vertical space with height set to [_horizontalSpaceLarge]
static Widget horizontalSpaceLarge() {
return horizontalSpace(HorizontalSpaceLarge);
return horizontalSpace(_horizontalSpaceLarge);
}
/// Returns a vertical space equal to the [width] supplied

View file

@ -6,13 +6,14 @@ import '../../core/enums/viewstate.dart';
import '../../core/viewmodels/about_model.dart';
import '../../ui/shared/text_styles.dart';
import '../../ui/shared/ui_helpers.dart';
import '../shared/app_colors.dart';
import '../widgets/my_appbar.dart';
import 'base_view.dart';
class AboutView extends StatelessWidget {
static const routeName = '/about';
const AboutView({super.key});
@override
Widget build(BuildContext context) {
final logo = Hero(
@ -31,14 +32,14 @@ class AboutView extends StatelessWidget {
title: Text(translate('titles.about')),
enableAbout: false,
),
backgroundColor: backgroundColor,
body: model.state == ViewState.Busy
? Center(child: CircularProgressIndicator())
body: model.state == ViewState.busy
? const Center(child: CircularProgressIndicator())
: Container(
padding: EdgeInsets.all(0),
padding: const EdgeInsets.all(0),
child: ListView(
shrinkWrap: true,
padding: EdgeInsets.only(left: 10.0, right: 10.0, bottom: 10, top: 10),
padding: const EdgeInsets.only(
left: 10.0, right: 10.0, bottom: 10, top: 10),
children: <Widget>[
UIHelper.verticalSpaceMedium(),
Center(child: logo),
@ -77,7 +78,7 @@ class AboutView extends StatelessWidget {
Center(
child: Linkify(
text: translate('about.website'),
options: LinkifyOptions(humanize: false),
options: const LinkifyOptions(humanize: false),
onOpen: (link) => model.openLink(link.url),
),
)

View file

@ -10,7 +10,7 @@ class BaseView<T extends BaseModel> extends StatefulWidget {
final Widget Function(BuildContext context, T model, Widget? child)? builder;
final Function(T)? onModelReady;
BaseView({this.builder, this.onModelReady});
const BaseView({super.key, this.builder, this.onModelReady});
@override
_BaseViewState<T> createState() => _BaseViewState<T>();

View file

@ -13,12 +13,13 @@ import '../../core/viewmodels/history_model.dart';
import '../../ui/widgets/centered_error_row.dart';
import '../shared/app_colors.dart';
import '../widgets/my_appbar.dart';
import '../widgets/swipe_navigation.dart';
import 'base_view.dart';
class HistoryView extends StatelessWidget {
static const routeName = '/history';
const HistoryView({super.key});
@override
Widget build(BuildContext context) {
return BaseView<HistoryModel>(
@ -28,24 +29,23 @@ class HistoryView extends StatelessWidget {
},
builder: (context, model, child) => Scaffold(
appBar: MyAppBar(title: Text(translate('titles.history'))),
backgroundColor: backgroundColor,
body: SwipeNavigation(child: _render(model, context))),
body: _render(model, context)),
);
}
Widget _render(HistoryModel model, BuildContext context) {
var url = Provider.of<Session>(context).url;
return model.state == ViewState.Busy
? Center(child: CircularProgressIndicator())
return model.state == ViewState.busy
? const Center(child: CircularProgressIndicator())
: (model.errorMessage == null
? Container(
padding: EdgeInsets.all(0),
padding: const EdgeInsets.all(0),
child: RefreshIndicator(
onRefresh: () async => await model.getHistory(),
child: _renderItems(model, url, context)))
: Container(
padding: EdgeInsets.all(25),
padding: const EdgeInsets.all(25),
child: CenteredErrorRow(
model.errorMessage,
retryCallback: () => model.getHistory(),
@ -55,8 +55,8 @@ class HistoryView extends StatelessWidget {
Widget _renderItems(HistoryModel model, String url, BuildContext context) {
List<Widget> cards = [];
if (model.pastes.length > 0) {
model.pastes.reversed.forEach((paste) {
if (model.pastes.isNotEmpty) {
for (var paste in model.pastes.reversed) {
List<Widget> widgets = [];
var fullPasteUrl = PasteUtil.generateLink(url, paste.id);
@ -76,7 +76,7 @@ class HistoryView extends StatelessWidget {
var copyWidget = ListTile(
title: Text(translate('history.copy_link.description')),
trailing: IconButton(
icon: Icon(Icons.copy,
icon: const Icon(Icons.copy,
color: blueColor, textDirection: TextDirection.ltr),
onPressed: () {
FlutterClipboard.copy(fullPasteUrl).then((value) {
@ -89,16 +89,18 @@ class HistoryView extends StatelessWidget {
},
),
content: Text(translate('history.copy_link.copied')),
duration: Duration(seconds: 10),
duration: const Duration(seconds: 10),
);
ScaffoldMessenger.of(context).showSnackBar(snackBar);
if (context.mounted) {
ScaffoldMessenger.of(context).showSnackBar(snackBar);
}
});
}));
var deleteWidget = ListTile(
title: Text(translate('history.delete')),
trailing: IconButton(
icon: Icon(Icons.delete, color: redColor),
icon: const Icon(Icons.delete, color: redColor),
onPressed: () {
model.deletePaste(paste.id);
}));
@ -126,13 +128,13 @@ class HistoryView extends StatelessWidget {
widgets.add(fileSizeWidget);
widgets.add(mimeTypeWidget);
} else {
paste.items!.forEach((element) {
for (var element in paste.items!) {
widgets.add(ListTile(
title: Text(element!),
subtitle: Text(translate('history.multipaste_element')),
trailing: _renderOpenInBrowser(model, '$url/$element'),
));
});
}
}
widgets.add(dateWidget);
@ -141,7 +143,7 @@ class HistoryView extends StatelessWidget {
widgets.add(deleteWidget);
var expandable = ExpandableTheme(
data: ExpandableThemeData(
data: const ExpandableThemeData(
iconPlacement: ExpandablePanelIconPlacement.right,
headerAlignment: ExpandablePanelHeaderAlignment.center,
hasIcon: true,
@ -152,7 +154,7 @@ class HistoryView extends StatelessWidget {
header: InkWell(
child: Text(
paste.id,
style: TextStyle(color: blueColor),
style: const TextStyle(color: blueColor),
textAlign: TextAlign.left,
)),
expanded: Column(
@ -168,17 +170,17 @@ class HistoryView extends StatelessWidget {
trailing: Wrap(children: [
openInBrowserButton,
IconButton(
icon: Icon(Icons.share,
icon: const Icon(Icons.share,
color: blueColor, textDirection: TextDirection.ltr),
onPressed: () async {
await Share.share(fullPasteUrl);
})
]),
subtitle: Text(!paste.isMulti! ? paste.filename! : '',
style: TextStyle(fontStyle: FontStyle.italic)),
style: const TextStyle(fontStyle: FontStyle.italic)),
),
));
});
}
} else {
cards.add(Card(
child: ListTile(
@ -189,14 +191,14 @@ class HistoryView extends StatelessWidget {
return ListView(
padding: const EdgeInsets.all(8),
physics: const AlwaysScrollableScrollPhysics(),
children: cards,
physics: AlwaysScrollableScrollPhysics(),
);
}
Widget _renderOpenInBrowser(HistoryModel model, String url) {
return IconButton(
icon: Icon(Icons.open_in_new,
icon: const Icon(Icons.open_in_new,
color: blueColor, textDirection: TextDirection.ltr),
onPressed: () {
return model.openLink(url);

View file

@ -3,20 +3,22 @@ import 'package:flutter_translate/flutter_translate.dart';
import '../../core/enums/viewstate.dart';
import '../../core/viewmodels/home_model.dart';
import '../shared/app_colors.dart';
import '../widgets/my_appbar.dart';
import 'base_view.dart';
class HomeView extends StatelessWidget {
static const routeName = '/home';
const HomeView({super.key});
@override
Widget build(BuildContext context) {
return BaseView<HomeModel>(
builder: (context, model, child) => Scaffold(
appBar: MyAppBar(title: Text(translate('app.title'))),
backgroundColor: backgroundColor,
body: model.state == ViewState.Busy ? Center(child: CircularProgressIndicator()) : Container()),
body: model.state == ViewState.busy
? const Center(child: CircularProgressIndicator())
: Container()),
);
}
}

View file

@ -6,7 +6,6 @@ import '../../core/services/dialog_service.dart';
import '../../core/services/navigation_service.dart';
import '../../core/viewmodels/login_model.dart';
import '../../locator.dart';
import '../../ui/shared/text_styles.dart';
import '../../ui/views/home_view.dart';
import '../../ui/widgets/my_appbar.dart';
import '../shared/app_colors.dart';
@ -21,6 +20,8 @@ class LoginView extends StatelessWidget {
final NavigationService _navigationService = locator<NavigationService>();
final DialogService _dialogService = locator<DialogService>();
LoginView({super.key});
@override
Widget build(BuildContext context) {
final logo = Hero(
@ -36,12 +37,11 @@ class LoginView extends StatelessWidget {
onModelReady: (model) => model.init(),
builder: (context, model, child) => Scaffold(
appBar: MyAppBar(title: Text(translate('titles.login'))),
backgroundColor: backgroundColor,
body: model.state == ViewState.Busy
? Center(child: CircularProgressIndicator())
body: model.state == ViewState.busy
? const Center(child: CircularProgressIndicator())
: ListView(
shrinkWrap: true,
padding: EdgeInsets.only(left: 10.0, right: 10.0),
padding: const EdgeInsets.only(left: 10.0, right: 10.0),
children: <Widget>[
UIHelper.verticalSpaceMedium(),
Center(child: logo),
@ -51,12 +51,8 @@ class LoginView extends StatelessWidget {
crossAxisAlignment: WrapCrossAlignment.center,
alignment: WrapAlignment.center,
children: <Widget>[
Text(
translate('login.help'),
style: subHeaderStyle,
),
InkWell(
child: Icon(Icons.help, color: buttonBackgroundColor),
child: const Icon(Icons.help),
onTap: () {
_dialogService.showDialog(
title: translate(
@ -89,9 +85,9 @@ class LoginView extends StatelessWidget {
uriController: model.uriController,
apiKeyController: model.apiKeyController),
UIHelper.verticalSpaceMedium(),
ElevatedButton(
child: Text(translate('login.button'),
style: TextStyle(color: buttonForegroundColor)),
ElevatedButton.icon(
icon: const Icon(Icons.login, color: blueColor),
label: Text(translate('login.button')),
onPressed: () async {
var loginSuccess = await model.login();
if (loginSuccess) {

View file

@ -0,0 +1,73 @@
import 'package:fbmobile/core/util/logger.dart';
import 'package:fbmobile/ui/views/profile_view.dart';
import 'package:fbmobile/ui/views/upload_view.dart';
import 'package:flutter/material.dart';
import 'package:logger/logger.dart';
import '../shared/app_colors.dart';
import 'history_view.dart';
class AuthenticatedNavBarView extends StatefulWidget {
const AuthenticatedNavBarView({super.key});
@override
AuthenticatedNavBarState createState() => AuthenticatedNavBarState();
}
class AuthenticatedNavBarState extends State<AuthenticatedNavBarView>
with SingleTickerProviderStateMixin {
final Logger _logger = getLogger();
int _currentTabIndex = 0;
void updateIndex(int targetIndex) {
setState(() {
_currentTabIndex = targetIndex;
_logger.d("Changing current tab index to '$targetIndex'");
});
}
@override
Widget build(BuildContext context) {
return Scaffold(
bottomNavigationBar: NavigationBar(
key: UniqueKey(),
onDestinationSelected: (int index) {
updateIndex(index);
},
selectedIndex: _currentTabIndex,
labelBehavior: NavigationDestinationLabelBehavior.alwaysHide,
destinations: const <Widget>[
NavigationDestination(
icon: Icon(Icons.upload_outlined),
label: 'Upload',
),
NavigationDestination(
icon: Icon(Icons.history_outlined),
label: 'History',
),
NavigationDestination(
icon: Icon(Icons.person_outlined),
label: 'Profile',
),
],
),
body: <Widget>[
Container(
color: myColor,
alignment: Alignment.center,
child: const UploadView(),
),
Container(
color: myColor,
alignment: Alignment.center,
child: const HistoryView(),
),
Container(
color: myColor,
alignment: Alignment.center,
child: const ProfileView(),
),
][_currentTabIndex],
);
}
}

View file

@ -10,27 +10,27 @@ import '../shared/app_colors.dart';
import '../shared/text_styles.dart';
import '../shared/ui_helpers.dart';
import '../widgets/my_appbar.dart';
import '../widgets/swipe_navigation.dart';
import 'base_view.dart';
class ProfileView extends StatelessWidget {
static const routeName = '/profile';
const ProfileView({super.key});
@override
Widget build(BuildContext context) {
return BaseView<ProfileModel>(
builder: (context, model, child) => Scaffold(
appBar: MyAppBar(title: Text(translate('titles.profile'))),
backgroundColor: backgroundColor,
body: SwipeNavigation(child: _render(model, context))));
body: _render(model, context)));
}
Widget _render(ProfileModel model, BuildContext context) {
var url = Provider.of<Session>(context).url;
var apiKey = Provider.of<Session>(context).apiKey;
return model.state == ViewState.Busy
? Center(child: CircularProgressIndicator())
return model.state == ViewState.busy
? const Center(child: CircularProgressIndicator())
: ListView(
children: <Widget>[
UIHelper.verticalSpaceMedium(),
@ -48,16 +48,27 @@ class ProfileView extends StatelessWidget {
child: Linkify(
onOpen: (link) => model.openLink(link.url),
text: translate('profile.connection', args: {'url': url}),
options: LinkifyOptions(humanize: false),
options: const LinkifyOptions(humanize: false),
))),
UIHelper.verticalSpaceMedium(),
Padding(
padding: const EdgeInsets.only(left: 25.0, right: 25.0),
child: ElevatedButton.icon(
icon: Icon(Icons.settings, color: blueColor),
icon: model.configLoading
? Container(
width: 24,
height: 24,
padding: const EdgeInsets.all(2.0),
child: const CircularProgressIndicator(
color: blueColor,
strokeWidth: 3,
),
)
: const Icon(Icons.settings, color: blueColor),
label: Text(
translate('profile.show_config'),
style: TextStyle(color: buttonForegroundColor),
model.configLoading
? translate('profile.show_config_loading')
: translate('profile.show_config'),
),
onPressed: () async {
await model.showConfig(url);
@ -66,10 +77,9 @@ class ProfileView extends StatelessWidget {
Padding(
padding: const EdgeInsets.only(left: 25.0, right: 25.0),
child: ElevatedButton.icon(
icon: Icon(Icons.lock, color: orangeColor),
icon: const Icon(Icons.lock, color: orangeColor),
label: Text(
translate('profile.reveal_api_key'),
style: TextStyle(color: buttonForegroundColor),
),
onPressed: () {
model.revealApiKey(apiKey);
@ -78,10 +88,9 @@ class ProfileView extends StatelessWidget {
Padding(
padding: const EdgeInsets.only(left: 25.0, right: 25.0),
child: ElevatedButton.icon(
icon: Icon(Icons.exit_to_app, color: redColor),
icon: const Icon(Icons.exit_to_app, color: redColor),
label: Text(
translate('profile.logout'),
style: TextStyle(color: buttonForegroundColor),
),
onPressed: () async {
await model.logout();

View file

@ -3,26 +3,28 @@ import 'package:stacked/stacked.dart';
import '../../core/enums/viewstate.dart';
import '../../core/viewmodels/startup_model.dart';
import '../shared/app_colors.dart';
class StartUpView extends StatelessWidget {
static const routeName = '/';
const StartUpView({super.key});
@override
Widget build(BuildContext context) {
return ViewModelBuilder<StartUpViewModel>.reactive(
viewModelBuilder: () => StartUpViewModel(),
onModelReady: (model) => model.handleStartUpLogic(),
onViewModelReady: (model) => model.handleStartUpLogic(),
builder: (context, model, child) => Scaffold(
backgroundColor: whiteColor,
body: model.state == ViewState.Busy
body: model.state == ViewState.busy
? Center(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
CircularProgressIndicator(),
(model.stateMessage!.isNotEmpty ? Text(model.stateMessage!) : Container())
const CircularProgressIndicator(),
(model.stateMessage!.isNotEmpty
? Text(model.stateMessage!)
: Container())
]))
: Container()));
}

View file

@ -1,68 +0,0 @@
import 'package:flutter/material.dart';
import 'package:flutter_translate/flutter_translate.dart';
import '../shared/app_colors.dart';
import 'login_view.dart';
class AnonymousTabBarView extends StatefulWidget {
@override
AnonymousTabBarState createState() => AnonymousTabBarState();
}
class AnonymousTabBarState extends State<AnonymousTabBarView>
with SingleTickerProviderStateMixin {
TabController? _tabController;
int _currentTabIndex = 0;
List<Widget> _realPages = [LoginView()];
List<Widget> _tabPages = [LoginView()];
List<bool> _hasInit = [true];
List<Widget> _tabsButton = [
Tab(
icon: Icon(Icons.person_outline, color: blueColor),
child: Text(
translate('tabs.login'),
style: TextStyle(color: blueColor),
),
)
];
@override
void initState() {
super.initState();
_tabController = TabController(length: _realPages.length, vsync: this)
..addListener(() {
int selectedIndex = _tabController!.index;
if (_currentTabIndex != selectedIndex) {
if (!_hasInit[selectedIndex]) {
_tabPages[selectedIndex] = _realPages[selectedIndex];
_hasInit[selectedIndex] = true;
}
setState(() => _currentTabIndex = selectedIndex);
}
});
}
@override
void dispose() {
_tabController!.dispose();
super.dispose();
}
@override
Widget build(BuildContext context) {
return Scaffold(
body: IndexedStack(index: _currentTabIndex, children: _tabPages),
bottomNavigationBar: BottomAppBar(
child: TabBar(
labelColor: primaryAccentColor,
indicatorColor: blueColor,
indicatorWeight: 3.0,
tabs: _tabsButton,
controller: _tabController,
),
),
);
}
}

View file

@ -1,164 +0,0 @@
import 'dart:async';
import 'dart:math';
import 'package:flutter/material.dart';
import 'package:flutter_translate/flutter_translate.dart';
import 'package:logger/logger.dart';
import '../../core/enums/swipe_event.dart';
import '../../core/services/swipe_service.dart';
import '../../core/util/logger.dart';
import '../../locator.dart';
import '../shared/app_colors.dart';
import 'history_view.dart';
import 'profile_view.dart';
import 'upload_view.dart';
class AuthenticatedTabBarView extends StatefulWidget {
@override
AuthenticatedTabBarState createState() => AuthenticatedTabBarState();
}
class AuthenticatedTabBarState extends State<AuthenticatedTabBarView>
with SingleTickerProviderStateMixin {
final Logger _logger = getLogger();
final SwipeService _swipeService = locator<SwipeService>();
late StreamSubscription _swipeEventSubscription;
TabController? _tabController;
int _currentTabIndex = 0;
List<Widget> _realPages = [UploadView(), HistoryView(), ProfileView()];
List<Widget> _tabPages = [
UploadView(),
Container(),
Container(),
];
List<bool> _hasInit = [true, false, false];
@override
void initState() {
super.initState();
_tabController = TabController(length: _realPages.length, vsync: this)
..addListener(() {
int selectedIndex = _tabController!.index;
if (_currentTabIndex != selectedIndex) {
if (!_hasInit[selectedIndex]) {
_tabPages[selectedIndex] = _realPages[selectedIndex];
_hasInit[selectedIndex] = true;
}
setState(() => _currentTabIndex = selectedIndex);
}
});
_swipeEventSubscription =
_swipeService.swipeEventController.stream.listen((SwipeEvent event) {
_logger.d('Received a swipe event for the authenticated tab bar: $event');
int targetIndex = _currentTabIndex;
if (SwipeEvent.Left == event) {
targetIndex = min(_currentTabIndex + 1, _realPages.length - 1);
}
if (SwipeEvent.Right == event) {
targetIndex = max(_currentTabIndex - 1, 0);
}
if (SwipeEvent.Start == event) {
targetIndex = 0;
}
if (SwipeEvent.End == event) {
targetIndex = _tabPages.length - 1;
}
_logger.d(
"Changing to tab '$targetIndex' because of a swipe event '$event'");
_tabController!.animateTo(targetIndex);
});
}
@override
void dispose() {
_tabController!.dispose();
_swipeEventSubscription.cancel();
super.dispose();
}
@override
Widget build(BuildContext context) {
double width = MediaQuery.of(context).size.width;
double yourWidth = width / 3;
double yourHeight = 55;
Color colorTabItem0 =
_currentTabIndex == 0 ? blueColor : primaryAccentColor;
Color colorTabItem1 =
_currentTabIndex == 1 ? blueColor : primaryAccentColor;
Color colorTabItem2 =
_currentTabIndex == 2 ? blueColor : primaryAccentColor;
List<Widget> _tabsButton = [
Container(
width: yourWidth,
height: yourHeight,
alignment: Alignment.center,
child: Tab(
icon: Icon(
_currentTabIndex == 0
? Icons.upload_outlined
: Icons.upload_rounded,
color: colorTabItem0,
),
child: Text(translate('tabs.upload'),
style: TextStyle(color: colorTabItem0)),
),
),
Container(
width: yourWidth,
height: yourHeight,
alignment: Alignment.center,
child: Tab(
icon: Icon(
_currentTabIndex == 1
? Icons.history_outlined
: Icons.history_rounded,
color: colorTabItem1,
),
child: Text(translate('tabs.history'),
style: TextStyle(color: colorTabItem1)),
),
),
Container(
width: yourWidth,
height: yourHeight,
alignment: Alignment.center,
child: Tab(
icon: Icon(
_currentTabIndex == 2
? Icons.person_outlined
: Icons.person_rounded,
color: colorTabItem2,
),
child: Text(translate('tabs.profile'),
style: TextStyle(color: colorTabItem2)),
),
),
];
return Scaffold(
body: IndexedStack(index: _currentTabIndex, children: _tabPages),
bottomNavigationBar: BottomAppBar(
child: TabBar(
indicatorSize: TabBarIndicatorSize.label,
labelColor: primaryAccentColor,
indicatorColor: blueColor,
indicatorWeight: 3.0,
labelPadding: EdgeInsets.all(0),
tabs: _tabsButton,
isScrollable: true,
controller: _tabController,
)),
);
}
}

View file

@ -1,11 +1,13 @@
import 'package:fbmobile/ui/views/login_view.dart';
import 'package:fbmobile/ui/views/navbar_authenticated.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import '../../core/models/session.dart';
import 'tabbar_anonymous.dart';
import 'tabbar_authenticated.dart';
class TabBarContainerView extends StatelessWidget {
const TabBarContainerView({super.key});
@override
Widget build(BuildContext context) {
Session? currentSession = Provider.of<Session?>(context);
@ -13,9 +15,9 @@ class TabBarContainerView extends StatelessWidget {
currentSession != null ? currentSession.apiKey.isNotEmpty : false;
if (isAuthenticated) {
return AuthenticatedTabBarView();
return const AuthenticatedNavBarView();
}
return AnonymousTabBarView();
return LoginView();
}
}

View file

@ -1,4 +1,5 @@
import 'package:clipboard/clipboard.dart';
import 'package:fbmobile/core/util/formatter_util.dart';
import 'package:flutter/material.dart';
import 'package:flutter_translate/flutter_translate.dart';
import 'package:provider/provider.dart';
@ -9,37 +10,37 @@ import '../../core/viewmodels/upload_model.dart';
import '../shared/app_colors.dart';
import '../widgets/centered_error_row.dart';
import '../widgets/my_appbar.dart';
import '../widgets/swipe_navigation.dart';
import 'base_view.dart';
class UploadView extends StatelessWidget {
static const routeName = '/upload';
const UploadView({super.key});
@override
Widget build(BuildContext context) {
return BaseView<UploadModel>(
onModelReady: (model) => model.init(),
builder: (context, model, child) => Scaffold(
appBar: MyAppBar(title: Text(translate('titles.upload'))),
backgroundColor: backgroundColor,
body: SwipeNavigation(child: _render(model, context))));
body: _render(model, context)));
}
bool _isUploadButtonEnabled(UploadModel model) {
return model.pasteTextTouched ||
(model.paths != null && model.paths!.length > 0);
(model.paths != null && model.paths!.isNotEmpty);
}
Widget _render(UploadModel model, BuildContext context) {
var url = Provider.of<Session>(context).url;
return model.state == ViewState.Busy
return model.state == ViewState.busy
? Center(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
CircularProgressIndicator(),
const CircularProgressIndicator(),
(model.stateMessage != null && model.stateMessage!.isNotEmpty
? Text(model.stateMessage!)
: Container())
@ -56,18 +57,17 @@ class UploadView extends StatelessWidget {
minLines: 1,
maxLines: 7,
decoration: InputDecoration(
prefixIcon: Icon(
prefixIcon: const Icon(
Icons.text_snippet,
color: buttonBackgroundColor,
),
suffixIcon: IconButton(
onPressed: () =>
model.pasteTextController.clear(),
icon: Icon(Icons.clear),
icon: const Icon(Icons.clear),
),
hintText: translate('upload.text_to_be_pasted'),
contentPadding:
EdgeInsets.fromLTRB(20.0, 10.0, 20.0, 10.0),
contentPadding: const EdgeInsets.fromLTRB(
20.0, 10.0, 20.0, 10.0),
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(32.0)),
),
@ -85,24 +85,21 @@ class UploadView extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.end,
children: [
ElevatedButton.icon(
icon: Icon(Icons.file_copy_sharp,
icon: const Icon(Icons.file_copy_sharp,
color: blueColor),
onPressed: () => model.openFileExplorer(),
label: Text(
translate('upload.open_file_explorer'),
style:
TextStyle(color: buttonForegroundColor),
)),
ElevatedButton.icon(
icon: Icon(Icons.cancel, color: orangeColor),
icon: const Icon(Icons.cancel,
color: orangeColor),
onPressed: model.paths != null &&
model.paths!.length > 0
model.paths!.isNotEmpty
? () => model.clearCachedFiles()
: null,
label: Text(
translate('upload.clear_temporary_files'),
style:
TextStyle(color: buttonForegroundColor),
)),
],
)),
@ -151,19 +148,20 @@ class UploadView extends StatelessWidget {
),
content: Text(translate(
'upload.uploaded')),
duration: Duration(seconds: 10),
duration:
const Duration(seconds: 10),
);
ScaffoldMessenger.of(context)
.showSnackBar(snackBar);
if (context.mounted) {
ScaffoldMessenger.of(context)
.showSnackBar(snackBar);
}
});
}
},
icon: Icon(Icons.upload_rounded,
icon: const Icon(Icons.upload_rounded,
color: greenColor),
label: Text(
translate('upload.upload'),
style:
TextStyle(color: buttonForegroundColor),
)),
])),
model.errorMessage != null && model.errorMessage!.isNotEmpty
@ -174,13 +172,13 @@ class UploadView extends StatelessWidget {
: Container(),
Builder(
builder: (BuildContext context) => model.loadingPath
? Padding(
padding: const EdgeInsets.only(bottom: 10.0),
child: const CircularProgressIndicator(),
? const Padding(
padding: EdgeInsets.only(bottom: 10.0),
child: CircularProgressIndicator(),
)
: model.paths != null
? Container(
padding: const EdgeInsets.only(bottom: 30.0),
padding: const EdgeInsets.only(bottom: 20.0),
height:
MediaQuery.of(context).size.height * 0.50,
child: ListView.separated(
@ -198,7 +196,13 @@ class UploadView extends StatelessWidget {
.map((e) => e.name)
.toList()[index]
: model.fileName ?? '...');
final path = model.paths!.length > 0
final size = model.paths!.isNotEmpty
? model.paths!
.map((e) => e.size)
.toList()[index]
.toString()
: '';
final path = model.paths!.isNotEmpty
? model.paths!
.map((e) => e.path)
.toList()[index]
@ -207,8 +211,14 @@ class UploadView extends StatelessWidget {
return Card(
child: ListTile(
trailing: IconButton(
icon: const Icon(Icons.clear,
color: orangeColor),
onPressed: () {
model.deleteIntentFile(path);
}),
title: Text(
name,
"$name (${FormatterUtil.formatBytes(int.parse(size), 2)})",
),
subtitle: Text(path),
));

View file

@ -3,18 +3,16 @@ import 'package:flutter/material.dart';
import '../../core/services/navigation_service.dart';
import '../../locator.dart';
import '../../ui/views/about_view.dart';
import '../shared/app_colors.dart';
class AboutIconButton extends StatelessWidget {
AboutIconButton();
AboutIconButton({super.key});
final NavigationService _navigationService = locator<NavigationService>();
@override
Widget build(BuildContext context) {
return IconButton(
icon: Icon(Icons.help),
color: whiteColor,
icon: const Icon(Icons.help),
onPressed: () {
_navigationService.navigateTo(AboutView.routeName);
});

View file

@ -6,7 +6,7 @@ class CenteredErrorRow extends StatelessWidget {
final Function? retryCallback;
final String? message;
CenteredErrorRow(this.message, {this.retryCallback});
const CenteredErrorRow(this.message, {super.key, this.retryCallback});
@override
Widget build(BuildContext context) {
@ -20,7 +20,10 @@ class CenteredErrorRow extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
Expanded(child: Center(child: Text(message!, style: TextStyle(color: redColor)))),
Expanded(
child: Center(
child: Text(message!,
style: const TextStyle(color: redColor)))),
],
),
(retryCallback != null
@ -30,7 +33,7 @@ class CenteredErrorRow extends StatelessWidget {
children: <Widget>[
Center(
child: IconButton(
icon: Icon(Icons.refresh),
icon: const Icon(Icons.refresh),
color: primaryAccentColor,
onPressed: () {
retryCallback!();

View file

@ -10,18 +10,25 @@ class LoginApiKeyHeaders extends StatelessWidget {
final String? validationMessage;
LoginApiKeyHeaders({required this.uriController, required this.apiKeyController, this.validationMessage});
const LoginApiKeyHeaders(
{super.key,
required this.uriController,
required this.apiKeyController,
this.validationMessage});
@override
Widget build(BuildContext context) {
return Column(children: <Widget>[
this.validationMessage != null ? Text(validationMessage!, style: TextStyle(color: redColor)) : Container(),
LoginTextField(uriController, translate('login.url_placeholder'), Icon(Icons.link),
validationMessage != null
? Text(validationMessage!, style: const TextStyle(color: redColor))
: Container(),
LoginTextField(uriController, translate('login.url_placeholder'),
const Icon(Icons.link),
keyboardType: TextInputType.url),
LoginTextField(
apiKeyController,
translate('login.apikey_placeholder'),
Icon(Icons.vpn_key),
const Icon(Icons.vpn_key),
obscureText: true,
),
]);

View file

@ -11,8 +11,9 @@ class LoginCredentialsHeaders extends StatelessWidget {
final String? validationMessage;
LoginCredentialsHeaders(
{required this.uriController,
const LoginCredentialsHeaders(
{super.key,
required this.uriController,
required this.usernameController,
required this.passwordController,
this.validationMessage});
@ -20,12 +21,17 @@ class LoginCredentialsHeaders extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Column(children: <Widget>[
this.validationMessage != null ? Text(validationMessage!, style: TextStyle(color: redColor)) : Container(),
LoginTextField(uriController, translate('login.url_placeholder'), Icon(Icons.link),
validationMessage != null
? Text(validationMessage!, style: const TextStyle(color: redColor))
: Container(),
LoginTextField(uriController, translate('login.url_placeholder'),
const Icon(Icons.link),
keyboardType: TextInputType.url),
LoginTextField(usernameController, translate('login.username_placeholder'), Icon(Icons.person),
LoginTextField(usernameController,
translate('login.username_placeholder'), const Icon(Icons.person),
keyboardType: TextInputType.name),
LoginTextField(passwordController, translate('login.password_placeholder'), Icon(Icons.vpn_key),
LoginTextField(passwordController,
translate('login.password_placeholder'), const Icon(Icons.vpn_key),
obscureText: true),
]);
}

View file

@ -1,7 +1,5 @@
import 'package:flutter/material.dart';
import '../shared/app_colors.dart';
class LoginTextField extends StatelessWidget {
final TextEditingController controller;
final String placeHolder;
@ -9,29 +7,31 @@ class LoginTextField extends StatelessWidget {
final bool obscureText;
final Widget prefixIcon;
LoginTextField(this.controller, this.placeHolder, this.prefixIcon,
{this.keyboardType = TextInputType.text, this.obscureText = false});
const LoginTextField(this.controller, this.placeHolder, this.prefixIcon,
{super.key,
this.keyboardType = TextInputType.text,
this.obscureText = false});
@override
Widget build(BuildContext context) {
return Container(
padding: EdgeInsets.symmetric(horizontal: 10.0),
margin: EdgeInsets.symmetric(horizontal: 10.0, vertical: 10.0),
padding: const EdgeInsets.symmetric(horizontal: 10.0),
margin: const EdgeInsets.symmetric(horizontal: 10.0, vertical: 10.0),
height: 50.0,
alignment: Alignment.centerLeft,
decoration: BoxDecoration(color: whiteColor, borderRadius: BorderRadius.circular(10.0)),
child: TextFormField(
keyboardType: keyboardType,
obscureText: obscureText,
decoration: InputDecoration(
suffixIcon: IconButton(
onPressed: () => controller.clear(),
icon: Icon(Icons.clear),
icon: const Icon(Icons.clear),
),
prefixIcon: prefixIcon,
hintText: placeHolder,
contentPadding: EdgeInsets.fromLTRB(20.0, 10.0, 20.0, 10.0),
border: OutlineInputBorder(borderRadius: BorderRadius.circular(32.0)),
contentPadding: const EdgeInsets.fromLTRB(20.0, 10.0, 20.0, 10.0),
border:
OutlineInputBorder(borderRadius: BorderRadius.circular(32.0)),
),
controller: controller),
);

View file

@ -1,7 +1,5 @@
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import '../shared/app_colors.dart';
import '../widgets/about_iconbutton.dart';
class MyAppBar extends AppBar {
@ -9,25 +7,17 @@ class MyAppBar extends AppBar {
static final List<Widget> aboutDisabledWidgets = [];
MyAppBar(
{Key? key,
{super.key,
required Widget title,
List<Widget>? actionWidgets,
bool enableAbout = true})
: super(
key: key,
title: Row(children: <Widget>[title]),
actions: _renderIconButtons(actionWidgets, enableAbout),
systemOverlayStyle: SystemUiOverlayStyle(
systemNavigationBarColor: primaryAccentColor, // Navigation bar
statusBarColor: primaryAccentColor, // Status bar
),
backgroundColor: primaryAccentColor);
actions: _renderIconButtons(actionWidgets, enableAbout));
static List<Widget> _renderIconButtons(
List<Widget>? actionWidgets, bool aboutEnabled) {
if (actionWidgets == null) {
actionWidgets = [];
}
actionWidgets ??= [];
List<Widget> widgets = [...actionWidgets];

View file

@ -1,38 +0,0 @@
import 'package:flutter/material.dart';
import 'package:simple_gesture_detector/simple_gesture_detector.dart';
import '../../core/enums/swipe_event.dart';
import '../../core/services/swipe_service.dart';
import '../../locator.dart';
class SwipeNavigation extends StatefulWidget {
/// Widget to be augmented with gesture detection.
final Widget? child;
/// Creates a [SwipeNavigation] widget.
const SwipeNavigation({
Key? key,
this.child,
}) : super(key: key);
@override
_SwipeNavigationState createState() => _SwipeNavigationState();
}
class _SwipeNavigationState extends State<SwipeNavigation> {
final SwipeService _swipeService = locator<SwipeService>();
void _onHorizontalSwipe(SwipeDirection direction) {
if (direction == SwipeDirection.left) {
_swipeService.addEvent(SwipeEvent.Left);
} else {
_swipeService.addEvent(SwipeEvent.Right);
}
}
@override
Widget build(BuildContext context) {
return SimpleGestureDetector(
onHorizontalSwipe: _onHorizontalSwipe, child: widget.child!);
}
}

File diff suppressed because it is too large Load diff

View file

@ -11,43 +11,47 @@ description: A mobile client for FileBin.
# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
# Read more about iOS versioning at
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
version: 1.4.2+15
version: 1.6.4+22
environment:
sdk: '>=2.16.2 <3.0.0'
sdk: '>=3.5.0 <4.0.0'
dependencies:
flutter:
sdk: flutter
cupertino_icons: 1.0.4
cupertino_icons: 1.0.8
flutter_localizations:
sdk: flutter
flutter_translate: 3.0.1
provider: 6.0.2
stacked: 2.3.3
get_it: 7.2.0
logger: 1.1.0
shared_preferences: 2.0.13
http: 0.13.4
flutter_translate: 4.1.0
provider: 6.1.2
stacked: 3.4.3
get_it: 7.7.0
logger: 2.4.0
shared_preferences: 2.3.2
http: 1.2.2
validators: 3.0.0
flutter_linkify: 5.0.2
url_launcher: 6.1.0
flutter_linkify: 6.0.0
url_launcher: 6.3.1
expandable: 5.0.1
share_plus: 4.0.4
file_picker: 4.5.1
share_plus: 10.1.1
file_picker: 8.1.3
clipboard: 0.1.3
receive_sharing_intent: 1.4.5
permission_handler: 9.2.0
package_info_plus: 1.4.2
simple_gesture_detector: 0.2.0
json_annotation: 4.5.0
permission_handler: 11.3.1
package_info_plus: 8.1.0
json_annotation: 4.9.0
dynamic_color: 1.7.0
intl: 0.19.0
path: 1.9.0
flutter_sharing_intent: 1.1.1
device_info_plus: 11.1.0
dev_dependencies:
flutter_test:
sdk: flutter
build_runner: 2.1.10
built_value_generator: ^8.2.3
json_serializable: 6.2.0
build_runner: 2.4.13
built_value_generator: 8.9.2
json_serializable: 6.8.0
flutter_lints: 5.0.0
# For information on the generic Dart part of this file, see the
# following page: https://www.dartlang.org/tools/pub/pubspec

38
renovate.json5 Normal file
View file

@ -0,0 +1,38 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"config:recommended",
":rebaseStalePrs",
":ignoreUnstable",
"group:monorepos",
"group:recommended"
],
"prConcurrentLimit": 0,
"schedule": [
"monthly"
],
"ignorePaths": [
"android/**",
"ios/**"
],
"ignoreDeps": [
"intl",
"path"
],
"packageRules": [
{
"matchUpdateTypes": [
"minor"
],
"groupName": "all minor dependencies",
"groupSlug": "all-minor-deps"
},
{
"matchUpdateTypes": [
"patch"
],
"groupName": "all patch dependencies",
"groupSlug": "all-patch-deps"
}
]
}