varakh/fbmobile
1
0
Fork 0
Code Issues 1 Pull requests Releases 19 Activity Actions

Compare commits

base: varakh:master
Branches Tags
varakh:develop
varakh:master
varakh:1.6.4+22
varakh:1.6.3+21
varakh:1.6.2+20
varakh:1.6.1+19
varakh:1.6.0+18
varakh:1.5.1+17
varakh:1.5.0+16
varakh:1.4.2+15
varakh:1.4.1+14
varakh:1.4.0+13
varakh:1.3.3+12
varakh:1.3.2+11
varakh:1.3.1+10
varakh:1.3.0+9
varakh:1.2.2+8
varakh:1.2.1+7
varakh:1.2.0+6
varakh:1.1.0+5
varakh:1.0.0+4
varakh:1.0.0+2
..
compare: varakh:1.3.0+9
Branches Tags
varakh:develop
varakh:master
varakh:1.6.4+22
varakh:1.6.3+21
varakh:1.6.2+20
varakh:1.6.1+19
varakh:1.6.0+18
varakh:1.5.1+17
varakh:1.5.0+16
varakh:1.4.2+15
varakh:1.4.1+14
varakh:1.4.0+13
varakh:1.3.3+12
varakh:1.3.2+11
varakh:1.3.1+10
varakh:1.3.0+9
varakh:1.2.2+8
varakh:1.2.1+7
varakh:1.2.0+6
varakh:1.1.0+5
varakh:1.0.0+4
varakh:1.0.0+2

No commits in common. "master" and "1.3.0+9" have entirely different histories.
master ... 1.3.0+9

103 changed files with 1601 additions and 3906 deletions
Show stats Expand all files Collapse all files

6
.editorconfig
View file

@ -1,6 +0,0 @@
[*]
end_of_line = lf
insert_final_newline = true
charset = utf-8
indent_style = space
indent_size = 4

21
.forgejo/workflows/build.yaml
View file

@ -1,21 +0,0 @@
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

2
.gitignore vendored
View file

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

69
CHANGELOG.md
View file

@ -1,74 +1,5 @@
# CHANGELOG # 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
* Updated to Android embedding v2
* Updated to Gradle 7
* Upgraded internal dependencies to latest versions
## 1.4.1+14
* Fixed opening links
## 1.4.0+13
* Increased target SDK to `30`
* Upgraded to Dart `2.15.1`
* Upgraded to use null-safety
* Upgraded internal dependencies to latest versions
* Replaced `share` with `share_plus`
## 1.3.3+12
* Automatically switch to initial tab when coming from the share menu
* Upgraded internal dependencies
## 1.3.2+11
* Add a slash to copied URLs
* Expand item when pressing on the card's title in history view
## 1.3.1+10
* Added gesture detection for tab bar
* Disable upload when no files have been attached or upload text input is empty
* Added version information to about view
* Minor refactor regarding state management
## 1.3.0+9 ## 1.3.0+9
* Allow API key login * Allow API key login
* Revamp profile view * Revamp profile view

8
LICENSE.txt
View file

@ -404,14 +404,6 @@ where to find the applicable terms.
form of a separately written license, or stated as exceptions; form of a separately written license, or stated as exceptions;
the above requirements apply either way. 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. 8. Termination.
You may not propagate or modify a covered work except as expressly You may not propagate or modify a covered work except as expressly

45
README.md
View file

@ -1,14 +1,8 @@
# README # README
A mobile flutter app for [FileBin](https://git.server-speed.net/users/flo/filebin/). A mobile flutter app for [FileBin](https://github.com/Bluewind/filebin).
Available on the [Play Store](https://play.google.com/store/apps/details?id=de.varakh.fbmobile) and Available on the [Play Store](https://play.google.com/store/apps/details?id=de.varakh.fbmobile).
[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 ## Getting Started
@ -35,6 +29,13 @@ This project is a starting point for a Flutter application.
Start by installing dependencies and generating entities! Start by installing dependencies and generating entities!
### Working versions for SDK
```
[✓] Flutter (Channel stable, 2.0.4, on Linux, locale de_DE.UTF-8)
[✓] Android toolchain - develop for Android devices (Android SDK version 29.0.3)
```
## Dependencies ## 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 * 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
@ -95,7 +96,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. You need access to the git repository in which those private files reside.
#### Usage / doing the actual release #### Usage
Go into the platform directory you want to build for, e.g. `ios/` or `android/` and then look into the 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 `Fastlane` file which lanes are present. Run a lane via `fastlane <platform> <lane>`, e.g. use the
@ -105,37 +106,13 @@ following to build for Android `fastlane android build`.
##### Android ##### Android
It's recommended you set up `fastlane` via `bundler` (you need this to be installed on your machine). Use `fastlane android beta` to build and upload a new beta version to the Play Store.
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 ##### iOS
For iOS you need to execute `fastlane ios build` before uploading to testflight with For iOS you need to execute `fastlane ios build` before uploading to testflight with
`fastlane ios beta`. `fastlane ios beta`.
Probably do the same Ruby/fastlane setup as mentioned under the _Android_ section.
### Release manually (not recommended) ### Release manually (not recommended)
See the following links on how to setup: See the following links on how to setup:

30
analysis_options.yaml
View file

@ -1,30 +0,0 @@
# 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,5 +5,3 @@ gradle-wrapper.jar
/gradlew.bat /gradlew.bat
/local.properties /local.properties
GeneratedPluginRegistrant.java GeneratedPluginRegistrant.java
.bundle
vendor/

222
android/Gemfile.lock
View file

@ -1,222 +0,0 @@
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

22
android/app/build.gradle
View file

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

15
android/app/src/debug/AndroidManifest.xml
View file

@ -3,17 +3,6 @@
<!-- Flutter needs it to communicate with the running application <!-- Flutter needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc. to allow setting breakpoints, to provide hot reload, etc.
--> -->
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32" /> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
<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>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="https" />
</intent>
</queries>
</manifest> </manifest>

32
android/app/src/main/AndroidManifest.xml
View file

@ -6,46 +6,50 @@
additional functionality it is fine to subclass or reimplement additional functionality it is fine to subclass or reimplement
FlutterApplication and put your custom class here. --> FlutterApplication and put your custom class here. -->
<application <application
android:name="${applicationName}" android:name="io.flutter.app.FlutterApplication"
android:label="FileBin" android:label="FileBin"
android:icon="@mipmap/ic_launcher"> android:icon="@mipmap/ic_launcher">
<activity <activity
android:name=".MainActivity" android:name=".MainActivity"
android:exported="true"
android:launchMode="singleTask" android:launchMode="singleTask"
android:theme="@style/LaunchTheme" android:theme="@style/LaunchTheme"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
android:hardwareAccelerated="true" android:hardwareAccelerated="true"
android:windowSoftInputMode="adjustResize"> android:windowSoftInputMode="adjustResize">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter> </intent-filter>
<intent-filter> <intent-filter>
<action android:name="android.intent.action.SEND" /> <action android:name="android.intent.action.SEND" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<data android:mimeType="text/*" /> <data android:mimeType="text/*" />
</intent-filter> </intent-filter>
<intent-filter> <intent-filter>
<action android:name="android.intent.action.SEND" /> <action android:name="android.intent.action.SEND" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<data android:mimeType="image/*" /> <data android:mimeType="image/*" />
</intent-filter> </intent-filter>
<intent-filter> <intent-filter>
<action android:name="android.intent.action.SEND_MULTIPLE" /> <action android:name="android.intent.action.SEND_MULTIPLE" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<data android:mimeType="image/*" /> <data android:mimeType="image/*" />
</intent-filter> </intent-filter>
<intent-filter> <intent-filter>
<action android:name="android.intent.action.SEND_MULTIPLE" /> <action android:name="android.intent.action.SEND" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<data android:mimeType="image/*" /> <data android:mimeType="video/*" />
</intent-filter> </intent-filter>
<intent-filter> <intent-filter>
<action android:name="android.intent.action.SEND_MULTIPLE" /> <action android:name="android.intent.action.SEND_MULTIPLE" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
<data android:mimeType="video/*" /> <data android:mimeType="video/*" />
</intent-filter> </intent-filter>
<intent-filter> <intent-filter>
<action android:name="android.intent.action.SEND" /> <action android:name="android.intent.action.SEND" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
@ -63,18 +67,6 @@
android:name="flutterEmbedding" android:name="flutterEmbedding"
android:value="2" /> android:value="2" />
</application> </application>
<uses-permission android:name="android.permission.INTERNET"/>
<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>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="https" />
</intent>
</queries>
</manifest> </manifest>

7
android/app/src/main/java/de/varakh/fbmobile/MainActivity.java
View file

@ -1,6 +1,13 @@
package de.varakh.fbmobile; package de.varakh.fbmobile;
import androidx.annotation.NonNull;
import io.flutter.embedding.android.FlutterActivity; import io.flutter.embedding.android.FlutterActivity;
import io.flutter.embedding.engine.FlutterEngine;
import io.flutter.plugins.GeneratedPluginRegistrant;
public class MainActivity extends FlutterActivity { public class MainActivity extends FlutterActivity {
@Override
public void configureFlutterEngine(@NonNull FlutterEngine flutterEngine) {
GeneratedPluginRegistrant.registerWith(flutterEngine);
}
} }

3
android/app/src/main/res/drawable/launch_background.xml
View file

@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?><!-- Modify this file to customize your launch splash screen --> <?xml version="1.0" encoding="utf-8"?>
<!-- Modify this file to customize your launch splash screen -->
<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@android:color/white" /> <item android:drawable="@android:color/white" />

1
android/app/src/main/res/values/styles.xml
View file

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar"> <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
<!-- Show a splash screen on the activity. Automatically removed when <!-- Show a splash screen on the activity. Automatically removed when
Flutter draws its first frame --> Flutter draws its first frame -->

15
android/app/src/profile/AndroidManifest.xml
View file

@ -3,17 +3,6 @@
<!-- Flutter needs it to communicate with the running application <!-- Flutter needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc. to allow setting breakpoints, to provide hot reload, etc.
--> -->
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32" /> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
<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>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="https" />
</intent>
</queries>
</manifest> </manifest>

17
android/build.gradle
View file

@ -1,7 +1,20 @@
buildscript {
repositories {
google()
jcenter()
}
dependencies {
// TODO switch to 4.0.1 again: https://github.com/flutter/flutter/issues/58479
// TODO switch to 4.0.1 again: https://github.com/miguelpruivo/flutter_file_picker/issues/545
classpath 'com.android.tools.build:gradle:3.6.2'
}
}
allprojects { allprojects {
repositories { repositories {
google() google()
mavenCentral() jcenter()
} }
} }
@ -13,6 +26,6 @@ subprojects {
project.evaluationDependsOn(':app') project.evaluationDependsOn(':app')
} }
tasks.register("clean", Delete) { task clean(type: Delete) {
delete rootProject.buildDir delete rootProject.buildDir
} }

5
android/fastlane/Fastfile
View file

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

70
android/fastlane/README.md
View file

@ -1,80 +1,54 @@
fastlane documentation fastlane documentation
---- ================
# Installation # Installation
Make sure you have the latest version of the Xcode command line tools installed: Make sure you have the latest version of the Xcode command line tools installed:
```sh ```
xcode-select --install xcode-select --install
``` ```
For _fastlane_ installation instructions, see [Installing _fastlane_](https://docs.fastlane.tools/#installing-fastlane) Install _fastlane_ using
```
[sudo] gem install fastlane -NV
```
or alternatively using `brew install fastlane`
# Available Actions # Available Actions
## Android ## Android
### android build_debug ### android build_debug
```sh
[bundle exec] fastlane android build_debug
``` ```
fastlane android build_debug
```
Build Debug Build Debug
### android build_production ### android build_production
```sh
[bundle exec] fastlane android build_production
``` ```
fastlane android build_production
```
Build Production Build Production
### android build_production_fdroid
```sh
[bundle exec] fastlane android build_production_fdroid
```
Build Production fdroid
### android build ### android build
```sh
[bundle exec] fastlane android build
``` ```
fastlane android build
```
Build Build
### android alpha ### android alpha
```sh
[bundle exec] fastlane android alpha
``` ```
fastlane android alpha
```
Deploy a new version to the Google Play as Alpha Deploy a new version to the Google Play as Alpha
### android beta ### android beta
```sh
[bundle exec] fastlane android beta
``` ```
fastlane android beta
```
Deploy a new version to the Google Play as Beta Deploy a new version to the Google Play as Beta
### android deploy ### android deploy
```sh
[bundle exec] fastlane android deploy
``` ```
fastlane android deploy
```
Deploy a new version to the Google Play Deploy a new version to the Google Play
---- ----
This README.md is auto-generated and will be re-generated every time [_fastlane_](https://fastlane.tools) is run. This README.md is auto-generated and will be re-generated every time [fastlane](https://fastlane.tools) is run.
More information about fastlane can be found on [fastlane.tools](https://fastlane.tools).
More information about _fastlane_ can be found on [fastlane.tools](https://fastlane.tools). The documentation of fastlane can be found on [docs.fastlane.tools](https://docs.fastlane.tools).
The documentation of _fastlane_ can be found on [docs.fastlane.tools](https://docs.fastlane.tools).

9
android/fastlane/buildAndroidProductionFdroid.sh
View file

@ -1,9 +0,0 @@
#!/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;

4
android/gradle.properties
View file

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

5
android/gradle/wrapper/gradle-wrapper.properties vendored
View file

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

30
android/settings.gradle
View file

@ -1,25 +1,15 @@
pluginManagement { include ':app'
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
}()
includeBuild("$flutterSdkPath/packages/flutter_tools/gradle") def flutterProjectRoot = rootProject.projectDir.parentFile.toPath()
repositories { def plugins = new Properties()
google() def pluginsFile = new File(flutterProjectRoot.toFile(), '.flutter-plugins')
mavenCentral() if (pluginsFile.exists()) {
gradlePluginPortal() pluginsFile.withReader('UTF-8') { reader -> plugins.load(reader) }
}
} }
plugins { plugins.each { name, path ->
id "dev.flutter.flutter-plugin-loader" version "1.0.0" def pluginDirectory = flutterProjectRoot.resolve(path).resolve('android').toFile()
id "com.android.application" version "${agpVersion}" apply false include ":$name"
id "org.jetbrains.kotlin.android" version "${kotlinVersion}" apply false project(":$name").projectDir = pluginDirectory
} }
include ":app"

19
assets/i18n/en.json
View file

@ -18,6 +18,12 @@
"about": "About", "about": "About",
"upload": "Upload" "upload": "Upload"
}, },
"tabs": {
"login": "Login",
"history": "History",
"profile": "Profile",
"upload": "New"
},
"upload": { "upload": {
"and_or": "and/or", "and_or": "and/or",
"open_file_explorer": "Select file(s)...", "open_file_explorer": "Select file(s)...",
@ -39,6 +45,7 @@
"start_services": "Starting services..." "start_services": "Starting services..."
}, },
"login": { "login": {
"help": "Login",
"compatibility_dialog": { "compatibility_dialog": {
"title": "How to login?", "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." "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."
@ -87,18 +94,16 @@
} }
}, },
"about": { "about": {
"versions": "{appName} ({packageName}) {version}+{buildNumber}",
"description": "This application is a mobile client for FileBin and it's open source. It helps you to manage your pastes.\n\nIn order to use the application, you need access to a FileBin instance.", "description": "This application is a mobile client for FileBin and it's open source. It helps you to manage your pastes.\n\nIn order to use the application, you need access to a FileBin instance.",
"faq_headline": "F.A.Q", "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.", "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?", "contact_us": "Feedback? Issues?",
"website": "https://git.server-speed.net/users/flo/filebin and https://git.myservermanager.com/varakh/fbmobile" "website": "https://github.com/Bluewind/filebin and https://github.com/v4rakh/fbmobile"
}, },
"profile": { "profile": {
"instance": "Instance", "instance": "Instance",
"connection": "{url}", "connection": "{url}",
"show_config": "Show configuration", "show_config": "Show configuration",
"show_config_loading": "Loading configuration...",
"shown_config": { "shown_config": {
"title": "Configuration", "title": "Configuration",
"description": "Upload max size: {uploadMaxSize}\n\nMax files per request: {maxFilesPerRequest}\n\nMax inputs vars: {maxInputVars}\n\nRequest max size: {requestMaxSize}", "description": "Upload max size: {uploadMaxSize}\n\nMax files per request: {maxFilesPerRequest}\n\nMax inputs vars: {maxInputVars}\n\nRequest max size: {requestMaxSize}",
@ -126,6 +131,14 @@
"description": "Could not open '{link}'. Please ensure that you have an application installed which handles opening such link types." "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": { "dialog": {
"confirm": "OK", "confirm": "OK",
"cancel": "Cancel" "cancel": "Cancel"

563
assets/logo_caption.svg
View file

@ -1,462 +1,225 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?><!-- Created with Inkscape (http://www.inkscape.org/) --> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" <!-- Created with Inkscape (http://www.inkscape.org/) -->
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" <svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="128" height="128" id="svg2" version="1.1" inkscape:version="0.48.4 r9939" sodipodi:docname="FileBin.LOGO.6.FINAL.0.svg" inkscape:export-filename="/media/win2/projects/design/FileBin_(paste.xinu.at)_LOGO/FileBin.LOGO.6.FINAL.0.png" inkscape:export-xdpi="300" inkscape:export-ydpi="300">
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="128" height="128" id="svg2"
version="1.1" inkscape:version="0.48.4 r9939" sodipodi:docname="FileBin.LOGO.6.FINAL.0.svg"
inkscape:export-filename="/media/win2/projects/design/FileBin_(paste.xinu.at)_LOGO/FileBin.LOGO.6.FINAL.0.png"
inkscape:export-xdpi="300" inkscape:export-ydpi="300">
<defs id="defs4"> <defs id="defs4">
<linearGradient inkscape:collect="always" id="linearGradient13881"> <linearGradient inkscape:collect="always" id="linearGradient13881">
<stop style="stop-color:#eeeeec;stop-opacity:1" offset="0" id="stop13883" /> <stop style="stop-color:#eeeeec;stop-opacity:1" offset="0" id="stop13883"/>
<stop style="stop-color:#ffffff;stop-opacity:1" offset="1" id="stop13885" /> <stop style="stop-color:#ffffff;stop-opacity:1" offset="1" id="stop13885"/>
</linearGradient> </linearGradient>
<linearGradient inkscape:collect="always" xlink:href="#linearGradient13881" <linearGradient inkscape:collect="always" xlink:href="#linearGradient13881" id="linearGradient13887" x1="363.7587" y1="781.0882" x2="363.7587" y2="270.32452" gradientUnits="userSpaceOnUse"/>
id="linearGradient13887" x1="363.7587" y1="781.0882" x2="363.7587" y2="270.32452" <linearGradient inkscape:collect="always" xlink:href="#linearGradient13831-5" id="linearGradient13837-1" x1="128.57443" y1="886.22906" x2="128.57443" y2="1012.7642" gradientUnits="userSpaceOnUse"/>
gradientUnits="userSpaceOnUse" />
<linearGradient inkscape:collect="always" xlink:href="#linearGradient13831-5"
id="linearGradient13837-1" x1="128.57443" y1="886.22906" x2="128.57443" y2="1012.7642"
gradientUnits="userSpaceOnUse" />
<linearGradient inkscape:collect="always" id="linearGradient13831-5"> <linearGradient inkscape:collect="always" id="linearGradient13831-5">
<stop style="stop-color:#ef2929;stop-opacity:1" offset="0" id="stop13833-4" /> <stop style="stop-color:#ef2929;stop-opacity:1" offset="0" id="stop13833-4"/>
<stop style="stop-color:#a40000;stop-opacity:1" offset="1" id="stop13835-1" /> <stop style="stop-color:#a40000;stop-opacity:1" offset="1" id="stop13835-1"/>
</linearGradient> </linearGradient>
<linearGradient gradientTransform="translate(-0.7412829,-138.61258)" <linearGradient gradientTransform="translate(-0.7412829,-138.61258)" inkscape:collect="always" xlink:href="#linearGradient13831-4" id="linearGradient13837-6" x1="128.57443" y1="886.22906" x2="128.57443" y2="1012.7642" gradientUnits="userSpaceOnUse"/>
inkscape:collect="always" xlink:href="#linearGradient13831-4" id="linearGradient13837-6"
x1="128.57443" y1="886.22906" x2="128.57443" y2="1012.7642"
gradientUnits="userSpaceOnUse" />
<linearGradient inkscape:collect="always" id="linearGradient13831-4"> <linearGradient inkscape:collect="always" id="linearGradient13831-4">
<stop style="stop-color:#729fcf;stop-opacity:1" offset="0" id="stop13833-0" /> <stop style="stop-color:#729fcf;stop-opacity:1" offset="0" id="stop13833-0"/>
<stop style="stop-color:#3465a4;stop-opacity:1" offset="1" id="stop13835-4" /> <stop style="stop-color:#3465a4;stop-opacity:1" offset="1" id="stop13835-4"/>
</linearGradient> </linearGradient>
<linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5" <linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5" id="linearGradient13887-0" x1="363.7587" y1="781.0882" x2="363.7587" y2="270.32452" gradientUnits="userSpaceOnUse"/>
id="linearGradient13887-0" x1="363.7587" y1="781.0882" x2="363.7587" y2="270.32452"
gradientUnits="userSpaceOnUse" />
<linearGradient inkscape:collect="always" id="linearGradient13881-5"> <linearGradient inkscape:collect="always" id="linearGradient13881-5">
<stop style="stop-color:#eeeeec;stop-opacity:1" offset="0" id="stop13883-7" /> <stop style="stop-color:#eeeeec;stop-opacity:1" offset="0" id="stop13883-7"/>
<stop style="stop-color:#ffffff;stop-opacity:1" offset="1" id="stop13885-3" /> <stop style="stop-color:#ffffff;stop-opacity:1" offset="1" id="stop13885-3"/>
</linearGradient> </linearGradient>
<linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5" <linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5" id="linearGradient13991" x1="363.7587" y1="781.0882" x2="363.7587" y2="270.32452" gradientUnits="userSpaceOnUse"/>
id="linearGradient13991" x1="363.7587" y1="781.0882" x2="363.7587" y2="270.32452" <linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5" id="linearGradient13999" x1="363.7587" y1="781.0882" x2="363.7587" y2="270.32452" gradientUnits="userSpaceOnUse"/>
gradientUnits="userSpaceOnUse" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5" id="linearGradient14007" x1="363.7587" y1="781.0882" x2="363.7587" y2="270.32452" gradientUnits="userSpaceOnUse"/>
<linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5" <linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5" id="linearGradient14015" x1="363.7587" y1="781.0882" x2="363.7587" y2="270.32452" gradientUnits="userSpaceOnUse"/>
id="linearGradient13999" x1="363.7587" y1="781.0882" x2="363.7587" y2="270.32452" <linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5" id="linearGradient14023" x1="363.7587" y1="781.0882" x2="363.7587" y2="270.32452" gradientUnits="userSpaceOnUse"/>
gradientUnits="userSpaceOnUse" /> <linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587" gradientUnits="userSpaceOnUse" id="linearGradient14045" xlink:href="#linearGradient13881-5" inkscape:collect="always"/>
<linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5" <linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587" gradientUnits="userSpaceOnUse" id="linearGradient14047" xlink:href="#linearGradient13881-5" inkscape:collect="always"/>
id="linearGradient14007" x1="363.7587" y1="781.0882" x2="363.7587" y2="270.32452" <linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587" gradientUnits="userSpaceOnUse" id="linearGradient14049" xlink:href="#linearGradient13881-5" inkscape:collect="always"/>
gradientUnits="userSpaceOnUse" /> <linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587" gradientUnits="userSpaceOnUse" id="linearGradient14051" xlink:href="#linearGradient13881-5" inkscape:collect="always"/>
<linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5" <linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587" gradientUnits="userSpaceOnUse" id="linearGradient14053" xlink:href="#linearGradient13881-5" inkscape:collect="always"/>
id="linearGradient14015" x1="363.7587" y1="781.0882" x2="363.7587" y2="270.32452" <linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-2" id="linearGradient13887-0-0" x1="363.7587" y1="781.0882" x2="363.7587" y2="270.32452" gradientUnits="userSpaceOnUse"/>
gradientUnits="userSpaceOnUse" />
<linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5"
id="linearGradient14023" x1="363.7587" y1="781.0882" x2="363.7587" y2="270.32452"
gradientUnits="userSpaceOnUse" />
<linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587"
gradientUnits="userSpaceOnUse" id="linearGradient14045"
xlink:href="#linearGradient13881-5" inkscape:collect="always" />
<linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587"
gradientUnits="userSpaceOnUse" id="linearGradient14047"
xlink:href="#linearGradient13881-5" inkscape:collect="always" />
<linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587"
gradientUnits="userSpaceOnUse" id="linearGradient14049"
xlink:href="#linearGradient13881-5" inkscape:collect="always" />
<linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587"
gradientUnits="userSpaceOnUse" id="linearGradient14051"
xlink:href="#linearGradient13881-5" inkscape:collect="always" />
<linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587"
gradientUnits="userSpaceOnUse" id="linearGradient14053"
xlink:href="#linearGradient13881-5" inkscape:collect="always" />
<linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-2"
id="linearGradient13887-0-0" x1="363.7587" y1="781.0882" x2="363.7587" y2="270.32452"
gradientUnits="userSpaceOnUse" />
<linearGradient inkscape:collect="always" id="linearGradient13881-5-2"> <linearGradient inkscape:collect="always" id="linearGradient13881-5-2">
<stop style="stop-color:#eeeeec;stop-opacity:1" offset="0" id="stop13883-7-8" /> <stop style="stop-color:#eeeeec;stop-opacity:1" offset="0" id="stop13883-7-8"/>
<stop style="stop-color:#ffffff;stop-opacity:1" offset="1" id="stop13885-3-5" /> <stop style="stop-color:#ffffff;stop-opacity:1" offset="1" id="stop13885-3-5"/>
</linearGradient> </linearGradient>
<linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587" <linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587" gradientUnits="userSpaceOnUse" id="linearGradient14053-2" xlink:href="#linearGradient13881-5-2" inkscape:collect="always"/>
gradientUnits="userSpaceOnUse" id="linearGradient14053-2" <linearGradient gradientTransform="translate(502.01164,0.78745356)" inkscape:collect="always" xlink:href="#linearGradient13831-4-2-6" id="linearGradient13837-6-9-0" x1="128.57443" y1="886.22906" x2="128.57443" y2="1012.7642" gradientUnits="userSpaceOnUse"/>
xlink:href="#linearGradient13881-5-2" inkscape:collect="always" />
<linearGradient gradientTransform="translate(502.01164,0.78745356)"
inkscape:collect="always" xlink:href="#linearGradient13831-4-2-6"
id="linearGradient13837-6-9-0" x1="128.57443" y1="886.22906" x2="128.57443"
y2="1012.7642" gradientUnits="userSpaceOnUse" />
<linearGradient inkscape:collect="always" id="linearGradient13831-4-2-6"> <linearGradient inkscape:collect="always" id="linearGradient13831-4-2-6">
<stop style="stop-color:#babdb6;stop-opacity:1" offset="0" id="stop13833-0-6-8" /> <stop style="stop-color:#babdb6;stop-opacity:1" offset="0" id="stop13833-0-6-8"/>
<stop style="stop-color:#555753;stop-opacity:1" offset="1" id="stop13835-4-6-2" /> <stop style="stop-color:#555753;stop-opacity:1" offset="1" id="stop13835-4-6-2"/>
</linearGradient> </linearGradient>
<linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-2-2" <linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-2-2" id="linearGradient13887-0-0-5" x1="363.7587" y1="781.0882" x2="363.7587" y2="270.32452" gradientUnits="userSpaceOnUse"/>
id="linearGradient13887-0-0-5" x1="363.7587" y1="781.0882" x2="363.7587" y2="270.32452"
gradientUnits="userSpaceOnUse" />
<linearGradient inkscape:collect="always" id="linearGradient13881-5-2-2"> <linearGradient inkscape:collect="always" id="linearGradient13881-5-2-2">
<stop style="stop-color:#eeeeec;stop-opacity:1" offset="0" id="stop13883-7-8-0" /> <stop style="stop-color:#eeeeec;stop-opacity:1" offset="0" id="stop13883-7-8-0"/>
<stop style="stop-color:#ffffff;stop-opacity:1" offset="1" id="stop13885-3-5-1" /> <stop style="stop-color:#ffffff;stop-opacity:1" offset="1" id="stop13885-3-5-1"/>
</linearGradient> </linearGradient>
<linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587" <linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587" gradientUnits="userSpaceOnUse" id="linearGradient14053-2-2" xlink:href="#linearGradient13881-5-2-2" inkscape:collect="always"/>
gradientUnits="userSpaceOnUse" id="linearGradient14053-2-2" <linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587" gradientUnits="userSpaceOnUse" id="linearGradient14045-3-2" xlink:href="#linearGradient13881-5-2-2" inkscape:collect="always"/>
xlink:href="#linearGradient13881-5-2-2" inkscape:collect="always" /> <linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587" gradientUnits="userSpaceOnUse" id="linearGradient14047-4-9" xlink:href="#linearGradient13881-5-2-2" inkscape:collect="always"/>
<linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587" <linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587" gradientUnits="userSpaceOnUse" id="linearGradient14049-8-7" xlink:href="#linearGradient13881-5-2-2" inkscape:collect="always"/>
gradientUnits="userSpaceOnUse" id="linearGradient14045-3-2" <linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587" gradientUnits="userSpaceOnUse" id="linearGradient14051-6-4" xlink:href="#linearGradient13881-5-2-2" inkscape:collect="always"/>
xlink:href="#linearGradient13881-5-2-2" inkscape:collect="always" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-2-2-2" id="linearGradient13887-0-0-5-9" x1="363.7587" y1="781.0882" x2="363.7587" y2="270.32452" gradientUnits="userSpaceOnUse"/>
<linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587"
gradientUnits="userSpaceOnUse" id="linearGradient14047-4-9"
xlink:href="#linearGradient13881-5-2-2" inkscape:collect="always" />
<linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587"
gradientUnits="userSpaceOnUse" id="linearGradient14049-8-7"
xlink:href="#linearGradient13881-5-2-2" inkscape:collect="always" />
<linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587"
gradientUnits="userSpaceOnUse" id="linearGradient14051-6-4"
xlink:href="#linearGradient13881-5-2-2" inkscape:collect="always" />
<linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-2-2-2"
id="linearGradient13887-0-0-5-9" x1="363.7587" y1="781.0882" x2="363.7587"
y2="270.32452" gradientUnits="userSpaceOnUse" />
<linearGradient inkscape:collect="always" id="linearGradient13881-5-2-2-2"> <linearGradient inkscape:collect="always" id="linearGradient13881-5-2-2-2">
<stop style="stop-color:#eeeeec;stop-opacity:1" offset="0" id="stop13883-7-8-0-3" /> <stop style="stop-color:#eeeeec;stop-opacity:1" offset="0" id="stop13883-7-8-0-3"/>
<stop style="stop-color:#ffffff;stop-opacity:1" offset="1" id="stop13885-3-5-1-1" /> <stop style="stop-color:#ffffff;stop-opacity:1" offset="1" id="stop13885-3-5-1-1"/>
</linearGradient> </linearGradient>
<linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587" <linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587" gradientUnits="userSpaceOnUse" id="linearGradient14053-2-2-2" xlink:href="#linearGradient13881-5-2-2-2" inkscape:collect="always"/>
gradientUnits="userSpaceOnUse" id="linearGradient14053-2-2-2" <linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-2" id="linearGradient14674" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882" x2="363.7587" y2="270.32452"/>
xlink:href="#linearGradient13881-5-2-2-2" inkscape:collect="always" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-2" id="linearGradient14676" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882" x2="363.7587" y2="270.32452"/>
<linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-2" <linearGradient inkscape:collect="always" xlink:href="#linearGradient13881" id="linearGradient14704" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882" x2="363.7587" y2="270.32452"/>
id="linearGradient14674" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882" <linearGradient inkscape:collect="always" xlink:href="#linearGradient13881" id="linearGradient14706" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882" x2="363.7587" y2="270.32452"/>
x2="363.7587" y2="270.32452" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5" id="linearGradient14724" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882" x2="363.7587" y2="270.32452"/>
<linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-2" <linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5" id="linearGradient14726" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882" x2="363.7587" y2="270.32452"/>
id="linearGradient14676" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882" <linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-2-2" id="linearGradient14728" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882" x2="363.7587" y2="270.32452"/>
x2="363.7587" y2="270.32452" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-2-2" id="linearGradient14730" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882" x2="363.7587" y2="270.32452"/>
<linearGradient inkscape:collect="always" xlink:href="#linearGradient13881" <linearGradient gradientTransform="translate(502.01164,0.78745356)" inkscape:collect="always" xlink:href="#linearGradient13831-4-2-6-5" id="linearGradient13837-6-9-0-0" x1="128.57443" y1="886.22906" x2="128.57443" y2="1012.7642" gradientUnits="userSpaceOnUse"/>
id="linearGradient14704" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882"
x2="363.7587" y2="270.32452" />
<linearGradient inkscape:collect="always" xlink:href="#linearGradient13881"
id="linearGradient14706" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882"
x2="363.7587" y2="270.32452" />
<linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5"
id="linearGradient14724" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882"
x2="363.7587" y2="270.32452" />
<linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5"
id="linearGradient14726" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882"
x2="363.7587" y2="270.32452" />
<linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-2-2"
id="linearGradient14728" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882"
x2="363.7587" y2="270.32452" />
<linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-2-2"
id="linearGradient14730" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882"
x2="363.7587" y2="270.32452" />
<linearGradient gradientTransform="translate(502.01164,0.78745356)"
inkscape:collect="always" xlink:href="#linearGradient13831-4-2-6-5"
id="linearGradient13837-6-9-0-0" x1="128.57443" y1="886.22906" x2="128.57443"
y2="1012.7642" gradientUnits="userSpaceOnUse" />
<linearGradient inkscape:collect="always" id="linearGradient13831-4-2-6-5"> <linearGradient inkscape:collect="always" id="linearGradient13831-4-2-6-5">
<stop style="stop-color:#babdb6;stop-opacity:1" offset="0" id="stop13833-0-6-8-6" /> <stop style="stop-color:#babdb6;stop-opacity:1" offset="0" id="stop13833-0-6-8-6"/>
<stop style="stop-color:#555753;stop-opacity:1" offset="1" id="stop13835-4-6-2-5" /> <stop style="stop-color:#555753;stop-opacity:1" offset="1" id="stop13835-4-6-2-5"/>
</linearGradient> </linearGradient>
<linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-2-2-1" <linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-2-2-1" id="linearGradient14730-6" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882" x2="363.7587" y2="270.32452"/>
id="linearGradient14730-6" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882"
x2="363.7587" y2="270.32452" />
<linearGradient inkscape:collect="always" id="linearGradient13881-5-2-2-1"> <linearGradient inkscape:collect="always" id="linearGradient13881-5-2-2-1">
<stop style="stop-color:#eeeeec;stop-opacity:1" offset="0" id="stop13883-7-8-0-0" /> <stop style="stop-color:#eeeeec;stop-opacity:1" offset="0" id="stop13883-7-8-0-0"/>
<stop style="stop-color:#ffffff;stop-opacity:1" offset="1" id="stop13885-3-5-1-7" /> <stop style="stop-color:#ffffff;stop-opacity:1" offset="1" id="stop13885-3-5-1-7"/>
</linearGradient> </linearGradient>
<linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-2-2-1" <linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-2-2-1" id="linearGradient14728-5" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882" x2="363.7587" y2="270.32452"/>
id="linearGradient14728-5" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882" <linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587" gradientUnits="userSpaceOnUse" id="linearGradient14045-3-2-7" xlink:href="#linearGradient13881-5-2-2-1" inkscape:collect="always"/>
x2="363.7587" y2="270.32452" /> <linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587" gradientUnits="userSpaceOnUse" id="linearGradient14047-4-9-3" xlink:href="#linearGradient13881-5-2-2-1" inkscape:collect="always"/>
<linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587" <linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587" gradientUnits="userSpaceOnUse" id="linearGradient14049-8-7-2" xlink:href="#linearGradient13881-5-2-2-1" inkscape:collect="always"/>
gradientUnits="userSpaceOnUse" id="linearGradient14045-3-2-7" <linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587" gradientUnits="userSpaceOnUse" id="linearGradient14051-6-4-5" xlink:href="#linearGradient13881-5-2-2-1" inkscape:collect="always"/>
xlink:href="#linearGradient13881-5-2-2-1" inkscape:collect="always" /> <linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587" gradientUnits="userSpaceOnUse" id="linearGradient14800" xlink:href="#linearGradient13881-5-2-2-1" inkscape:collect="always"/>
<linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587" <linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-2-4" id="linearGradient14676-9" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882" x2="363.7587" y2="270.32452"/>
gradientUnits="userSpaceOnUse" id="linearGradient14047-4-9-3"
xlink:href="#linearGradient13881-5-2-2-1" inkscape:collect="always" />
<linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587"
gradientUnits="userSpaceOnUse" id="linearGradient14049-8-7-2"
xlink:href="#linearGradient13881-5-2-2-1" inkscape:collect="always" />
<linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587"
gradientUnits="userSpaceOnUse" id="linearGradient14051-6-4-5"
xlink:href="#linearGradient13881-5-2-2-1" inkscape:collect="always" />
<linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587"
gradientUnits="userSpaceOnUse" id="linearGradient14800"
xlink:href="#linearGradient13881-5-2-2-1" inkscape:collect="always" />
<linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-2-4"
id="linearGradient14676-9" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882"
x2="363.7587" y2="270.32452" />
<linearGradient inkscape:collect="always" id="linearGradient13881-5-2-4"> <linearGradient inkscape:collect="always" id="linearGradient13881-5-2-4">
<stop style="stop-color:#eeeeec;stop-opacity:1" offset="0" id="stop13883-7-8-00" /> <stop style="stop-color:#eeeeec;stop-opacity:1" offset="0" id="stop13883-7-8-00"/>
<stop style="stop-color:#ffffff;stop-opacity:1" offset="1" id="stop13885-3-5-7" /> <stop style="stop-color:#ffffff;stop-opacity:1" offset="1" id="stop13885-3-5-7"/>
</linearGradient> </linearGradient>
<linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-2-4" <linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-2-4" id="linearGradient14674-9" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882" x2="363.7587" y2="270.32452"/>
id="linearGradient14674-9" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882" <linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587" gradientUnits="userSpaceOnUse" id="linearGradient14963" xlink:href="#linearGradient13881-5-2-4" inkscape:collect="always"/>
x2="363.7587" y2="270.32452" /> <linearGradient gradientTransform="translate(-0.7412829,-138.61258)" inkscape:collect="always" xlink:href="#linearGradient13831-4-3" id="linearGradient13837-6-1" x1="128.57443" y1="886.22906" x2="128.57443" y2="1012.7642" gradientUnits="userSpaceOnUse"/>
<linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587"
gradientUnits="userSpaceOnUse" id="linearGradient14963"
xlink:href="#linearGradient13881-5-2-4" inkscape:collect="always" />
<linearGradient gradientTransform="translate(-0.7412829,-138.61258)"
inkscape:collect="always" xlink:href="#linearGradient13831-4-3"
id="linearGradient13837-6-1" x1="128.57443" y1="886.22906" x2="128.57443" y2="1012.7642"
gradientUnits="userSpaceOnUse" />
<linearGradient inkscape:collect="always" id="linearGradient13831-4-3"> <linearGradient inkscape:collect="always" id="linearGradient13831-4-3">
<stop style="stop-color:#729fcf;stop-opacity:1" offset="0" id="stop13833-0-3" /> <stop style="stop-color:#729fcf;stop-opacity:1" offset="0" id="stop13833-0-3"/>
<stop style="stop-color:#3465a4;stop-opacity:1" offset="1" id="stop13835-4-0" /> <stop style="stop-color:#3465a4;stop-opacity:1" offset="1" id="stop13835-4-0"/>
</linearGradient> </linearGradient>
<linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-27" <linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-27" id="linearGradient14726-7" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882" x2="363.7587" y2="270.32452"/>
id="linearGradient14726-7" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882"
x2="363.7587" y2="270.32452" />
<linearGradient inkscape:collect="always" id="linearGradient13881-5-27"> <linearGradient inkscape:collect="always" id="linearGradient13881-5-27">
<stop style="stop-color:#eeeeec;stop-opacity:1" offset="0" id="stop13883-7-9" /> <stop style="stop-color:#eeeeec;stop-opacity:1" offset="0" id="stop13883-7-9"/>
<stop style="stop-color:#ffffff;stop-opacity:1" offset="1" id="stop13885-3-54" /> <stop style="stop-color:#ffffff;stop-opacity:1" offset="1" id="stop13885-3-54"/>
</linearGradient> </linearGradient>
<linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-27" <linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-27" id="linearGradient14724-8" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882" x2="363.7587" y2="270.32452"/>
id="linearGradient14724-8" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882" <linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587" gradientUnits="userSpaceOnUse" id="linearGradient14045-1" xlink:href="#linearGradient13881-5-27" inkscape:collect="always"/>
x2="363.7587" y2="270.32452" /> <linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587" gradientUnits="userSpaceOnUse" id="linearGradient14047-0" xlink:href="#linearGradient13881-5-27" inkscape:collect="always"/>
<linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587" <linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587" gradientUnits="userSpaceOnUse" id="linearGradient14049-3" xlink:href="#linearGradient13881-5-27" inkscape:collect="always"/>
gradientUnits="userSpaceOnUse" id="linearGradient14045-1" <linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587" gradientUnits="userSpaceOnUse" id="linearGradient14051-1" xlink:href="#linearGradient13881-5-27" inkscape:collect="always"/>
xlink:href="#linearGradient13881-5-27" inkscape:collect="always" /> <linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587" gradientUnits="userSpaceOnUse" id="linearGradient15126" xlink:href="#linearGradient13881-5-27" inkscape:collect="always"/>
<linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587" <linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-9" id="linearGradient14706-8" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882" x2="363.7587" y2="270.32452"/>
gradientUnits="userSpaceOnUse" id="linearGradient14047-0"
xlink:href="#linearGradient13881-5-27" inkscape:collect="always" />
<linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587"
gradientUnits="userSpaceOnUse" id="linearGradient14049-3"
xlink:href="#linearGradient13881-5-27" inkscape:collect="always" />
<linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587"
gradientUnits="userSpaceOnUse" id="linearGradient14051-1"
xlink:href="#linearGradient13881-5-27" inkscape:collect="always" />
<linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587"
gradientUnits="userSpaceOnUse" id="linearGradient15126"
xlink:href="#linearGradient13881-5-27" inkscape:collect="always" />
<linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-9"
id="linearGradient14706-8" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882"
x2="363.7587" y2="270.32452" />
<linearGradient inkscape:collect="always" id="linearGradient13881-9"> <linearGradient inkscape:collect="always" id="linearGradient13881-9">
<stop style="stop-color:#eeeeec;stop-opacity:1" offset="0" id="stop13883-9" /> <stop style="stop-color:#eeeeec;stop-opacity:1" offset="0" id="stop13883-9"/>
<stop style="stop-color:#ffffff;stop-opacity:1" offset="1" id="stop13885-7" /> <stop style="stop-color:#ffffff;stop-opacity:1" offset="1" id="stop13885-7"/>
</linearGradient> </linearGradient>
<linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-9" <linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-9" id="linearGradient14704-4" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882" x2="363.7587" y2="270.32452"/>
id="linearGradient14704-4" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882" <linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587" gradientUnits="userSpaceOnUse" id="linearGradient15289" xlink:href="#linearGradient13881-9" inkscape:collect="always"/>
x2="363.7587" y2="270.32452" />
<linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587"
gradientUnits="userSpaceOnUse" id="linearGradient15289"
xlink:href="#linearGradient13881-9" inkscape:collect="always" />
<linearGradient id="linearGradient13831-4-27"> <linearGradient id="linearGradient13831-4-27">
<stop style="stop-color:#729fcf;stop-opacity:1" offset="0" id="stop13833-0-9" /> <stop style="stop-color:#729fcf;stop-opacity:1" offset="0" id="stop13833-0-9"/>
<stop style="stop-color:#204a87;stop-opacity:1;" offset="1" id="stop13835-4-2" /> <stop style="stop-color:#204a87;stop-opacity:1;" offset="1" id="stop13835-4-2"/>
</linearGradient> </linearGradient>
<linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-3" <linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-3" id="linearGradient14726-0" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882" x2="363.7587" y2="270.32452"/>
id="linearGradient14726-0" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882"
x2="363.7587" y2="270.32452" />
<linearGradient inkscape:collect="always" id="linearGradient13881-5-3"> <linearGradient inkscape:collect="always" id="linearGradient13881-5-3">
<stop style="stop-color:#eeeeec;stop-opacity:1" offset="0" id="stop13883-7-4" /> <stop style="stop-color:#eeeeec;stop-opacity:1" offset="0" id="stop13883-7-4"/>
<stop style="stop-color:#ffffff;stop-opacity:1" offset="1" id="stop13885-3-6" /> <stop style="stop-color:#ffffff;stop-opacity:1" offset="1" id="stop13885-3-6"/>
</linearGradient> </linearGradient>
<linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-3" <linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-3" id="linearGradient14724-3" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882" x2="363.7587" y2="270.32452"/>
id="linearGradient14724-3" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882" <linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587" gradientUnits="userSpaceOnUse" id="linearGradient14110" xlink:href="#linearGradient13881-5-3" inkscape:collect="always"/>
x2="363.7587" y2="270.32452" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient13831-4-27" id="linearGradient15013" gradientUnits="userSpaceOnUse" gradientTransform="translate(173.56054,-271.90218)" x1="128.57443" y1="886.22906" x2="128.57443" y2="1012.7642"/>
<linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587" <linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-3" id="linearGradient15015" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882" x2="363.7587" y2="270.32452"/>
gradientUnits="userSpaceOnUse" id="linearGradient14110" <linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-3" id="linearGradient15017" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882" x2="363.7587" y2="270.32452"/>
xlink:href="#linearGradient13881-5-3" inkscape:collect="always" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-3" id="linearGradient15019" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882" x2="363.7587" y2="270.32452"/>
<linearGradient inkscape:collect="always" xlink:href="#linearGradient13831-4-27" <linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-3" id="linearGradient15021" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882" x2="363.7587" y2="270.32452"/>
id="linearGradient15013" gradientUnits="userSpaceOnUse" <linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-3" id="linearGradient15023" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882" x2="363.7587" y2="270.32452"/>
gradientTransform="translate(173.56054,-271.90218)" x1="128.57443" y1="886.22906" <linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-3" id="linearGradient15025" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882" x2="363.7587" y2="270.32452"/>
x2="128.57443" y2="1012.7642" /> <linearGradient gradientTransform="translate(-0.7412829,-138.61258)" inkscape:collect="always" xlink:href="#linearGradient13831-4-3-8" id="linearGradient13837-6-1-2" x1="128.57443" y1="886.22906" x2="128.57443" y2="1012.7642" gradientUnits="userSpaceOnUse"/>
<linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-3"
id="linearGradient15015" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882"
x2="363.7587" y2="270.32452" />
<linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-3"
id="linearGradient15017" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882"
x2="363.7587" y2="270.32452" />
<linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-3"
id="linearGradient15019" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882"
x2="363.7587" y2="270.32452" />
<linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-3"
id="linearGradient15021" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882"
x2="363.7587" y2="270.32452" />
<linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-3"
id="linearGradient15023" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882"
x2="363.7587" y2="270.32452" />
<linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-3"
id="linearGradient15025" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882"
x2="363.7587" y2="270.32452" />
<linearGradient gradientTransform="translate(-0.7412829,-138.61258)"
inkscape:collect="always" xlink:href="#linearGradient13831-4-3-8"
id="linearGradient13837-6-1-2" x1="128.57443" y1="886.22906" x2="128.57443"
y2="1012.7642" gradientUnits="userSpaceOnUse" />
<linearGradient inkscape:collect="always" id="linearGradient13831-4-3-8"> <linearGradient inkscape:collect="always" id="linearGradient13831-4-3-8">
<stop style="stop-color:#729fcf;stop-opacity:1" offset="0" id="stop13833-0-3-8" /> <stop style="stop-color:#729fcf;stop-opacity:1" offset="0" id="stop13833-0-3-8"/>
<stop style="stop-color:#3465a4;stop-opacity:1" offset="1" id="stop13835-4-0-4" /> <stop style="stop-color:#3465a4;stop-opacity:1" offset="1" id="stop13835-4-0-4"/>
</linearGradient> </linearGradient>
<linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587" <linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587" gradientUnits="userSpaceOnUse" id="linearGradient15126-7" xlink:href="#linearGradient13881-5-27-8" inkscape:collect="always"/>
gradientUnits="userSpaceOnUse" id="linearGradient15126-7"
xlink:href="#linearGradient13881-5-27-8" inkscape:collect="always" />
<linearGradient inkscape:collect="always" id="linearGradient13881-5-27-8"> <linearGradient inkscape:collect="always" id="linearGradient13881-5-27-8">
<stop style="stop-color:#eeeeec;stop-opacity:1" offset="0" id="stop13883-7-9-7" /> <stop style="stop-color:#eeeeec;stop-opacity:1" offset="0" id="stop13883-7-9-7"/>
<stop style="stop-color:#ffffff;stop-opacity:1" offset="1" id="stop13885-3-54-4" /> <stop style="stop-color:#ffffff;stop-opacity:1" offset="1" id="stop13885-3-54-4"/>
</linearGradient> </linearGradient>
<linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-27-8" <linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-27-8" id="linearGradient14724-8-3" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882" x2="363.7587" y2="270.32452"/>
id="linearGradient14724-8-3" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882" <linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587" gradientUnits="userSpaceOnUse" id="linearGradient14045-1-0" xlink:href="#linearGradient13881-5-27-8" inkscape:collect="always"/>
x2="363.7587" y2="270.32452" /> <linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587" gradientUnits="userSpaceOnUse" id="linearGradient14047-0-5" xlink:href="#linearGradient13881-5-27-8" inkscape:collect="always"/>
<linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587" <linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587" gradientUnits="userSpaceOnUse" id="linearGradient14049-3-2" xlink:href="#linearGradient13881-5-27-8" inkscape:collect="always"/>
gradientUnits="userSpaceOnUse" id="linearGradient14045-1-0" <linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587" gradientUnits="userSpaceOnUse" id="linearGradient14051-1-3" xlink:href="#linearGradient13881-5-27-8" inkscape:collect="always"/>
xlink:href="#linearGradient13881-5-27-8" inkscape:collect="always" /> <linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587" gradientUnits="userSpaceOnUse" id="linearGradient15095" xlink:href="#linearGradient13881-5-27-8" inkscape:collect="always"/>
<linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587"
gradientUnits="userSpaceOnUse" id="linearGradient14047-0-5"
xlink:href="#linearGradient13881-5-27-8" inkscape:collect="always" />
<linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587"
gradientUnits="userSpaceOnUse" id="linearGradient14049-3-2"
xlink:href="#linearGradient13881-5-27-8" inkscape:collect="always" />
<linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587"
gradientUnits="userSpaceOnUse" id="linearGradient14051-1-3"
xlink:href="#linearGradient13881-5-27-8" inkscape:collect="always" />
<linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587"
gradientUnits="userSpaceOnUse" id="linearGradient15095"
xlink:href="#linearGradient13881-5-27-8" inkscape:collect="always" />
<linearGradient id="linearGradient13831-4-27-2"> <linearGradient id="linearGradient13831-4-27-2">
<stop style="stop-color:#3465a4;stop-opacity:1;" offset="0" id="stop13833-0-9-6" /> <stop style="stop-color:#3465a4;stop-opacity:1;" offset="0" id="stop13833-0-9-6"/>
<stop style="stop-color:#204a87;stop-opacity:1;" offset="1" id="stop13835-4-2-1" /> <stop style="stop-color:#204a87;stop-opacity:1;" offset="1" id="stop13835-4-2-1"/>
</linearGradient> </linearGradient>
<linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-3-6" <linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-3-6" id="linearGradient15025-3" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882" x2="363.7587" y2="270.32452"/>
id="linearGradient15025-3" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882"
x2="363.7587" y2="270.32452" />
<linearGradient inkscape:collect="always" id="linearGradient13881-5-3-6"> <linearGradient inkscape:collect="always" id="linearGradient13881-5-3-6">
<stop style="stop-color:#eeeeec;stop-opacity:1" offset="0" id="stop13883-7-4-6" /> <stop style="stop-color:#eeeeec;stop-opacity:1" offset="0" id="stop13883-7-4-6"/>
<stop style="stop-color:#ffffff;stop-opacity:1" offset="1" id="stop13885-3-6-0" /> <stop style="stop-color:#ffffff;stop-opacity:1" offset="1" id="stop13885-3-6-0"/>
</linearGradient> </linearGradient>
<linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-3-6" <linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-3-6" id="linearGradient15023-5" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882" x2="363.7587" y2="270.32452"/>
id="linearGradient15023-5" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882" <linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587" gradientUnits="userSpaceOnUse" id="linearGradient15260" xlink:href="#linearGradient13881-5-3-6" inkscape:collect="always"/>
x2="363.7587" y2="270.32452" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient13831-4-27-2-5" id="linearGradient15370-4" gradientUnits="userSpaceOnUse" gradientTransform="translate(350.34367,-250.09554)" x1="128.57443" y1="886.22906" x2="128.57443" y2="1012.7642"/>
<linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587"
gradientUnits="userSpaceOnUse" id="linearGradient15260"
xlink:href="#linearGradient13881-5-3-6" inkscape:collect="always" />
<linearGradient inkscape:collect="always" xlink:href="#linearGradient13831-4-27-2-5"
id="linearGradient15370-4" gradientUnits="userSpaceOnUse"
gradientTransform="translate(350.34367,-250.09554)" x1="128.57443" y1="886.22906"
x2="128.57443" y2="1012.7642" />
<linearGradient id="linearGradient13831-4-27-2-5"> <linearGradient id="linearGradient13831-4-27-2-5">
<stop style="stop-color:#3465a4;stop-opacity:1;" offset="0" id="stop13833-0-9-6-7" /> <stop style="stop-color:#3465a4;stop-opacity:1;" offset="0" id="stop13833-0-9-6-7"/>
<stop style="stop-color:#204a87;stop-opacity:1;" offset="1" id="stop13835-4-2-1-3" /> <stop style="stop-color:#204a87;stop-opacity:1;" offset="1" id="stop13835-4-2-1-3"/>
</linearGradient> </linearGradient>
<linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587" <linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587" gradientUnits="userSpaceOnUse" id="linearGradient15260-9" xlink:href="#linearGradient13881-5-3-6-4" inkscape:collect="always"/>
gradientUnits="userSpaceOnUse" id="linearGradient15260-9"
xlink:href="#linearGradient13881-5-3-6-4" inkscape:collect="always" />
<linearGradient inkscape:collect="always" id="linearGradient13881-5-3-6-4"> <linearGradient inkscape:collect="always" id="linearGradient13881-5-3-6-4">
<stop style="stop-color:#eeeeec;stop-opacity:1" offset="0" id="stop13883-7-4-6-5" /> <stop style="stop-color:#eeeeec;stop-opacity:1" offset="0" id="stop13883-7-4-6-5"/>
<stop style="stop-color:#ffffff;stop-opacity:1" offset="1" id="stop13885-3-6-0-2" /> <stop style="stop-color:#ffffff;stop-opacity:1" offset="1" id="stop13885-3-6-0-2"/>
</linearGradient> </linearGradient>
<linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-3-6-4" <linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-3-6-4" id="linearGradient15023-5-0" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882" x2="363.7587" y2="270.32452"/>
id="linearGradient15023-5-0" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882" <linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-3-6-4" id="linearGradient15015-5-1" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882" x2="363.7587" y2="270.32452"/>
x2="363.7587" y2="270.32452" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-3-6-4" id="linearGradient15017-6-4" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882" x2="363.7587" y2="270.32452"/>
<linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-3-6-4" <linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-3-6-4" id="linearGradient15019-0-7" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882" x2="363.7587" y2="270.32452"/>
id="linearGradient15015-5-1" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882" <linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-3-6-4" id="linearGradient15021-5-6" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882" x2="363.7587" y2="270.32452"/>
x2="363.7587" y2="270.32452" /> <linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587" gradientUnits="userSpaceOnUse" id="linearGradient15457" xlink:href="#linearGradient13881-5-3-6-4" inkscape:collect="always"/>
<linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-3-6-4" <linearGradient inkscape:collect="always" xlink:href="#linearGradient13831-4-27-2" id="linearGradient15552" gradientUnits="userSpaceOnUse" gradientTransform="translate(350.34367,-250.09554)" x1="128.57443" y1="886.22906" x2="128.57443" y2="1012.7642"/>
id="linearGradient15017-6-4" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882" <linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-3-6" id="linearGradient15554" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882" x2="363.7587" y2="270.32452"/>
x2="363.7587" y2="270.32452" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-3-6" id="linearGradient15556" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882" x2="363.7587" y2="270.32452"/>
<linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-3-6-4" <linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-3-6" id="linearGradient15558" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882" x2="363.7587" y2="270.32452"/>
id="linearGradient15019-0-7" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882" <linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-3-6" id="linearGradient15560" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882" x2="363.7587" y2="270.32452"/>
x2="363.7587" y2="270.32452" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-3-6" id="linearGradient15562" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882" x2="363.7587" y2="270.32452"/>
<linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-3-6-4" <linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-3-6" id="linearGradient15564" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882" x2="363.7587" y2="270.32452"/>
id="linearGradient15021-5-6" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882" <linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-3" id="linearGradient3360" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882" x2="363.7587" y2="270.32452"/>
x2="363.7587" y2="270.32452" /> <linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-3" id="linearGradient3362" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882" x2="363.7587" y2="270.32452"/>
<linearGradient y2="270.32452" x2="363.7587" y1="781.0882" x1="363.7587"
gradientUnits="userSpaceOnUse" id="linearGradient15457"
xlink:href="#linearGradient13881-5-3-6-4" inkscape:collect="always" />
<linearGradient inkscape:collect="always" xlink:href="#linearGradient13831-4-27-2"
id="linearGradient15552" gradientUnits="userSpaceOnUse"
gradientTransform="translate(350.34367,-250.09554)" x1="128.57443" y1="886.22906"
x2="128.57443" y2="1012.7642" />
<linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-3-6"
id="linearGradient15554" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882"
x2="363.7587" y2="270.32452" />
<linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-3-6"
id="linearGradient15556" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882"
x2="363.7587" y2="270.32452" />
<linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-3-6"
id="linearGradient15558" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882"
x2="363.7587" y2="270.32452" />
<linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-3-6"
id="linearGradient15560" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882"
x2="363.7587" y2="270.32452" />
<linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-3-6"
id="linearGradient15562" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882"
x2="363.7587" y2="270.32452" />
<linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-3-6"
id="linearGradient15564" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882"
x2="363.7587" y2="270.32452" />
<linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-3"
id="linearGradient3360" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882"
x2="363.7587" y2="270.32452" />
<linearGradient inkscape:collect="always" xlink:href="#linearGradient13881-5-3"
id="linearGradient3362" gradientUnits="userSpaceOnUse" x1="363.7587" y1="781.0882"
x2="363.7587" y2="270.32452" />
</defs> </defs>
<sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1.4142136" inkscape:cx="116.01422" inkscape:cy="115.13684" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" showguides="true" inkscape:guide-bbox="true" inkscape:window-width="1231" inkscape:window-height="1138" inkscape:window-x="1920" inkscape:window-y="0" inkscape:window-maximized="0" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0">
inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1.4142136" <sodipodi:guide orientation="1,0" position="-178.89701,175.46456" id="guide13939"/>
inkscape:cx="116.01422" inkscape:cy="115.13684" inkscape:document-units="px" <sodipodi:guide orientation="0,1" position="3.7515623,-42.079504" id="guide15364"/>
inkscape:current-layer="layer1" showgrid="false" showguides="true" <sodipodi:guide orientation="1,0" position="0.0010123365,156.27187" id="guide13111"/>
inkscape:guide-bbox="true" inkscape:window-width="1231" inkscape:window-height="1138" <sodipodi:guide orientation="0,1" position="-50.910678,0.80919395" id="guide14630"/>
inkscape:window-x="1920" inkscape:window-y="0" inkscape:window-maximized="0" <sodipodi:guide orientation="0,1" position="450.77709,156.27187" id="guide15384"/>
fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0"> <sodipodi:guide orientation="1,0" position="177.13125,183.59629" id="guide15386"/>
<sodipodi:guide orientation="1,0" position="-178.89701,175.46456" id="guide13939" /> <sodipodi:guide orientation="1,0" position="351.07952,174.4039" id="guide15388"/>
<sodipodi:guide orientation="0,1" position="3.7515623,-42.079504" id="guide15364" />
<sodipodi:guide orientation="1,0" position="0.0010123365,156.27187" id="guide13111" />
<sodipodi:guide orientation="0,1" position="-50.910678,0.80919395" id="guide14630" />
<sodipodi:guide orientation="0,1" position="450.77709,156.27187" id="guide15384" />
<sodipodi:guide orientation="1,0" position="177.13125,183.59629" id="guide15386" />
<sodipodi:guide orientation="1,0" position="351.07952,174.4039" id="guide15388" />
</sodipodi:namedview> </sodipodi:namedview>
<metadata id="metadata7"> <metadata id="metadata7">
<rdf:RDF> <rdf:RDF>
<cc:Work rdf:about=""> <cc:Work rdf:about="">
<dc:format>image/svg+xml</dc:format> <dc:format>image/svg+xml</dc:format>
<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
<dc:title /> <dc:title/>
</cc:Work> </cc:Work>
</rdf:RDF> </rdf:RDF>
</metadata> </metadata>
<g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(-231.22291,-886.63406)">
transform="translate(-231.22291,-886.63406)">
<g id="g14997" transform="matrix(0.99999368,0,0,0.99285775,-0.34584976,277.87803)"> <g id="g14997" transform="matrix(0.99999368,0,0,0.99285775,-0.34584976,277.87803)">
<rect ry="13.27135" y="615.24164" x="231.57103" height="126.81434" width="128" <rect ry="13.27135" y="615.24164" x="231.57103" height="126.81434" width="128" id="rect12980-4-1-8-0-8" style="color:#000000;fill:#183866;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:79.67999581;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"/>
id="rect12980-4-1-8-0-8" <rect ry="13.395431" y="613.13519" x="231.57022" height="128" width="128" id="rect12980-4-1-3-02" style="color:#000000;fill:url(#linearGradient15013);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:79.67999581;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"/>
style="color:#000000;fill:#183866;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:79.67999581;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> <g style="opacity:0.3;fill:#000000" transform="matrix(0.25,0,0,0.25,202.56698,546.71978)" id="g14368-1-1-4-9-6">
<rect ry="13.395431" y="613.13519" x="231.57022" height="128" width="128"
id="rect12980-4-1-3-02"
style="color:#000000;fill:url(#linearGradient15013);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:79.67999581;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
<g style="opacity:0.3;fill:#000000"
transform="matrix(0.25,0,0,0.25,202.56698,546.71978)" id="g14368-1-1-4-9-6">
<g style="fill:#000000" id="g14380-1-5-9-4-9"> <g style="fill:#000000" id="g14380-1-5-9-4-9">
<rect transform="matrix(1,0,-0.44619856,0.89493399,0,0)" ry="0" y="613.62866" <rect transform="matrix(1,0,-0.44619856,0.89493399,0,0)" ry="0" y="613.62866" x="498.49884" height="58.009731" width="246.91225" id="rect12978-93-3-97-3-4-8" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:79.67999581;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"/>
x="498.49884" height="58.009731" width="246.91225" <rect transform="matrix(1,0,-0.45382734,0.89108964,0,0)" ry="0" y="726.05896" x="554.76031" height="58.259998" width="320.02499" id="rect12978-9-6-44-8-0-2-6" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:79.67999581;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"/>
id="rect12978-93-3-97-3-4-8" <rect transform="matrix(1,0,-0.44127854,0.89737018,0,0)" ry="0" y="502.93268" x="446.27722" height="57.852242" width="295.71799" id="rect12978-5-3-33-8-6-4-7" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:79.67999581;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"/>
style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:79.67999581;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> <rect ry="0" rx="0" transform="matrix(1,0,-0.44219356,0.89691965,0,0)" y="394.08627" x="398.67178" height="57.881306" width="192.59586" id="rect12978-5-4-7-8-3-8-7-1" style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:79.67999581;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"/>
<rect transform="matrix(1,0,-0.45382734,0.89108964,0,0)" ry="0" y="726.05896"
x="554.76031" height="58.259998" width="320.02499"
id="rect12978-9-6-44-8-0-2-6"
style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:79.67999581;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
<rect transform="matrix(1,0,-0.44127854,0.89737018,0,0)" ry="0" y="502.93268"
x="446.27722" height="57.852242" width="295.71799"
id="rect12978-5-3-33-8-6-4-7"
style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:79.67999581;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
<rect ry="0" rx="0" transform="matrix(1,0,-0.44219356,0.89691965,0,0)"
y="394.08627" x="398.67178" height="57.881306" width="192.59586"
id="rect12978-5-4-7-8-3-8-7-1"
style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:79.67999581;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
</g> </g>
</g> </g>
<g style="fill:url(#linearGradient3362);fill-opacity:1" <g style="fill:url(#linearGradient3362);fill-opacity:1" transform="matrix(0.25,0,0,0.25,202.55842,545.58997)" id="g14368-1-1-71-1">
transform="matrix(0.25,0,0,0.25,202.55842,545.58997)" id="g14368-1-1-71-1">
<g style="fill:url(#linearGradient3360);fill-opacity:1" id="g14380-1-5-08-8"> <g style="fill:url(#linearGradient3360);fill-opacity:1" id="g14380-1-5-08-8">
<rect transform="matrix(1,0,-0.44619856,0.89493399,0,0)" ry="0" y="613.62866" <rect transform="matrix(1,0,-0.44619856,0.89493399,0,0)" ry="0" y="613.62866" x="498.49884" height="58.009731" width="246.91225" id="rect12978-93-3-97-37-0" style="color:#000000;fill:url(#linearGradient15015);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:79.67999581;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"/>
x="498.49884" height="58.009731" width="246.91225" <rect transform="matrix(1,0,-0.45382734,0.89108964,0,0)" ry="0" y="726.05896" x="554.76031" height="58.259998" width="320.02499" id="rect12978-9-6-44-8-46-5" style="color:#000000;fill:url(#linearGradient15017);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:79.67999581;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"/>
id="rect12978-93-3-97-37-0" <rect transform="matrix(1,0,-0.44127854,0.89737018,0,0)" ry="0" y="502.93268" x="446.27722" height="57.852242" width="295.71799" id="rect12978-5-3-33-8-33-29" style="color:#000000;fill:url(#linearGradient15019);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:79.67999581;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"/>
style="color:#000000;fill:url(#linearGradient15015);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:79.67999581;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> <rect ry="0" rx="0" transform="matrix(1,0,-0.44219356,0.89691965,0,0)" y="394.08627" x="398.67178" height="57.881306" width="192.59586" id="rect12978-5-4-7-8-3-9-6" style="color:#000000;fill:url(#linearGradient15021);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:79.67999581;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"/>
<rect transform="matrix(1,0,-0.45382734,0.89108964,0,0)" ry="0" y="726.05896"
x="554.76031" height="58.259998" width="320.02499"
id="rect12978-9-6-44-8-46-5"
style="color:#000000;fill:url(#linearGradient15017);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:79.67999581;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
<rect transform="matrix(1,0,-0.44127854,0.89737018,0,0)" ry="0" y="502.93268"
x="446.27722" height="57.852242" width="295.71799"
id="rect12978-5-3-33-8-33-29"
style="color:#000000;fill:url(#linearGradient15019);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:79.67999581;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
<rect ry="0" rx="0" transform="matrix(1,0,-0.44219356,0.89691965,0,0)"
y="394.08627" x="398.67178" height="57.881306" width="192.59586"
id="rect12978-5-4-7-8-3-9-6"
style="color:#000000;fill:url(#linearGradient15021);fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:79.67999581;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
</g> </g>
</g> </g>
</g> </g>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 36 KiB

After

Width:  |  Height:  |  Size: 32 KiB

205
ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
View file

@ -1,204 +1 @@
{ {"images":[{"size":"60x60","expected-size":"180","filename":"180.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"40x40","expected-size":"80","filename":"80.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"40x40","expected-size":"120","filename":"120.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"60x60","expected-size":"120","filename":"120.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"57x57","expected-size":"57","filename":"57.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"1x"},{"size":"29x29","expected-size":"58","filename":"58.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"29x29","expected-size":"29","filename":"29.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"1x"},{"size":"29x29","expected-size":"87","filename":"87.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"57x57","expected-size":"114","filename":"114.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"20x20","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"20x20","expected-size":"60","filename":"60.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"1024x1024","filename":"1024.png","expected-size":"1024","idiom":"ios-marketing","folder":"Assets.xcassets/AppIcon.appiconset/","scale":"1x"},{"size":"40x40","expected-size":"80","filename":"80.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"72x72","expected-size":"72","filename":"72.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"76x76","expected-size":"152","filename":"152.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"50x50","expected-size":"100","filename":"100.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"29x29","expected-size":"58","filename":"58.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"76x76","expected-size":"76","filename":"76.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"29x29","expected-size":"29","filename":"29.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"50x50","expected-size":"50","filename":"50.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"72x72","expected-size":"144","filename":"144.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"40x40","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"83.5x83.5","expected-size":"167","filename":"167.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"20x20","expected-size":"20","filename":"20.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"20x20","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"}]}
"images": [
{
"size": "60x60",
"expected-size": "180",
"filename": "180.png",
"folder": "Assets.xcassets/AppIcon.appiconset/",
"idiom": "iphone",
"scale": "3x"
},
{
"size": "40x40",
"expected-size": "80",
"filename": "80.png",
"folder": "Assets.xcassets/AppIcon.appiconset/",
"idiom": "iphone",
"scale": "2x"
},
{
"size": "40x40",
"expected-size": "120",
"filename": "120.png",
"folder": "Assets.xcassets/AppIcon.appiconset/",
"idiom": "iphone",
"scale": "3x"
},
{
"size": "60x60",
"expected-size": "120",
"filename": "120.png",
"folder": "Assets.xcassets/AppIcon.appiconset/",
"idiom": "iphone",
"scale": "2x"
},
{
"size": "57x57",
"expected-size": "57",
"filename": "57.png",
"folder": "Assets.xcassets/AppIcon.appiconset/",
"idiom": "iphone",
"scale": "1x"
},
{
"size": "29x29",
"expected-size": "58",
"filename": "58.png",
"folder": "Assets.xcassets/AppIcon.appiconset/",
"idiom": "iphone",
"scale": "2x"
},
{
"size": "29x29",
"expected-size": "29",
"filename": "29.png",
"folder": "Assets.xcassets/AppIcon.appiconset/",
"idiom": "iphone",
"scale": "1x"
},
{
"size": "29x29",
"expected-size": "87",
"filename": "87.png",
"folder": "Assets.xcassets/AppIcon.appiconset/",
"idiom": "iphone",
"scale": "3x"
},
{
"size": "57x57",
"expected-size": "114",
"filename": "114.png",
"folder": "Assets.xcassets/AppIcon.appiconset/",
"idiom": "iphone",
"scale": "2x"
},
{
"size": "20x20",
"expected-size": "40",
"filename": "40.png",
"folder": "Assets.xcassets/AppIcon.appiconset/",
"idiom": "iphone",
"scale": "2x"
},
{
"size": "20x20",
"expected-size": "60",
"filename": "60.png",
"folder": "Assets.xcassets/AppIcon.appiconset/",
"idiom": "iphone",
"scale": "3x"
},
{
"size": "1024x1024",
"filename": "1024.png",
"expected-size": "1024",
"idiom": "ios-marketing",
"folder": "Assets.xcassets/AppIcon.appiconset/",
"scale": "1x"
},
{
"size": "40x40",
"expected-size": "80",
"filename": "80.png",
"folder": "Assets.xcassets/AppIcon.appiconset/",
"idiom": "ipad",
"scale": "2x"
},
{
"size": "72x72",
"expected-size": "72",
"filename": "72.png",
"folder": "Assets.xcassets/AppIcon.appiconset/",
"idiom": "ipad",
"scale": "1x"
},
{
"size": "76x76",
"expected-size": "152",
"filename": "152.png",
"folder": "Assets.xcassets/AppIcon.appiconset/",
"idiom": "ipad",
"scale": "2x"
},
{
"size": "50x50",
"expected-size": "100",
"filename": "100.png",
"folder": "Assets.xcassets/AppIcon.appiconset/",
"idiom": "ipad",
"scale": "2x"
},
{
"size": "29x29",
"expected-size": "58",
"filename": "58.png",
"folder": "Assets.xcassets/AppIcon.appiconset/",
"idiom": "ipad",
"scale": "2x"
},
{
"size": "76x76",
"expected-size": "76",
"filename": "76.png",
"folder": "Assets.xcassets/AppIcon.appiconset/",
"idiom": "ipad",
"scale": "1x"
},
{
"size": "29x29",
"expected-size": "29",
"filename": "29.png",
"folder": "Assets.xcassets/AppIcon.appiconset/",
"idiom": "ipad",
"scale": "1x"
},
{
"size": "50x50",
"expected-size": "50",
"filename": "50.png",
"folder": "Assets.xcassets/AppIcon.appiconset/",
"idiom": "ipad",
"scale": "1x"
},
{
"size": "72x72",
"expected-size": "144",
"filename": "144.png",
"folder": "Assets.xcassets/AppIcon.appiconset/",
"idiom": "ipad",
"scale": "2x"
},
{
"size": "40x40",
"expected-size": "40",
"filename": "40.png",
"folder": "Assets.xcassets/AppIcon.appiconset/",
"idiom": "ipad",
"scale": "1x"
},
{
"size": "83.5x83.5",
"expected-size": "167",
"filename": "167.png",
"folder": "Assets.xcassets/AppIcon.appiconset/",
"idiom": "ipad",
"scale": "2x"
},
{
"size": "20x20",
"expected-size": "20",
"filename": "20.png",
"folder": "Assets.xcassets/AppIcon.appiconset/",
"idiom": "ipad",
"scale": "1x"
},
{
"size": "20x20",
"expected-size": "40",
"filename": "40.png",
"folder": "Assets.xcassets/AppIcon.appiconset/",
"idiom": "ipad",
"scale": "2x"
}
]
}

26
ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json vendored
View file

@ -1,23 +1,23 @@
{ {
"images": [ "images" : [
{ {
"idiom": "universal", "idiom" : "universal",
"filename": "LaunchImage.png", "filename" : "LaunchImage.png",
"scale": "1x" "scale" : "1x"
}, },
{ {
"idiom": "universal", "idiom" : "universal",
"filename": "LaunchImage@2x.png", "filename" : "LaunchImage@2x.png",
"scale": "2x" "scale" : "2x"
}, },
{ {
"idiom": "universal", "idiom" : "universal",
"filename": "LaunchImage@3x.png", "filename" : "LaunchImage@3x.png",
"scale": "3x" "scale" : "3x"
} }
], ],
"info": { "info" : {
"version": 1, "version" : 1,
"author": "xcode" "author" : "xcode"
} }
} }

7
ios/Runner/Info.plist
View file

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

45
lib/app.dart
View file

@ -1,7 +1,7 @@
import 'package:dynamic_color/dynamic_color.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_translate/flutter_translate.dart'; import 'package:flutter_translate/flutter_translate.dart';
import 'package:intl/date_symbol_data_local.dart'; import 'package:flutter_translate/localization_provider.dart';
import 'package:flutter_translate/localized_app.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'core/enums/refresh_event.dart'; import 'core/enums/refresh_event.dart';
@ -18,54 +18,33 @@ import 'ui/shared/app_colors.dart';
import 'ui/views/startup_view.dart'; import 'ui/views/startup_view.dart';
class MyApp extends StatelessWidget { 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 @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
var localizationDelegate = LocalizedApp.of(context).delegate; var localizationDelegate = LocalizedApp.of(context).delegate;
return LocalizationProvider( return LocalizationProvider(
state: LocalizationProvider.of(context).state, state: LocalizationProvider.of(context).state,
child: StreamProvider<RefreshEvent?>( child: StreamProvider<RefreshEvent>(
initialData: null, initialData: null,
create: (context) => create: (context) => locator<RefreshService>().refreshHistoryController.stream,
locator<RefreshService>().refreshEventController.stream, child: StreamProvider<Session>(
child: StreamProvider<Session?>(
initialData: Session.initial(), initialData: Session.initial(),
create: (context) => create: (context) => locator<SessionService>().sessionController.stream,
locator<SessionService>().sessionController.stream, child: LifeCycleManager(
child: LifeCycleManager(child: DynamicColorBuilder( child: MaterialApp(
builder: (lightColorScheme, darkColorScheme) {
return MaterialApp(
debugShowCheckedModeBanner: false,
title: translate('app.title'), title: translate('app.title'),
builder: (context, child) => Navigator( builder: (context, child) => Navigator(
key: locator<DialogService>().dialogNavigationKey, key: locator<DialogService>().dialogNavigationKey,
onGenerateRoute: (settings) => MaterialPageRoute( onGenerateRoute: (settings) => MaterialPageRoute(builder: (context) => DialogManager(child: child)),
builder: (context) => DialogManager(child: child)),
), ),
theme: ThemeData( theme: ThemeData(
useMaterial3: true, brightness: Brightness.light, primarySwatch: primaryAccentColor, primaryColor: primaryAccentColor),
brightness: Brightness.light,
colorScheme:
lightColorScheme ?? _defaultLightColorScheme),
darkTheme: ThemeData(
useMaterial3: true,
colorScheme: darkColorScheme ?? _defaultDarkColorScheme),
onGenerateRoute: AppRouter.generateRoute, onGenerateRoute: AppRouter.generateRoute,
navigatorKey: locator<NavigationService>().navigationKey, navigatorKey: locator<NavigationService>().navigationKey,
home: const StartUpView(), home: StartUpView(),
supportedLocales: localizationDelegate.supportedLocales, supportedLocales: localizationDelegate.supportedLocales,
locale: localizationDelegate.currentLocale, locale: localizationDelegate.currentLocale,
); )),
})),
))); )));
} }
} }

8
lib/core/datamodels/dialog_request.dart
View file

@ -1,8 +1,8 @@
class DialogRequest { class DialogRequest {
final String? title; final String title;
final String? description; final String description;
final String? buttonTitleAccept; final String buttonTitleAccept;
final String? buttonTitleDeny; final String buttonTitleDeny;
DialogRequest({ DialogRequest({
this.title, this.title,

2
lib/core/datamodels/dialog_response.dart
View file

@ -1,5 +1,5 @@
class DialogResponse { class DialogResponse {
final bool? confirmed; final bool confirmed;
DialogResponse({ DialogResponse({
this.confirmed, this.confirmed,

10
lib/core/enums/error_code.dart
View file

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

2
lib/core/enums/refresh_event.dart
View file

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

2
lib/core/enums/viewstate.dart
View file

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

5
lib/core/error/rest_service_exception.dart
View file

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

5
lib/core/error/service_exception.dart
View file

@ -2,11 +2,10 @@ import '../enums/error_code.dart';
class ServiceException implements Exception { class ServiceException implements Exception {
final ErrorCode code; final ErrorCode code;
final String? message; final String message;
ServiceException({this.code = ErrorCode.generalError, this.message = ''}); ServiceException({this.code = ErrorCode.GENERAL_ERROR, this.message = ''});
@override
String toString() { String toString() {
return "$code: $message"; return "$code: $message";
} }

20
lib/core/manager/dialog_manager.dart
View file

@ -6,16 +6,15 @@ import '../datamodels/dialog_response.dart';
import '../services/dialog_service.dart'; import '../services/dialog_service.dart';
class DialogManager extends StatefulWidget { class DialogManager extends StatefulWidget {
final Widget? child; final Widget child;
const DialogManager({super.key, this.child}); DialogManager({Key key, this.child}) : super(key: key);
@override
_DialogManagerState createState() => _DialogManagerState(); _DialogManagerState createState() => _DialogManagerState();
} }
class _DialogManagerState extends State<DialogManager> { class _DialogManagerState extends State<DialogManager> {
final DialogService _dialogService = locator<DialogService>(); DialogService _dialogService = locator<DialogService>();
@override @override
void initState() { void initState() {
@ -25,16 +24,15 @@ class _DialogManagerState extends State<DialogManager> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return widget.child!; return widget.child;
} }
void _showDialog(DialogRequest request) { void _showDialog(DialogRequest request) {
List<Widget> actions = <Widget>[]; List<Widget> actions = <Widget>[];
if (request.buttonTitleDeny != null && if (request.buttonTitleDeny != null && request.buttonTitleDeny.isNotEmpty) {
request.buttonTitleDeny!.isNotEmpty) {
Widget denyBtn = TextButton( Widget denyBtn = TextButton(
child: Text(request.buttonTitleDeny!), child: Text(request.buttonTitleDeny),
onPressed: () { onPressed: () {
_dialogService.dialogComplete(DialogResponse(confirmed: false)); _dialogService.dialogComplete(DialogResponse(confirmed: false));
}, },
@ -43,7 +41,7 @@ class _DialogManagerState extends State<DialogManager> {
} }
Widget confirmBtn = TextButton( Widget confirmBtn = TextButton(
child: Text(request.buttonTitleAccept!), child: Text(request.buttonTitleAccept),
onPressed: () { onPressed: () {
_dialogService.dialogComplete(DialogResponse(confirmed: true)); _dialogService.dialogComplete(DialogResponse(confirmed: true));
}, },
@ -51,8 +49,8 @@ class _DialogManagerState extends State<DialogManager> {
actions.add(confirmBtn); actions.add(confirmBtn);
AlertDialog alert = AlertDialog( AlertDialog alert = AlertDialog(
title: Text(request.title!), title: Text(request.title),
content: Text(request.description!), content: Text(request.description),
actions: actions, actions: actions,
); );

19
lib/core/manager/lifecycle_manager.dart
View file

@ -9,26 +9,21 @@ import '../util/logger.dart';
/// Stop and start long running services /// Stop and start long running services
class LifeCycleManager extends StatefulWidget { class LifeCycleManager extends StatefulWidget {
final Widget? child; final Widget child;
const LifeCycleManager({super.key, this.child}); LifeCycleManager({Key key, this.child}) : super(key: key);
@override
_LifeCycleManagerState createState() => _LifeCycleManagerState(); _LifeCycleManagerState createState() => _LifeCycleManagerState();
} }
class _LifeCycleManagerState extends State<LifeCycleManager> class _LifeCycleManagerState extends State<LifeCycleManager> with WidgetsBindingObserver {
with WidgetsBindingObserver {
final Logger logger = getLogger(); final Logger logger = getLogger();
List<StoppableService> servicesToManage = [ List<StoppableService> servicesToManage = [locator<SessionService>(), locator<PermissionService>()];
locator<SessionService>(),
locator<PermissionService>()
];
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return widget.child!; return widget.child;
} }
@override @override
@ -48,12 +43,12 @@ class _LifeCycleManagerState extends State<LifeCycleManager>
logger.d('LifeCycle event ${state.toString()}'); logger.d('LifeCycle event ${state.toString()}');
super.didChangeAppLifecycleState(state); super.didChangeAppLifecycleState(state);
for (var service in servicesToManage) { servicesToManage.forEach((service) {
if (state == AppLifecycleState.resumed) { if (state == AppLifecycleState.resumed) {
service.start(); service.start();
} else { } else {
service.stop(); service.stop();
} }
} });
} }
} }

8
lib/core/models/rest/apikey.dart
View file

@ -13,13 +13,9 @@ class ApiKey {
@JsonKey(required: true, name: 'access_level') @JsonKey(required: true, name: 'access_level')
final String accessLevel; final String accessLevel;
final String? comment; final String comment;
ApiKey( ApiKey({this.key, this.created, this.accessLevel, this.comment});
{required this.key,
required this.created,
required this.accessLevel,
this.comment});
// JSON Init // JSON Init
factory ApiKey.fromJson(Map<String, dynamic> json) => _$ApiKeyFromJson(json); factory ApiKey.fromJson(Map<String, dynamic> json) => _$ApiKeyFromJson(json);

7
lib/core/models/rest/apikeys.dart
View file

@ -6,14 +6,13 @@ part 'apikeys.g.dart';
@JsonSerializable() @JsonSerializable()
class ApiKeys { class ApiKeys {
@JsonKey(name: "items", required: true) @JsonKey(name: "items")
final Map<String, ApiKey> apikeys; final Map<String, ApiKey> apikeys;
ApiKeys({required this.apikeys}); ApiKeys({this.apikeys});
// JSON Init // JSON Init
factory ApiKeys.fromJson(Map<String, dynamic> json) => factory ApiKeys.fromJson(Map<String, dynamic> json) => _$ApiKeysFromJson(json);
_$ApiKeysFromJson(json);
// JSON Export // JSON Export
Map<String, dynamic> toJson() => _$ApiKeysToJson(this); Map<String, dynamic> toJson() => _$ApiKeysToJson(this);

5
lib/core/models/rest/apikeys_response.dart
View file

@ -12,11 +12,10 @@ class ApiKeysResponse {
@JsonKey(required: true) @JsonKey(required: true)
final ApiKeys data; final ApiKeys data;
ApiKeysResponse({required this.status, required this.data}); ApiKeysResponse({this.status, this.data});
// JSON Init // JSON Init
factory ApiKeysResponse.fromJson(Map<String, dynamic> json) => factory ApiKeysResponse.fromJson(Map<String, dynamic> json) => _$ApiKeysResponseFromJson(json);
_$ApiKeysResponseFromJson(json);
// JSON Export // JSON Export
Map<String, dynamic> toJson() => _$ApiKeysResponseToJson(this); Map<String, dynamic> toJson() => _$ApiKeysResponseToJson(this);

6
lib/core/models/rest/config.dart
View file

@ -16,11 +16,7 @@ class Config {
@JsonKey(name: "request_max_size", required: true) @JsonKey(name: "request_max_size", required: true)
final num requestMaxSize; final num requestMaxSize;
Config( Config({this.uploadMaxSize, this.maxFilesPerRequest, this.maxInputVars, this.requestMaxSize});
{required this.uploadMaxSize,
required this.maxFilesPerRequest,
required this.maxInputVars,
required this.requestMaxSize});
// JSON Init // JSON Init
factory Config.fromJson(Map<String, dynamic> json) => _$ConfigFromJson(json); factory Config.fromJson(Map<String, dynamic> json) => _$ConfigFromJson(json);

5
lib/core/models/rest/config_response.dart
View file

@ -12,11 +12,10 @@ class ConfigResponse {
@JsonKey(required: true) @JsonKey(required: true)
final Config data; final Config data;
ConfigResponse({required this.status, required this.data}); ConfigResponse({this.status, this.data});
// JSON Init // JSON Init
factory ConfigResponse.fromJson(Map<String, dynamic> json) => factory ConfigResponse.fromJson(Map<String, dynamic> json) => _$ConfigResponseFromJson(json);
_$ConfigResponseFromJson(json);
// JSON Export // JSON Export
Map<String, dynamic> toJson() => _$ConfigResponseToJson(this); Map<String, dynamic> toJson() => _$ConfigResponseToJson(this);

5
lib/core/models/rest/create_apikey_response.dart
View file

@ -10,11 +10,10 @@ class CreateApiKeyResponse {
@JsonKey(required: true) @JsonKey(required: true)
final Map<String, String> data; final Map<String, String> data;
CreateApiKeyResponse({required this.status, required this.data}); CreateApiKeyResponse({this.status, this.data});
// JSON Init // JSON Init
factory CreateApiKeyResponse.fromJson(Map<String, dynamic> json) => factory CreateApiKeyResponse.fromJson(Map<String, dynamic> json) => _$CreateApiKeyResponseFromJson(json);
_$CreateApiKeyResponseFromJson(json);
// JSON Export // JSON Export
Map<String, dynamic> toJson() => _$CreateApiKeyResponseToJson(this); Map<String, dynamic> toJson() => _$CreateApiKeyResponseToJson(this);

7
lib/core/models/rest/history.dart
View file

@ -14,13 +14,12 @@ class History {
final Map<String, HistoryMultipasteItem> multipasteItems; final Map<String, HistoryMultipasteItem> multipasteItems;
@JsonKey(name: "total_size") @JsonKey(name: "total_size")
final String? totalSize; final String totalSize;
History({required this.items, required this.multipasteItems, this.totalSize}); History({this.items, this.multipasteItems, this.totalSize});
// JSON Init // JSON Init
factory History.fromJson(Map<String, dynamic> json) => factory History.fromJson(Map<String, dynamic> json) => _$HistoryFromJson(json);
_$HistoryFromJson(json);
// JSON Export // JSON Export
Map<String, dynamic> toJson() => _$HistoryToJson(this); Map<String, dynamic> toJson() => _$HistoryToJson(this);

14
lib/core/models/rest/history_item.dart
View file

@ -11,20 +11,12 @@ class HistoryItem {
final String filesize; final String filesize;
final String hash; final String hash;
final String mimetype; final String mimetype;
final String? thumbnail; final String thumbnail;
HistoryItem( HistoryItem({this.date, this.filename, this.filesize, this.hash, this.id, this.mimetype, this.thumbnail});
{required this.date,
required this.filename,
required this.filesize,
required this.hash,
required this.id,
required this.mimetype,
this.thumbnail});
// JSON Init // JSON Init
factory HistoryItem.fromJson(Map<String, dynamic> json) => factory HistoryItem.fromJson(Map<String, dynamic> json) => _$HistoryItemFromJson(json);
_$HistoryItemFromJson(json);
// JSON Export // JSON Export
Map<String, dynamic> toJson() => _$HistoryItemToJson(this); Map<String, dynamic> toJson() => _$HistoryItemToJson(this);

9
lib/core/models/rest/history_multipaste_item.dart
View file

@ -1,22 +1,21 @@
import 'package:json_annotation/json_annotation.dart'; import 'package:json_annotation/json_annotation.dart';
import 'history_multipaste_item_entry.dart'; import 'history_item.dart';
part 'history_multipaste_item.g.dart'; part 'history_multipaste_item.g.dart';
@JsonSerializable() @JsonSerializable()
class HistoryMultipasteItem { class HistoryMultipasteItem {
final String date; final String date;
final Map<String, HistoryMultipasteItemEntry> items; final Map<String, HistoryItem> items;
@JsonKey(name: "url_id") @JsonKey(name: "url_id")
final String urlId; final String urlId;
HistoryMultipasteItem(this.items, {required this.date, required this.urlId}); HistoryMultipasteItem({this.date, this.items, this.urlId});
// JSON Init // JSON Init
factory HistoryMultipasteItem.fromJson(Map<String, dynamic> json) => factory HistoryMultipasteItem.fromJson(Map<String, dynamic> json) => _$HistoryMultipasteItemFromJson(json);
_$HistoryMultipasteItemFromJson(json);
// JSON Export // JSON Export
Map<String, dynamic> toJson() => _$HistoryMultipasteItemToJson(this); Map<String, dynamic> toJson() => _$HistoryMultipasteItemToJson(this);

17
lib/core/models/rest/history_multipaste_item_entry.dart
View file

@ -1,17 +0,0 @@
import 'package:json_annotation/json_annotation.dart';
part 'history_multipaste_item_entry.g.dart';
@JsonSerializable()
class HistoryMultipasteItemEntry {
final String id;
HistoryMultipasteItemEntry({required this.id});
// JSON Init
factory HistoryMultipasteItemEntry.fromJson(Map<String, dynamic> json) =>
_$HistoryMultipasteItemEntryFromJson(json);
// JSON Export
Map<String, dynamic> toJson() => _$HistoryMultipasteItemEntryToJson(this);
}

5
lib/core/models/rest/history_response.dart
View file

@ -12,11 +12,10 @@ class HistoryResponse {
@JsonKey(required: true) @JsonKey(required: true)
final History data; final History data;
HistoryResponse({required this.status, required this.data}); HistoryResponse({this.status, this.data});
// JSON Init // JSON Init
factory HistoryResponse.fromJson(Map<String, dynamic> json) => factory HistoryResponse.fromJson(Map<String, dynamic> json) => _$HistoryResponseFromJson(json);
_$HistoryResponseFromJson(json);
// JSON Export // JSON Export
Map<String, dynamic> toJson() => _$HistoryResponseToJson(this); Map<String, dynamic> toJson() => _$HistoryResponseToJson(this);

9
lib/core/models/rest/rest_error.dart
View file

@ -10,13 +10,12 @@ class RestError {
final String errorId; final String errorId;
RestError({ RestError({
required this.status, this.status,
required this.message, this.message,
required this.errorId, this.errorId,
}); // JSON Init }); // JSON Init
factory RestError.fromJson(Map<String, dynamic> json) => factory RestError.fromJson(Map<String, dynamic> json) => _$RestErrorFromJson(json);
_$RestErrorFromJson(json);
// JSON Export // JSON Export
Map<String, dynamic> toJson() => _$RestErrorToJson(this); Map<String, dynamic> toJson() => _$RestErrorToJson(this);

5
lib/core/models/rest/uploaded.dart
View file

@ -10,11 +10,10 @@ class Uploaded {
@JsonKey(required: true) @JsonKey(required: true)
final List<String> urls; final List<String> urls;
Uploaded({required this.ids, required this.urls}); Uploaded({this.ids, this.urls});
// JSON Init // JSON Init
factory Uploaded.fromJson(Map<String, dynamic> json) => factory Uploaded.fromJson(Map<String, dynamic> json) => _$UploadedFromJson(json);
_$UploadedFromJson(json);
// JSON Export // JSON Export
Map<String, dynamic> toJson() => _$UploadedToJson(this); Map<String, dynamic> toJson() => _$UploadedToJson(this);

5
lib/core/models/rest/uploaded_multi.dart
View file

@ -10,11 +10,10 @@ class UploadedMulti {
@JsonKey(required: true, name: "url_id") @JsonKey(required: true, name: "url_id")
final String urlId; final String urlId;
UploadedMulti({required this.url, required this.urlId}); UploadedMulti({this.url, this.urlId});
// JSON Init // JSON Init
factory UploadedMulti.fromJson(Map<String, dynamic> json) => factory UploadedMulti.fromJson(Map<String, dynamic> json) => _$UploadedMultiFromJson(json);
_$UploadedMultiFromJson(json);
// JSON Export // JSON Export
Map<String, dynamic> toJson() => _$UploadedMultiToJson(this); Map<String, dynamic> toJson() => _$UploadedMultiToJson(this);

5
lib/core/models/rest/uploaded_multi_response.dart
View file

@ -12,11 +12,10 @@ class UploadedMultiResponse {
@JsonKey(required: true) @JsonKey(required: true)
final UploadedMulti data; final UploadedMulti data;
UploadedMultiResponse({required this.status, required this.data}); UploadedMultiResponse({this.status, this.data});
// JSON Init // JSON Init
factory UploadedMultiResponse.fromJson(Map<String, dynamic> json) => factory UploadedMultiResponse.fromJson(Map<String, dynamic> json) => _$UploadedMultiResponseFromJson(json);
_$UploadedMultiResponseFromJson(json);
// JSON Export // JSON Export
Map<String, dynamic> toJson() => _$UploadedMultiResponseToJson(this); Map<String, dynamic> toJson() => _$UploadedMultiResponseToJson(this);

5
lib/core/models/rest/uploaded_response.dart
View file

@ -12,11 +12,10 @@ class UploadedResponse {
@JsonKey(required: true) @JsonKey(required: true)
final Uploaded data; final Uploaded data;
UploadedResponse({required this.status, required this.data}); UploadedResponse({this.status, this.data});
// JSON Init // JSON Init
factory UploadedResponse.fromJson(Map<String, dynamic> json) => factory UploadedResponse.fromJson(Map<String, dynamic> json) => _$UploadedResponseFromJson(json);
_$UploadedResponseFromJson(json);
// JSON Export // JSON Export
Map<String, dynamic> toJson() => _$UploadedResponseToJson(this); Map<String, dynamic> toJson() => _$UploadedResponseToJson(this);

5
lib/core/models/session.dart
View file

@ -7,14 +7,13 @@ class Session {
final String url; final String url;
final String apiKey; final String apiKey;
Session({required this.url, required this.apiKey}); Session({this.url, this.apiKey});
Session.initial() Session.initial()
: url = '', : url = '',
apiKey = ''; apiKey = '';
factory Session.fromJson(Map<String, dynamic> json) => factory Session.fromJson(Map<String, dynamic> json) => _$SessionFromJson(json);
_$SessionFromJson(json);
Map<String, dynamic> toJson() => _$SessionToJson(this); Map<String, dynamic> toJson() => _$SessionToJson(this);
} }

21
lib/core/models/uploaded_paste.dart
View file

@ -4,30 +4,29 @@ part 'uploaded_paste.g.dart';
@JsonSerializable() @JsonSerializable()
class UploadedPaste { class UploadedPaste {
final DateTime? date; final DateTime date;
final String? filename; final String filename;
final num? filesize; final num filesize;
final String? hash; final String hash;
final String id; final String id;
final String? mimetype; final String mimetype;
final String? thumbnail; final String thumbnail;
final bool? isMulti; final bool isMulti;
final List<String?>? items; final List<String> items;
UploadedPaste( UploadedPaste(
{this.date, {this.date,
this.filename, this.filename,
this.filesize, this.filesize,
this.hash, this.hash,
required this.id, this.id,
this.mimetype, this.mimetype,
this.thumbnail, this.thumbnail,
this.isMulti, this.isMulti,
this.items}); this.items});
// JSON Init // JSON Init
factory UploadedPaste.fromJson(Map<String, dynamic> json) => factory UploadedPaste.fromJson(Map<String, dynamic> json) => _$UploadedPasteFromJson(json);
_$UploadedPasteFromJson(json);
// JSON Export // JSON Export
Map<String, dynamic> toJson() => _$UploadedPasteToJson(this); Map<String, dynamic> toJson() => _$UploadedPasteToJson(this);

28
lib/core/repositories/file_repository.dart
View file

@ -11,7 +11,7 @@ import '../models/rest/uploaded_response.dart';
import '../services/api.dart'; import '../services/api.dart';
class FileRepository { class FileRepository {
final Api _api = locator<Api>(); Api _api = locator<Api>();
Future<History> getHistory() async { Future<History> getHistory() async {
var response = await _api.post('/file/history'); var response = await _api.post('/file/history');
@ -27,29 +27,23 @@ class FileRepository {
return parsedResponse.data; return parsedResponse.data;
} }
Future postDelete(String id) async { Future delete(String id) async {
var fields = Map.fromEntries([MapEntry("ids[1]", id)]); await _api.post('/file/delete', fields: {'ids[1]': id});
var response = await _api.post('/file/delete', fields: fields);
return response;
} }
Future<UploadedResponse> postUpload( Future<UploadedResponse> upload(List<File> files, Map<String, String> additionalFiles) async {
List<File>? files, Map<String, String>? additionalFiles) async { var response = await _api.post('/file/upload', files: files, additionalFiles: additionalFiles);
var response = await _api.post('/file/upload',
files: files, additionalFiles: additionalFiles);
return UploadedResponse.fromJson(json.decode(response.body)); return UploadedResponse.fromJson(json.decode(response.body));
} }
Future<UploadedMultiResponse> postCreateMultiPaste(List<String> ids) async { Future createMulti(List<String> ids) async {
Map<String, String> multiPasteIds = {}; Map<String, String> multiPasteIds = Map();
for (var element in ids) { ids.forEach((element) {
multiPasteIds.putIfAbsent( multiPasteIds.putIfAbsent("ids[${ids.indexOf(element) + 1}]", () => element);
"ids[${ids.indexOf(element) + 1}]", () => element); });
}
var response = var response = await _api.post('/file/create_multipaste', fields: multiPasteIds);
await _api.post('/file/create_multipaste', fields: multiPasteIds);
return UploadedMultiResponse.fromJson(json.decode(response.body)); return UploadedMultiResponse.fromJson(json.decode(response.body));
} }
} }

15
lib/core/repositories/user_repository.dart
View file

@ -6,19 +6,14 @@ import '../models/rest/create_apikey_response.dart';
import '../services/api.dart'; import '../services/api.dart';
class UserRepository { class UserRepository {
final Api _api = locator<Api>(); Api _api = locator<Api>();
Future<CreateApiKeyResponse> postApiKey(String url, String username, Future<CreateApiKeyResponse> createApiKey(
String password, String accessLevel, String comment) async { String url, String username, String password, String accessLevel, String comment) async {
_api.setUrl(url); _api.setUrl(url);
var fields = Map.fromEntries([ var response = await _api.post('/user/create_apikey',
MapEntry("username", username), fields: {'username': username, 'password': password, 'access_level': accessLevel, 'comment': comment});
MapEntry("password", password),
MapEntry("access_level", accessLevel),
MapEntry("comment", comment),
]);
var response = await _api.post('/user/create_apikey', fields: fields);
return CreateApiKeyResponse.fromJson(json.decode(response.body)); return CreateApiKeyResponse.fromJson(json.decode(response.body));
} }

73
lib/core/services/api.dart
View file

@ -24,34 +24,25 @@ class Api implements ApiErrorConverter {
String _url = ""; String _url = "";
String _apiKey = ""; String _apiKey = "";
final Map<String, String> _headers = { Map<String, String> _headers = {"Content-Type": _applicationJson, "Accept": _applicationJson};
"Content-Type": _applicationJson, Duration _timeout = Duration(seconds: Constants.apiRequestTimeoutLimit);
"Accept": _applicationJson
};
Duration _timeout = const Duration(seconds: Constants.apiRequestTimeoutLimit);
Future<http.Response> fetch<T>(String route) async { Future<http.Response> fetch<T>(String route) async {
try { try {
_logger.d( _logger
"Requesting GET API endpoint '${_url + route}' with headers '$_headers' and maximum timeout '$_timeout'"); .d("Requesting GET API endpoint '${_url + route}' with headers '$_headers' and maximum timeout '$_timeout'");
var response = await http var response = await http.get(_url + route, headers: _headers).timeout(_timeout);
.get(Uri.parse(_url + route), headers: _headers)
.timeout(_timeout);
handleRestErrors(response); handleRestErrors(response);
return response; return response;
} on TimeoutException { } on TimeoutException {
throw ServiceException( throw ServiceException(code: ErrorCode.SOCKET_TIMEOUT, message: _errorTimeout);
code: ErrorCode.socketTimeout, message: _errorTimeout);
} on SocketException { } on SocketException {
throw ServiceException( throw ServiceException(code: ErrorCode.SOCKET_ERROR, message: _errorNoConnection);
code: ErrorCode.socketError, message: _errorNoConnection);
} }
} }
Future<http.Response> post<T>(String route, Future<http.Response> post<T>(String route,
{Map<String, String?>? fields, {Map<String, String> fields, List<File> files, Map<String, String> additionalFiles}) async {
List<File>? files,
Map<String, String>? additionalFiles}) async {
try { try {
var uri = Uri.parse(_url + route); var uri = Uri.parse(_url + route);
var request = http.MultipartRequest('POST', uri) var request = http.MultipartRequest('POST', uri)
@ -63,39 +54,32 @@ class Api implements ApiErrorConverter {
} }
if (fields != null && fields.isNotEmpty) { if (fields != null && fields.isNotEmpty) {
request.fields.addAll(fields as Map<String, String>); request.fields.addAll(fields);
} }
if (files != null && files.isNotEmpty) { if (files != null && files.isNotEmpty) {
for (var element in files) { files.forEach((element) async {
request.files.add(await http.MultipartFile.fromPath( request.files.add(await http.MultipartFile.fromPath('file[${files.indexOf(element) + 1}]', element.path));
'file[${files.indexOf(element) + 1}]', element.path));
}
}
if (additionalFiles != null && additionalFiles.isNotEmpty) {
List<String> keys = additionalFiles.keys.toList();
additionalFiles.forEach((key, value) {
var index = files != null
? files.length + keys.indexOf(key) + 1
: keys.indexOf(key) + 1;
request.files.add(http.MultipartFile.fromString('file[$index]', value,
filename: key));
}); });
} }
_logger.d( if (additionalFiles != null && additionalFiles.length > 0) {
"Requesting POST API endpoint '${uri.toString()}' and ${request.files.length} files"); List<String> keys = additionalFiles.keys.toList();
additionalFiles.forEach((key, value) {
var index = files != null ? files.length + keys.indexOf(key) + 1 : keys.indexOf(key) + 1;
request.files.add(http.MultipartFile.fromString('file[$index]', value, filename: key));
});
}
_logger.d("Requesting POST API endpoint '${uri.toString()}' and ${request.files.length} files");
var multiResponse = await request.send(); var multiResponse = await request.send();
var response = await http.Response.fromStream(multiResponse); var response = await http.Response.fromStream(multiResponse);
handleRestErrors(response); handleRestErrors(response);
return response; return response;
} on TimeoutException { } on TimeoutException {
throw ServiceException( throw ServiceException(code: ErrorCode.SOCKET_TIMEOUT, message: _errorTimeout);
code: ErrorCode.socketTimeout, message: _errorTimeout);
} on SocketException { } on SocketException {
throw ServiceException( throw ServiceException(code: ErrorCode.SOCKET_ERROR, message: _errorNoConnection);
code: ErrorCode.socketError, message: _errorNoConnection);
} }
} }
@ -123,21 +107,20 @@ class Api implements ApiErrorConverter {
/// have a json decoded object. Replace this with a custom /// have a json decoded object. Replace this with a custom
/// conversion method by overwriting the interface if needed /// conversion method by overwriting the interface if needed
void handleRestErrors(http.Response response) { void handleRestErrors(http.Response response) {
if (response.statusCode != HttpStatus.ok && if (response != null) {
response.statusCode != HttpStatus.noContent) { if (response.statusCode != HttpStatus.ok && response.statusCode != HttpStatus.noContent) {
if (response.headers.containsKey(HttpHeaders.contentTypeHeader)) { if (response.headers.containsKey(HttpHeaders.contentTypeHeader)) {
ContentType responseContentType = ContentType responseContentType = ContentType.parse(response.headers[HttpHeaders.contentTypeHeader]);
ContentType.parse(response.headers[HttpHeaders.contentTypeHeader]!);
if (ContentType.json.primaryType == responseContentType.primaryType && if (ContentType.json.primaryType == responseContentType.primaryType &&
ContentType.json.subType == responseContentType.subType) { ContentType.json.subType == responseContentType.subType) {
var parsedBody = convert(response); var parsedBody = convert(response);
throw RestServiceException(response.statusCode, throw new RestServiceException(response.statusCode, responseBody: parsedBody);
responseBody: parsedBody);
} }
} }
throw RestServiceException(response.statusCode); throw new RestServiceException(response.statusCode);
}
} }
} }

39
lib/core/services/dialog_service.dart
View file

@ -7,10 +7,9 @@ import '../datamodels/dialog_request.dart';
import '../datamodels/dialog_response.dart'; import '../datamodels/dialog_response.dart';
class DialogService { class DialogService {
final GlobalKey<NavigatorState> _dialogNavigationKey = GlobalKey<NavigatorState> _dialogNavigationKey = GlobalKey<NavigatorState>();
GlobalKey<NavigatorState>(); Function(DialogRequest) _showDialogListener;
late Function(DialogRequest) _showDialogListener; Completer<DialogResponse> _dialogCompleter;
Completer<DialogResponse>? _dialogCompleter;
GlobalKey<NavigatorState> get dialogNavigationKey => _dialogNavigationKey; GlobalKey<NavigatorState> get dialogNavigationKey => _dialogNavigationKey;
@ -19,43 +18,35 @@ class DialogService {
} }
Future<DialogResponse> showDialog({ Future<DialogResponse> showDialog({
String? title, String title,
String? description, String description,
String? buttonTitleAccept, String buttonTitleAccept,
}) { }) {
_dialogCompleter = Completer<DialogResponse>(); _dialogCompleter = Completer<DialogResponse>();
_showDialogListener(DialogRequest( _showDialogListener(DialogRequest(
title: title, title: title,
description: description, description: description,
buttonTitleAccept: buttonTitleAccept:
buttonTitleAccept == null || buttonTitleAccept.isEmpty buttonTitleAccept == null || buttonTitleAccept.isEmpty ? translate('dialog.confirm') : buttonTitleAccept));
? translate('dialog.confirm') return _dialogCompleter.future;
: buttonTitleAccept));
return _dialogCompleter!.future;
} }
Future<DialogResponse> showConfirmationDialog( Future<DialogResponse> showConfirmationDialog(
{String? title, {String title, String description, String buttonTitleAccept, String buttonTitleDeny}) {
String? description,
String? buttonTitleAccept,
String? buttonTitleDeny}) {
_dialogCompleter = Completer<DialogResponse>(); _dialogCompleter = Completer<DialogResponse>();
_showDialogListener(DialogRequest( _showDialogListener(DialogRequest(
title: title, title: title,
description: description, description: description,
buttonTitleAccept: buttonTitleAccept:
buttonTitleAccept == null || buttonTitleAccept.isEmpty buttonTitleAccept == null || buttonTitleAccept.isEmpty ? translate('dialog.confirm') : buttonTitleAccept,
? translate('dialog.confirm') buttonTitleDeny:
: buttonTitleAccept, buttonTitleDeny == null || buttonTitleDeny.isEmpty ? translate('dialog.cancel') : buttonTitleDeny));
buttonTitleDeny: buttonTitleDeny == null || buttonTitleDeny.isEmpty return _dialogCompleter.future;
? translate('dialog.cancel')
: buttonTitleDeny));
return _dialogCompleter!.future;
} }
void dialogComplete(DialogResponse response) { void dialogComplete(DialogResponse response) {
_dialogNavigationKey.currentState!.pop(); _dialogNavigationKey.currentState.pop();
_dialogCompleter!.complete(response); _dialogCompleter.complete(response);
_dialogCompleter = null; _dialogCompleter = null;
} }
} }

19
lib/core/services/file_service.dart
View file

@ -3,32 +3,27 @@ import 'dart:io';
import '../../core/repositories/file_repository.dart'; import '../../core/repositories/file_repository.dart';
import '../../locator.dart'; import '../../locator.dart';
import '../models/rest/config.dart';
import '../models/rest/history.dart';
import '../models/rest/uploaded_multi_response.dart';
import '../models/rest/uploaded_response.dart';
class FileService { class FileService {
final FileRepository _fileRepository = locator<FileRepository>(); final FileRepository _fileRepository = locator<FileRepository>();
Future<Config> getConfig(String url) async { Future getConfig(String url) async {
return await _fileRepository.getConfig(url); return await _fileRepository.getConfig(url);
} }
FutureOr<History> getHistory() async { Future getHistory() async {
return await _fileRepository.getHistory(); return await _fileRepository.getHistory();
} }
Future deletePaste(String id) async { Future deletePaste(String id) async {
return await _fileRepository.postDelete(id); return await _fileRepository.delete(id);
} }
Future<UploadedResponse> uploadPaste( Future upload(List<File> files, Map<String, String> additionalFiles) async {
List<File>? files, Map<String, String>? additionalFiles) async { return await _fileRepository.upload(files, additionalFiles);
return await _fileRepository.postUpload(files, additionalFiles);
} }
Future<UploadedMultiResponse> uploadMultiPaste(List<String> ids) async { Future createMulti(List<String> ids) async {
return await _fileRepository.postCreateMultiPaste(ids); return await _fileRepository.createMulti(ids);
} }
} }

11
lib/core/services/link_service.dart
View file

@ -1,4 +1,4 @@
import 'package:flutter_translate/flutter_translate.dart'; import 'package:flutter_translate/global.dart';
import 'package:logger/logger.dart'; import 'package:logger/logger.dart';
import 'package:url_launcher/url_launcher.dart'; import 'package:url_launcher/url_launcher.dart';
@ -11,16 +11,13 @@ class LinkService {
final DialogService _dialogService = locator<DialogService>(); final DialogService _dialogService = locator<DialogService>();
Future open(String link) async { Future open(String link) async {
Uri uri = Uri.parse(link); if (await canLaunch(link)) {
await launch(link);
if (await canLaunchUrl(uri)) {
await launchUrl(uri);
} else { } else {
_logger.e('Could not launch link $link'); _logger.e('Could not launch link $link');
_dialogService.showDialog( _dialogService.showDialog(
title: translate('link.dialog.title'), title: translate('link.dialog.title'),
description: description: translate('link.dialog.description', args: {'link': link}));
translate('link.dialog.description', args: {'link': link}));
} }
} }
} }

10
lib/core/services/navigation_service.dart
View file

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

165
lib/core/services/permission_service.dart
View file

@ -1,109 +1,115 @@
import 'dart:async'; import 'dart:async';
import 'dart:io' show Platform;
import 'package:device_info_plus/device_info_plus.dart'; import 'package:flutter_translate/flutter_translate.dart';
import 'package:logger/logger.dart'; import 'package:logger/logger.dart';
import 'package:permission_handler/permission_handler.dart'; import 'package:permission_handler/permission_handler.dart';
import '../../constants.dart'; import '../../constants.dart';
import '../../core/datamodels/dialog_response.dart';
import '../../core/services/dialog_service.dart';
import '../../core/services/stoppable_service.dart'; import '../../core/services/stoppable_service.dart';
import '../../core/util/logger.dart'; import '../../core/util/logger.dart';
import '../../locator.dart';
import 'storage_service.dart';
class PermissionService extends StoppableService { class PermissionService extends StoppableService {
final Logger _logger = getLogger(); final Logger _logger = getLogger();
final DialogService _dialogService = locator<DialogService>();
final StorageService _storageService = locator<StorageService>();
Timer? _serviceCheckTimer; Timer _serviceCheckTimer;
PermissionStatus _permissionStatus;
bool _permanentlyIgnored = false;
bool _devicePermissionDialogActive = false; bool _devicePermissionDialogActive = false;
bool _ownPermissionDialogActive = false;
bool _deviceInformationInitialized = false; PermissionService() {
bool _useStoragePermission = true; _devicePermissionDialogActive = true;
PermissionService(); Permission.storage.request().then((status) {
_permissionStatus = status;
if (PermissionStatus.permanentlyDenied == status) {
_permanentlyIgnored = true;
}
}).whenComplete(() {
_logger.d('Initial device request permission finished');
_devicePermissionDialogActive = false;
});
}
Future checkEnabledAndPermission() async { Future checkEnabledAndPermission() async {
if (_permanentlyIgnored) {
await _storageService.storeStoragePermissionDialogIgnored();
_permanentlyIgnored = false;
_logger.d('Set permanently ignored permission request');
stop();
}
if (_devicePermissionDialogActive) { if (_devicePermissionDialogActive) {
_logger.d('Device permission dialog active, skipping'); _logger.d('Device permission dialog active, skipping');
return; return;
} }
bool allGranted = false; if (_ownPermissionDialogActive) {
bool anyPermanentlyDenied = false; _logger.d('Own permission dialog already active, skipping');
return;
}
// Since Android compileSdk >= 33, "storage" is deprecated var ignoredDialog = await _storageService.hasStoragePermissionDialogIgnored();
// Instead, request access to all of
// - Permission.photos if (ignoredDialog) {
// - Permission.videos _logger.d('Permanently ignored permission request, skipping');
// - Permission.audio stop();
// return;
// For iOS and Android < 33, keep using "storage" }
if (_useStoragePermission) {
PermissionStatus storagePermission = await Permission.storage.status; _permissionStatus = await Permission.storage.status;
allGranted = PermissionStatus.granted == storagePermission; if (_permissionStatus != PermissionStatus.granted) {
anyPermanentlyDenied = if (_permissionStatus == PermissionStatus.permanentlyDenied) {
PermissionStatus.permanentlyDenied == storagePermission; await _storageService.storeStoragePermissionDialogIgnored();
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'));
if (!response.confirmed) {
await _storageService.storeStoragePermissionDialogIgnored();
} else { } 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;
}
// 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;
}
// all good, stop the permission service
if (allGranted) {
_logger.d("All permissions have been granted, stopping service");
stop();
return;
}
// not all have been granted, show OS dialog
_logger.d(
"Not all permissions have been granted yet, initializing permission dialog");
_devicePermissionDialogActive = true; _devicePermissionDialogActive = true;
Permission.storage.request().then((status) async {
if (PermissionStatus.permanentlyDenied == status) {
await _storageService.storeStoragePermissionDialogIgnored();
}
}).whenComplete(() {
_logger.d('Device request permission finished');
_devicePermissionDialogActive = false;
});
}
if (_useStoragePermission) { _ownPermissionDialogActive = false;
await [Permission.storage].request().whenComplete(() {
_logger.d('Device request permission finished');
_devicePermissionDialogActive = false;
});
} else { } else {
await [Permission.photos, Permission.videos, Permission.audio] await _storageService.storeStoragePermissionDialogIgnored();
.request()
.whenComplete(() {
_logger.d('Device request permission finished');
_devicePermissionDialogActive = false;
});
} }
} }
@override @override
Future start() async { Future start() async {
super.start(); super.start();
await _determineDeviceInfo();
await checkEnabledAndPermission(); await checkEnabledAndPermission();
_serviceCheckTimer = Timer.periodic( _serviceCheckTimer =
const Duration(milliseconds: Constants.mediaPermissionCheckInterval), Timer.periodic(Duration(milliseconds: Constants.mediaPermissionCheckInterval), (_serviceTimer) async {
(serviceTimer) async {
if (!super.serviceStopped) { if (!super.serviceStopped) {
await checkEnabledAndPermission(); await checkEnabledAndPermission();
} else { } else {
serviceTimer.cancel(); _serviceTimer.cancel();
} }
}); });
_logger.d('PermissionService started'); _logger.d('PermissionService started');
@ -116,32 +122,9 @@ class PermissionService extends StoppableService {
_logger.d('PermissionService stopped'); _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() { void _removeServiceCheckTimer() {
if (_serviceCheckTimer != null) { if (_serviceCheckTimer != null) {
_serviceCheckTimer!.cancel(); _serviceCheckTimer.cancel();
_serviceCheckTimer = null; _serviceCheckTimer = null;
_logger.d('Removed service check timer'); _logger.d('Removed service check timer');
} }

7
lib/core/services/refresh_service.dart
View file

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

6
lib/core/services/session_service.dart
View file

@ -14,9 +14,9 @@ class SessionService extends StoppableService {
final StorageService _storageService = locator<StorageService>(); final StorageService _storageService = locator<StorageService>();
final Api _api = locator<Api>(); final Api _api = locator<Api>();
StreamController<Session?> sessionController = StreamController<Session?>(); StreamController<Session> sessionController = StreamController<Session>();
void setApiConfig(String url, String? apiKey) { void setApiConfig(String url, String apiKey) {
_logger.d('Setting API config for session'); _logger.d('Setting API config for session');
_api.setUrl(url); _api.setUrl(url);
_api.addApiKeyAuthorization(apiKey); _api.addApiKeyAuthorization(apiKey);
@ -31,7 +31,7 @@ class SessionService extends StoppableService {
Future<bool> login(String url, String apiKey) async { Future<bool> login(String url, String apiKey) async {
setApiConfig(url, apiKey); setApiConfig(url, apiKey);
var session = Session(url: url, apiKey: apiKey); var session = new Session(url: url, apiKey: apiKey);
sessionController.add(session); sessionController.add(session);
await _storageService.storeSession(session); await _storageService.storeSession(session);
_logger.d('Session created'); _logger.d('Session created');

33
lib/core/services/storage_service.dart
View file

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

16
lib/core/services/user_service.dart
View file

@ -3,8 +3,6 @@ import 'dart:async';
import '../../locator.dart'; import '../../locator.dart';
import '../enums/error_code.dart'; import '../enums/error_code.dart';
import '../error/service_exception.dart'; import '../error/service_exception.dart';
import '../models/rest/apikeys_response.dart';
import '../models/rest/create_apikey_response.dart';
import '../repositories/user_repository.dart'; import '../repositories/user_repository.dart';
import 'file_service.dart'; import 'file_service.dart';
@ -12,22 +10,20 @@ class UserService {
final FileService _fileService = locator<FileService>(); final FileService _fileService = locator<FileService>();
final UserRepository _userRepository = locator<UserRepository>(); final UserRepository _userRepository = locator<UserRepository>();
Future<CreateApiKeyResponse> createApiKey(String url, String username, Future createApiKey(String url, String username, String password, String accessLevel, String comment) async {
String password, String accessLevel, String comment) async { return await _userRepository.createApiKey(url, username, password, accessLevel, comment);
return await _userRepository.postApiKey(
url, username, password, accessLevel, comment);
} }
Future<ApiKeysResponse> getApiKeys() async { Future getApiKeys() async {
return await _userRepository.getApiKeys(); return await _userRepository.getApiKeys();
} }
/// Use 'getHistory' to check currently used API key to require 'apikey' access level /// Use 'getHistory' to check currently used API key to require 'apikey' access level
Future<void> checkAccessLevelIsAtLeastApiKey() async { Future checkAccessLevelIsAtLeastApiKey() async {
try { try {
await _fileService.getHistory(); await _fileService.getHistory();
} on ServiceException catch (e) { } catch (e) {
throw ServiceException(code: ErrorCode.invalidApiKey, message: e.message); throw new ServiceException(code: ErrorCode.INVALID_API_KEY, message: e.message);
} }
} }
} }

5
lib/core/util/formatter_util.dart
View file

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

6
lib/core/util/paste_util.dart
View file

@ -1,6 +0,0 @@
class PasteUtil {
/// Generate paste link adding a trailing slash
static String generateLink(String url, String id) {
return '$url/$id/';
}
}

21
lib/core/viewmodels/about_model.dart
View file

@ -1,31 +1,10 @@
import 'package:package_info_plus/package_info_plus.dart';
import '../../core/services/link_service.dart'; import '../../core/services/link_service.dart';
import '../../locator.dart'; import '../../locator.dart';
import '../enums/viewstate.dart';
import 'base_model.dart'; import 'base_model.dart';
class AboutModel extends BaseModel { class AboutModel extends BaseModel {
final LinkService _linkService = locator<LinkService>(); final LinkService _linkService = locator<LinkService>();
PackageInfo packageInfo = PackageInfo(
appName: 'Unknown',
packageName: 'Unknown',
version: 'Unknown',
buildNumber: 'Unknown',
);
void init() async {
await _initPackageInfo();
}
Future<void> _initPackageInfo() async {
setStateView(ViewState.busy);
final PackageInfo info = await PackageInfo.fromPlatform();
packageInfo = info;
setStateView(ViewState.idle);
}
void openLink(String link) { void openLink(String link) {
_linkService.open(link); _linkService.open(link);
} }

74
lib/core/viewmodels/base_model.dart
View file

@ -5,89 +5,35 @@ import '../../core/util/logger.dart';
import '../enums/viewstate.dart'; import '../enums/viewstate.dart';
class BaseModel extends ChangeNotifier { class BaseModel extends ChangeNotifier {
static const String stateViewKey = 'viewState';
static const String stateMessageKey = 'viewMessage';
final Logger _logger = getLogger(); final Logger _logger = getLogger();
bool _isDisposed = false; bool _isDisposed = false;
final Map<String, Object?> _stateMap = { ViewState _state = ViewState.Idle;
stateViewKey: ViewState.idle, String _stateMessage;
stateMessageKey: null
};
ViewState? get state => _stateMap[stateViewKey] as ViewState?; ViewState get state => _state;
String? get stateMessage => _stateMap[stateMessageKey] as String?; String get stateMessage => _stateMessage;
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 {
_stateMap.putIfAbsent(key, () => stateValue);
}
void setState(ViewState viewState) {
_state = viewState;
if (!_isDisposed) { if (!_isDisposed) {
notifyListeners(); notifyListeners();
_logger _logger.d("Notified state change '${viewState.toString()}'");
.d("Notified state value update '($key, ${stateValue.toString()})'");
} }
} }
void removeStateValue(String key) { void setStateMessage(String stateMessage) {
_stateMap.remove(key); _stateMessage = stateMessage;
if (!_isDisposed) { if (!_isDisposed) {
notifyListeners(); notifyListeners();
_logger.d("Notified state removal of '$key'"); _logger.d("Notified state message change '$stateMessage'");
} }
} }
void setStateView(ViewState stateView) {
_setStateValue(stateViewKey, stateView);
}
void setStateMessage(String? stateMessage) {
_setStateValue(stateMessageKey, stateMessage);
}
@override @override
void dispose() { void dispose() {
_logger.d("Calling dispose");
super.dispose(); super.dispose();
_isDisposed = true; _isDisposed = true;
} }

66
lib/core/viewmodels/history_model.dart
View file

@ -28,15 +28,14 @@ class HistoryModel extends BaseModel {
final LinkService _linkService = locator<LinkService>(); final LinkService _linkService = locator<LinkService>();
final DialogService _dialogService = locator<DialogService>(); final DialogService _dialogService = locator<DialogService>();
late StreamSubscription _refreshTriggerSubscription; StreamSubscription _refreshTriggerSubscription;
List<UploadedPaste> pastes = []; List<UploadedPaste> pastes = [];
String? errorMessage; String errorMessage;
void init() { void init() {
_refreshTriggerSubscription = _refreshTriggerSubscription = _refreshService.refreshHistoryController.stream.listen((event) {
_refreshService.refreshEventController.stream.listen((event) { if (event == RefreshEvent.RefreshHistory) {
if (event == RefreshEvent.refreshHistory) {
_logger.d('History needs a refresh'); _logger.d('History needs a refresh');
getHistory(); getHistory();
} }
@ -44,19 +43,18 @@ class HistoryModel extends BaseModel {
} }
Future getHistory() async { Future getHistory() async {
setStateView(ViewState.busy); setState(ViewState.Busy);
try { try {
pastes.clear(); pastes.clear();
History history = await _fileService.getHistory(); History _history = await _fileService.getHistory();
if (history.items.isNotEmpty) { if (_history.items != null) {
history.items.forEach((key, value) { _history.items.forEach((key, value) {
var millisecondsSinceEpoch = int.parse(value.date) * 1000; var millisecondsSinceEpoch = int.parse(value.date) * 1000;
pastes.add( pastes.add(
UploadedPaste( UploadedPaste(
id: key, id: key,
date: date: DateTime.fromMillisecondsSinceEpoch(millisecondsSinceEpoch),
DateTime.fromMillisecondsSinceEpoch(millisecondsSinceEpoch),
filename: value.filename, filename: value.filename,
filesize: int.parse(value.filesize), filesize: int.parse(value.filesize),
hash: value.hash, hash: value.hash,
@ -68,8 +66,8 @@ class HistoryModel extends BaseModel {
}); });
} }
if (history.multipasteItems.isNotEmpty) { if (_history.multipasteItems != null) {
history.multipasteItems.forEach((key, multiPaste) { _history.multipasteItems.forEach((key, multiPaste) {
var millisecondsSinceEpoch = int.parse(multiPaste.date) * 1000; var millisecondsSinceEpoch = int.parse(multiPaste.date) * 1000;
pastes.add(UploadedPaste( pastes.add(UploadedPaste(
id: key, id: key,
@ -79,7 +77,7 @@ class HistoryModel extends BaseModel {
}); });
} }
pastes.sort((a, b) => a.date!.compareTo(b.date!)); pastes.sort((a, b) => a.date.compareTo(b.date));
errorMessage = null; errorMessage = null;
} catch (e) { } catch (e) {
if (e is RestServiceException) { if (e is RestServiceException) {
@ -92,43 +90,40 @@ class HistoryModel extends BaseModel {
e.responseBody is RestError && e.responseBody is RestError &&
e.responseBody.message != null) { e.responseBody.message != null) {
if (e.statusCode == HttpStatus.badRequest) { if (e.statusCode == HttpStatus.badRequest) {
errorMessage = translate('api.bad_request', errorMessage = translate('api.bad_request', args: {'reason': e.responseBody.message});
args: {'reason': e.responseBody.message});
} else { } else {
errorMessage = translate('api.general_rest_error_payload', errorMessage = translate('api.general_rest_error_payload', args: {'message': e.responseBody.message});
args: {'message': e.responseBody.message});
} }
} else { } else {
errorMessage = translate('api.general_rest_error'); errorMessage = translate('api.general_rest_error');
} }
} else if (e is ServiceException && e.code == ErrorCode.socketError) { } else if (e is ServiceException && e.code == ErrorCode.SOCKET_ERROR) {
errorMessage = translate('api.socket_error'); errorMessage = translate('api.socket_error');
} else if (e is ServiceException && e.code == ErrorCode.socketTimeout) { } else if (e is ServiceException && e.code == ErrorCode.SOCKET_TIMEOUT) {
errorMessage = translate('api.socket_timeout'); errorMessage = translate('api.socket_timeout');
} else { } else {
errorMessage = translate('app.unknown_error'); errorMessage = translate('app.unknown_error');
setStateView(ViewState.idle); setState(ViewState.Idle);
_logger.e('An unknown error occurred', error: e); _logger.e('An unknown error occurred', e);
rethrow; throw e;
} }
} }
setStateView(ViewState.idle); setState(ViewState.Idle);
} }
Future deletePaste(String id) async { Future deletePaste(String id) async {
DialogResponse res = await _dialogService.showConfirmationDialog( DialogResponse res = await _dialogService.showConfirmationDialog(
title: translate('history.delete_dialog.title'), title: translate('history.delete_dialog.title'),
description: description: translate('history.delete_dialog.description', args: {'id': id}),
translate('history.delete_dialog.description', args: {'id': id}),
buttonTitleAccept: translate('history.delete_dialog.accept'), buttonTitleAccept: translate('history.delete_dialog.accept'),
buttonTitleDeny: translate('history.delete_dialog.deny')); buttonTitleDeny: translate('history.delete_dialog.deny'));
if (!res.confirmed!) { if (!res.confirmed) {
return; return;
} }
setStateView(ViewState.busy); setState(ViewState.Busy);
try { try {
await _fileService.deletePaste(id); await _fileService.deletePaste(id);
@ -144,24 +139,23 @@ class HistoryModel extends BaseModel {
e.statusCode != HttpStatus.forbidden && e.statusCode != HttpStatus.forbidden &&
e.responseBody is RestError && e.responseBody is RestError &&
e.responseBody.message != null) { e.responseBody.message != null) {
errorMessage = translate('api.general_rest_error_payload', errorMessage = translate('api.general_rest_error_payload', args: {'message': e.responseBody.message});
args: {'message': e.responseBody.message});
} else { } else {
errorMessage = translate('api.general_rest_error'); errorMessage = translate('api.general_rest_error');
} }
} else if (e is ServiceException && e.code == ErrorCode.socketError) { } else if (e is ServiceException && e.code == ErrorCode.SOCKET_ERROR) {
errorMessage = translate('api.socket_error'); errorMessage = translate('api.socket_error');
} else if (e is ServiceException && e.code == ErrorCode.socketTimeout) { } else if (e is ServiceException && e.code == ErrorCode.SOCKET_TIMEOUT) {
errorMessage = translate('api.socket_timeout'); errorMessage = translate('api.socket_timeout');
} else { } else {
errorMessage = translate('app.unknown_error'); errorMessage = translate('app.unknown_error');
setStateView(ViewState.idle); setState(ViewState.Idle);
_logger.e('An unknown error occurred', error: e); _logger.e('An unknown error occurred', e);
rethrow; throw e;
} }
} }
setStateView(ViewState.idle); setState(ViewState.Idle);
} }
void openLink(String link) { void openLink(String link) {

77
lib/core/viewmodels/login_model.dart
View file

@ -1,4 +1,3 @@
import 'dart:async';
import 'dart:io'; import 'dart:io';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -20,12 +19,12 @@ import '../util/logger.dart';
import 'base_model.dart'; import 'base_model.dart';
class LoginModel extends BaseModel { class LoginModel extends BaseModel {
TextEditingController _uriController = TextEditingController(); TextEditingController _uriController = new TextEditingController();
final TextEditingController _userNameController = TextEditingController(); final TextEditingController _userNameController = new TextEditingController();
final TextEditingController _passwordController = TextEditingController(); final TextEditingController _passwordController = new TextEditingController();
final TextEditingController _apiKeyController = TextEditingController(); final TextEditingController _apiKeyController = new TextEditingController();
TextEditingController get uriController => _uriController; TextEditingController get uriController => _uriController;
@ -41,26 +40,26 @@ class LoginModel extends BaseModel {
final Logger _logger = getLogger(); final Logger _logger = getLogger();
bool useCredentialsLogin = true; bool useCredentialsLogin = true;
String? errorMessage; String errorMessage;
void toggleLoginMethod() { void toggleLoginMethod() {
setStateView(ViewState.busy); setState(ViewState.Busy);
useCredentialsLogin = !useCredentialsLogin; useCredentialsLogin = !useCredentialsLogin;
setStateView(ViewState.idle); setState(ViewState.Idle);
} }
void init() async { void init() async {
bool hasLastUrl = await _storageService.hasLastUrl(); bool hasLastUrl = await _storageService.hasLastUrl();
if (hasLastUrl) { if (hasLastUrl) {
setStateView(ViewState.busy); setState(ViewState.Busy);
var s = await (_storageService.retrieveLastUrl() as FutureOr<String>); var s = await _storageService.retrieveLastUrl();
if (s.isNotEmpty) { if (s.isNotEmpty) {
_uriController = TextEditingController(text: s); _uriController = new TextEditingController(text: s);
} }
setStateView(ViewState.idle); setState(ViewState.Idle);
} }
} }
@ -70,45 +69,45 @@ class LoginModel extends BaseModel {
var password = passwordController.text; var password = passwordController.text;
var apiKey = apiKeyController.text; var apiKey = apiKeyController.text;
setStateView(ViewState.busy); setState(ViewState.Busy);
url = trim(url); url = trim(url);
username = trim(username); username = trim(username);
if (url.isEmpty) { if (url.isEmpty) {
errorMessage = translate('login.errors.empty_url'); errorMessage = translate('login.errors.empty_url');
setStateView(ViewState.idle); setState(ViewState.Idle);
return false; return false;
} }
if (!url.contains("https://") && !url.contains("http://")) { if (!url.contains("https://") && !url.contains("http://")) {
errorMessage = translate('login.errors.no_protocol'); errorMessage = translate('login.errors.no_protocol');
setStateView(ViewState.idle); setState(ViewState.Idle);
return false; return false;
} }
bool validUri = Uri.parse(url).isAbsolute; bool validUri = Uri.parse(url).isAbsolute;
if (!validUri || !isURL(url)) { if (!validUri || !isURL(url)) {
errorMessage = translate('login.errors.invalid_url'); errorMessage = translate('login.errors.invalid_url');
setStateView(ViewState.idle); setState(ViewState.Idle);
return false; return false;
} }
if (useCredentialsLogin) { if (useCredentialsLogin) {
if (username.isEmpty) { if (username.isEmpty) {
errorMessage = translate('login.errors.empty_username'); errorMessage = translate('login.errors.empty_username');
setStateView(ViewState.idle); setState(ViewState.Idle);
return false; return false;
} }
if (password.isEmpty) { if (password.isEmpty) {
errorMessage = translate('login.errors.empty_password'); errorMessage = translate('login.errors.empty_password');
setStateView(ViewState.idle); setState(ViewState.Idle);
return false; return false;
} }
} else { } else {
if (apiKey.isEmpty) { if (apiKey.isEmpty) {
errorMessage = translate('login.errors.empty_apikey'); errorMessage = translate('login.errors.empty_apikey');
setStateView(ViewState.idle); setState(ViewState.Idle);
return false; return false;
} }
} }
@ -117,23 +116,11 @@ class LoginModel extends BaseModel {
try { try {
if (useCredentialsLogin) { if (useCredentialsLogin) {
CreateApiKeyResponse apiKeyResponse = await _userService.createApiKey( CreateApiKeyResponse apiKeyResponse = await _userService.createApiKey(
url, url, username, password, 'apikey', 'fbmobile-${new DateTime.now().millisecondsSinceEpoch}');
username, success = await _sessionService.login(url, apiKeyResponse.data['new_key']);
password,
'apikey',
'fbmobile-${DateTime.now().millisecondsSinceEpoch}');
var newKey = apiKeyResponse.data['new_key'];
if (newKey != null) {
success = await _sessionService.login(url, newKey);
} else {
throw ServiceException(
code: ErrorCode.invalidApiKey,
message: translate('login.errors.invalid_api_key'));
}
} else { } else {
_sessionService.setApiConfig(url, apiKey); _sessionService.setApiConfig(url, apiKey);
await _userService.checkAccessLevelIsAtLeastApiKey(); success = await _userService.checkAccessLevelIsAtLeastApiKey();
success = await _sessionService.login(url, apiKey); success = await _sessionService.login(url, apiKey);
} }
errorMessage = null; errorMessage = null;
@ -141,37 +128,35 @@ class LoginModel extends BaseModel {
if (e is RestServiceException) { if (e is RestServiceException) {
if (e.statusCode == HttpStatus.unauthorized) { if (e.statusCode == HttpStatus.unauthorized) {
errorMessage = translate('login.errors.wrong_credentials'); errorMessage = translate('login.errors.wrong_credentials');
} else if (e.statusCode != HttpStatus.unauthorized && } else if (e.statusCode != HttpStatus.unauthorized && e.statusCode == HttpStatus.forbidden) {
e.statusCode == HttpStatus.forbidden) {
errorMessage = translate('login.errors.forbidden'); errorMessage = translate('login.errors.forbidden');
} else if (e.statusCode == HttpStatus.notFound) { } else if (e.statusCode == HttpStatus.notFound) {
errorMessage = translate('api.incompatible_error_not_found'); errorMessage = translate('api.incompatible_error_not_found');
} }
if (e.statusCode == HttpStatus.badRequest) { if (e.statusCode == HttpStatus.badRequest) {
errorMessage = translate('api.bad_request', errorMessage = translate('api.bad_request', args: {'reason': e.responseBody.message});
args: {'reason': e.responseBody.message});
} else { } else {
errorMessage = translate('api.general_rest_error'); errorMessage = translate('api.general_rest_error');
} }
} else if (e is ServiceException && e.code == ErrorCode.invalidApiKey) { } else if (e is ServiceException && e.code == ErrorCode.INVALID_API_KEY) {
errorMessage = translate('login.errors.invalid_api_key'); errorMessage = translate('login.errors.invalid_api_key');
} else if (e is ServiceException && e.code == ErrorCode.socketError) { } else if (e is ServiceException && e.code == ErrorCode.SOCKET_ERROR) {
errorMessage = translate('api.socket_error'); errorMessage = translate('api.socket_error');
} else if (e is ServiceException && e.code == ErrorCode.socketTimeout) { } else if (e is ServiceException && e.code == ErrorCode.SOCKET_TIMEOUT) {
errorMessage = translate('api.socket_timeout'); errorMessage = translate('api.socket_timeout');
} else { } else {
errorMessage = translate('app.unknown_error'); errorMessage = translate('app.unknown_error');
_sessionService.logout(); _sessionService.logout();
setStateView(ViewState.idle); setState(ViewState.Idle);
_logger.e('An unknown error occurred', error: e); _logger.e('An unknown error occurred', e);
rethrow; throw e;
} }
if (errorMessage!.isNotEmpty) { if (errorMessage.isNotEmpty) {
_sessionService.logout(); _sessionService.logout();
} }
setStateView(ViewState.idle); setState(ViewState.Idle);
return success; return success;
} }

48
lib/core/viewmodels/profile_model.dart
View file

@ -6,6 +6,7 @@ import 'package:logger/logger.dart';
import '../../core/services/session_service.dart'; import '../../core/services/session_service.dart';
import '../../locator.dart'; import '../../locator.dart';
import '../enums/error_code.dart'; import '../enums/error_code.dart';
import '../enums/viewstate.dart';
import '../error/rest_service_exception.dart'; import '../error/rest_service_exception.dart';
import '../error/service_exception.dart'; import '../error/service_exception.dart';
import '../models/rest/config.dart'; import '../models/rest/config.dart';
@ -17,38 +18,31 @@ import '../util/logger.dart';
import 'base_model.dart'; import 'base_model.dart';
class ProfileModel extends BaseModel { class ProfileModel extends BaseModel {
static const _configurationButtonLoading = 'configurationButtonLoading';
final SessionService _sessionService = locator<SessionService>(); final SessionService _sessionService = locator<SessionService>();
final DialogService _dialogService = locator<DialogService>(); final DialogService _dialogService = locator<DialogService>();
final LinkService _linkService = locator<LinkService>(); final LinkService _linkService = locator<LinkService>();
final FileService _fileService = locator<FileService>(); final FileService _fileService = locator<FileService>();
final Logger _logger = getLogger(); final Logger _logger = getLogger();
bool get configLoading => getStateValueAsBoolean(_configurationButtonLoading); String errorMessage;
String? errorMessage;
Future logout() async { Future logout() async {
var dialogResult = await _dialogService.showConfirmationDialog( var dialogResult = await _dialogService.showConfirmationDialog(
title: translate('logout.title'), title: translate('logout.title'), description: translate('logout.confirm'));
description: translate('logout.confirm'));
if (dialogResult.confirmed!) { if (dialogResult.confirmed) {
await _sessionService.logout(); await _sessionService.logout();
} }
} }
Future revealApiKey(String? apiKey) async { Future revealApiKey(String apiKey) async {
await _dialogService.showDialog( await _dialogService.showDialog(
title: translate('profile.revealed_api_key.title'), title: translate('profile.revealed_api_key.title'),
description: translate('profile.revealed_api_key.description', description: translate('profile.revealed_api_key.description', args: {'apiKey': apiKey}));
args: {'apiKey': apiKey}));
} }
Future showConfig(String url) async { Future showConfig(String url) async {
setStateBoolValue(_configurationButtonLoading, true); Config config;
Config? config;
try { try {
config = await _fileService.getConfig(url); config = await _fileService.getConfig(url);
errorMessage = null; errorMessage = null;
@ -56,50 +50,42 @@ class ProfileModel extends BaseModel {
if (e is RestServiceException) { if (e is RestServiceException) {
if (e.statusCode == HttpStatus.unauthorized) { if (e.statusCode == HttpStatus.unauthorized) {
errorMessage = translate('login.errors.wrong_credentials'); errorMessage = translate('login.errors.wrong_credentials');
} else if (e.statusCode != HttpStatus.unauthorized && } else if (e.statusCode != HttpStatus.unauthorized && e.statusCode == HttpStatus.forbidden) {
e.statusCode == HttpStatus.forbidden) {
errorMessage = translate('login.errors.forbidden'); errorMessage = translate('login.errors.forbidden');
} else if (e.statusCode == HttpStatus.notFound) { } else if (e.statusCode == HttpStatus.notFound) {
errorMessage = translate('api.incompatible_error_not_found'); errorMessage = translate('api.incompatible_error_not_found');
} }
if (e.statusCode == HttpStatus.badRequest) { if (e.statusCode == HttpStatus.badRequest) {
errorMessage = translate('api.bad_request', errorMessage = translate('api.bad_request', args: {'reason': e.responseBody.message});
args: {'reason': e.responseBody.message});
} else { } else {
errorMessage = translate('api.general_rest_error'); errorMessage = translate('api.general_rest_error');
} }
} else if (e is ServiceException && e.code == ErrorCode.socketError) { } else if (e is ServiceException && e.code == ErrorCode.SOCKET_ERROR) {
errorMessage = translate('api.socket_error'); errorMessage = translate('api.socket_error');
} else if (e is ServiceException && e.code == ErrorCode.socketTimeout) { } else if (e is ServiceException && e.code == ErrorCode.SOCKET_TIMEOUT) {
errorMessage = translate('api.socket_timeout'); errorMessage = translate('api.socket_timeout');
} else { } else {
errorMessage = translate('app.unknown_error'); errorMessage = translate('app.unknown_error');
setStateBoolValue(_configurationButtonLoading, false);
_sessionService.logout(); _sessionService.logout();
setStateBoolValue(_configurationButtonLoading, false); setState(ViewState.Idle);
_logger.e('An unknown error occurred', error: e); _logger.e('An unknown error occurred', e);
rethrow; throw e;
} }
} }
setStateBoolValue(_configurationButtonLoading, false);
if (config != null && errorMessage == null) { if (config != null && errorMessage == null) {
await _dialogService.showDialog( await _dialogService.showDialog(
title: translate('profile.shown_config.title'), title: translate('profile.shown_config.title'),
description: translate('profile.shown_config.description', args: { description: translate('profile.shown_config.description', args: {
'uploadMaxSize': 'uploadMaxSize': FormatterUtil.formatBytes(config.uploadMaxSize, 2),
FormatterUtil.formatBytes(config.uploadMaxSize as int, 2),
'maxFilesPerRequest': config.maxFilesPerRequest, 'maxFilesPerRequest': config.maxFilesPerRequest,
'maxInputVars': config.maxInputVars, 'maxInputVars': config.maxInputVars,
'requestMaxSize': 'requestMaxSize': FormatterUtil.formatBytes(config.requestMaxSize, 2)
FormatterUtil.formatBytes(config.requestMaxSize as int, 2)
})); }));
} else { } else {
await _dialogService.showDialog( await _dialogService.showDialog(
title: translate('profile.shown_config.error.title'), title: translate('profile.shown_config.error.title'),
description: translate('profile.shown_config.error.description', description: translate('profile.shown_config.error.description', args: {'message': errorMessage}));
args: {'message': errorMessage}));
} }
} }

11
lib/core/viewmodels/startup_model.dart
View file

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

201
lib/core/viewmodels/upload_model.dart
View file

@ -4,11 +4,10 @@ import 'dart:io';
import 'package:file_picker/file_picker.dart'; import 'package:file_picker/file_picker.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.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:flutter_translate/flutter_translate.dart';
import 'package:logger/logger.dart'; import 'package:logger/logger.dart';
import 'package:path/path.dart'; import 'package:path/path.dart';
import 'package:receive_sharing_intent/receive_sharing_intent.dart';
import '../../locator.dart'; import '../../locator.dart';
import '../enums/error_code.dart'; import '../enums/error_code.dart';
@ -23,7 +22,6 @@ import '../services/file_service.dart';
import '../services/link_service.dart'; import '../services/link_service.dart';
import '../services/refresh_service.dart'; import '../services/refresh_service.dart';
import '../util/logger.dart'; import '../util/logger.dart';
import '../util/paste_util.dart';
import 'base_model.dart'; import 'base_model.dart';
class UploadModel extends BaseModel { class UploadModel extends BaseModel {
@ -32,111 +30,88 @@ class UploadModel extends BaseModel {
final LinkService _linkService = locator<LinkService>(); final LinkService _linkService = locator<LinkService>();
final RefreshService _refreshService = locator<RefreshService>(); final RefreshService _refreshService = locator<RefreshService>();
final TextEditingController _pasteTextController = TextEditingController(); TextEditingController _pasteTextController = TextEditingController();
bool pasteTextTouched = false; StreamSubscription _intentDataStreamSubscription;
late StreamSubscription _intentDataStreamSubscription;
bool createMulti = false; bool createMulti = false;
String? fileName; String fileName;
List<PlatformFile>? paths; List<PlatformFile> paths;
String? _extension; String _extension;
bool loadingPath = false; bool loadingPath = false;
String? errorMessage; String errorMessage;
TextEditingController get pasteTextController => _pasteTextController; TextEditingController get pasteTextController => _pasteTextController;
void _parseIntentFiles(List<SharedFile> files) { void init() {
if (files.isNotEmpty) { // For sharing images coming from outside the app while the app is in the memory
setStateView(ViewState.busy); _intentDataStreamSubscription = ReceiveSharingIntent.getMediaStream().listen((List<SharedMediaFile> value) {
if (value != null && value.length > 0) {
paths = files.map((sharedFile) { setState(ViewState.Busy);
_logger.d("Shared file name: ${basename(sharedFile.value ?? '')}"); paths = value.map((sharedFile) {
_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({ return PlatformFile.fromMap({
'path': sharedFile.value, 'path': sharedFile.path,
'name': basename(sharedFile.value!), 'name': basename(sharedFile.path),
'size': File(sharedFile.value!).lengthSync(), 'size': File(sharedFile.path).lengthSync(),
'bytes': null 'bytes': null
}); });
}).toList(); }).toList();
setState(ViewState.Idle);
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;
setStateBoolValue("PASTE_TEXT_TOUCHED", pasteTextTouched);
});
// For sharing images coming from outside the app while the app is in the memory
_intentDataStreamSubscription = FlutterSharingIntent.instance
.getMediaStream()
.listen((List<SharedFile> value) {
_logger.d("Retrieved ${value.length} files from intent");
_parseIntentFiles(value);
}, onError: (err) { }, onError: (err) {
_errorIntentHandle(err); setState(ViewState.Busy);
errorMessage = translate('upload.retrieval_intent');
_logger.e('Error while retrieving shared data: $err');
setState(ViewState.Idle);
}); });
// For sharing images coming from outside the app while the app is closed // For sharing images coming from outside the app while the app is closed
FlutterSharingIntent.instance ReceiveSharingIntent.getInitialMedia().then((List<SharedMediaFile> value) {
.getInitialSharing() if (value != null && value.length > 0) {
.then((List<SharedFile> value) { setState(ViewState.Busy);
_logger.d("Retrieved ${value.length} files from inactive intent"); paths = value.map((sharedFile) {
_parseIntentFiles(value); return PlatformFile.fromMap({
'path': sharedFile.path,
'name': basename(sharedFile.path),
'size': File(sharedFile.path).lengthSync(),
'bytes': null
}); });
}).toList();
setState(ViewState.Idle);
} }
});
void _errorIntentHandle(err) { // For sharing or opening urls/text coming from outside the app while the app is in the memory
setStateView(ViewState.busy); _intentDataStreamSubscription = ReceiveSharingIntent.getTextStream().listen((String value) {
if (value != null && value.isNotEmpty) {
setState(ViewState.Busy);
pasteTextController.text = value;
setState(ViewState.Idle);
}
}, onError: (err) {
setState(ViewState.Busy);
errorMessage = translate('upload.retrieval_intent'); errorMessage = translate('upload.retrieval_intent');
_logger.e('Error while retrieving shared data: $err'); _logger.e('Error while retrieving shared data: $err');
setStateView(ViewState.idle); setState(ViewState.Idle);
}
String? generatePasteLinks(Map<String, bool>? uploads, String url) {
if (uploads != null && uploads.isNotEmpty) {
var links = '';
uploads.forEach((id, isMulti) {
if (isMulti && createMulti || !isMulti && !createMulti) {
links += '${PasteUtil.generateLink(url, id)}\n';
}
}); });
return links; // 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) {
setState(ViewState.Busy);
pasteTextController.text = value;
setState(ViewState.Idle);
} }
});
return null;
} }
void toggleCreateMulti() { void toggleCreateMulti() {
setStateView(ViewState.busy); setState(ViewState.Busy);
createMulti = !createMulti; createMulti = !createMulti;
setStateView(ViewState.idle); setState(ViewState.Idle);
} }
void openFileExplorer() async { void openFileExplorer() async {
setStateView(ViewState.busy); setState(ViewState.Busy);
setStateMessage(translate('upload.file_explorer_open')); setStateMessage(translate('upload.file_explorer_open'));
loadingPath = true; loadingPath = true;
@ -146,68 +121,62 @@ class UploadModel extends BaseModel {
allowMultiple: true, allowMultiple: true,
withData: false, withData: false,
withReadStream: true, withReadStream: true,
allowedExtensions: (_extension?.isNotEmpty ?? false) allowedExtensions: (_extension?.isNotEmpty ?? false) ? _extension?.replaceAll(' ', '')?.split(',') : null,
? _extension?.replaceAll(' ', '').split(',')
: null,
)) ))
?.files; ?.files;
} on PlatformException catch (e) { } on PlatformException catch (e) {
_logger.e('Unsupported operation', error: e); _logger.e('Unsupported operation', e);
} catch (ex) { } catch (ex) {
_logger.e('An unknown error occurred', error: ex); _logger.e('An unknown error occurred', ex);
} }
loadingPath = false; loadingPath = false;
fileName = paths != null ? paths!.map((e) => e.name).toString() : '...'; fileName = paths != null ? paths.map((e) => e.name).toString() : '...';
setStateMessage(null); setStateMessage(null);
setStateView(ViewState.idle); setState(ViewState.Idle);
} }
void clearCachedFiles() async { void clearCachedFiles() async {
setStateView(ViewState.busy); setState(ViewState.Busy);
await FilePicker.platform.clearTemporaryFiles(); await FilePicker.platform.clearTemporaryFiles();
paths = null; paths = null;
fileName = null; fileName = null;
errorMessage = null; errorMessage = null;
setStateView(ViewState.idle); setState(ViewState.Idle);
} }
Future<Map<String, bool>?> upload() async { Future<Map<String, bool>> upload() async {
setStateView(ViewState.busy); setState(ViewState.Busy);
setStateMessage(translate('upload.uploading_now')); setStateMessage(translate('upload.uploading_now'));
Map<String, bool> uploadedPasteIds = {}; Map<String, bool> uploadedPasteIds = new Map();
try { try {
List<File>? files; List<File> files;
Map<String, String>? additionalFiles; Map<String, String> additionalFiles;
if (pasteTextController.text.isNotEmpty) { if (pasteTextController.text != null && pasteTextController.text.isNotEmpty) {
additionalFiles = Map.from({ additionalFiles = Map.from(
'paste-${(DateTime.now().millisecondsSinceEpoch / 1000).round()}.txt': {'paste-${(new DateTime.now().millisecondsSinceEpoch / 1000).round()}.txt': pasteTextController.text});
pasteTextController.text
});
} }
if (paths != null && paths!.isNotEmpty) { if (paths != null && paths.length > 0) {
files = paths!.map((e) => File(e.path!)).toList(); files = paths.map((e) => new File(e.path)).toList();
} }
UploadedResponse response = UploadedResponse response = await _fileService.upload(files, additionalFiles);
await _fileService.uploadPaste(files, additionalFiles); response.data.ids.forEach((element) {
for (var element in response.data.ids) {
uploadedPasteIds.putIfAbsent(element, () => false); uploadedPasteIds.putIfAbsent(element, () => false);
} });
if (createMulti && response.data.ids.length > 1) { if (createMulti && response.data.ids.length > 1) {
UploadedMultiResponse multiResponse = UploadedMultiResponse multiResponse = await _fileService.createMulti(response.data.ids);
await _fileService.uploadMultiPaste(response.data.ids);
uploadedPasteIds.putIfAbsent(multiResponse.data.urlId, () => true); uploadedPasteIds.putIfAbsent(multiResponse.data.urlId, () => true);
} }
clearCachedFiles(); clearCachedFiles();
_pasteTextController.clear(); _pasteTextController.clear();
_refreshService.addEvent(RefreshEvent.refreshHistory); _refreshService.addEvent(RefreshEvent.RefreshHistory);
errorMessage = null; errorMessage = null;
return uploadedPasteIds; return uploadedPasteIds;
} catch (e) { } catch (e) {
@ -221,30 +190,28 @@ class UploadModel extends BaseModel {
e.responseBody is RestError && e.responseBody is RestError &&
e.responseBody.message != null) { e.responseBody.message != null) {
if (e.statusCode == HttpStatus.badRequest) { if (e.statusCode == HttpStatus.badRequest) {
errorMessage = translate('api.bad_request', errorMessage = translate('api.bad_request', args: {'reason': e.responseBody.message});
args: {'reason': e.responseBody.message});
} else { } else {
errorMessage = translate('api.general_rest_error_payload', errorMessage = translate('api.general_rest_error_payload', args: {'message': e.responseBody.message});
args: {'message': e.responseBody.message});
} }
} else { } else {
errorMessage = translate('api.general_rest_error'); errorMessage = translate('api.general_rest_error');
} }
} else if (e is ServiceException && e.code == ErrorCode.socketError) { } else if (e is ServiceException && e.code == ErrorCode.SOCKET_ERROR) {
errorMessage = translate('api.socket_error'); errorMessage = translate('api.socket_error');
} else if (e is ServiceException && e.code == ErrorCode.socketTimeout) { } else if (e is ServiceException && e.code == ErrorCode.SOCKET_TIMEOUT) {
errorMessage = translate('api.socket_timeout'); errorMessage = translate('api.socket_timeout');
} else { } else {
errorMessage = translate('app.unknown_error'); errorMessage = translate('app.unknown_error');
setStateMessage(null); setStateMessage(null);
setStateView(ViewState.idle); setState(ViewState.Idle);
_logger.e('An unknown error occurred', error: e); _logger.e('An unknown error occurred', e);
rethrow; throw e;
} }
} }
setStateMessage(null); setStateMessage(null);
setStateView(ViewState.idle); setState(ViewState.Idle);
return null; return null;
} }
@ -256,8 +223,6 @@ class UploadModel extends BaseModel {
void dispose() { void dispose() {
_pasteTextController.dispose(); _pasteTextController.dispose();
_intentDataStreamSubscription.cancel(); _intentDataStreamSubscription.cancel();
FlutterSharingIntent.instance.reset();
paths = null;
super.dispose(); super.dispose();
} }
} }

5
lib/main.dart
View file

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

12
lib/ui/app_router.dart
View file

@ -1,4 +1,5 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';
import 'package:flutter_translate/flutter_translate.dart'; import 'package:flutter_translate/flutter_translate.dart';
import '../ui/views/tabbar_container_view.dart'; import '../ui/views/tabbar_container_view.dart';
@ -14,21 +15,20 @@ class AppRouter {
static Route<dynamic> generateRoute(RouteSettings settings) { static Route<dynamic> generateRoute(RouteSettings settings) {
switch (settings.name) { switch (settings.name) {
case StartUpView.routeName: case StartUpView.routeName:
return MaterialPageRoute(builder: (_) => const StartUpView()); return MaterialPageRoute(builder: (_) => StartUpView());
case AboutView.routeName: case AboutView.routeName:
return MaterialPageRoute(builder: (_) => const AboutView()); return MaterialPageRoute(builder: (_) => AboutView());
case HomeView.routeName: case HomeView.routeName:
return MaterialPageRoute(builder: (_) => const TabBarContainerView()); return MaterialPageRoute(builder: (_) => TabBarContainerView());
case LoginView.routeName: case LoginView.routeName:
return MaterialPageRoute(builder: (_) => LoginView()); return MaterialPageRoute(builder: (_) => LoginView());
case ProfileView.routeName: case ProfileView.routeName:
return MaterialPageRoute(builder: (_) => const ProfileView()); return MaterialPageRoute(builder: (_) => ProfileView());
default: default:
return MaterialPageRoute( return MaterialPageRoute(
builder: (_) => Scaffold( builder: (_) => Scaffold(
body: Center( body: Center(
child: Text(translate('dev.no_route', child: Text(translate('dev.no_route', args: {'route': settings.name})),
args: {'route': settings.name})),
), ),
)); ));
} }

7
lib/ui/shared/app_colors.dart
View file

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

1
lib/ui/shared/text_styles.dart
View file

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

36
lib/ui/shared/ui_helpers.dart
View file

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

32
lib/ui/views/about_view.dart
View file

@ -6,14 +6,13 @@ import '../../core/enums/viewstate.dart';
import '../../core/viewmodels/about_model.dart'; import '../../core/viewmodels/about_model.dart';
import '../../ui/shared/text_styles.dart'; import '../../ui/shared/text_styles.dart';
import '../../ui/shared/ui_helpers.dart'; import '../../ui/shared/ui_helpers.dart';
import '../shared/app_colors.dart';
import '../widgets/my_appbar.dart'; import '../widgets/my_appbar.dart';
import 'base_view.dart'; import 'base_view.dart';
class AboutView extends StatelessWidget { class AboutView extends StatelessWidget {
static const routeName = '/about'; static const routeName = '/about';
const AboutView({super.key});
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final logo = Hero( final logo = Hero(
@ -26,42 +25,31 @@ class AboutView extends StatelessWidget {
); );
return BaseView<AboutModel>( return BaseView<AboutModel>(
onModelReady: (model) => model.init(),
builder: (context, model, child) => Scaffold( builder: (context, model, child) => Scaffold(
appBar: MyAppBar( appBar: MyAppBar(
title: Text(translate('titles.about')), title: Text(translate('titles.about')),
enableAbout: false, enableAbout: false,
), ),
body: model.state == ViewState.busy backgroundColor: backgroundColor,
? const Center(child: CircularProgressIndicator()) body: model.state == ViewState.Busy
? Center(child: CircularProgressIndicator())
: Container( : Container(
padding: const EdgeInsets.all(0), padding: EdgeInsets.all(0),
child: ListView( child: ListView(
shrinkWrap: true, shrinkWrap: true,
padding: const EdgeInsets.only( padding: EdgeInsets.only(left: 10.0, right: 10.0, bottom: 10, top: 10),
left: 10.0, right: 10.0, bottom: 10, top: 10),
children: <Widget>[ children: <Widget>[
UIHelper.verticalSpaceMedium(), UIHelper.verticalSpaceMedium(),
Center(child: logo), Center(child: logo),
UIHelper.verticalSpaceMedium(), UIHelper.verticalSpaceMedium(),
Center( Center(
child: Text( child: Text(
translate('about.versions', args: { translate(('about.description')),
'appName': model.packageInfo.appName,
'packageName': model.packageInfo.packageName,
'version': model.packageInfo.version,
'buildNumber': model.packageInfo.buildNumber
}),
)), )),
UIHelper.verticalSpaceMedium(), UIHelper.verticalSpaceMedium(),
Center( Center(
child: Text( child: Text(
translate('about.description'), translate(('about.faq_headline')),
)),
UIHelper.verticalSpaceMedium(),
Center(
child: Text(
translate('about.faq_headline'),
style: subHeaderStyle, style: subHeaderStyle,
)), )),
Center( Center(
@ -71,14 +59,14 @@ class AboutView extends StatelessWidget {
UIHelper.verticalSpaceMedium(), UIHelper.verticalSpaceMedium(),
Center( Center(
child: Text( child: Text(
translate('about.contact_us'), translate(('about.contact_us')),
style: subHeaderStyle, style: subHeaderStyle,
)), )),
UIHelper.verticalSpaceSmall(), UIHelper.verticalSpaceSmall(),
Center( Center(
child: Linkify( child: Linkify(
text: translate('about.website'), text: translate('about.website'),
options: const LinkifyOptions(humanize: false), options: LinkifyOptions(humanize: false),
onOpen: (link) => model.openLink(link.url), onOpen: (link) => model.openLink(link.url),
), ),
) )

12
lib/ui/views/base_view.dart
View file

@ -7,10 +7,10 @@ import '../../core/viewmodels/base_model.dart';
import '../../locator.dart'; import '../../locator.dart';
class BaseView<T extends BaseModel> extends StatefulWidget { class BaseView<T extends BaseModel> extends StatefulWidget {
final Widget Function(BuildContext context, T model, Widget? child)? builder; final Widget Function(BuildContext context, T model, Widget child) builder;
final Function(T)? onModelReady; final Function(T) onModelReady;
const BaseView({super.key, this.builder, this.onModelReady}); BaseView({this.builder, this.onModelReady});
@override @override
_BaseViewState<T> createState() => _BaseViewState<T>(); _BaseViewState<T> createState() => _BaseViewState<T>();
@ -24,16 +24,14 @@ class _BaseViewState<T extends BaseModel> extends State<BaseView<T>> {
@override @override
void initState() { void initState() {
if (widget.onModelReady != null) { if (widget.onModelReady != null) {
widget.onModelReady!(model); widget.onModelReady(model);
} }
super.initState(); super.initState();
} }
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return ChangeNotifierProvider<T?>( return ChangeNotifierProvider<T>(create: (context) => model, child: Consumer<T>(builder: widget.builder));
create: (context) => model,
child: Consumer<T>(builder: widget.builder!));
} }
@override @override

87
lib/ui/views/history_view.dart
View file

@ -3,12 +3,11 @@ import 'package:expandable/expandable.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_translate/flutter_translate.dart'; import 'package:flutter_translate/flutter_translate.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:share_plus/share_plus.dart'; import 'package:share/share.dart';
import '../../core/enums/viewstate.dart'; import '../../core/enums/viewstate.dart';
import '../../core/models/session.dart'; import '../../core/models/session.dart';
import '../../core/util/formatter_util.dart'; import '../../core/util/formatter_util.dart';
import '../../core/util/paste_util.dart';
import '../../core/viewmodels/history_model.dart'; import '../../core/viewmodels/history_model.dart';
import '../../ui/widgets/centered_error_row.dart'; import '../../ui/widgets/centered_error_row.dart';
import '../shared/app_colors.dart'; import '../shared/app_colors.dart';
@ -18,10 +17,10 @@ import 'base_view.dart';
class HistoryView extends StatelessWidget { class HistoryView extends StatelessWidget {
static const routeName = '/history'; static const routeName = '/history';
const HistoryView({super.key});
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
var url = Provider.of<Session>(context).url;
return BaseView<HistoryModel>( return BaseView<HistoryModel>(
onModelReady: (model) { onModelReady: (model) {
model.init(); model.init();
@ -29,42 +28,34 @@ class HistoryView extends StatelessWidget {
}, },
builder: (context, model, child) => Scaffold( builder: (context, model, child) => Scaffold(
appBar: MyAppBar(title: Text(translate('titles.history'))), appBar: MyAppBar(title: Text(translate('titles.history'))),
body: _render(model, context)), backgroundColor: backgroundColor,
); body: model.state == ViewState.Busy
} ? Center(child: CircularProgressIndicator())
Widget _render(HistoryModel model, BuildContext context) {
var url = Provider.of<Session>(context).url;
return model.state == ViewState.busy
? const Center(child: CircularProgressIndicator())
: (model.errorMessage == null : (model.errorMessage == null
? Container( ? Container(
padding: const EdgeInsets.all(0), padding: EdgeInsets.all(0),
child: RefreshIndicator( child: RefreshIndicator(onRefresh: () => model.getHistory(), child: _render(model, url, context)))
onRefresh: () async => await model.getHistory(),
child: _renderItems(model, url, context)))
: Container( : Container(
padding: const EdgeInsets.all(25), padding: EdgeInsets.all(25),
child: CenteredErrorRow( child: CenteredErrorRow(
model.errorMessage, model.errorMessage,
retryCallback: () => model.getHistory(), retryCallback: () => model.getHistory(),
))); )))),
);
} }
Widget _renderItems(HistoryModel model, String url, BuildContext context) { Widget _render(HistoryModel model, String url, BuildContext context) {
List<Widget> cards = []; List<Widget> cards = [];
if (model.pastes.isNotEmpty) { if (model.pastes.length > 0) {
for (var paste in model.pastes.reversed) { model.pastes.reversed.forEach((paste) {
List<Widget> widgets = []; List<Widget> widgets = [];
var fullPasteUrl = PasteUtil.generateLink(url, paste.id); var fullPasteUrl = '$url/${paste.id}';
var openInBrowserButton = _renderOpenInBrowser(model, fullPasteUrl); var openInBrowserButton = _renderOpenInBrowser(model, fullPasteUrl);
var dateWidget = ListTile( var dateWidget = ListTile(
title: Text( title: Text(FormatterUtil.formatEpoch(paste.date.millisecondsSinceEpoch)),
FormatterUtil.formatEpoch(paste.date!.millisecondsSinceEpoch)),
subtitle: Text(translate('history.date')), subtitle: Text(translate('history.date')),
); );
@ -76,8 +67,7 @@ class HistoryView extends StatelessWidget {
var copyWidget = ListTile( var copyWidget = ListTile(
title: Text(translate('history.copy_link.description')), title: Text(translate('history.copy_link.description')),
trailing: IconButton( trailing: IconButton(
icon: const Icon(Icons.copy, icon: Icon(Icons.copy, color: blueColor, textDirection: TextDirection.ltr),
color: blueColor, textDirection: TextDirection.ltr),
onPressed: () { onPressed: () {
FlutterClipboard.copy(fullPasteUrl).then((value) { FlutterClipboard.copy(fullPasteUrl).then((value) {
final snackBar = SnackBar( final snackBar = SnackBar(
@ -89,29 +79,27 @@ class HistoryView extends StatelessWidget {
}, },
), ),
content: Text(translate('history.copy_link.copied')), content: Text(translate('history.copy_link.copied')),
duration: const Duration(seconds: 10), duration: Duration(seconds: 10),
); );
if (context.mounted) {
ScaffoldMessenger.of(context).showSnackBar(snackBar); ScaffoldMessenger.of(context).showSnackBar(snackBar);
}
}); });
})); }));
var deleteWidget = ListTile( var deleteWidget = ListTile(
title: Text(translate('history.delete')), title: Text(translate('history.delete')),
trailing: IconButton( trailing: IconButton(
icon: const Icon(Icons.delete, color: redColor), icon: Icon(Icons.delete, color: redColor),
onPressed: () { onPressed: () {
model.deletePaste(paste.id); return model.deletePaste(paste.id);
})); }));
if (!paste.isMulti!) { if (!paste.isMulti) {
var titleWidget = ListTile( var titleWidget = ListTile(
title: Text(paste.filename ?? paste.id), title: Text(paste.filename ?? paste.id),
subtitle: Text(translate('history.filename')), subtitle: Text(translate('history.filename')),
); );
var fileSizeWidget = ListTile( var fileSizeWidget = ListTile(
title: Text(FormatterUtil.formatBytes(paste.filesize as int, 2)), title: Text(FormatterUtil.formatBytes(paste.filesize, 2)),
subtitle: Text(translate('history.filesize')), subtitle: Text(translate('history.filesize')),
); );
var idWidget = ListTile( var idWidget = ListTile(
@ -119,7 +107,7 @@ class HistoryView extends StatelessWidget {
subtitle: Text(translate('history.id')), subtitle: Text(translate('history.id')),
); );
var mimeTypeWidget = ListTile( var mimeTypeWidget = ListTile(
title: Text(paste.mimetype!), title: Text(paste.mimetype),
subtitle: Text(translate('history.mimetype')), subtitle: Text(translate('history.mimetype')),
); );
@ -128,13 +116,13 @@ class HistoryView extends StatelessWidget {
widgets.add(fileSizeWidget); widgets.add(fileSizeWidget);
widgets.add(mimeTypeWidget); widgets.add(mimeTypeWidget);
} else { } else {
for (var element in paste.items!) { paste.items.forEach((element) {
widgets.add(ListTile( widgets.add(ListTile(
title: Text(element!), title: Text(element),
subtitle: Text(translate('history.multipaste_element')), subtitle: Text(translate('history.multipaste_element')),
trailing: _renderOpenInBrowser(model, '$url/$element'), trailing: _renderOpenInBrowser(model, '$url/$element'),
)); ));
} });
} }
widgets.add(dateWidget); widgets.add(dateWidget);
@ -143,18 +131,18 @@ class HistoryView extends StatelessWidget {
widgets.add(deleteWidget); widgets.add(deleteWidget);
var expandable = ExpandableTheme( var expandable = ExpandableTheme(
data: const ExpandableThemeData( data: ExpandableThemeData(
iconPlacement: ExpandablePanelIconPlacement.right, iconPlacement: ExpandablePanelIconPlacement.right,
headerAlignment: ExpandablePanelHeaderAlignment.center, headerAlignment: ExpandablePanelHeaderAlignment.center,
hasIcon: true, hasIcon: true,
iconColor: blueColor, iconColor: blueColor,
tapHeaderToExpand: true), tapHeaderToExpand: true),
child: ExpandablePanel( child: ExpandablePanel(
collapsed: Container(),
header: InkWell( header: InkWell(
onLongPress: () => model.deletePaste(paste.id),
child: Text( child: Text(
paste.id, paste.id,
style: const TextStyle(color: blueColor), style: TextStyle(color: blueColor),
textAlign: TextAlign.left, textAlign: TextAlign.left,
)), )),
expanded: Column( expanded: Column(
@ -170,17 +158,15 @@ class HistoryView extends StatelessWidget {
trailing: Wrap(children: [ trailing: Wrap(children: [
openInBrowserButton, openInBrowserButton,
IconButton( IconButton(
icon: const Icon(Icons.share, icon: Icon(Icons.share, color: blueColor, textDirection: TextDirection.ltr),
color: blueColor, textDirection: TextDirection.ltr), onPressed: () {
onPressed: () async { return Share.share(fullPasteUrl);
await Share.share(fullPasteUrl);
}) })
]), ]),
subtitle: Text(!paste.isMulti! ? paste.filename! : '', subtitle: Text(!paste.isMulti ? paste.filename : '', style: TextStyle(fontStyle: FontStyle.italic)),
style: const TextStyle(fontStyle: FontStyle.italic)),
), ),
)); ));
} });
} else { } else {
cards.add(Card( cards.add(Card(
child: ListTile( child: ListTile(
@ -191,15 +177,14 @@ class HistoryView extends StatelessWidget {
return ListView( return ListView(
padding: const EdgeInsets.all(8), padding: const EdgeInsets.all(8),
physics: const AlwaysScrollableScrollPhysics(),
children: cards, children: cards,
physics: AlwaysScrollableScrollPhysics(),
); );
} }
Widget _renderOpenInBrowser(HistoryModel model, String url) { Widget _renderOpenInBrowser(HistoryModel model, String url) {
return IconButton( return IconButton(
icon: const Icon(Icons.open_in_new, icon: Icon(Icons.open_in_new, color: blueColor, textDirection: TextDirection.ltr),
color: blueColor, textDirection: TextDirection.ltr),
onPressed: () { onPressed: () {
return model.openLink(url); return model.openLink(url);
}); });

8
lib/ui/views/home_view.dart
View file

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

37
lib/ui/views/login_view.dart
View file

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

73
lib/ui/views/navbar_authenticated.dart
View file

@ -1,73 +0,0 @@
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],
);
}
}

70
lib/ui/views/profile_view.dart
View file

@ -15,22 +15,17 @@ import 'base_view.dart';
class ProfileView extends StatelessWidget { class ProfileView extends StatelessWidget {
static const routeName = '/profile'; static const routeName = '/profile';
const ProfileView({super.key});
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return BaseView<ProfileModel>(
builder: (context, model, child) => Scaffold(
appBar: MyAppBar(title: Text(translate('titles.profile'))),
body: _render(model, context)));
}
Widget _render(ProfileModel model, BuildContext context) {
var url = Provider.of<Session>(context).url; var url = Provider.of<Session>(context).url;
var apiKey = Provider.of<Session>(context).apiKey; var apiKey = Provider.of<Session>(context).apiKey;
return model.state == ViewState.busy return BaseView<ProfileModel>(
? const Center(child: CircularProgressIndicator()) builder: (context, model, child) => Scaffold(
appBar: MyAppBar(title: Text(translate('titles.profile'))),
backgroundColor: backgroundColor,
body: model.state == ViewState.Busy
? Center(child: CircularProgressIndicator())
: ListView( : ListView(
children: <Widget>[ children: <Widget>[
UIHelper.verticalSpaceMedium(), UIHelper.verticalSpaceMedium(),
@ -48,54 +43,45 @@ class ProfileView extends StatelessWidget {
child: Linkify( child: Linkify(
onOpen: (link) => model.openLink(link.url), onOpen: (link) => model.openLink(link.url),
text: translate('profile.connection', args: {'url': url}), text: translate('profile.connection', args: {'url': url}),
options: const LinkifyOptions(humanize: false), options: LinkifyOptions(humanize: false),
))), ))),
UIHelper.verticalSpaceMedium(), UIHelper.verticalSpaceMedium(),
Padding( Padding(
padding: const EdgeInsets.only(left: 25.0, right: 25.0), padding: const EdgeInsets.only(left: 25.0, right: 25.0),
child: ElevatedButton.icon( child: ElevatedButton.icon(
icon: model.configLoading icon: Icon(Icons.settings, color: blueColor),
? 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( label: Text(
model.configLoading translate('profile.show_config'),
? translate('profile.show_config_loading') style: TextStyle(color: buttonForegroundColor),
: translate('profile.show_config'),
),
onPressed: () async {
await model.showConfig(url);
})),
UIHelper.verticalSpaceMedium(),
Padding(
padding: const EdgeInsets.only(left: 25.0, right: 25.0),
child: ElevatedButton.icon(
icon: const Icon(Icons.lock, color: orangeColor),
label: Text(
translate('profile.reveal_api_key'),
), ),
onPressed: () { onPressed: () {
model.revealApiKey(apiKey); return model.showConfig(url);
})), })),
UIHelper.verticalSpaceMedium(), UIHelper.verticalSpaceMedium(),
Padding( Padding(
padding: const EdgeInsets.only(left: 25.0, right: 25.0), padding: const EdgeInsets.only(left: 25.0, right: 25.0),
child: ElevatedButton.icon( child: ElevatedButton.icon(
icon: const Icon(Icons.exit_to_app, color: redColor), icon: Icon(Icons.lock, color: orangeColor),
label: Text(
translate('profile.reveal_api_key'),
style: TextStyle(color: buttonForegroundColor),
),
onPressed: () {
return model.revealApiKey(apiKey);
})),
UIHelper.verticalSpaceMedium(),
Padding(
padding: const EdgeInsets.only(left: 25.0, right: 25.0),
child: ElevatedButton.icon(
icon: Icon(Icons.exit_to_app, color: redColor),
label: Text( label: Text(
translate('profile.logout'), translate('profile.logout'),
style: TextStyle(color: buttonForegroundColor),
), ),
onPressed: () async { onPressed: () {
await model.logout(); return model.logout();
})), })),
], ],
); )));
} }
} }

18
lib/ui/views/startup_view.dart
View file

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

68
lib/ui/views/tabbar_anonymous.dart Normal file
View file

@ -0,0 +1,68 @@
import 'package:flutter/material.dart';
import 'package:flutter/widgets.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,
),
),
);
}
}

113
lib/ui/views/tabbar_authenticated.dart Normal file
View file

@ -0,0 +1,113 @@
import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';
import 'package:flutter_translate/flutter_translate.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 {
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);
}
});
}
@override
void dispose() {
_tabController.dispose();
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,
)),
);
}
}

15
lib/ui/views/tabbar_container_view.dart
View file

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

155
lib/ui/views/upload_view.dart
View file

@ -1,5 +1,4 @@
import 'package:clipboard/clipboard.dart'; import 'package:clipboard/clipboard.dart';
import 'package:fbmobile/core/util/formatter_util.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_translate/flutter_translate.dart'; import 'package:flutter_translate/flutter_translate.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@ -15,34 +14,24 @@ import 'base_view.dart';
class UploadView extends StatelessWidget { class UploadView extends StatelessWidget {
static const routeName = '/upload'; static const routeName = '/upload';
const UploadView({super.key});
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
var url = Provider.of<Session>(context).url;
return BaseView<UploadModel>( return BaseView<UploadModel>(
onModelReady: (model) => model.init(), onModelReady: (model) => model.init(),
builder: (context, model, child) => Scaffold( builder: (context, model, child) => Scaffold(
appBar: MyAppBar(title: Text(translate('titles.upload'))), appBar: MyAppBar(title: Text(translate('titles.upload'))),
body: _render(model, context))); backgroundColor: backgroundColor,
} body: model.state == ViewState.Busy
bool _isUploadButtonEnabled(UploadModel model) {
return model.pasteTextTouched ||
(model.paths != null && model.paths!.isNotEmpty);
}
Widget _render(UploadModel model, BuildContext context) {
var url = Provider.of<Session>(context).url;
return model.state == ViewState.busy
? Center( ? Center(
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
const CircularProgressIndicator(), CircularProgressIndicator(),
(model.stateMessage != null && model.stateMessage!.isNotEmpty (model.stateMessage != null && model.stateMessage.isNotEmpty
? Text(model.stateMessage!) ? Text(model.stateMessage)
: Container()) : Container())
])) ]))
: ListView(children: <Widget>[ : ListView(children: <Widget>[
@ -57,19 +46,17 @@ class UploadView extends StatelessWidget {
minLines: 1, minLines: 1,
maxLines: 7, maxLines: 7,
decoration: InputDecoration( decoration: InputDecoration(
prefixIcon: const Icon( prefixIcon: Icon(
Icons.text_snippet, Icons.text_snippet,
color: buttonBackgroundColor,
), ),
suffixIcon: IconButton( suffixIcon: IconButton(
onPressed: () => onPressed: () => model.pasteTextController.clear(),
model.pasteTextController.clear(), icon: Icon(Icons.clear),
icon: const Icon(Icons.clear),
), ),
hintText: translate('upload.text_to_be_pasted'), hintText: translate('upload.text_to_be_pasted'),
contentPadding: const EdgeInsets.fromLTRB( contentPadding: EdgeInsets.fromLTRB(20.0, 10.0, 20.0, 10.0),
20.0, 10.0, 20.0, 10.0), border: OutlineInputBorder(borderRadius: BorderRadius.circular(32.0)),
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(32.0)),
), ),
controller: model.pasteTextController)), controller: model.pasteTextController)),
Padding( Padding(
@ -85,21 +72,20 @@ class UploadView extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.end, crossAxisAlignment: CrossAxisAlignment.end,
children: [ children: [
ElevatedButton.icon( ElevatedButton.icon(
icon: const Icon(Icons.file_copy_sharp, icon: Icon(Icons.file_copy_sharp, color: blueColor),
color: blueColor),
onPressed: () => model.openFileExplorer(), onPressed: () => model.openFileExplorer(),
label: Text( label: Text(
translate('upload.open_file_explorer'), translate('upload.open_file_explorer'),
style: TextStyle(color: buttonForegroundColor),
)), )),
ElevatedButton.icon( ElevatedButton.icon(
icon: const Icon(Icons.cancel, icon: Icon(Icons.cancel, color: orangeColor),
color: orangeColor), onPressed: model.paths != null && model.paths.length > 0
onPressed: model.paths != null &&
model.paths!.isNotEmpty
? () => model.clearCachedFiles() ? () => model.clearCachedFiles()
: null, : null,
label: Text( label: Text(
translate('upload.clear_temporary_files'), translate('upload.clear_temporary_files'),
style: TextStyle(color: buttonForegroundColor),
)), )),
], ],
)), )),
@ -122,116 +108,81 @@ class UploadView extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.end, crossAxisAlignment: CrossAxisAlignment.end,
children: [ children: [
ElevatedButton.icon( ElevatedButton.icon(
onPressed: !_isUploadButtonEnabled(model) onPressed: () async {
? null Map<String, bool> items = await model.upload();
: () async {
Map<String, bool>? items =
await model.upload();
String? clipboardContent = model
.generatePasteLinks(items, url);
if (clipboardContent != null && if (items != null) {
clipboardContent.isNotEmpty) { var clipboardContent = '';
FlutterClipboard.copy( items.forEach((id, isMulti) {
clipboardContent) if (isMulti && model.createMulti || !isMulti && !model.createMulti) {
.then((value) { clipboardContent += '$url/$id\n';
}
});
FlutterClipboard.copy(clipboardContent).then((value) {
final snackBar = SnackBar( final snackBar = SnackBar(
action: SnackBarAction( action: SnackBarAction(
label: translate( label: translate('upload.dismiss'),
'upload.dismiss'),
textColor: blueColor, textColor: blueColor,
onPressed: () { onPressed: () {
ScaffoldMessenger.of( ScaffoldMessenger.of(context).hideCurrentSnackBar();
context)
.hideCurrentSnackBar();
}, },
), ),
content: Text(translate( content: Text(translate('upload.uploaded')),
'upload.uploaded')), duration: Duration(seconds: 10),
duration:
const Duration(seconds: 10),
); );
if (context.mounted) { ScaffoldMessenger.of(context).showSnackBar(snackBar);
ScaffoldMessenger.of(context)
.showSnackBar(snackBar);
}
}); });
} }
}, },
icon: const Icon(Icons.upload_rounded, icon: Icon(Icons.upload_rounded, color: greenColor),
color: greenColor),
label: Text( label: Text(
translate('upload.upload'), translate('upload.upload'),
style: TextStyle(color: buttonForegroundColor),
)), )),
])), ])),
model.errorMessage != null && model.errorMessage!.isNotEmpty model.errorMessage != null && model.errorMessage.isNotEmpty
? (Padding( ? (Padding(
padding: padding: const EdgeInsets.only(top: 10.0, bottom: 10.0),
const EdgeInsets.only(top: 10.0, bottom: 10.0),
child: CenteredErrorRow(model.errorMessage))) child: CenteredErrorRow(model.errorMessage)))
: Container(), : Container(),
Builder( Builder(
builder: (BuildContext context) => model.loadingPath builder: (BuildContext context) => model.loadingPath
? const Padding( ? Padding(
padding: EdgeInsets.only(bottom: 10.0), padding: const EdgeInsets.only(bottom: 10.0),
child: CircularProgressIndicator(), child: const CircularProgressIndicator(),
) )
: model.paths != null : model.paths != null
? Container( ? Container(
padding: const EdgeInsets.only(bottom: 20.0), padding: const EdgeInsets.only(bottom: 30.0),
height: height: MediaQuery.of(context).size.height * 0.50,
MediaQuery.of(context).size.height * 0.50,
child: ListView.separated( child: ListView.separated(
itemCount: model.paths != null && itemCount:
model.paths!.isNotEmpty model.paths != null && model.paths.isNotEmpty ? model.paths.length : 1,
? model.paths!.length itemBuilder: (BuildContext context, int index) {
: 1, final bool isMultiPath = model.paths != null && model.paths.isNotEmpty;
itemBuilder:
(BuildContext context, int index) {
final bool isMultiPath =
model.paths != null &&
model.paths!.isNotEmpty;
final String name = (isMultiPath final String name = (isMultiPath
? model.paths! ? model.paths.map((e) => e.name).toList()[index]
.map((e) => e.name)
.toList()[index]
: model.fileName ?? '...'); : model.fileName ?? '...');
final size = model.paths!.isNotEmpty final path = model.paths.length > 0
? model.paths! ? model.paths.map((e) => e.path).toList()[index].toString()
.map((e) => e.size)
.toList()[index]
.toString()
: '';
final path = model.paths!.isNotEmpty
? model.paths!
.map((e) => e.path)
.toList()[index]
.toString()
: ''; : '';
return Card( return Card(
child: ListTile( child: ListTile(
trailing: IconButton(
icon: const Icon(Icons.clear,
color: orangeColor),
onPressed: () {
model.deleteIntentFile(path);
}),
title: Text( title: Text(
"$name (${FormatterUtil.formatBytes(int.parse(size), 2)})", name,
), ),
subtitle: Text(path), subtitle: Text(path),
)); ));
}, },
separatorBuilder: separatorBuilder: (BuildContext context, int index) => const Divider(),
(BuildContext context, int index) =>
const Divider(),
), ),
) )
: Container(), : Container(),
), ),
], ],
)) ))
]); ])));
} }
} }

6
lib/ui/widgets/about_iconbutton.dart
View file

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

16
lib/ui/widgets/centered_error_row.dart
View file

@ -1,12 +1,13 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import '../shared/app_colors.dart'; import '../shared/app_colors.dart';
class CenteredErrorRow extends StatelessWidget { class CenteredErrorRow extends StatelessWidget {
final Function? retryCallback; final Function retryCallback;
final String? message; final String message;
const CenteredErrorRow(this.message, {super.key, this.retryCallback}); CenteredErrorRow(this.message, {this.retryCallback});
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -20,10 +21,7 @@ class CenteredErrorRow extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[ children: <Widget>[
Expanded( Expanded(child: Center(child: Text(message, style: TextStyle(color: redColor)))),
child: Center(
child: Text(message!,
style: const TextStyle(color: redColor)))),
], ],
), ),
(retryCallback != null (retryCallback != null
@ -33,10 +31,10 @@ class CenteredErrorRow extends StatelessWidget {
children: <Widget>[ children: <Widget>[
Center( Center(
child: IconButton( child: IconButton(
icon: const Icon(Icons.refresh), icon: Icon(Icons.refresh),
color: primaryAccentColor, color: primaryAccentColor,
onPressed: () { onPressed: () {
retryCallback!(); retryCallback();
}, },
)) ))
]) ])

17
lib/ui/widgets/login_header_apikey.dart
View file

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

24
lib/ui/widgets/login_header_credentials.dart
View file

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

20
lib/ui/widgets/login_text_field.dart
View file

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

19
lib/ui/widgets/my_appbar.dart
View file

@ -1,23 +1,24 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import '../shared/app_colors.dart';
import '../widgets/about_iconbutton.dart'; import '../widgets/about_iconbutton.dart';
class MyAppBar extends AppBar { class MyAppBar extends AppBar {
static final List<Widget> aboutEnabledWidgets = [AboutIconButton()]; static final List<Widget> aboutEnabledWidgets = [AboutIconButton()];
static final List<Widget> aboutDisabledWidgets = []; static final List<Widget> aboutDisabledWidgets = [];
MyAppBar( MyAppBar({Key key, Widget title, List<Widget> actionWidgets, bool enableAbout = true})
{super.key,
required Widget title,
List<Widget>? actionWidgets,
bool enableAbout = true})
: super( : super(
key: key,
title: Row(children: <Widget>[title]), title: Row(children: <Widget>[title]),
actions: _renderIconButtons(actionWidgets, enableAbout)); actions: _renderIconButtons(actionWidgets, enableAbout),
brightness: Brightness.dark,
backgroundColor: primaryAccentColor);
static List<Widget> _renderIconButtons( static List<Widget> _renderIconButtons(List<Widget> actionWidgets, bool aboutEnabled) {
List<Widget>? actionWidgets, bool aboutEnabled) { if (actionWidgets == null) {
actionWidgets ??= []; actionWidgets = [];
}
List<Widget> widgets = [...actionWidgets]; List<Widget> widgets = [...actionWidgets];

Some files were not shown because too many files have changed in this diff Show more