Compare commits
3 commits
master
...
feature/da
| Author | SHA1 | Date | |
|---|---|---|---|
|
c52be73a80 | ||
|
|
925da5c87a | ||
|
|
be0400c3ac |
48 changed files with 472 additions and 1280 deletions
24
.github/workflows/changelog.yml
vendored
24
.github/workflows/changelog.yml
vendored
|
|
@ -1,24 +0,0 @@
|
|||
name: Changelog Generation
|
||||
|
||||
on:
|
||||
release:
|
||||
types: [published]
|
||||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
changelog:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
with:
|
||||
submodules: 'recursive'
|
||||
ref: master
|
||||
- uses: rhysd/changelog-from-release/action@v3
|
||||
with:
|
||||
file: CHANGELOG.md
|
||||
pull_request: true
|
||||
github_token: ${{ secrets.GITHUB_TOKEN }}
|
||||
commit_summary_template: 'update changelog for %s changes'
|
||||
args: -l 2
|
||||
header: |
|
||||
# Changelog
|
||||
67
.github/workflows/ci.yml
vendored
67
.github/workflows/ci.yml
vendored
|
|
@ -1,67 +0,0 @@
|
|||
name: Continuous Integration
|
||||
on: [push, pull_request]
|
||||
|
||||
jobs:
|
||||
test:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v3
|
||||
with:
|
||||
submodules: "recursive"
|
||||
|
||||
- name: Set up JDK environment
|
||||
uses: actions/setup-java@v3
|
||||
with:
|
||||
distribution: "zulu"
|
||||
java-version: 17
|
||||
|
||||
- name: Make gradlew executable
|
||||
run: chmod +x ./gradlew
|
||||
|
||||
- name: Setup Gradle
|
||||
uses: gradle/gradle-build-action@v2
|
||||
|
||||
- name: Run local unit tests
|
||||
run: bash ./gradlew test --stacktrace
|
||||
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v3
|
||||
with:
|
||||
submodules: "recursive"
|
||||
|
||||
- name: Set up JDK environment
|
||||
uses: actions/setup-java@v3
|
||||
with:
|
||||
distribution: "zulu"
|
||||
java-version: 17
|
||||
|
||||
- name: Make gradlew executable
|
||||
run: chmod +x ./gradlew
|
||||
|
||||
- name: Setup Gradle
|
||||
uses: gradle/gradle-build-action@v2
|
||||
|
||||
- name: Run lint check
|
||||
run: bash ./gradlew lint
|
||||
|
||||
- name: Upload lint result
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: lint-results-debug
|
||||
path: app/build/reports/lint-results-debug.html
|
||||
|
||||
- name: Build the app
|
||||
run: bash ./gradlew build --stacktrace
|
||||
|
||||
- name: Build debug apk
|
||||
run: bash ./gradlew assembleDebug
|
||||
|
||||
- name: Upload debug apk
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: debug-apk
|
||||
path: app/build/outputs/apk/debug/*.apk
|
||||
3
.gitignore
vendored
3
.gitignore
vendored
|
|
@ -1,7 +1,8 @@
|
|||
*.iml
|
||||
.gradle
|
||||
/local.properties
|
||||
/.idea
|
||||
/.idea/workspace.xml
|
||||
/.idea/libraries
|
||||
.DS_Store
|
||||
/build
|
||||
/captures
|
||||
|
|
|
|||
137
.idea/codeStyles/Project.xml
generated
Normal file
137
.idea/codeStyles/Project.xml
generated
Normal file
|
|
@ -0,0 +1,137 @@
|
|||
<component name="ProjectCodeStyleConfiguration">
|
||||
<code_scheme name="Project" version="173">
|
||||
<DBN-PSQL>
|
||||
<case-options enabled="false">
|
||||
<option name="KEYWORD_CASE" value="lower" />
|
||||
<option name="FUNCTION_CASE" value="lower" />
|
||||
<option name="PARAMETER_CASE" value="lower" />
|
||||
<option name="DATATYPE_CASE" value="lower" />
|
||||
<option name="OBJECT_CASE" value="preserve" />
|
||||
</case-options>
|
||||
<formatting-settings enabled="false" />
|
||||
</DBN-PSQL>
|
||||
<DBN-SQL>
|
||||
<case-options enabled="false">
|
||||
<option name="KEYWORD_CASE" value="lower" />
|
||||
<option name="FUNCTION_CASE" value="lower" />
|
||||
<option name="PARAMETER_CASE" value="lower" />
|
||||
<option name="DATATYPE_CASE" value="lower" />
|
||||
<option name="OBJECT_CASE" value="preserve" />
|
||||
</case-options>
|
||||
<formatting-settings enabled="false">
|
||||
<option name="STATEMENT_SPACING" value="one_line" />
|
||||
<option name="CLAUSE_CHOP_DOWN" value="chop_down_if_statement_long" />
|
||||
<option name="ITERATION_ELEMENTS_WRAPPING" value="chop_down_if_not_single" />
|
||||
</formatting-settings>
|
||||
</DBN-SQL>
|
||||
<codeStyleSettings language="XML">
|
||||
<arrangement>
|
||||
<rules>
|
||||
<section>
|
||||
<rule>
|
||||
<match>
|
||||
<AND>
|
||||
<NAME>xmlns:android</NAME>
|
||||
<XML_ATTRIBUTE />
|
||||
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
||||
</AND>
|
||||
</match>
|
||||
</rule>
|
||||
</section>
|
||||
<section>
|
||||
<rule>
|
||||
<match>
|
||||
<AND>
|
||||
<NAME>xmlns:.*</NAME>
|
||||
<XML_ATTRIBUTE />
|
||||
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
||||
</AND>
|
||||
</match>
|
||||
<order>BY_NAME</order>
|
||||
</rule>
|
||||
</section>
|
||||
<section>
|
||||
<rule>
|
||||
<match>
|
||||
<AND>
|
||||
<NAME>.*:id</NAME>
|
||||
<XML_ATTRIBUTE />
|
||||
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
|
||||
</AND>
|
||||
</match>
|
||||
</rule>
|
||||
</section>
|
||||
<section>
|
||||
<rule>
|
||||
<match>
|
||||
<AND>
|
||||
<NAME>.*:name</NAME>
|
||||
<XML_ATTRIBUTE />
|
||||
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
|
||||
</AND>
|
||||
</match>
|
||||
</rule>
|
||||
</section>
|
||||
<section>
|
||||
<rule>
|
||||
<match>
|
||||
<AND>
|
||||
<NAME>name</NAME>
|
||||
<XML_ATTRIBUTE />
|
||||
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
||||
</AND>
|
||||
</match>
|
||||
</rule>
|
||||
</section>
|
||||
<section>
|
||||
<rule>
|
||||
<match>
|
||||
<AND>
|
||||
<NAME>style</NAME>
|
||||
<XML_ATTRIBUTE />
|
||||
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
||||
</AND>
|
||||
</match>
|
||||
</rule>
|
||||
</section>
|
||||
<section>
|
||||
<rule>
|
||||
<match>
|
||||
<AND>
|
||||
<NAME>.*</NAME>
|
||||
<XML_ATTRIBUTE />
|
||||
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
||||
</AND>
|
||||
</match>
|
||||
<order>BY_NAME</order>
|
||||
</rule>
|
||||
</section>
|
||||
<section>
|
||||
<rule>
|
||||
<match>
|
||||
<AND>
|
||||
<NAME>.*</NAME>
|
||||
<XML_ATTRIBUTE />
|
||||
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
|
||||
</AND>
|
||||
</match>
|
||||
<order>ANDROID_ATTRIBUTE_ORDER</order>
|
||||
</rule>
|
||||
</section>
|
||||
<section>
|
||||
<rule>
|
||||
<match>
|
||||
<AND>
|
||||
<NAME>.*</NAME>
|
||||
<XML_ATTRIBUTE />
|
||||
<XML_NAMESPACE>.*</XML_NAMESPACE>
|
||||
</AND>
|
||||
</match>
|
||||
<order>BY_NAME</order>
|
||||
</rule>
|
||||
</section>
|
||||
</rules>
|
||||
</arrangement>
|
||||
</codeStyleSettings>
|
||||
</code_scheme>
|
||||
</component>
|
||||
6
.idea/compiler.xml
generated
Normal file
6
.idea/compiler.xml
generated
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="CompilerConfiguration">
|
||||
<bytecodeTargetLevel target="11" />
|
||||
</component>
|
||||
</project>
|
||||
21
.idea/gradle.xml
generated
Normal file
21
.idea/gradle.xml
generated
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="GradleMigrationSettings" migrationVersion="1" />
|
||||
<component name="GradleSettings">
|
||||
<option name="linkedExternalProjectsSettings">
|
||||
<GradleProjectSettings>
|
||||
<option name="testRunner" value="GRADLE" />
|
||||
<option name="distributionType" value="DEFAULT_WRAPPED" />
|
||||
<option name="externalProjectPath" value="$PROJECT_DIR$" />
|
||||
<option name="gradleJvm" value="corretto-11" />
|
||||
<option name="modules">
|
||||
<set>
|
||||
<option value="$PROJECT_DIR$" />
|
||||
<option value="$PROJECT_DIR$/app" />
|
||||
<option value="$PROJECT_DIR$/libs/privacy-friendly-backup-api/BackupAPI" />
|
||||
</set>
|
||||
</option>
|
||||
</GradleProjectSettings>
|
||||
</option>
|
||||
</component>
|
||||
</project>
|
||||
40
.idea/jarRepositories.xml
generated
Normal file
40
.idea/jarRepositories.xml
generated
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="RemoteRepositoriesConfiguration">
|
||||
<remote-repository>
|
||||
<option name="id" value="central" />
|
||||
<option name="name" value="Maven Central repository" />
|
||||
<option name="url" value="https://repo1.maven.org/maven2" />
|
||||
</remote-repository>
|
||||
<remote-repository>
|
||||
<option name="id" value="jboss.community" />
|
||||
<option name="name" value="JBoss Community repository" />
|
||||
<option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
|
||||
</remote-repository>
|
||||
<remote-repository>
|
||||
<option name="id" value="BintrayJCenter" />
|
||||
<option name="name" value="BintrayJCenter" />
|
||||
<option name="url" value="https://jcenter.bintray.com/" />
|
||||
</remote-repository>
|
||||
<remote-repository>
|
||||
<option name="id" value="Google" />
|
||||
<option name="name" value="Google" />
|
||||
<option name="url" value="https://dl.google.com/dl/android/maven2/" />
|
||||
</remote-repository>
|
||||
<remote-repository>
|
||||
<option name="id" value="MavenRepo" />
|
||||
<option name="name" value="MavenRepo" />
|
||||
<option name="url" value="https://repo.maven.apache.org/maven2/" />
|
||||
</remote-repository>
|
||||
<remote-repository>
|
||||
<option name="id" value="MavenLocal" />
|
||||
<option name="name" value="MavenLocal" />
|
||||
<option name="url" value="file:$USER_HOME$/.m2/repository" />
|
||||
</remote-repository>
|
||||
<remote-repository>
|
||||
<option name="id" value="MavenLocal" />
|
||||
<option name="name" value="MavenLocal" />
|
||||
<option name="url" value="file:$USER_HOME$/.m2/repository/" />
|
||||
</remote-repository>
|
||||
</component>
|
||||
</project>
|
||||
6
.idea/kotlinc.xml
generated
Normal file
6
.idea/kotlinc.xml
generated
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="KotlinJpsPluginSettings">
|
||||
<option name="version" value="1.7.20" />
|
||||
</component>
|
||||
</project>
|
||||
7
.idea/misc.xml
generated
Normal file
7
.idea/misc.xml
generated
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
<project version="4">
|
||||
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="corretto-11" project-jdk-type="JavaSDK" />
|
||||
<component name="SuppressKotlinCodeStyleNotification">
|
||||
<option name="disableForAll" value="true" />
|
||||
</component>
|
||||
</project>
|
||||
7
.idea/vcs.xml
generated
Normal file
7
.idea/vcs.xml
generated
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="VcsDirectoryMappings">
|
||||
<mapping directory="" vcs="Git" />
|
||||
<mapping directory="$PROJECT_DIR$/libs/privacy-friendly-backup-api" vcs="Git" />
|
||||
</component>
|
||||
</project>
|
||||
108
CHANGELOG.md
108
CHANGELOG.md
|
|
@ -1,108 +0,0 @@
|
|||
# Changelog
|
||||
|
||||
<a id="v1.2.6"></a>
|
||||
## [Aktivpause to Go v1.2.6](https://github.com/SecUSo/Aktivpause/releases/tag/v1.2.6) - 2025-08-22
|
||||
|
||||
Fixes missing canScheduleExactAlarm check.
|
||||
**Full Changelog**: https://github.com/SecUSo/Aktivpause/compare/v1.2.5...v1.2.6
|
||||
|
||||
[Changes][v1.2.6]
|
||||
|
||||
|
||||
<a id="v1.2.5"></a>
|
||||
## [Aktivpause to Go v1.2.5](https://github.com/SecUSo/Aktivpause/releases/tag/v1.2.5) - 2025-08-22
|
||||
|
||||
Fixes crashes due to missing receiver flags.
|
||||
**Full Changelog**: https://github.com/SecUSo/Aktivpause/compare/v1.2.4...v1.2.5
|
||||
|
||||
[Changes][v1.2.5]
|
||||
|
||||
|
||||
<a id="v1.2.3"></a>
|
||||
## [Aktivpause to Go v1.2.3](https://github.com/SecUSo/Aktivpause/releases/tag/v1.2.3) - 2025-08-03
|
||||
|
||||
## What's Changed
|
||||
* Change versionCode to differentiate from last Google Play version by [@coderPaddyS](https://github.com/coderPaddyS) in [#28](https://github.com/SecUSo/Aktivpause/pull/28)
|
||||
|
||||
|
||||
**Full Changelog**: https://github.com/SecUSo/Aktivpause/compare/v1.2.2...v1.2.3
|
||||
|
||||
[Changes][v1.2.3]
|
||||
|
||||
|
||||
<a id="v1.2.2"></a>
|
||||
## [Aktivpause to Go v1.2.2](https://github.com/SecUSo/Aktivpause/releases/tag/v1.2.2) - 2025-07-23
|
||||
|
||||
## What's Changed
|
||||
* documentation: Added info re: Privacy Friendly Backup by [@jahway603](https://github.com/jahway603) in [#16](https://github.com/SecUSo/Aktivpause/pull/16)
|
||||
* Updates Copyright by [@coderPaddyS](https://github.com/coderPaddyS) in [#17](https://github.com/SecUSo/Aktivpause/pull/17)
|
||||
* Update to SDK 34; Fixes a bug hindering the training to start. by [@coderPaddyS](https://github.com/coderPaddyS) in [#21](https://github.com/SecUSo/Aktivpause/pull/21)
|
||||
* Adds ci and changelog workflows. by [@coderPaddyS](https://github.com/coderPaddyS) in [#24](https://github.com/SecUSo/Aktivpause/pull/24)
|
||||
* Updates App-Info by [@coderPaddyS](https://github.com/coderPaddyS) in [#22](https://github.com/SecUSo/Aktivpause/pull/22)
|
||||
|
||||
## New Contributors
|
||||
* [@jahway603](https://github.com/jahway603) made their first contribution in [#16](https://github.com/SecUSo/Aktivpause/pull/16)
|
||||
|
||||
**Full Changelog**: https://github.com/SecUSo/Aktivpause/compare/v1.2...v1.2.2
|
||||
|
||||
[Changes][v1.2.2]
|
||||
|
||||
|
||||
<a id="v1.2"></a>
|
||||
## [v1.2](https://github.com/SecUSo/Aktivpause/releases/tag/v1.2) - 2023-05-28
|
||||
|
||||
## What's Changed
|
||||
* Backup integration by [@coderPaddyS](https://github.com/coderPaddyS) in [#14](https://github.com/SecUSo/Aktivpause/pull/14)
|
||||
|
||||
## New Contributors
|
||||
* [@coderPaddyS](https://github.com/coderPaddyS) made their first contribution in [#14](https://github.com/SecUSo/Aktivpause/pull/14)
|
||||
|
||||
**Full Changelog**: https://github.com/SecUSo/Aktivpause/compare/v1.1.2...v1.2
|
||||
|
||||
[Changes][v1.2]
|
||||
|
||||
|
||||
<a id="v1.1.2"></a>
|
||||
## [Aktivpause to Go v1.1.2](https://github.com/SecUSo/Aktivpause/releases/tag/v1.1.2) - 2020-07-09
|
||||
|
||||
- Evaluation is done. Thank you for participating.
|
||||
- Removed evaluation link
|
||||
|
||||
[Changes][v1.1.2]
|
||||
|
||||
|
||||
<a id="v1.1.1"></a>
|
||||
## [Aktivpause to Go v1.1.1](https://github.com/SecUSo/Aktivpause/releases/tag/v1.1.1) - 2020-04-02
|
||||
|
||||
- Release für PlayStore
|
||||
|
||||
[Changes][v1.1.1]
|
||||
|
||||
|
||||
<a id="v1.1"></a>
|
||||
## [Aktivpause to Go v1.1](https://github.com/SecUSo/Aktivpause/releases/tag/v1.1) - 2020-04-02
|
||||
|
||||
- Online-Umfrage Link hinzugefügt
|
||||
|
||||
[Changes][v1.1]
|
||||
|
||||
|
||||
<a id="v1.0"></a>
|
||||
## [Aktivpause to Go (v1.0)](https://github.com/SecUSo/Aktivpause/releases/tag/v1.0) - 2019-10-28
|
||||
|
||||
- Initial release
|
||||
|
||||
[Changes][v1.0]
|
||||
|
||||
|
||||
[v1.2.6]: https://github.com/SecUSo/Aktivpause/compare/v1.2.5...v1.2.6
|
||||
[v1.2.5]: https://github.com/SecUSo/Aktivpause/compare/v1.2.3...v1.2.5
|
||||
[v1.2.3]: https://github.com/SecUSo/Aktivpause/compare/v1.2.2...v1.2.3
|
||||
[v1.2.2]: https://github.com/SecUSo/Aktivpause/compare/v1.2...v1.2.2
|
||||
[v1.2]: https://github.com/SecUSo/Aktivpause/compare/v1.1.2...v1.2
|
||||
[v1.1.2]: https://github.com/SecUSo/Aktivpause/compare/v1.1.1...v1.1.2
|
||||
[v1.1.1]: https://github.com/SecUSo/Aktivpause/compare/v1.1...v1.1.1
|
||||
[v1.1]: https://github.com/SecUSo/Aktivpause/compare/v1.0...v1.1
|
||||
[v1.0]: https://github.com/SecUSo/Aktivpause/tree/v1.0
|
||||
|
||||
<!-- Generated by https://github.com/rhysd/changelog-from-release v3.9.0 -->
|
||||
16
README.md
16
README.md
|
|
@ -1,10 +1,10 @@
|
|||
[][PFA]
|
||||
[][Bluesky]
|
||||
[][Twitter]
|
||||
[][Mastodon]
|
||||
|
||||
[PFA]: https://secuso.org/pfa
|
||||
[Mastodon]: https://xn--baw-joa.social/@SECUSO_Research
|
||||
[Bluesky]: https://bsky.app/profile/secusoresearch.bsky.social
|
||||
[Twitter]: https://twitter.com/SECUSOResearch
|
||||
<img src="https://github.com/SecUSo/Aktivpause/raw/master/fastlane/metadata/android/en-US/images/icon.png"
|
||||
alt="Privacy Friendly Aktivpause Icon"
|
||||
width="80px"
|
||||
|
|
@ -14,10 +14,12 @@
|
|||
|
||||
## Aktivpause
|
||||
|
||||
[<img src="https://f-droid.org/badge/get-it-on.png" alt="Get it on F-Droid" height="60">](https://f-droid.org/repository/browse/?fdid=org.secuso.aktivpause)
|
||||
|
||||
The Aktivpause to Go App allows you to integrate planned breaks into your daily work. You can decide when, where and for how long you want to take breaks and this app will help shape your break in a healthy way. It offers a wide variety of exercises from the well-established Aktivpause program at KIT and was developed by Scientists at the Institute of Sports and Sports Science (IfSS) of KIT. Exercises are currently only provided in german.
|
||||
|
||||
[<img src="https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png"
|
||||
alt="Get it on Google Play"
|
||||
height="80">](https://play.google.com/store/apps/details?id=org.secuso.aktivpause)
|
||||
|
||||
## Download and more Information
|
||||
|
||||
Further development requires Android Studio, we recommend to use the latest version.
|
||||
|
|
@ -27,10 +29,6 @@ Further development requires Android Studio, we recommend to use the latest vers
|
|||
Mininum SDK: 21<br />
|
||||
Target SDK: 28
|
||||
|
||||
## Data Backup
|
||||
|
||||
You can use the [Privacy Friendly Backup app](https://github.com/SecUSo/privacy-friendly-backup) to backup and restore this application's data. This can also be used to migrate your data to a new phone.
|
||||
|
||||
## License
|
||||
|
||||
Aktivpause is licensed under the GPLv3.
|
||||
|
|
@ -49,7 +47,7 @@ GNU General Public License for more details.
|
|||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
The app uses icons from [Google Design Material Icons](https://design.google.com/icons/index.html) licensed under Apache License Version 2.0. All other images (the logo of Privacy Friendly Apps, the SECUSO logo, the App icon and the exercise Images) copyright [SECUSO](www.secuso.org) (2019).
|
||||
The app uses icons from [Google Design Material Icons](https://design.google.com/icons/index.html) licensed under Apache License Version 2.0. All other images (the logo of Privacy Friendly Apps, the SECUSO logo, the App icon and the exercise Images) copyright [Karlsruhe Institute of Technology (KIT)](https://www.kit.edu) (2019).
|
||||
|
||||
## Contributors
|
||||
|
||||
|
|
|
|||
|
|
@ -3,15 +3,14 @@ apply plugin: 'kotlin-android'
|
|||
|
||||
|
||||
android {
|
||||
compileSdk 34
|
||||
compileSdkVersion 33
|
||||
|
||||
namespace 'org.secuso.aktivpause'
|
||||
defaultConfig {
|
||||
applicationId "org.secuso.aktivpause"
|
||||
minSdkVersion 21
|
||||
targetSdkVersion 34
|
||||
versionCode 102
|
||||
versionName "1.2.6"
|
||||
targetSdkVersion 33
|
||||
versionCode 10
|
||||
versionName "1.2.0"
|
||||
vectorDrawables.useSupportLibrary = true
|
||||
}
|
||||
buildTypes {
|
||||
|
|
@ -20,21 +19,12 @@ android {
|
|||
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
|
||||
}
|
||||
}
|
||||
buildFeatures {
|
||||
buildConfig true
|
||||
}
|
||||
compileOptions {
|
||||
sourceCompatibility JavaVersion.VERSION_17
|
||||
targetCompatibility JavaVersion.VERSION_17
|
||||
}
|
||||
kotlinOptions {
|
||||
jvmTarget = JavaVersion.VERSION_17.toString()
|
||||
}
|
||||
kotlin {
|
||||
jvmToolchain(17)
|
||||
sourceCompatibility JavaVersion.VERSION_1_8
|
||||
targetCompatibility JavaVersion.VERSION_1_8
|
||||
}
|
||||
namespace 'org.secuso.aktivpause'
|
||||
lint {
|
||||
lintConfig = file("lint.xml")
|
||||
abortOnError false
|
||||
checkReleaseBuilds false
|
||||
}
|
||||
|
|
@ -59,7 +49,7 @@ dependencies {
|
|||
implementation 'com.readystatesoftware.sqliteasset:sqliteassethelper:2.0.1'
|
||||
testImplementation 'junit:junit:4.12'
|
||||
// https://github.com/ShawnLin013/NumberPicker
|
||||
implementation 'io.github.ShawnLin013:number-picker:2.4.13'
|
||||
implementation 'com.shawnlin:number-picker:2.4.4'
|
||||
|
||||
// Backup
|
||||
implementation project(path: ':backup-api')
|
||||
|
|
|
|||
|
|
@ -1,6 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<lint>
|
||||
<!-- Set the severity of missing translations to warning instead of error -->
|
||||
<issue id="MissingTranslation" severity="warning" />
|
||||
<issue id="MissingQuantity" severity="warning" />
|
||||
</lint>
|
||||
Binary file not shown.
|
|
@ -10,6 +10,7 @@
|
|||
<uses-permission android:name="android.permission.VIBRATE" />
|
||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
|
||||
<uses-permission android:name="android.permission.WAKE_LOCK" />
|
||||
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
|
||||
|
||||
<application
|
||||
android:name=".PFAktivpause"
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ class PFAktivpause : Application(), Configuration.Provider {
|
|||
BackupManager.backupRestorer = BackupRestorer()
|
||||
}
|
||||
|
||||
override val workManagerConfiguration by lazy {
|
||||
Configuration.Builder().setMinimumLoggingLevel(Log.INFO).build()
|
||||
override fun getWorkManagerConfiguration(): Configuration {
|
||||
return Configuration.Builder().setMinimumLoggingLevel(Log.INFO).build()
|
||||
}
|
||||
}
|
||||
|
|
@ -2,11 +2,9 @@ package org.secuso.aktivpause.activities;
|
|||
|
||||
import android.animation.Animator;
|
||||
import android.animation.AnimatorListenerAdapter;
|
||||
import android.content.ComponentName;
|
||||
import android.content.Context;
|
||||
import android.content.DialogInterface;
|
||||
import android.content.Intent;
|
||||
import android.content.ServiceConnection;
|
||||
import android.content.SharedPreferences;
|
||||
import android.graphics.Color;
|
||||
import android.graphics.drawable.Drawable;
|
||||
|
|
@ -14,7 +12,6 @@ import android.os.Build;
|
|||
import android.os.Bundle;
|
||||
import android.os.CountDownTimer;
|
||||
import android.os.Handler;
|
||||
import android.os.IBinder;
|
||||
import android.os.VibrationEffect;
|
||||
import android.os.Vibrator;
|
||||
import android.preference.PreferenceManager;
|
||||
|
|
@ -120,39 +117,14 @@ public class ExerciseActivity extends AppCompatActivity implements LoaderManager
|
|||
private SharedPreferences pref;
|
||||
private Handler mHandler;
|
||||
|
||||
private TimerService timerService = null;
|
||||
private boolean serviceBound = false;
|
||||
|
||||
/**
|
||||
* Defines callbacks for service binding, passed to bindService()
|
||||
* Performs an initial GUI update when connection is established.
|
||||
**/
|
||||
private final ServiceConnection serviceConnection = new ServiceConnection() {
|
||||
|
||||
@Override
|
||||
public void onServiceConnected(ComponentName className, IBinder service) {
|
||||
TimerService.TimerServiceBinder binder = (TimerService.TimerServiceBinder) service;
|
||||
timerService = binder.getService();
|
||||
serviceBound = true;
|
||||
|
||||
timerService.setIsAppInBackground(false);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onServiceDisconnected(ComponentName arg0) {
|
||||
serviceBound = false;
|
||||
}
|
||||
};
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.activity_exercise);
|
||||
|
||||
Intent stopTimer = new Intent(this, TimerService.class);
|
||||
bindService(stopTimer, serviceConnection, Context.BIND_AUTO_CREATE);
|
||||
// stopTimer.setAction(ACTION_STOP_TIMER);
|
||||
// startService(stopTimer);
|
||||
stopTimer.setAction(ACTION_STOP_TIMER);
|
||||
startService(stopTimer);
|
||||
|
||||
mHandler = new Handler();
|
||||
|
||||
|
|
@ -355,10 +327,6 @@ public class ExerciseActivity extends AppCompatActivity implements LoaderManager
|
|||
super.onResume();
|
||||
isActivityVisible = true;
|
||||
|
||||
if (timerService != null) {
|
||||
timerService.setIsAppInBackground(false);
|
||||
}
|
||||
|
||||
if (isBreakFinished) {
|
||||
showEndDialog(this);
|
||||
}
|
||||
|
|
@ -373,10 +341,6 @@ public class ExerciseActivity extends AppCompatActivity implements LoaderManager
|
|||
super.onPause();
|
||||
isActivityVisible = false;
|
||||
|
||||
if (timerService != null) {
|
||||
timerService.setIsAppInBackground(true);
|
||||
}
|
||||
|
||||
if(isBreakFinished) {
|
||||
// TODO: Either start a short Timer to see if the user comes back - or start the next work time rand finish this activity
|
||||
// TODO: for now we just finish
|
||||
|
|
@ -386,28 +350,6 @@ public class ExerciseActivity extends AppCompatActivity implements LoaderManager
|
|||
getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
|
||||
}
|
||||
|
||||
/**
|
||||
* Stop the notification when activity is destroyed
|
||||
*/
|
||||
@Override
|
||||
public void onDestroy() {
|
||||
if (timerService != null) {
|
||||
timerService.workoutClosed();
|
||||
}
|
||||
super.onDestroy();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onStop() {
|
||||
super.onStop();
|
||||
|
||||
// Unbind from the service
|
||||
if (serviceBound) {
|
||||
unbindService(serviceConnection);
|
||||
serviceBound = false;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onLoadFinished(Loader<ExerciseSet> loader, ExerciseSet set) {
|
||||
if (set != null) {
|
||||
|
|
|
|||
|
|
@ -1,232 +0,0 @@
|
|||
|
||||
package org.secuso.aktivpause.activities;
|
||||
|
||||
|
||||
import android.annotation.TargetApi;
|
||||
import android.content.Context;
|
||||
import android.content.SharedPreferences;
|
||||
import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
|
||||
import android.content.res.Configuration;
|
||||
import android.os.Build;
|
||||
import android.os.Bundle;
|
||||
import android.preference.ListPreference;
|
||||
import android.preference.MultiSelectListPreference;
|
||||
import android.preference.Preference;
|
||||
import android.preference.PreferenceFragment;
|
||||
import android.preference.PreferenceManager;
|
||||
import android.view.MenuItem;
|
||||
|
||||
import org.secuso.aktivpause.R;
|
||||
import org.secuso.aktivpause.activities.helper.AppCompatPreferenceActivity;
|
||||
import org.secuso.aktivpause.receivers.TimerSchedulerReceiver;
|
||||
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author Christopher Beckmann
|
||||
* @version 2.0
|
||||
*/
|
||||
public class SettingsActivity extends AppCompatPreferenceActivity {
|
||||
|
||||
protected SharedPreferences mSharedPreferences;
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
|
||||
mSharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
|
||||
|
||||
overridePendingTransition(0, 0);
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
@Override
|
||||
public boolean onIsMultiPane() {
|
||||
return isXLargeTablet(this);
|
||||
}
|
||||
|
||||
/**
|
||||
* Helper method to determine if the device has an extra-large screen. For
|
||||
* example, 10" tablets are extra-large.
|
||||
*/
|
||||
private static boolean isXLargeTablet(Context context) {
|
||||
return (context.getResources().getConfiguration().screenLayout
|
||||
& Configuration.SCREENLAYOUT_SIZE_MASK) >= Configuration.SCREENLAYOUT_SIZE_XLARGE;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
@Override
|
||||
@TargetApi(Build.VERSION_CODES.HONEYCOMB)
|
||||
public void onBuildHeaders(List<Header> target) {
|
||||
loadHeadersFromResource(R.xml.pref_headers, target);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onOptionsItemSelected(MenuItem item) {
|
||||
switch (item.getItemId()) {
|
||||
case android.R.id.home:
|
||||
onBackPressed();
|
||||
return true;
|
||||
default:
|
||||
return super.onOptionsItemSelected(item);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected boolean isValidFragment(String fragmentName) {
|
||||
return ExercisePreferenceFragment.class.getName().equals(fragmentName)
|
||||
|| TimerSchedulePreferenceFragment.class.getName().equals(fragmentName);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* A preference value change listener that updates the preference's summary
|
||||
* to reflect its new value.
|
||||
*/
|
||||
private static Preference.OnPreferenceChangeListener sBindPreferenceSummaryToValueListener = new Preference.OnPreferenceChangeListener() {
|
||||
@Override
|
||||
public boolean onPreferenceChange(Preference preference, Object value) {
|
||||
String stringValue = value.toString();
|
||||
|
||||
if (preference instanceof ListPreference) {
|
||||
|
||||
// For list preferences, look up the correct display value in
|
||||
// the preference's 'entries' list.
|
||||
ListPreference listPreference = (ListPreference) preference;
|
||||
int index = listPreference.findIndexOfValue(stringValue);
|
||||
|
||||
// Set the summary to reflect the new value.
|
||||
preference.setSummary(
|
||||
index >= 0
|
||||
? listPreference.getEntries()[index]
|
||||
: null);
|
||||
} if(preference instanceof MultiSelectListPreference) {
|
||||
MultiSelectListPreference mslPreference = (MultiSelectListPreference) preference;
|
||||
|
||||
if(stringValue.length() >= 2) {
|
||||
stringValue = stringValue.substring(1, stringValue.length() - 1);
|
||||
}
|
||||
|
||||
String[] setValues = stringValue.split(",");
|
||||
|
||||
if(setValues.length == 7) {
|
||||
mslPreference.setSummary(preference.getContext().getString(R.string.pref_schedule_exercise_days_allselectedsummary));
|
||||
return true;
|
||||
}
|
||||
|
||||
StringBuilder sb = new StringBuilder();
|
||||
for(int i = 0; i < mslPreference.getEntries().length; i++) {
|
||||
String preferenceEntryString = mslPreference.getEntryValues()[i].toString();
|
||||
|
||||
for(String chosenValue : setValues) {
|
||||
if (chosenValue.trim().equals(preferenceEntryString)) {
|
||||
sb.append(mslPreference.getEntries()[i]);
|
||||
sb.append(", ");
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if(sb.length() > 0) {
|
||||
sb.setLength(sb.length() - 2);
|
||||
}
|
||||
|
||||
if(sb.length() == 0) {
|
||||
sb.append(preference.getContext().getString(R.string.pref_schedule_exercise_days_defaultsummary));
|
||||
}
|
||||
|
||||
mslPreference.setSummary(sb.toString());
|
||||
|
||||
} else {
|
||||
// For all other preferences, set the summary to the value's
|
||||
// simple string representation.
|
||||
preference.setSummary(stringValue);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* Binds a preference's summary to its value. More specifically, when the
|
||||
* preference's value is changed, its summary (line of text below the
|
||||
* preference title) is updated to reflect the value. The summary is also
|
||||
* immediately updated upon calling this method. The exact display format is
|
||||
* dependent on the type of preference.
|
||||
*
|
||||
* @see #sBindPreferenceSummaryToValueListener
|
||||
*/
|
||||
private static void bindPreferenceSummaryToValue(Preference preference) {
|
||||
// Set the listener to watch for value changes.
|
||||
preference.setOnPreferenceChangeListener(sBindPreferenceSummaryToValueListener);
|
||||
|
||||
// Trigger the listener immediately with the preference's
|
||||
// current value.
|
||||
if(preference instanceof MultiSelectListPreference) {
|
||||
sBindPreferenceSummaryToValueListener.onPreferenceChange(preference, PreferenceManager
|
||||
.getDefaultSharedPreferences(preference.getContext())
|
||||
.getStringSet(preference.getKey(), new HashSet<String>()));
|
||||
} else {
|
||||
sBindPreferenceSummaryToValueListener.onPreferenceChange(preference, PreferenceManager
|
||||
.getDefaultSharedPreferences(preference.getContext())
|
||||
.getString(preference.getKey(), ""));
|
||||
}
|
||||
}
|
||||
|
||||
protected int getNavigationDrawerID() {
|
||||
return R.id.nav_settings;
|
||||
}
|
||||
|
||||
public static class ExercisePreferenceFragment extends PreferenceFragment {
|
||||
|
||||
@Override
|
||||
public void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
addPreferencesFromResource(R.xml.pref_exercise);
|
||||
setHasOptionsMenu(true);
|
||||
|
||||
// Bind the summaries of EditText/List/Dialog/Ringtone preferences
|
||||
// to their values. When their values change, their summaries are
|
||||
// updated to reflect the new value, per the Android Design
|
||||
// guidelines.
|
||||
bindPreferenceSummaryToValue(findPreference("pref_exercise_time"));
|
||||
}
|
||||
}
|
||||
|
||||
public static class TimerSchedulePreferenceFragment extends PreferenceFragment {
|
||||
|
||||
private OnSharedPreferenceChangeListener listener = new OnSharedPreferenceChangeListener() {
|
||||
@Override
|
||||
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
|
||||
// if anything changed with this settings .. reset the alarm
|
||||
TimerSchedulerReceiver.scheduleNextAlarm(getActivity().getApplicationContext());
|
||||
}
|
||||
};
|
||||
|
||||
@Override
|
||||
public void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
addPreferencesFromResource(R.xml.pref_scheduler);
|
||||
setHasOptionsMenu(true);
|
||||
|
||||
bindPreferenceSummaryToValue(findPreference("pref_schedule_exercise_days"));
|
||||
|
||||
PreferenceManager.getDefaultSharedPreferences(getActivity().getApplicationContext())
|
||||
.registerOnSharedPreferenceChangeListener(listener);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDetach() {
|
||||
PreferenceManager.getDefaultSharedPreferences(getActivity().getApplicationContext())
|
||||
.unregisterOnSharedPreferenceChangeListener(listener);
|
||||
|
||||
super.onDetach();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,28 @@
|
|||
/*
|
||||
This file is part of the application Privacy Friendly Notes.
|
||||
Privacy Friendly Notes is free software:
|
||||
you can redistribute it and/or modify it under the terms of the
|
||||
GNU General Public License as published by the Free Software Foundation,
|
||||
either version 3 of the License, or any later version.
|
||||
Privacy Friendly Notes is distributed in the hope
|
||||
that it will be useful, but WITHOUT ANY WARRANTY; without even
|
||||
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
See the GNU General Public License for more details.
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with Privacy Friendly Notes. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package org.secuso.aktivpause.activities
|
||||
|
||||
import android.os.Bundle
|
||||
import androidx.appcompat.app.AppCompatActivity
|
||||
import org.secuso.aktivpause.R
|
||||
|
||||
/**
|
||||
* Activity that allows to register some settings like a custom font size.
|
||||
*/
|
||||
class SettingsActivity : AppCompatActivity() {
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
super.onCreate(savedInstanceState)
|
||||
setContentView(R.layout.activity_settings)
|
||||
}
|
||||
}
|
||||
|
|
@ -12,10 +12,10 @@ import android.graphics.drawable.Drawable;
|
|||
import android.net.Uri;
|
||||
import android.os.IBinder;
|
||||
import android.preference.PreferenceManager;
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.constraintlayout.widget.ConstraintLayout;
|
||||
import androidx.constraintlayout.widget.ConstraintSet;
|
||||
import androidx.core.app.ActivityCompat;
|
||||
import androidx.core.content.ContextCompat;
|
||||
import androidx.loader.app.LoaderManager;
|
||||
import androidx.loader.content.AsyncTaskLoader;
|
||||
import androidx.loader.content.Loader;
|
||||
|
|
@ -117,9 +117,12 @@ public class TimerActivity extends BaseActivity implements LoaderManager.LoaderC
|
|||
boolean isRunning = intent.getBooleanExtra("isRunning", false);
|
||||
boolean isPaused = intent.getBooleanExtra("isPaused", false);
|
||||
|
||||
if (millisUntilDone <= 0) {
|
||||
startActivity(new Intent(TimerActivity.this, ExerciseActivity.class));
|
||||
}
|
||||
//if(intent.getBooleanExtra("done" ,false)) {
|
||||
// TODO: show a dialog here to start the exercise?
|
||||
//}
|
||||
|
||||
//Log.d(TAG, millisUntilDone + "/" + initialDuration + " (" + (isRunning ? "Running" : "") + (isPaused ? "Paused" : "") + (!isRunning && !isPaused ? "Stopped" : "") + ")");
|
||||
|
||||
updateUI(isRunning, isPaused, initialDuration, millisUntilDone);
|
||||
}
|
||||
};
|
||||
|
|
@ -232,7 +235,7 @@ public class TimerActivity extends BaseActivity implements LoaderManager.LoaderC
|
|||
|
||||
isActivityVisible = true;
|
||||
|
||||
ContextCompat.registerReceiver(this, timerReceiver, new IntentFilter(TimerService.TIMER_BROADCAST), ContextCompat.RECEIVER_NOT_EXPORTED);
|
||||
registerReceiver(timerReceiver, new IntentFilter(TimerService.TIMER_BROADCAST));
|
||||
|
||||
if(mTimerService != null && !mTimerService.isRunning()) {
|
||||
updateProgress(mTimerService.getInitialDuration());
|
||||
|
|
|
|||
|
|
@ -0,0 +1,31 @@
|
|||
/*
|
||||
This file is part of the application Privacy Friendly Notes.
|
||||
Privacy Friendly Notes is free software:
|
||||
you can redistribute it and/or modify it under the terms of the
|
||||
GNU General Public License as published by the Free Software Foundation,
|
||||
either version 3 of the License, or any later version.
|
||||
Privacy Friendly Notes is distributed in the hope
|
||||
that it will be useful, but WITHOUT ANY WARRANTY; without even
|
||||
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
See the GNU General Public License for more details.
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with Privacy Friendly Notes. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package org.secuso.aktivpause.activities.fragments;
|
||||
|
||||
import android.os.Bundle
|
||||
import android.preference.PreferenceFragment
|
||||
import androidx.appcompat.app.AppCompatDelegate
|
||||
import org.secuso.aktivpause.R
|
||||
|
||||
class SettingsFragment : PreferenceFragment() {
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
super.onCreate(savedInstanceState)
|
||||
addPreferencesFromResource(R.xml.preferences)
|
||||
findPreference("settings_day_night_theme")?.setOnPreferenceChangeListener { _, newValue ->
|
||||
AppCompatDelegate.setDefaultNightMode(newValue.toString().toInt())
|
||||
true;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -11,7 +11,6 @@ import android.os.Build;
|
|||
import android.os.IBinder;
|
||||
import android.preference.PreferenceManager;
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.core.app.AlarmManagerCompat;
|
||||
import androidx.legacy.content.WakefulBroadcastReceiver;
|
||||
|
||||
import org.secuso.aktivpause.service.TimerService;
|
||||
|
|
@ -80,7 +79,7 @@ public class TimerSchedulerReceiver extends WakefulBroadcastReceiver {
|
|||
AlarmManager alarmManager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
|
||||
|
||||
Intent automaticTimerIntent = new Intent(context, TimerSchedulerReceiver.class);
|
||||
PendingIntent automaticTimerPending = PendingIntent.getBroadcast(context, 0, automaticTimerIntent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
|
||||
PendingIntent automaticTimerPending = PendingIntent.getBroadcast(context, 0, automaticTimerIntent, PendingIntent.FLAG_UPDATE_CURRENT);
|
||||
|
||||
Calendar calendar = Calendar.getInstance();
|
||||
calendar.setTimeInMillis(timestamp);
|
||||
|
|
@ -144,8 +143,12 @@ public class TimerSchedulerReceiver extends WakefulBroadcastReceiver {
|
|||
}
|
||||
}
|
||||
|
||||
if((done || !scheduleExerciseDaysEnabled) && (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) || alarmManager.canScheduleExactAlarms()) {
|
||||
AlarmManagerCompat.setExactAndAllowWhileIdle(alarmManager, AlarmManager.RTC_WAKEUP, calendar.getTimeInMillis(), automaticTimerPending);
|
||||
if(done || !scheduleExerciseDaysEnabled) {
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
|
||||
alarmManager.setExactAndAllowWhileIdle(AlarmManager.RTC_WAKEUP, calendar.getTimeInMillis(), automaticTimerPending);
|
||||
} else {
|
||||
alarmManager.setExact(AlarmManager.RTC_WAKEUP, calendar.getTimeInMillis(), automaticTimerPending);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -9,15 +9,12 @@ import android.content.Context;
|
|||
import android.content.Intent;
|
||||
import android.content.IntentFilter;
|
||||
import android.content.SharedPreferences;
|
||||
import android.content.pm.ServiceInfo;
|
||||
import android.os.Binder;
|
||||
import android.os.CountDownTimer;
|
||||
import android.os.Handler;
|
||||
import android.os.IBinder;
|
||||
import android.preference.PreferenceManager;
|
||||
import android.provider.Settings;
|
||||
import androidx.core.app.NotificationCompat;
|
||||
import androidx.core.app.ServiceCompat;
|
||||
import androidx.core.content.ContextCompat;
|
||||
|
||||
import org.secuso.aktivpause.R;
|
||||
|
|
@ -36,7 +33,6 @@ import static org.secuso.aktivpause.activities.tutorial.FirstLaunchManager.WORK_
|
|||
import static org.secuso.aktivpause.receivers.NotificationCancelReceiver.ACTION_NOTIFICATION_CANCELED;
|
||||
import static org.secuso.aktivpause.receivers.NotificationDeletedReceiver.ACTION_NOTIFICATION_DELETED;
|
||||
|
||||
import kotlin.Unit;
|
||||
/**
|
||||
* The main timer service. It handles the work timer and sends updates to the notification and the {@link TimerActivity}.
|
||||
* When the work time is up, an alarm will fire to start the exercises.
|
||||
|
|
@ -57,9 +53,6 @@ public class TimerService extends Service {
|
|||
|
||||
private static final int UPDATE_INTERVAL = 125;
|
||||
public static final int NOTIFICATION_ID = 31337;
|
||||
private NotificationCompat.Builder notiBuilder = null;
|
||||
private NotificationManager notiManager = null;
|
||||
private boolean isAppInBackground = false;
|
||||
|
||||
private TimerServiceBinder mBinder = new TimerServiceBinder();
|
||||
private CountDownTimer mTimer;
|
||||
|
|
@ -146,10 +139,9 @@ public class TimerService extends Service {
|
|||
public void onCreate() {
|
||||
super.onCreate();
|
||||
|
||||
|
||||
ContextCompat.registerReceiver(this, timerReceiver, new IntentFilter(TIMER_BROADCAST), ContextCompat.RECEIVER_NOT_EXPORTED);
|
||||
ContextCompat.registerReceiver(this, notificationDeletedReceiver, new IntentFilter(ACTION_NOTIFICATION_DELETED), ContextCompat.RECEIVER_NOT_EXPORTED);
|
||||
ContextCompat.registerReceiver(this, notificationPreferenceChangedReceiver, new IntentFilter(ACTION_NOTIFICATION_CANCELED), ContextCompat.RECEIVER_NOT_EXPORTED);
|
||||
registerReceiver(timerReceiver, new IntentFilter(TIMER_BROADCAST));
|
||||
registerReceiver(notificationDeletedReceiver, new IntentFilter(ACTION_NOTIFICATION_DELETED));
|
||||
registerReceiver(notificationPreferenceChangedReceiver, new IntentFilter(ACTION_NOTIFICATION_CANCELED));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -370,50 +362,13 @@ public class TimerService extends Service {
|
|||
}
|
||||
|
||||
private void updateNotification() {
|
||||
if(isAppInBackground) {
|
||||
Notification notification = buildNotification();
|
||||
notiManager.notify(NOTIFICATION_ID, notification);
|
||||
}
|
||||
else if(notiManager != null) {
|
||||
notiManager.cancel(NOTIFICATION_ID);
|
||||
if(isRunning() || isPaused()) {
|
||||
startForeground(NOTIFICATION_ID, buildNotification());
|
||||
} else {
|
||||
stopForeground(true);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if the app is in the background.
|
||||
* If so, start a notification showing the current timer.
|
||||
*
|
||||
* @param isInBackground Sets global flag to determine whether the app is in the background
|
||||
*/
|
||||
public void setIsAppInBackground(boolean isInBackground){
|
||||
this.isAppInBackground = isInBackground;
|
||||
|
||||
//Execute after short delay to prevent short notification popup if workoutActivity is closed
|
||||
final Handler handler = new Handler();
|
||||
handler.postDelayed(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
updateNotification();
|
||||
}
|
||||
}, 700);
|
||||
}
|
||||
|
||||
/**
|
||||
* Cancel the notification when workout activity is destroyed
|
||||
*/
|
||||
public void workoutClosed(){
|
||||
this.isAppInBackground = false;
|
||||
notiManager.cancel(NOTIFICATION_ID);
|
||||
}
|
||||
|
||||
// private void updateNotification() {
|
||||
// if(isRunning() || isPaused()) {
|
||||
// ServiceCompat.startForeground(this, NOTIFICATION_ID, buildNotification(), ServiceInfo.FOREGROUND_SERVICE_TYPE_SPECIAL_USE);
|
||||
// } else {
|
||||
// stopForeground(true);
|
||||
// }
|
||||
// }
|
||||
|
||||
@Override
|
||||
public IBinder onBind(Intent intent) {
|
||||
return mBinder;
|
||||
|
|
|
|||
|
|
@ -1,264 +0,0 @@
|
|||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="1903.9dp"
|
||||
android:height="561.4dp"
|
||||
android:viewportWidth="1903.9"
|
||||
android:viewportHeight="561.4">
|
||||
<group>
|
||||
<clip-path
|
||||
android:pathData="M0,0L1903.9,0L1903.9,561.4L0,561.4Z"/>
|
||||
<path
|
||||
android:pathData="m775.9,268.7c0,-7.6 -3.8,-13.7 -11.5,-18.3l-106.1,-63.6l0,-40.7l64.7,-0L723,188.5L775.9,188.5L775.9,138.1c0,-13.6 -10.7,-20.4 -32.1,-20.4l-106.5,-0c-21.3,-0 -31.9,6.9 -31.9,20.7L605.4,188.5c0,7.3 3.8,13.3 11.5,18L723,270.4L723,314.6L658.3,314.6L658.3,268.7l-52.9,-0l0,53.7c0,13.7 10.6,20.6 31.9,20.6l106.5,-0C765.2,342.9 775.9,336.1 775.9,322.3Z"
|
||||
android:fillColor="#1d1d1b"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m960.3,313.1l-93.9,-0l0,-70.7l79.6,-0L946,213.2L866.4,213.2l0,-65.8l92.5,-0l0,-29.8L813.5,117.7L813.5,342.9L960.3,342.9Z"
|
||||
android:fillColor="#1d1d1b"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="M1166.1,266.7L1113.4,266.7L1113.4,314L1044.9,314L1044.9,146.6l68.5,-0L1113.4,191.1L1166.1,191.1l0,-52.7c0,-13.8 -10.8,-20.7 -32.4,-20.7l-110.4,-0c-20.9,-0 -31.4,6.9 -31.4,20.7l0,184c0,13.7 10.5,20.6 31.4,20.6l110.4,-0c21.6,-0 32.4,-6.9 32.4,-20.6z"
|
||||
android:fillColor="#1d1d1b"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m1380.3,117.7l-52.9,-0l0,196.3l-71.3,-0L1256.1,117.7l-52.9,-0l0,204.7c0,13.7 10.7,20.6 32.1,20.6l112.4,-0c21.7,-0 32.6,-6.9 32.6,-20.6z"
|
||||
android:fillColor="#1d1d1b"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m1587.9,268.7c0,-7.6 -3.9,-13.7 -11.6,-18.3l-106.1,-63.6l0,-40.7l64.7,-0L1535,188.5L1587.9,188.5L1587.9,138.1c0,-13.6 -10.7,-20.4 -32.1,-20.4L1449.2,117.7c-21.2,-0 -31.9,6.9 -31.9,20.7L1417.3,188.5c0,7.3 3.8,13.3 11.5,18L1535,270.4L1535,314.6L1470.3,314.6L1470.3,268.7l-52.9,-0l0,53.7c0,13.7 10.6,20.6 31.9,20.6l106.5,-0C1577.2,342.9 1587.9,336.1 1587.9,322.3Z"
|
||||
android:fillColor="#1d1d1b"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m1678.3,146.6l72.6,-0L1750.9,314l-72.6,-0zM1803.9,138.4c0,-13.8 -10.7,-20.7 -32.1,-20.7l-114.9,-0c-21,-0 -31.4,6.9 -31.4,20.7L1625.4,322.3c0,13.7 10.5,20.6 31.4,20.6l114.9,-0c21.4,-0 32.1,-6.9 32.1,-20.6z"
|
||||
android:fillColor="#1d1d1b"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="M639.9,446.7C639.9,448 639.4,449 638.2,449.9 637.1,450.7 635.6,451.1 633.8,451.1l-21.9,-0c-1.8,-0 -3.3,-0.4 -4.5,-1.2 -1.2,-0.8 -1.7,-1.9 -1.7,-3.2l0,-15.9l7.7,-0L613.4,446.2L632.2,446.2L632.2,431.3L608.2,410.4c-1.7,-1.4 -2.5,-3 -2.5,-4.8l0,-12.7c0,-1.3 0.6,-2.4 1.7,-3.2 1.2,-0.8 2.7,-1.2 4.5,-1.2l21.9,-0c1.8,-0 3.3,0.4 4.4,1.2C639.4,390.6 639.9,391.7 639.9,393L639.9,407.5L632.2,407.5L632.2,393.4L613.4,393.4L613.4,406.7L637.5,427.5C639.1,428.9 639.9,430.5 639.9,432.2Z"
|
||||
android:fillColor="#1d1d1b"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="M686,451.1L657.4,451.1L657.4,388.5L685.6,388.5L685.6,393.4L665.1,393.4L665.1,416.8L683.8,416.8L683.8,421.8L665.1,421.8L665.1,446.2L686,446.2Z"
|
||||
android:fillColor="#1d1d1b"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="M736.7,446.7C736.7,448 736.1,449 734.9,449.9 733.7,450.7 732.2,451.1 730.4,451.1l-22.4,-0c-1.8,-0 -3.3,-0.4 -4.4,-1.2 -1.2,-0.8 -1.7,-1.9 -1.7,-3.2l0,-53.7c0,-1.3 0.6,-2.4 1.7,-3.2 1.1,-0.8 2.6,-1.2 4.4,-1.2l22.4,-0c1.8,-0 3.3,0.4 4.5,1.2C736.1,390.6 736.7,391.7 736.7,393L736.7,407.5L728.9,407.5L728.9,393.4L709.5,393.4L709.5,446.2L728.9,446.2L728.9,430.8L736.7,430.8Z"
|
||||
android:fillColor="#1d1d1b"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="M790,446.7C790,448 789.5,449 788.3,449.9 787.1,450.7 785.6,451.1 783.8,451.1l-23.7,-0c-1.8,-0 -3.3,-0.4 -4.4,-1.2 -1.2,-0.8 -1.7,-1.9 -1.7,-3.2l0,-58.1l7.7,-0L761.7,446.2l20.6,-0L782.3,388.5L790,388.5Z"
|
||||
android:fillColor="#1d1d1b"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m844.7,451.1l-8.1,-0l-16.2,-33.5 1.1,-1.1l13.8,-0l0,-23L815.4,393.4L815.4,451.1l-7.7,-0l0,-62.6l29.1,-0c1.8,-0 3.3,0.4 4.4,1.2 1.2,0.8 1.7,1.9 1.7,3.2L843,416.7c0,3 -2.8,4.5 -8.4,4.5 -0.6,-0 -1.4,-0 -2.5,-0.1 -1.1,-0 -1.9,-0.1 -2.3,-0.1C834.8,431.1 839.8,441.1 844.7,451.1"
|
||||
android:fillColor="#1d1d1b"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m868.3,451.1l-7.7,-0l0,-62.6l7.7,-0z"
|
||||
android:fillColor="#1d1d1b"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m916.5,393.5l-13.5,-0l0,57.6l-7.7,-0L895.3,393.5L881.7,393.5L881.7,388.5L916.5,388.5Z"
|
||||
android:fillColor="#1d1d1b"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m964.3,388.9 l-10.6,25.3c-1.3,2.5 -3.1,6.8 -5.3,12.7l0,24.2l-7.7,-0l0,-24.2c-0.5,-2 -1.3,-4.2 -2.4,-6.4 -1.8,-3.8 -2.7,-5.9 -2.9,-6.3L924.9,388.9l0,-0.4l7.8,-0l12,31.3L956.5,388.5L964.3,388.5Z"
|
||||
android:fillColor="#1d1d1b"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m1006.6,423.3l-8.5,-0l0,-7l8.5,-0z"
|
||||
android:fillColor="#1d1d1b"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="M1077.1,446.7C1077.1,448 1076.6,449 1075.4,449.9 1074.2,450.7 1072.7,451.1 1070.9,451.1l-23.7,-0c-1.8,-0 -3.3,-0.4 -4.5,-1.2 -1.1,-0.8 -1.7,-1.9 -1.7,-3.2l0,-58.1l7.7,-0L1048.8,446.2L1069.4,446.2L1069.4,388.5L1077.1,388.5Z"
|
||||
android:fillColor="#1d1d1b"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="M1128.7,446.7C1128.7,448 1128.2,449 1127,449.9 1125.9,450.7 1124.4,451.1 1122.6,451.1l-21.9,-0c-1.8,-0 -3.3,-0.4 -4.5,-1.2 -1.2,-0.8 -1.7,-1.9 -1.7,-3.2L1094.5,430.8L1102.2,430.8L1102.2,446.2l18.8,-0l0,-14.9l-24,-20.9c-1.7,-1.4 -2.5,-3 -2.5,-4.8l0,-12.7c0,-1.3 0.6,-2.4 1.7,-3.2 1.2,-0.8 2.7,-1.2 4.5,-1.2l21.9,-0c1.8,-0 3.3,0.4 4.4,1.2C1128.2,390.6 1128.7,391.7 1128.7,393L1128.7,407.5L1121,407.5L1121,393.4L1102.2,393.4L1102.2,406.7L1126.4,427.5C1127.9,428.9 1128.7,430.5 1128.7,432.2Z"
|
||||
android:fillColor="#1d1d1b"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="M1169.5,432.3 L1161.9,398.4 1154.3,432.3ZM1181.3,451.1L1173.6,451.1L1170.5,437.2l-17.3,-0l-3.1,13.9l-7.5,-0l0,-0.2l15.5,-62.6l7.6,-0z"
|
||||
android:fillColor="#1d1d1b"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m1222.6,446.2l0,-21.6l-7.8,-3.7l-11.5,-0L1203.2,446.2ZM1222.4,412.3l0,-18.8l-19.1,-0L1203.2,416l11.4,-0zM1230.4,446.7C1230.4,448 1229.8,449 1228.7,449.9 1227.5,450.7 1226,451.1 1224.2,451.1L1195.5,451.1L1195.5,388.5L1224,388.5c1.8,-0 3.3,0.4 4.4,1.2 1.2,0.8 1.7,1.9 1.7,3.2L1230.1,411.6c0,1.7 -1,3 -3.1,4.2 -2,0.9 -4.1,1.8 -6.1,2.6L1227.5,421.4c1.9,0.9 2.9,2.2 2.9,4z"
|
||||
android:fillColor="#1d1d1b"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m1255.8,451.1l-7.7,-0l0,-62.6l7.7,-0z"
|
||||
android:fillColor="#1d1d1b"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m1301.9,451.1l-27.8,-0l0,-62.6l7.7,-0L1281.8,446.2L1301.9,446.2Z"
|
||||
android:fillColor="#1d1d1b"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m1324.4,451.1l-7.7,-0l0,-62.6l7.7,-0z"
|
||||
android:fillColor="#1d1d1b"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m1372.7,393.5l-13.5,-0l0,57.6l-7.7,-0L1351.5,393.5L1337.9,393.5L1337.9,388.5L1372.7,388.5Z"
|
||||
android:fillColor="#1d1d1b"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m1420.5,388.9 l-10.6,25.3c-1.3,2.5 -3.1,6.8 -5.3,12.7l0,24.2l-7.7,-0l0,-24.2c-0.5,-2 -1.3,-4.2 -2.4,-6.4 -1.8,-3.8 -2.7,-5.9 -2.9,-6.3L1381,388.9l0,-0.4l7.8,-0L1400.8,419.8 1412.7,388.5L1420.5,388.5Z"
|
||||
android:fillColor="#1d1d1b"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m1462.7,423.3l-8.5,-0l0,-7l8.5,-0z"
|
||||
android:fillColor="#1d1d1b"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="M1531.1,446.7C1531.1,448 1530.6,449 1529.4,449.9 1528.3,450.7 1526.8,451.1 1525,451.1l-21.9,-0c-1.8,-0 -3.3,-0.4 -4.5,-1.2 -1.2,-0.8 -1.8,-1.9 -1.8,-3.2L1496.9,430.8L1504.6,430.8L1504.6,446.2l18.8,-0l0,-14.9l-24,-20.9c-1.7,-1.4 -2.5,-3 -2.5,-4.8l0,-12.7c0,-1.3 0.6,-2.4 1.8,-3.2 1.2,-0.8 2.7,-1.2 4.5,-1.2l21.9,-0c1.8,-0 3.3,0.4 4.4,1.2C1530.6,390.6 1531.1,391.7 1531.1,393L1531.1,407.5L1523.4,407.5L1523.4,393.4L1504.6,393.4L1504.6,406.7L1528.7,427.5C1530.3,428.9 1531.1,430.5 1531.1,432.2Z"
|
||||
android:fillColor="#1d1d1b"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m1577.6,393.4l-21.3,-0L1556.3,446.2l21.3,-0zM1585.3,446.7c0,1.3 -0.6,2.4 -1.7,3.2 -1.2,0.8 -2.7,1.2 -4.5,1.2l-24.4,-0c-1.8,-0 -3.3,-0.4 -4.5,-1.2 -1.1,-0.8 -1.7,-1.9 -1.7,-3.2l0,-53.7c0,-1.3 0.6,-2.4 1.7,-3.2 1.2,-0.8 2.6,-1.2 4.5,-1.2l24.4,-0c1.8,-0 3.3,0.4 4.5,1.2 1.2,0.8 1.7,1.9 1.7,3.2z"
|
||||
android:fillColor="#1d1d1b"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="M1637.9,446.7C1637.9,448 1637.3,449 1636.1,449.9 1634.9,450.7 1633.4,451.1 1631.6,451.1l-22.4,-0c-1.8,-0 -3.3,-0.4 -4.4,-1.2 -1.2,-0.8 -1.7,-1.9 -1.7,-3.2l0,-53.7c0,-1.3 0.6,-2.4 1.7,-3.2 1.1,-0.8 2.6,-1.2 4.4,-1.2l22.4,-0c1.8,-0 3.3,0.4 4.5,1.2C1637.3,390.6 1637.9,391.7 1637.9,393L1637.9,407.5L1630.1,407.5L1630.1,393.4L1610.7,393.4L1610.7,446.2L1630.1,446.2L1630.1,430.8L1637.9,430.8Z"
|
||||
android:fillColor="#1d1d1b"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m1663.3,451.1l-7.7,-0l0,-62.6l7.7,-0z"
|
||||
android:fillColor="#1d1d1b"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="M1710.2,451.1L1681.6,451.1L1681.6,388.5L1709.9,388.5L1709.9,393.4L1689.3,393.4L1689.3,416.8L1708,416.8L1708,421.8L1689.3,421.8L1689.3,446.2L1710.2,446.2Z"
|
||||
android:fillColor="#1d1d1b"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m1756,393.5l-13.5,-0l0,57.6l-7.7,-0L1734.8,393.5L1721.3,393.5L1721.3,388.5L1756,388.5Z"
|
||||
android:fillColor="#1d1d1b"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m1803.8,388.9 l-10.6,25.3c-1.3,2.5 -3.1,6.8 -5.3,12.7l0,24.2l-7.7,-0l0,-24.2c-0.5,-2 -1.3,-4.2 -2.4,-6.4 -1.8,-3.8 -2.8,-5.9 -2.9,-6.3L1764.4,388.9l0,-0.4l7.8,-0l12,31.3 11.8,-31.3L1803.8,388.5Z"
|
||||
android:fillColor="#1d1d1b"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m356.4,472.5c-1.8,0.1 -3.6,0.1 -5.4,0.2 -2.2,0.1 -3.9,0.2 -6.1,0.7 -3.7,0.7 -7.6,1.9 -11,3.5 -2,0.9 -4,2.1 -5.7,3.5 -0.6,0.5 -1.2,1.1 -1.8,1.7 -0.6,0.5 -1.2,1.1 -1.8,1.6 -5.7,5 -12.2,9.7 -19.3,12.6 30.2,-3 59.4,-12.3 85.7,-27.5C383.5,470.4 375.4,471.3 367.9,471.9 364.1,472.2 360.2,472.4 356.4,472.5"
|
||||
android:fillColor="#1d1d1b"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m376.7,97.2c0.5,0.5 0.9,1.1 1.4,1.6 0.6,0.7 1.2,1.3 1.9,1.9 4,3.7 9.9,7.3 14.8,9.6 1.4,0.7 2.8,1.2 4.2,1.8 1.3,0.5 2.6,1.1 3.9,1.6 2.7,1.2 5.4,2.4 8.1,3.6 5.3,2.5 10.5,5.3 15.5,8.4C408.9,110.2 389,97.5 367.3,88.4 369.7,90.1 371.9,92.1 374,94.2 374.9,95.2 375.8,96.2 376.7,97.2"
|
||||
android:fillColor="#1d1d1b"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m195,468.1c-1,-1.3 -2,-2.7 -2.9,-4.1 -1.2,-1.8 -2.7,-3.3 -4.3,-4.7 -2.8,-2.5 -6.1,-4.7 -9.4,-6.4 -1.8,-1 -3.7,-1.8 -5.7,-2.5 -1,-0.4 -4,-1.2 -5,-1.5 -3.7,-1.1 -7.3,-2.3 -10.9,-3.5 -7,-2.4 -14.6,-5.3 -21.1,-8.7C157.1,457.6 182.8,473.9 211.1,484.2 204.8,479.9 199.5,474.1 195,468.1"
|
||||
android:fillColor="#1d1d1b"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m219.9,86.6c1.3,-0.1 2.6,-0.2 3.8,-0.4 1.5,-0.2 2.9,-0.4 4.3,-0.7 4.9,-1 11.1,-2.8 15.7,-5 0.7,-0.3 1.4,-0.7 2,-1.1 0.6,-0.4 1.1,-0.7 1.7,-1 1.1,-0.7 2.2,-1.3 3.4,-1.9 2.4,-1.3 5,-2.4 7.6,-3.3C236.7,75.8 215.5,81.8 195.6,90.9c5.3,-1.4 10.7,-2.4 16.2,-3.2C214.5,87.3 217.2,86.9 219.9,86.6"
|
||||
android:fillColor="#1d1d1b"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m309.1,482.3c0.7,-0.6 1.3,-1.3 1.9,-1.9 0.6,-0.6 1,-1.2 1.2,-2 0.4,-1.7 -0.4,-3 -1.6,-4 -0.9,-0.7 -1.8,-1.2 -2.8,-1.6 -1.3,-0.5 -2.6,-0.9 -4,-1.1 -1.8,-0.3 -3.6,-0.4 -5.4,-0.6 -1.9,-0.2 -3.7,-0.3 -5.6,-0.5 -3.7,-0.3 -7.5,-0.7 -11.3,-1 -7.4,-0.8 -14.8,-1.6 -22.2,-2.5 -7.4,-0.9 -14.8,-2 -22.1,-3.1 -3.8,-0.6 -7.5,-1.2 -11.3,-1.8 -1.8,-0.3 -3.7,-0.6 -5.5,-0.9 -1.8,-0.3 -3.5,-0.6 -5.3,-0.6 -1.3,-0 -2.6,0 -3.9,0.3 -1,0.2 -1.9,0.5 -2.8,1.1 -1.4,0.9 -1.9,2.3 -1.5,3.9 0.2,0.9 0.7,1.6 1.2,2.4 0.5,0.8 1,1.6 1.6,2.3 1,1.5 2.1,3 3.2,4.4 4.5,5.9 9.9,11.3 16.3,15.1 18.6,5 37.7,7.4 57,7.2 7.1,-2.4 13.5,-6.7 19,-11.4C306.6,484.7 307.9,483.5 309.1,482.3"
|
||||
android:fillColor="#1d1d1b"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m262.4,83.9c1.6,0.8 3.5,1.2 5.2,1.5 2.4,0.4 4.7,0.5 7.1,0.6 12.2,0.9 24.4,2.2 36.6,3.9 12.1,1.8 24.1,4 36.1,6.6 2.3,0.5 4.6,1.1 7,1.4 1.8,0.2 3.7,0.4 5.5,0.1 2.1,-0.3 4.2,-1.3 2.9,-3.6 -0.4,-0.8 -2.5,-3.3 -3.1,-3.9 -1,-1.2 -2.1,-2.3 -3.3,-3.4C354.3,85.1 352.1,83.3 349.6,81.8 326.5,74.3 302.2,70.9 277.8,71.6 275,72.4 272.3,73.4 269.7,74.7 268.3,75.4 266.9,76.1 265.5,76.9 264.7,77.4 262.1,78.9 261.3,79.5 259.2,81.2 260.2,82.8 262.4,83.9"
|
||||
android:fillColor="#1d1d1b"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m479.9,243.5c-0.4,1.1 -1.1,1.9 -2.6,1.6 -0.6,-0.2 -1.3,-0.5 -2,-0.9 -4.5,-2.1 -9.1,-4.2 -14,-6 -5.7,-2.1 -9.6,-4.2 -15.6,-6 -2.5,12.5 -8.7,18.3 -15.9,24.9 7,-15.5 4.9,-27 4.9,-27 0,-0 -0.1,-0.4 -2.1,-1.1 -3.4,-1.2 -5.2,-4.8 -6,-7.5 -0.9,-2.9 -1.4,-6.3 -1.7,-9.5 -0.5,-6.6 -1.2,-13.3 -2,-19.9 -0.7,-6.4 -1.6,-12.8 -3,-19 -0.6,-2.9 -1.5,-5.9 -2.2,-8.7 -0.7,-2.5 -1.8,-5.8 -0.7,-8.6 0.7,-1.9 3.3,-0.9 4.3,-0.6 8.1,3 15.2,7.1 22,11.3 2,1.2 2.7,1.7 4.6,3 3.7,2.7 6.4,7.4 8.8,11.5 3.5,6 6.7,12.3 9.6,19.1 3.8,9 7.8,17.9 10.6,27.9C477.7,230.3 478.3,232.6 479.1,235.4 479.6,237.6 480.7,241 479.9,243.5m-37.3,-101.4c-4.6,-3.2 -9.5,-6 -14.4,-8.6 -6.2,-3.3 -12.6,-6.2 -19,-9 -1.7,-0.8 -3.4,-1.5 -5.2,-2.2 -1.7,-0.7 -3.4,-1.5 -5.2,-2 -2,-0.5 -5.3,-0.8 -6.1,1.9 -0.4,1.2 -0.1,2.7 0.2,3.8 0.2,0.8 0.5,1.6 0.8,2.3 0.3,0.8 0.5,1.6 0.8,2.4 1.1,3.4 2.1,6.8 3,10.2 6.3,24.1 8.7,50.3 9.2,75 0.2,12.6 0,25.2 -0.6,37.8 -0.2,4 -0.5,6.3 0.4,10.3 0.7,3.3 2.1,6.6 4.1,9.4 1.8,2.4 4.2,4.5 7,5.8 1.5,0.7 2.4,0.8 3.9,1.2 1.3,0.3 2.6,0.5 3.9,0.8 12.4,2.5 24.7,5.2 37,8.2 7.5,1.8 15,3.8 22.3,6.2 2.4,0.8 4.8,1.6 7.2,2.6 0.5,0.2 1,0.4 1.4,0.6 0.2,0.1 0.5,0.2 0.7,0.3 0.2,0.1 0.4,0.2 0.7,0.3 1.3,0.4 2,-2.2 2.3,-2.9C500.1,239.7 480.5,184.2 442.7,142.1"
|
||||
android:fillColor="#1d1d1b"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m472.5,348.8c-0.7,1 -1.5,1.7 -2.2,2.5 -0.7,0.8 -1.6,1.6 -2.4,2.3 -0.8,0.7 -1.7,1.5 -2.5,2.2 -1.7,1.5 -3.2,2.9 -4.9,4.5 -1.2,1.1 -2.3,2.3 -3.6,3.5 -0.3,0.3 -1,0.9 -1.1,1.2 -0.1,0.6 0,1.5 0,2.2 0,4.9 -1,9 -2.2,13 -2.6,8.8 -6.9,16.4 -11.7,23 -1.8,2.4 -3.8,4.8 -6,7 -0.3,0.3 -0.6,0.7 -1,1.1 -0.3,0.3 -1,0.7 -1.1,1 -0.1,0.3 -0.1,0.7 -0.1,1.1 -0.1,1 -0.3,2.2 -0.5,3.1 -0.3,1.4 -0.3,2.8 -1.2,3.8 -0.8,0.9 -2,1.3 -2.9,2.2 -0.4,0.4 -0.8,0.9 -1.2,1.4 -0.3,0.4 -1,1.1 -1.4,1.1 -0.2,-0 -0.3,-0.1 -0.5,-0.2 -0.1,0 -0.1,0.1 -0.2,0.1 -0.6,-0 -0.9,-0.7 -0.9,-1.4 -0,-0.7 0.2,-1.5 0.3,-2 0.2,-1.1 0.4,-2.2 0.6,-3.2 -2.6,1.4 -5.6,3.1 -9.3,3.3 -1.3,0.1 -2.5,-0.1 -3.5,-0.4 -2.8,-0.6 -4.4,-2.3 -5.5,-4.6 -0.2,0.2 -0.5,0.4 -0.7,0.7 -2.3,2.6 -4.7,5.3 -7.1,7.9 -1.3,1.4 -2.8,3 -4.1,4.5 -0.6,0.7 -1.3,1.5 -2.1,2.2 -0.8,0.6 -1.7,1.4 -2.9,1.1 -0,-0 0,-0.1 0,-0.1 -0.2,0 -0.4,0 -0.7,-0.1 -0.2,-0.8 0.4,-1.2 0.8,-1.8 0.3,-0.4 1,-1.1 1,-1.6 -0,-0.7 -1.2,-1.1 -1.2,-1.7 -0.1,-0.9 1.1,-2 1.7,-2.6 4.6,-5.2 9.3,-10.5 13.9,-15.8 -0.1,-7.8 1.3,-14.7 3.2,-20.9 3.1,-10.4 7.1,-19.6 12.8,-27.4 -0.9,-3 -1.8,-5.8 -3,-8.9 -0.5,-1.3 -1,-2.8 -1.3,-4.6 -0.3,-1.7 -0.6,-3.8 0.2,-5.2 0.6,-1 1.6,-1.2 2.6,-0.8 0.5,0.1 1,0.3 1.5,0.6 1.7,1.3 2.8,3.6 3.7,5.8 0.9,2.1 1.7,4.3 2.3,6.4 0.8,-0.6 1.4,-1.3 2.3,-1.9 2.8,-2 6.3,-4.2 10.9,-4.4 1.4,-0 2.6,0.1 3.8,0.4 1.8,0.4 3.4,1.2 4.6,2.2 1.8,1.4 3.2,3.1 4.1,5.3 0.2,-0.2 0.4,-0.4 0.5,-0.6 0.9,-1 2,-2 3,-3 2.6,-2.6 5.2,-5.5 8,-7.9 1.5,-1.3 2.7,-3.1 4.9,-3.2 0.4,-0 0.8,0.1 1.2,0.2C472.9,341.6 474,343.4 473.9,345.5 473.9,346.7 473.2,347.9 472.5,348.8m21,-29.5c-0.1,-0.6 -0.3,-1.5 -0.9,-1.9 -0.2,-0.2 -0.4,-0.2 -0.6,-0.3 -0.2,-0.1 -0.5,-0.2 -0.7,-0.2 -0.5,-0.2 -1,-0.3 -1.5,-0.5 -2.5,-0.8 -4.9,-1.5 -7.4,-2.1 -7.7,-2 -15.4,-3.7 -23.1,-5.3 -13.1,-2.7 -26.2,-5.1 -39.4,-7.4 -1.4,-0.2 -2.7,-0.5 -4.1,-0.6 -1.5,-0 -2.9,0.2 -4.3,0.6 -3.1,1 -5.9,3 -8,5.4 -2.4,2.7 -4.1,6.1 -5,9.5 -0.3,0.9 -0.4,1.8 -0.6,2.7 -0.2,0.9 -0.4,1.8 -0.6,2.7 -0.4,1.8 -0.8,3.6 -1.2,5.3 -2.9,13.1 -6.1,26 -9.8,38.9 -7.4,25.4 -16.8,51 -29.4,74.5 -1.8,3.4 -3.7,6.7 -5.6,10 -0.9,1.5 -1.8,2.9 -2.2,4.6 -0.3,1.3 -0.4,2.6 0.2,3.8 0.6,1.2 1.6,2 2.7,2.5 1.5,0.6 3.2,0.8 4.8,0.8 1.1,-0 4.5,-0.2 5.6,-0.2 1.8,-0.1 3.5,-0.1 5.3,-0.2 7.7,-0.4 15.5,-0.8 23.2,-1.6 5.6,-0.5 11.2,-1.2 16.7,-2.3 45.2,-32.1 76.1,-80.5 86.1,-135.1 0,-1.2 0,-2.4 -0.2,-3.6"
|
||||
android:fillColor="#1d1d1b"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m428,394.1c-0.6,0.8 -1.4,1.6 -2.1,2.4 -2.1,2.3 -4.1,4.6 -6.2,6.8 -2.4,2.6 -4.9,5.3 -7.3,7.9 -0.3,0.4 -0.7,0.7 -0.9,1.2 1.2,2.8 3.4,4.7 7.2,4.5 3.5,-0.2 6.3,-1.7 8.6,-3.1 0.7,-6 1.2,-13 0.9,-19.6C428,394.1 428,394.1 428,394.1"
|
||||
android:fillColor="#1d1d1b"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="M427.5,385.7C427.6,385.5 427.5,384.9 427.4,384.5 426.7,378 425.5,371.7 424,366.3 422.1,368.8 420.4,371.5 418.8,374.5 417.4,377.4 415.9,380.4 414.7,383.6c-2.3,6.4 -4.4,13.6 -4.5,21.6 5.3,-5.8 10.9,-12.3 16.2,-18.3C426.8,386.6 427.5,386.1 427.5,385.7"
|
||||
android:fillColor="#1d1d1b"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m447.2,373.6c-1.3,1.5 -2.9,2.9 -4.3,4.5 -2.3,2.5 -5,5.3 -7.4,7.9 -0.3,0.4 -1,1 -1,1.2 -0.1,0.3 0.1,0.8 0.1,1.3 0.5,6.8 0.2,12.9 -0.3,19.4 0.7,-0.5 1.2,-1.1 1.8,-1.7 4,-4.3 7.3,-9.3 10.1,-14.8 3.1,-6.3 5.7,-13.7 5.6,-22.4C451.6,369.1 451.6,369 451.6,369.1 450.1,370.6 448.6,372.1 447.2,373.6"
|
||||
android:fillColor="#1d1d1b"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m435.8,377.1c4.7,-5.3 9.4,-10.5 14.1,-15.7 -1.8,-3.2 -4.7,-6.1 -9.6,-5.7 -4.5,0.3 -7.7,2.8 -10.3,4.9 1.7,5.8 3,12 3.9,18.6 0.4,-0.2 0.7,-0.7 1,-1C435.2,377.9 435.5,377.5 435.8,377.1"
|
||||
android:fillColor="#1d1d1b"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m352.1,222.2c-0.5,5.9 -1.1,11.4 -1.6,17.4 -10.9,-1.7 -21.8,-3.5 -32.7,-5.2 0.9,-6.2 1.6,-12.1 2.5,-18.3 0.3,-2 0.7,-4.1 0.7,-6.2 0.2,-4.8 -1,-8.3 -2.6,-11.2 -1.4,-2.6 -3.1,-4.8 -5.4,-6.8 -0.2,-0.2 -0.9,-0.7 -0.9,-0.8 -0,-0 0.4,-0.5 0.6,-0.7 0.5,-0.7 1,-1.7 1.3,-2.5 0.5,-1.5 1.3,-3.9 0.6,-5.7 -0.5,-1.3 -1.5,-2.3 -1.9,-4 -0.2,-0.8 -0.3,-1.6 -0.4,-2.5 -0.1,-0.8 0,-2.1 -0.3,-2.8 -0.4,-0.9 -1.5,-1.2 -2,-2.2 -1,-2.3 -0,-5.9 1.3,-6.9 0.2,-0.2 0.5,-0.2 0.6,-0.4 0.2,-0.4 0.2,-1.1 0.2,-1.7 0.5,-3.9 0.9,-7.6 2.6,-10.3 1.9,-3.1 4.8,-5.3 9.4,-5.6 2.5,-0.2 4.9,0.3 7,0.8 2.1,0.6 3.9,1.4 5.3,2.5 2.9,2.1 5.1,5.8 5.1,10.5 0,2.1 -0.3,4.2 -0.5,6.2 -0.1,0.6 -0.3,1.4 -0.3,1.9 0,0.4 0.7,0.9 0.9,1.3 1,2.1 0.1,6.3 -1.7,7.2 -0.8,0.4 -1.7,0.4 -2.1,1.1 -0.4,0.7 -0.6,1.7 -0.9,2.5 -0.3,0.8 -0.7,1.6 -1.1,2.2 -0.9,1.3 -2.4,2.1 -3.2,3.4 -0.8,1.2 -0.9,3.7 -0.8,5.8 0.1,4.6 2.6,6.8 5.4,8.8 3.7,2.7 8.4,4.3 11.5,7.5C350.2,209.1 351.6,211 352.2,213.4 352.8,216.1 352.3,219.2 352.1,222.2m-39,-8.8c-0.7,6.6 -1.5,12.9 -2.3,19.7 -26.1,-3.8 -52.9,-7.5 -80.1,-10.3 -0.1,-0.4 0.1,-0.8 0.1,-1.2 1.3,-5.8 2.7,-11.9 4.1,-17.6 0.8,-3.1 1.5,-6.1 3.1,-8.5 3,-4.5 8.1,-7.5 14.3,-8.9 6.3,-1.5 12.6,-2.6 15.5,-7.7 1,-1.8 1.6,-4.2 2.1,-6.6 0.2,-0.8 0.3,-1.7 0.3,-2.6 -0.1,-1 -0.7,-1.8 -1.2,-2.6 -1,-1.6 -1.6,-3.3 -1.8,-5.7 -0.1,-1.1 0.2,-2.7 -0.2,-3.7 -0.4,-1 -1.6,-1.3 -2.1,-2.1 -0.7,-1.2 -0.6,-3.3 -0.3,-4.8 0.3,-1.8 0.9,-3.2 2.1,-4.1 0.3,-0.2 0.7,-0.4 0.8,-0.7 0.2,-0.6 0.3,-1.3 0.4,-2 0.4,-1.9 0.9,-3.9 1.3,-5.8 0.6,-2.5 1.6,-4.7 2.8,-6.6 1.2,-2 2.9,-3.6 4.7,-4.7 1,-0.6 2.1,-1.1 3.3,-1.5 4.5,-1.4 10.5,-0.3 14.3,1.1 3,1.1 5.2,2.8 6.9,5.1 1.8,2.3 2.8,5.2 2.8,9.1 0.1,2.9 -0.5,5.3 -1,8 -0.1,0.4 -0.1,0.8 -0.2,1.3 -0.1,0.4 -0.3,0.9 -0.3,1.2 0,0.3 0.8,1 0.9,1.4 0.6,1.4 0.4,3.5 -0.1,5 -0.5,1.5 -1.1,2.9 -2.3,3.5 -0.9,0.5 -2,0.6 -2.6,1.5 -0.5,0.9 -0.8,2 -1.2,2.9 -0.9,1.9 -1.9,3.5 -3.4,4.7 -0.7,0.6 -1.6,1.2 -2.1,2 -0.8,1.1 -0.8,2.7 -1.1,4.5 -0.2,1.7 -0.4,3.4 -0.2,5.1 0.4,3.1 2.4,5.2 4.3,6.7 2.1,1.6 4.4,3 6.8,4.2 4.7,2.5 9.1,5.7 10.9,11 0.5,1.4 0.8,3 0.8,4.7 0,1.7 -0.2,3.3 -0.4,5.1m75.6,-9.6c-0.4,-14.5 -1.6,-28.9 -3.7,-43.3 -1.8,-12 -4.3,-23.7 -7.7,-35.3 -0.3,-1.2 -0.7,-2.3 -1.1,-3.4 -0.2,-0.6 -0.4,-1.1 -0.6,-1.7 -0.3,-0.6 -0.6,-1.2 -1,-1.7 -1.7,-2.6 -4.1,-4.8 -6.7,-6.4 -2.9,-1.9 -6.2,-3.3 -9.6,-4.2 -1.6,-0.4 -8.4,-1.8 -10.1,-2.1 -13.9,-2.7 -27.8,-5 -41.8,-6.8 -14.2,-1.9 -28.5,-3.4 -42.8,-4.6 -2,-0.2 -3.2,-0.3 -5.3,-0.3 -1.8,0.1 -3.6,0.2 -5.4,0.6 -3.3,0.6 -6.6,1.7 -9.5,3.5 -1.2,0.7 -2.3,1.6 -3.3,2.6 -0.7,0.7 -1.7,2.2 -2.2,3 -1.5,2.1 -2.9,4.2 -4.3,6.4 -6.7,10.3 -12.3,21 -17.3,32.2 -5.9,13.2 -10.8,26.7 -15.1,40.5 -3.9,12.7 -7.3,25.5 -10.3,38.5 -0.4,1.7 -0.8,3.4 -1.1,5 -0.4,1.7 -0.6,3.4 -0.5,5.1 0.1,3.3 1,6.5 2.8,9.3 1.8,2.7 4.3,4.8 7.3,6.1 1.5,0.7 3.1,1.1 4.7,1.3 0.8,0.1 1.7,0.2 2.5,0.3 0.8,0.1 1.7,0.2 2.5,0.3 13,1.5 25.9,3 38.8,4.6 13.5,1.7 26.9,3.4 40.4,5.3 26.3,3.6 52.6,7.5 78.8,11.8 6.7,1.1 13.3,-1.5 17.2,-7.2 1.9,-2.8 3,-6.1 3.3,-9.5 0.2,-2 0.5,-8.3 0.6,-10.3 0.6,-13.2 0.8,-26.3 0.4,-39.5"
|
||||
android:fillColor="#1d1d1b"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
</group>
|
||||
<group>
|
||||
<clip-path
|
||||
android:pathData="M0,0L1903.9,0L1903.9,561.4L0,561.4Z"/>
|
||||
<path
|
||||
android:pathData="M382.6,341.1C382.7,340.7 382.7,340.3 382.8,340"
|
||||
android:fillColor="#ffffff"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m313.4,369.5c-0.1,0.7 -0.3,1.5 -0.4,2.2 -0.2,0.7 -0.3,1.5 -0.5,2.2 -1.2,5.7 -2.6,11.3 -4.2,16.9 -1.7,6 -3.7,11.8 -6,17.6 -2,5 -4.3,9.9 -6.8,14.7 -0.6,1 -1.1,2.1 -1.7,3.1 -0.7,1.2 -1.6,2 -2.7,2.7 -1.3,0.7 -2.8,1.2 -4.3,1.4 -0.8,0.1 -1.5,0.1 -2.3,0.1 -0.3,-0 -1.9,-0.2 -2.2,-0.2 -6.1,-0.6 -12.2,-1.4 -18.3,-2.2 -6,-0.8 -12.1,-1.7 -18.1,-2.6 -0.7,-0.1 -1.5,-0.2 -2.2,-0.3 -0.7,-0.1 -1.5,-0.3 -2.2,-0.5 -1.4,-0.5 -2.8,-1.2 -3.9,-2.3 -1,-0.9 -1.8,-2 -2.3,-3.2 -0.2,-0.6 -0.8,-2.8 -1,-3.4 -1.4,-5.3 -2.4,-10.5 -3.1,-15.9 -0.8,-6.1 -1.3,-12.3 -1.4,-18.5 -0.2,-5.8 -0.1,-11.6 0.2,-17.4 0.1,-1.5 0.2,-3 0.2,-4.5 0,-0.7 0.1,-1.5 0.2,-2.2 0.2,-0.7 0.4,-1.4 0.7,-2.1 1.3,-2.6 3.8,-4.4 6.8,-4.4 0.7,-0 1.4,0.1 2,0.2 0.7,0.1 1.4,0.2 2.1,0.2 1.4,0.2 2.8,0.3 4.2,0.5 2.9,0.3 5.7,0.7 8.6,1.1 5.9,0.7 11.8,1.5 17.7,2.3C284.1,356.4 295.6,358.1 307,359.9 310,360.3 312.3,362.3 313.2,365.1 313.6,366.5 313.7,368.1 313.4,369.5m-62.1,-45.3c1.2,-9.2 8.5,-16 17.7,-16.6 0.9,-0.1 1.7,-0.1 2.6,0 4.9,0.6 9.9,1.2 14.8,2 8.2,1.4 14.7,9.1 15,17.5 0,1.3 -0,2.6 -0.2,3.9l-3.6,18.9 -8.8,-1.4c1.3,-6 3.1,-13.5 3.9,-19.4 -0,-7.2 -5.8,-10.8 -9.6,-11.4 -4.1,-0.6 -8.1,-1.1 -12.2,-1.6 -3.8,-0.5 -9.3,2.6 -10.6,9.8l-1.7,18.4 -8.6,-1.1zM378.9,305c-2.2,-6.7 -7.7,-11.5 -14.7,-12.6 -27.4,-4.3 -54.9,-8.3 -82.4,-12.1 -14.1,-1.9 -28.1,-3.8 -42.2,-5.5 -6.8,-0.9 -13.7,-1.7 -20.5,-2.5 -3.3,-0.4 -6.7,-0.8 -10,-1.2 -1.6,-0.2 -3.3,-0.4 -4.9,-0.6 -1.6,-0.2 -3.2,-0.4 -4.9,-0.4 -7.1,0.1 -13.1,4.2 -16.2,10.5 -0.8,1.6 -1.3,3.3 -1.7,5 -0.4,1.8 -0.4,3.5 -0.6,5.3 -0.2,3.6 -0.4,7.1 -0.6,10.7 -0.7,13.9 -0.9,27.8 -0.5,41.7 0.4,14.8 1.4,29.5 3.4,44.2 1.7,12.9 4.1,25.5 7.5,38.1 0.4,1.6 1.8,6.6 2.4,8.2 1.1,3 3.1,5.6 5.4,7.7 2.7,2.4 6,4.2 9.4,5.4 1.7,0.6 3.4,1 5.2,1.3 1.7,0.3 3.5,0.5 5.2,0.8 14.4,2.2 28.8,4.3 43.3,6.2 14.5,1.9 29.1,3.7 43.7,5.2 0.6,0.1 4.7,0.5 5.3,0.5 1.8,0.1 3.6,0.1 5.4,-0.1 3.5,-0.4 7.1,-1.5 10.2,-3.3 2.7,-1.6 5,-3.6 6.6,-6.4 1.4,-2.5 2.7,-4.9 4.1,-7.4 6.1,-11.4 11.5,-23.2 16.3,-35.2 5.5,-13.8 10.2,-27.8 14.4,-42.1 3.9,-13.3 7.2,-26.8 10.1,-40.4 0.4,-1.7 0.7,-3.5 1.1,-5.2 0.4,-1.7 0.7,-3.5 1,-5.2 0.6,-3.5 0.5,-7.1 -0.6,-10.5"
|
||||
android:fillColor="#009982"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m274.4,410.4c-5,-0.7 -9.8,-1.3 -14.8,-2 0.6,-1.8 1.2,-3.6 1.9,-5.4 1.1,-3.1 2.2,-6.3 3.4,-9.4 0.2,-0.6 -0,-1 -0.4,-1.4 -2.7,-3.4 -2.6,-7.5 0.1,-10.3 2.1,-2.2 4.7,-2.9 7.6,-2C275.2,380.9 277,383.1 277.4,386.2 277.8,389.2 276.7,391.8 274.1,393.5 273.4,393.9 273.2,394.3 273.3,395.1 273.7,399.9 274,404.7 274.4,409.6 274.4,409.8 274.4,410.1 274.4,410.4"
|
||||
android:fillColor="#009982"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m150.6,397.4c-0.4,0.6 -0.9,1 -1.6,1.2 -0.8,0.2 -1.7,0.2 -2.5,0 -0.5,-0.1 -2.4,-0.6 -2.9,-0.7 -0.9,-0.2 -1.8,-0.5 -2.8,-0.7 -4.1,-1.1 -8.2,-2.4 -12.2,-3.8 -2.9,-1 -8.3,-2.1 -11.1,-3.4 -14.9,-21.1 -26.4,-48 -28.8,-76.5 3.8,8.1 8.8,18.4 13.8,27 1.7,7.1 3.6,14.2 5.7,21.2 1.1,3.7 2.3,7.4 3.6,11 1.3,3.6 2.7,7.3 4.7,10.6 -1.6,-3.5 -2.6,-7.2 -3.4,-11 -0.9,-3.7 -1.6,-7.5 -2.3,-11.3 -0.6,-3.4 -1.1,-6.8 -1.7,-10.3 1.7,2.2 3.2,4 4.7,5.2l2.7,2.1 4.7,-10.2c3.1,6.4 6.2,12.8 9.4,19.2 2,4 4.1,8 6.2,11.9 1.1,2 2.1,3.9 3.3,5.9C140.6,385.8 141.1,386.8 141.7,387.7l0.9,1.4 1.1,1.3 -0.9,-1.4 -0.8,-1.5c-0.5,-1 -1,-2 -1.4,-3 -0.9,-2 -1.8,-4.1 -2.6,-6.2 -1.7,-4.1 -3.3,-8.3 -4.9,-12.5 -3.1,-8 -6.1,-16.1 -9,-24.3L139.4,308.5 139.7,312.9C139.7,313.9 139.7,314.8 139.7,315.8 139.6,317.7 139.6,319.7 139.6,321.6 139.6,328.9 139.9,336.2 140.5,343.5 141.6,358 144,372.5 148.3,386.5 148.9,388.5 149.5,390.5 150.2,392.5 150.6,393.4 150.9,394.3 151,395.3 151.1,396 151,396.8 150.6,397.4m-61.1,-95.8c0.5,-0.1 1.1,-0.1 1.7,-0.2 1.5,-0.1 4.3,-0.2 5.8,-0.2 4.7,-0.1 9.4,-0 14,0.1 3.4,0.1 6.7,0.2 10.1,0.4 1.9,0.1 3.8,0.2 5.7,0.3 1,0.1 2,0.1 3,0.2 0.5,0 1,0.1 1.5,0.1 0.5,0 1,0.2 1.5,0.3 1.3,0.1 2.3,0.2 3.2,0.3l-21.4,46.3c-2.1,-2.6 -4.6,-6.4 -7.2,-10.8 -0,-0.1 -0,-0.1 -0,-0.2l-0.1,0c-6.6,-11.5 -13.9,-27 -18.1,-36.5 0.1,-0 0.3,-0 0.3,-0m85.3,126.2c-1.1,-3.6 -2.1,-7.3 -3.1,-11 -6.6,-25.3 -9.8,-51.7 -10.8,-77.7 -0.5,-13.1 -0.4,-26.2 0.2,-39.3 0.2,-3.5 0.3,-6.9 0.5,-10.4 0.1,-1.7 0.3,-3.5 0.2,-5.2 -0,-1.8 -0.2,-3.5 -0.6,-5.2 -0.7,-3.2 -2,-6.3 -4,-8.9 -1.8,-2.2 -4.1,-4.1 -6.8,-5 -0.9,-0.3 -1.8,-0.5 -2.8,-0.6 -0.9,-0.1 -1.8,-0.2 -2.7,-0.3 -1.8,-0.2 -3.6,-0.3 -5.4,-0.5 -3.4,-0.3 -6.8,-0.6 -10.2,-0.9 -6,-0.5 -12.1,-1 -18.1,-1.5 -8.4,-0.6 -16.8,-1.1 -25.2,-1.3 -2.7,-0 -5.4,-0.1 -8.1,0 -1,0 -2,0.1 -3,0.2 -0.2,0 -1.1,0.1 -1.3,0.1 -0.6,0.1 -0.9,0.8 -1.1,1.3 -6.2,57.5 11.3,115 48.3,159.3 4.8,2.5 9.8,4.7 14.8,6.8 7.1,2.9 14.3,5.4 21.6,7.8 1.6,0.5 3.3,1 4.9,1.5 0.8,0.3 4.3,1.3 5.1,1.5 1.4,0.3 3.1,0.5 4.5,0.2 1.2,-0.3 2.3,-0.9 3,-2 0.7,-1.1 0.9,-2.5 0.9,-3.8 -0.1,-1.8 -0.6,-3.4 -1.2,-5.1"
|
||||
android:fillColor="#1d1d1b"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m152.5,164.3 l-0.2,0.3 16.2,4.7 -5.9,10.8 -12.9,-10.8 -0.2,0.3 -1.2,24.1 -9.2,2.4 6.4,-25.4 -0.2,-0.1 -18.4,19 -2.3,-8.7 19.7,-14.4 0.2,-0.3 -15.8,-4.7 5.9,-10.8 12.4,10.7 0.2,-0.3 1.6,-24.3 8.9,-2.4 -6.1,25.3 0.2,0.1 18,-19.1 2.8,8.5zM147.3,213.4c-12.2,-2.5 -35.5,-2.8 -36.3,-2.8 -0,-0 -2.8,0.1 -2.8,0.1l2.8,-7.6c-3,0 21.6,-0.8 38.5,2.7zM219.8,94C218.1,93.7 216.5,93.8 214.8,94 213,94.2 211.2,94.5 209.4,94.7 202.5,95.6 195.8,96.7 189.1,98.3 183.7,99.5 178.5,100.9 173.3,102.8 123,133.6 87.7,183.9 75.9,241.7c0.2,0.4 0.4,0.6 0.9,0.5 0.4,-0.1 0.8,-0.2 1.3,-0.2 1,-0.2 2,-0.3 2.9,-0.4 2.6,-0.3 5.2,-0.4 7.8,-0.6 7.9,-0.3 15.9,-0.2 23.8,0 12.3,0.4 24.7,1.1 37,2 1.5,0.1 2.3,0.2 3.8,0 1.4,-0.2 2.7,-0.5 4,-1 2.9,-1.2 5.3,-3.1 7.4,-5.4 2.2,-2.5 3.9,-5.5 5.1,-8.6 0.7,-1.9 0.9,-2.9 1.3,-4.8 0.4,-1.6 0.7,-3.2 1.1,-4.8 2.8,-12 6.1,-23.9 9.9,-35.7 7.5,-23.3 17.3,-46.5 30.3,-67.4 1.9,-3 3.8,-5.9 5.8,-8.8 1,-1.4 2,-2.8 3,-4.1 0.9,-1.2 1.7,-2.3 2.1,-3.8 0.7,-2.7 -1.1,-4 -3.5,-4.5"
|
||||
android:fillColor="#1d1d1b"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
</group>
|
||||
</vector>
|
||||
|
|
@ -1,256 +0,0 @@
|
|||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="1903.9dp"
|
||||
android:height="561.4dp"
|
||||
android:viewportWidth="1903.9"
|
||||
android:viewportHeight="561.4">
|
||||
<path
|
||||
android:pathData="m775.9,268.7c0,-7.6 -3.8,-13.7 -11.5,-18.3l-106.1,-63.6l0,-40.7l64.7,-0l0,42.4l52.9,-0l0,-50.4c0,-13.6 -10.7,-20.4 -32.1,-20.4l-106.5,-0c-21.3,-0 -31.9,6.9 -31.9,20.7l0,50.1c0,7.3 3.8,13.3 11.5,18l106.1,63.9l0,44.2l-64.7,-0l0,-45.9L605.4,268.7l0,53.7c0,13.7 10.6,20.6 31.9,20.6l106.5,-0c21.4,-0 32.1,-6.9 32.1,-20.6l0,-53.7"
|
||||
android:fillColor="#ffffff"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m960.3,313.1l-93.9,-0l0,-70.7l79.6,-0l0,-29.2l-79.6,-0l0,-65.8l92.5,-0l0,-29.8L813.5,117.7L813.5,342.9l146.8,-0l0,-29.8"
|
||||
android:fillColor="#ffffff"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m1166.1,266.6l-52.7,-0l0,47.3l-68.5,-0l0,-167.4l68.5,-0l0,44.5l52.7,-0l0,-52.7c0,-13.8 -10.8,-20.7 -32.4,-20.7l-110.4,-0c-20.9,-0 -31.4,6.9 -31.4,20.7l0,184c0,13.7 10.5,20.6 31.4,20.6l110.4,-0c21.6,-0 32.4,-6.9 32.4,-20.6l0,-55.7"
|
||||
android:fillColor="#ffffff"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="M1380.3,117.7L1327.3,117.7L1327.3,314L1256.1,314L1256.1,117.7L1203.2,117.7L1203.2,322.3c0,13.7 10.7,20.6 32.1,20.6l112.4,-0c21.7,-0 32.6,-6.9 32.6,-20.6l0,-204.7"
|
||||
android:fillColor="#ffffff"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m1587.9,268.7c0,-7.6 -3.9,-13.7 -11.6,-18.3l-106.1,-63.6l0,-40.7l64.7,-0l0,42.4l52.9,-0l0,-50.4c0,-13.6 -10.7,-20.4 -32.1,-20.4l-106.5,-0c-21.3,-0 -31.9,6.9 -31.9,20.7l0,50.1c0,7.3 3.8,13.3 11.5,18l106.1,63.9l0,44.2l-64.7,-0l0,-45.9l-52.9,-0l0,53.7c0,13.7 10.6,20.6 31.9,20.6l106.5,-0c21.4,-0 32.1,-6.9 32.1,-20.6l0,-53.7"
|
||||
android:fillColor="#ffffff"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m1678.3,146.6l72.6,-0L1750.9,314l-72.6,-0zM1803.9,138.4c0,-13.8 -10.7,-20.7 -32.1,-20.7l-114.9,-0c-21,-0 -31.4,6.9 -31.4,20.7L1625.4,322.3c0,13.7 10.5,20.6 31.4,20.6l114.9,-0c21.4,-0 32.1,-6.9 32.1,-20.6l0,-184"
|
||||
android:fillColor="#ffffff"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m639.9,446.6c0,1.3 -0.6,2.4 -1.7,3.2 -1.1,0.8 -2.6,1.2 -4.4,1.2l-21.9,-0c-1.8,-0 -3.3,-0.4 -4.5,-1.2 -1.2,-0.8 -1.7,-1.9 -1.7,-3.2l0,-15.9l7.7,-0L613.4,446.2l18.8,-0L632.2,431.3l-24,-20.9c-1.7,-1.4 -2.5,-3 -2.5,-4.8l0,-12.7c0,-1.3 0.6,-2.4 1.7,-3.2 1.2,-0.8 2.7,-1.2 4.5,-1.2l21.9,-0c1.8,-0 3.3,0.4 4.4,1.2 1.1,0.8 1.7,1.9 1.7,3.2l0,14.6l-7.7,-0l0,-14.1L613.4,393.4l0,13.2l24.1,20.9c1.6,1.4 2.4,2.9 2.4,4.7L639.9,446.6"
|
||||
android:fillColor="#ffffff"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="M686,451.1L657.4,451.1L657.4,388.5l28.3,-0l0,4.9L665.1,393.4L665.1,416.8l18.7,-0l0,5L665.1,421.8L665.1,446.2l20.9,-0l0,4.9"
|
||||
android:fillColor="#ffffff"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m736.7,446.6c0,1.3 -0.6,2.4 -1.8,3.2 -1.2,0.8 -2.7,1.2 -4.5,1.2l-22.4,-0c-1.8,-0 -3.3,-0.4 -4.4,-1.2 -1.2,-0.8 -1.7,-1.9 -1.7,-3.2l0,-53.7c0,-1.3 0.6,-2.4 1.7,-3.2 1.1,-0.8 2.6,-1.2 4.4,-1.2l22.4,-0c1.8,-0 3.3,0.4 4.5,1.2 1.2,0.8 1.8,1.9 1.8,3.2l0,14.6l-7.8,-0l0,-14.1L709.5,393.4L709.5,446.2l19.4,-0L728.9,430.8L736.7,430.8l0,15.9"
|
||||
android:fillColor="#ffffff"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m790,446.6c0,1.3 -0.6,2.4 -1.8,3.2 -1.2,0.8 -2.7,1.2 -4.5,1.2l-23.7,-0c-1.8,-0 -3.3,-0.4 -4.4,-1.2 -1.2,-0.8 -1.7,-1.9 -1.7,-3.2l0,-58.1l7.7,-0L761.7,446.2l20.6,-0l0,-57.6l7.7,-0L790,446.6"
|
||||
android:fillColor="#ffffff"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m844.7,451.1l-8.1,-0l-16.2,-33.5 1.1,-1.1l13.8,-0l0,-23L815.4,393.4L815.4,451.1L807.7,451.1L807.7,388.5l29.1,-0c1.8,-0 3.3,0.4 4.4,1.2 1.2,0.8 1.7,1.9 1.7,3.2l0,23.7c0,3 -2.8,4.5 -8.4,4.5 -0.6,-0 -1.4,-0 -2.5,-0.1 -1.1,-0 -1.9,-0.1 -2.3,-0.1 5,10 10,20 15,30"
|
||||
android:fillColor="#ffffff"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m868.3,451.1l-7.7,-0L860.5,388.5l7.7,-0L868.3,451.1"
|
||||
android:fillColor="#ffffff"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="M916.5,393.4L903,393.4L903,451.1l-7.7,-0l0,-57.6l-13.6,-0l0,-4.9l34.8,-0l0,4.9"
|
||||
android:fillColor="#ffffff"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m964.3,388.9 l-10.6,25.3c-1.3,2.5 -3.1,6.8 -5.3,12.7L948.5,451.1l-7.7,-0l0,-24.2c-0.5,-2 -1.3,-4.2 -2.4,-6.4 -1.8,-3.8 -2.7,-5.9 -2.9,-6.3l-10.6,-25.3l0,-0.4l7.8,-0l12,31.3 11.8,-31.3l7.8,-0l0,0.4"
|
||||
android:fillColor="#ffffff"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m1006.6,423.3l-8.5,-0l0,-7l8.5,-0l0,7"
|
||||
android:fillColor="#ffffff"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m1077.1,446.6c0,1.3 -0.6,2.4 -1.8,3.2 -1.2,0.8 -2.7,1.2 -4.5,1.2l-23.7,-0c-1.8,-0 -3.3,-0.4 -4.5,-1.2 -1.1,-0.8 -1.7,-1.9 -1.7,-3.2l0,-58.1l7.7,-0L1048.8,446.2l20.6,-0l0,-57.6l7.7,-0L1077.1,446.6"
|
||||
android:fillColor="#ffffff"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m1128.7,446.6c0,1.3 -0.6,2.4 -1.7,3.2 -1.1,0.8 -2.6,1.2 -4.4,1.2l-21.9,-0c-1.8,-0 -3.3,-0.4 -4.5,-1.2 -1.2,-0.8 -1.7,-1.9 -1.7,-3.2l0,-15.9l7.7,-0L1102.2,446.2l18.8,-0L1121,431.3l-24,-20.9c-1.7,-1.4 -2.5,-3 -2.5,-4.8l0,-12.7c0,-1.3 0.6,-2.4 1.7,-3.2 1.2,-0.8 2.7,-1.2 4.5,-1.2l21.9,-0c1.8,-0 3.3,0.4 4.4,1.2 1.1,0.8 1.7,1.9 1.7,3.2l0,14.6l-7.7,-0l0,-14.1l-18.8,-0l0,13.2l24.1,20.9c1.6,1.4 2.4,2.9 2.4,4.7L1128.7,446.6"
|
||||
android:fillColor="#ffffff"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m1169.5,432.3 l-7.6,-33.9 -7.7,33.9zM1181.3,451.1l-7.7,-0l-3.1,-13.9L1153.2,437.2L1150.2,451.1l-7.5,-0l0,-0.2l15.5,-62.6l7.6,-0l15.4,62.7"
|
||||
android:fillColor="#ffffff"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m1222.6,446.2l0,-21.6l-7.8,-3.7l-11.5,-0L1203.2,446.2ZM1222.4,412.3l0,-18.8l-19.1,-0l0,22.6l11.4,-0zM1230.4,446.6c0,1.3 -0.6,2.4 -1.7,3.2 -1.2,0.8 -2.6,1.2 -4.5,1.2l-28.7,-0l0,-62.6l28.5,-0c1.8,-0 3.3,0.4 4.4,1.2 1.2,0.8 1.7,1.9 1.7,3.2l0,18.6c0,1.7 -1,3 -3.1,4.2 -2,0.9 -4.1,1.8 -6.1,2.6l6.6,3c1.9,0.9 2.9,2.2 2.9,4L1230.4,446.6"
|
||||
android:fillColor="#ffffff"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m1255.8,451.1l-7.7,-0L1248.1,388.5l7.7,-0L1255.8,451.1"
|
||||
android:fillColor="#ffffff"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="M1301.9,451.1L1274.1,451.1L1274.1,388.5l7.7,-0L1281.8,446.2l20.1,-0l0,4.9"
|
||||
android:fillColor="#ffffff"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m1324.4,451.1l-7.7,-0L1316.7,388.5l7.7,-0L1324.4,451.1"
|
||||
android:fillColor="#ffffff"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m1372.7,393.4l-13.5,-0L1359.2,451.1l-7.7,-0l0,-57.6l-13.6,-0l0,-4.9l34.8,-0l0,4.9"
|
||||
android:fillColor="#ffffff"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m1420.5,388.9 l-10.6,25.3c-1.3,2.5 -3.1,6.8 -5.3,12.7L1404.6,451.1l-7.7,-0l0,-24.2c-0.5,-2 -1.3,-4.2 -2.4,-6.4 -1.8,-3.8 -2.7,-5.9 -2.9,-6.3l-10.6,-25.3l0,-0.4l7.8,-0l12,31.3 11.8,-31.3l7.8,-0l0,0.4"
|
||||
android:fillColor="#ffffff"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m1462.7,423.3l-8.5,-0l0,-7l8.5,-0l0,7"
|
||||
android:fillColor="#ffffff"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m1531.1,446.6c0,1.3 -0.6,2.4 -1.7,3.2 -1.1,0.8 -2.6,1.2 -4.4,1.2l-21.9,-0c-1.8,-0 -3.3,-0.4 -4.5,-1.2 -1.2,-0.8 -1.7,-1.9 -1.7,-3.2l0,-15.9l7.7,-0L1504.6,446.2l18.8,-0L1523.4,431.3l-24,-20.9c-1.7,-1.4 -2.5,-3 -2.5,-4.8l0,-12.7c0,-1.3 0.6,-2.4 1.7,-3.2 1.2,-0.8 2.7,-1.2 4.5,-1.2l21.9,-0c1.8,-0 3.3,0.4 4.4,1.2 1.1,0.8 1.7,1.9 1.7,3.2l0,14.6l-7.7,-0l0,-14.1l-18.8,-0l0,13.2l24.1,20.9c1.6,1.4 2.4,2.9 2.4,4.7L1531.1,446.6"
|
||||
android:fillColor="#ffffff"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m1577.6,393.4l-21.3,-0L1556.3,446.2l21.3,-0zM1585.3,446.6c0,1.3 -0.6,2.4 -1.7,3.2 -1.2,0.8 -2.7,1.2 -4.5,1.2l-24.3,-0c-1.8,-0 -3.3,-0.4 -4.5,-1.2 -1.1,-0.8 -1.7,-1.9 -1.7,-3.2l0,-53.7c0,-1.3 0.6,-2.4 1.7,-3.2 1.1,-0.8 2.6,-1.2 4.5,-1.2l24.3,-0c1.8,-0 3.3,0.4 4.5,1.2 1.2,0.8 1.7,1.9 1.7,3.2L1585.3,446.6"
|
||||
android:fillColor="#ffffff"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m1637.9,446.6c0,1.3 -0.6,2.4 -1.8,3.2 -1.2,0.8 -2.7,1.2 -4.5,1.2l-22.4,-0c-1.8,-0 -3.3,-0.4 -4.4,-1.2 -1.2,-0.8 -1.7,-1.9 -1.7,-3.2l0,-53.7c0,-1.3 0.6,-2.4 1.7,-3.2 1.1,-0.8 2.6,-1.2 4.4,-1.2l22.4,-0c1.8,-0 3.3,0.4 4.5,1.2 1.2,0.8 1.8,1.9 1.8,3.2l0,14.6l-7.8,-0l0,-14.1l-19.4,-0L1610.7,446.2l19.4,-0l0,-15.4l7.8,-0l0,15.9"
|
||||
android:fillColor="#ffffff"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m1663.3,451.1l-7.7,-0L1655.6,388.5l7.7,-0L1663.3,451.1"
|
||||
android:fillColor="#ffffff"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m1710.2,451.1l-28.6,-0L1681.6,388.5l28.3,-0l0,4.9l-20.5,-0L1689.3,416.8l18.7,-0l0,5l-18.7,-0L1689.3,446.2l20.9,-0l0,4.9"
|
||||
android:fillColor="#ffffff"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m1756,393.4l-13.5,-0L1742.6,451.1l-7.7,-0l0,-57.6l-13.6,-0l0,-4.9l34.8,-0l0,4.9"
|
||||
android:fillColor="#ffffff"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m1803.8,388.9 l-10.6,25.3c-1.3,2.5 -3.1,6.8 -5.3,12.7L1788,451.1l-7.7,-0l0,-24.2c-0.5,-2 -1.3,-4.2 -2.4,-6.4 -1.8,-3.8 -2.7,-5.9 -2.9,-6.3l-10.6,-25.3l0,-0.4l7.8,-0l12,31.3 11.9,-31.3l7.8,-0l0,0.4"
|
||||
android:fillColor="#ffffff"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m356.4,472.5c-1.8,0.1 -3.6,0.1 -5.4,0.2 -2.2,0.1 -3.9,0.2 -6.1,0.7 -3.7,0.7 -7.6,1.9 -11,3.5 -2,0.9 -4,2.1 -5.7,3.5 -0.6,0.5 -1.2,1.1 -1.8,1.7 -0.6,0.5 -1.2,1.1 -1.8,1.6 -5.7,5 -12.2,9.7 -19.3,12.6 30.2,-3 59.4,-12.3 85.7,-27.5 -7.3,1.7 -15.5,2.6 -22.9,3.2 -3.9,0.3 -7.7,0.5 -11.6,0.7"
|
||||
android:fillColor="#ffffff"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m376.7,97.2c0.5,0.5 0.9,1.1 1.4,1.6 0.6,0.7 1.2,1.3 1.9,1.9 4,3.7 9.9,7.3 14.8,9.6 1.4,0.7 2.8,1.2 4.2,1.8 1.3,0.5 2.6,1.1 3.9,1.6 2.7,1.2 5.4,2.4 8.1,3.6 5.3,2.5 10.5,5.3 15.5,8.4 -17.5,-15.7 -37.5,-28.3 -59.1,-37.5 2.4,1.8 4.6,3.7 6.6,5.8 1,1 1.9,2 2.7,3"
|
||||
android:fillColor="#ffffff"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m195,468.1c-1,-1.3 -2,-2.7 -2.9,-4.1 -1.2,-1.8 -2.7,-3.3 -4.3,-4.7 -2.8,-2.5 -6.1,-4.7 -9.4,-6.4 -1.8,-1 -3.7,-1.8 -5.7,-2.5 -1,-0.4 -4,-1.2 -5,-1.5 -3.7,-1.1 -7.3,-2.3 -10.9,-3.5 -7,-2.4 -14.6,-5.3 -21.1,-8.7 21.5,21 47.2,37.3 75.5,47.6 -6.3,-4.4 -11.6,-10.1 -16.1,-16.1"
|
||||
android:fillColor="#ffffff"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m219.9,86.6c1.3,-0.1 2.6,-0.2 3.8,-0.4 1.5,-0.2 2.9,-0.4 4.3,-0.7 4.9,-1 11.1,-2.8 15.7,-5 0.7,-0.3 1.4,-0.7 2,-1.1 0.6,-0.4 1.1,-0.7 1.7,-1 1.1,-0.7 2.2,-1.3 3.4,-1.9 2.4,-1.3 5,-2.4 7.6,-3.3 -21.8,2.7 -42.9,8.7 -62.8,17.8 5.3,-1.4 10.7,-2.4 16.2,-3.2 2.7,-0.4 5.4,-0.8 8.2,-1.1"
|
||||
android:fillColor="#ffffff"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m309.1,482.3c0.7,-0.6 1.3,-1.3 1.9,-1.9 0.6,-0.6 1,-1.2 1.2,-2 0.4,-1.7 -0.4,-3 -1.6,-4 -0.9,-0.7 -1.8,-1.2 -2.8,-1.6 -1.3,-0.5 -2.6,-0.9 -4,-1.1 -1.8,-0.3 -3.6,-0.4 -5.4,-0.6 -1.9,-0.2 -3.7,-0.3 -5.6,-0.5 -3.7,-0.3 -7.5,-0.7 -11.3,-1 -7.4,-0.8 -14.8,-1.6 -22.2,-2.5 -7.4,-0.9 -14.8,-2 -22.1,-3.1 -3.8,-0.6 -7.5,-1.2 -11.3,-1.8 -1.8,-0.3 -3.7,-0.6 -5.5,-0.9 -1.8,-0.3 -3.5,-0.6 -5.3,-0.6 -1.3,-0 -2.6,0 -3.9,0.3 -1,0.2 -1.9,0.5 -2.8,1.1 -1.4,0.9 -1.9,2.3 -1.5,3.9 0.2,0.9 0.7,1.6 1.2,2.4 0.5,0.8 1,1.6 1.6,2.3 1,1.5 2.1,3 3.2,4.4 4.5,5.9 9.9,11.3 16.3,15.1 18.6,5 37.7,7.4 57,7.2 7.1,-2.4 13.5,-6.7 19,-11.4 1.3,-1.1 2.6,-2.3 3.8,-3.5"
|
||||
android:fillColor="#ffffff"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m262.4,83.9c1.6,0.8 3.5,1.2 5.2,1.5 2.4,0.4 4.7,0.5 7.1,0.6 12.2,0.9 24.4,2.2 36.6,3.9 12.1,1.8 24.1,4 36.1,6.6 2.3,0.5 4.6,1.1 7,1.4 1.8,0.2 3.7,0.4 5.5,0.1 2.1,-0.3 4.2,-1.3 2.9,-3.6 -0.4,-0.8 -2.5,-3.3 -3.1,-3.9 -1,-1.2 -2.1,-2.3 -3.3,-3.4 -2.1,-2 -4.3,-3.8 -6.8,-5.3 -23.2,-7.5 -47.5,-10.9 -71.8,-10.1 -2.8,0.8 -5.5,1.8 -8.2,3 -1.4,0.7 -2.8,1.4 -4.2,2.2 -0.8,0.5 -3.4,2 -4.2,2.6 -2.1,1.7 -1.1,3.3 1,4.3"
|
||||
android:fillColor="#ffffff"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m479.9,243.4c-0.4,1.1 -1.1,1.9 -2.6,1.6 -0.6,-0.2 -1.3,-0.5 -2,-0.9 -4.5,-2.1 -9.1,-4.2 -14,-6 -5.7,-2.1 -9.6,-4.2 -15.6,-6 -2.5,12.5 -8.7,18.3 -15.9,24.9 7,-15.5 4.9,-27 4.9,-27 0,-0 -0.1,-0.4 -2.1,-1.1 -3.4,-1.2 -5.2,-4.8 -6,-7.5 -0.9,-2.9 -1.4,-6.3 -1.7,-9.5 -0.5,-6.6 -1.2,-13.3 -2,-19.9 -0.7,-6.4 -1.6,-12.8 -3,-19 -0.6,-2.9 -1.5,-5.9 -2.2,-8.7 -0.7,-2.5 -1.8,-5.8 -0.7,-8.6 0.7,-1.9 3.3,-0.9 4.3,-0.6 8.1,3 15.2,7.1 22,11.3 2,1.2 2.7,1.7 4.6,3 3.7,2.7 6.4,7.4 8.8,11.5 3.5,6 6.7,12.3 9.6,19.1 3.8,9 7.8,17.9 10.6,27.9 0.7,2.3 1.3,4.7 2.1,7.4 0.6,2.2 1.7,5.6 0.9,8.1m-37.3,-101.4c-4.6,-3.2 -9.5,-6 -14.4,-8.6 -6.2,-3.3 -12.6,-6.2 -19,-9 -1.7,-0.8 -3.4,-1.5 -5.2,-2.2 -1.7,-0.7 -3.4,-1.5 -5.2,-2 -2,-0.5 -5.3,-0.8 -6.1,1.9 -0.4,1.2 -0.1,2.7 0.2,3.8 0.2,0.8 0.5,1.6 0.8,2.3 0.3,0.8 0.5,1.6 0.8,2.4 1.1,3.4 2.1,6.8 3,10.2 6.3,24.1 8.7,50.3 9.2,75 0.2,12.6 0,25.2 -0.6,37.8 -0.2,4 -0.5,6.3 0.4,10.3 0.7,3.3 2.1,6.6 4.1,9.4 1.8,2.4 4.2,4.5 7,5.8 1.5,0.7 2.4,0.8 3.9,1.2 1.3,0.3 2.6,0.5 3.9,0.8 12.4,2.5 24.7,5.2 37,8.2 7.5,1.8 15,3.8 22.3,6.2 2.4,0.8 4.8,1.6 7.2,2.6 0.5,0.2 1,0.4 1.4,0.6 0.2,0.1 0.5,0.2 0.7,0.3 0.2,0.1 0.4,0.2 0.7,0.3 1.3,0.4 2,-2.2 2.3,-2.9 3.1,-56.6 -16.4,-112 -54.3,-154.2"
|
||||
android:fillColor="#ffffff"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m472.5,348.8c-0.7,1 -1.5,1.7 -2.2,2.5 -0.7,0.8 -1.6,1.6 -2.4,2.3 -0.8,0.7 -1.7,1.5 -2.5,2.2 -1.7,1.5 -3.2,2.9 -4.9,4.5 -1.2,1.1 -2.3,2.3 -3.6,3.5 -0.3,0.3 -1,0.9 -1.1,1.2 -0.1,0.6 0,1.5 0,2.2 0,4.9 -1,9 -2.2,13 -2.6,8.8 -6.9,16.4 -11.7,23 -1.8,2.4 -3.8,4.8 -6,7 -0.3,0.3 -0.6,0.7 -1,1.1 -0.3,0.3 -1,0.7 -1.1,1 -0.1,0.3 -0.1,0.7 -0.1,1.1 -0.1,1 -0.3,2.2 -0.5,3.1 -0.3,1.4 -0.3,2.8 -1.2,3.8 -0.8,0.9 -2,1.3 -2.9,2.2 -0.4,0.4 -0.8,0.9 -1.2,1.4 -0.3,0.4 -1,1.1 -1.4,1.1 -0.2,-0 -0.3,-0.1 -0.5,-0.2 -0.1,0 -0.1,0.1 -0.2,0.1 -0.6,-0 -0.9,-0.7 -0.9,-1.4 -0,-0.7 0.2,-1.5 0.3,-2 0.2,-1.1 0.4,-2.2 0.6,-3.2 -2.6,1.4 -5.6,3.1 -9.3,3.3 -1.3,0.1 -2.5,-0.1 -3.5,-0.4 -2.8,-0.6 -4.4,-2.3 -5.5,-4.6 -0.2,0.2 -0.5,0.4 -0.7,0.7 -2.3,2.6 -4.7,5.3 -7.1,7.9 -1.3,1.4 -2.8,3 -4.1,4.5 -0.6,0.7 -1.3,1.5 -2.1,2.2 -0.8,0.6 -1.7,1.4 -2.9,1.1 -0,-0 0,-0.1 0,-0.1 -0.2,0 -0.4,0 -0.7,-0.1 -0.2,-0.8 0.4,-1.2 0.8,-1.8 0.3,-0.4 1,-1.1 1,-1.6 -0,-0.7 -1.2,-1.1 -1.2,-1.7 -0.1,-0.9 1.1,-2 1.7,-2.6 4.6,-5.2 9.3,-10.5 13.9,-15.8 -0.1,-7.8 1.3,-14.7 3.2,-20.9 3.1,-10.4 7.1,-19.6 12.8,-27.4 -0.9,-3 -1.8,-5.8 -3,-8.9 -0.5,-1.3 -1,-2.8 -1.3,-4.6 -0.3,-1.7 -0.6,-3.8 0.2,-5.2 0.6,-1 1.6,-1.2 2.6,-0.8 0.5,0.1 1,0.3 1.5,0.6 1.7,1.3 2.8,3.6 3.7,5.8 0.9,2.1 1.7,4.3 2.3,6.4 0.8,-0.6 1.4,-1.3 2.3,-1.9 2.8,-2 6.3,-4.2 10.9,-4.4 1.4,-0 2.6,0.1 3.8,0.4 1.8,0.4 3.4,1.2 4.6,2.2 1.8,1.4 3.2,3.1 4.1,5.3 0.2,-0.2 0.4,-0.4 0.5,-0.6 0.9,-1 2,-2 3,-3 2.6,-2.6 5.2,-5.5 8,-7.9 1.5,-1.3 2.7,-3.1 4.9,-3.2 0.4,-0 0.8,0.1 1.2,0.2 1.7,0.2 2.8,2 2.8,4.1 -0,1.2 -0.8,2.3 -1.4,3.3m21,-29.5c-0.1,-0.6 -0.3,-1.5 -0.9,-1.9 -0.2,-0.2 -0.4,-0.2 -0.6,-0.3 -0.2,-0.1 -0.5,-0.2 -0.7,-0.2 -0.5,-0.2 -1,-0.3 -1.5,-0.5 -2.5,-0.8 -4.9,-1.5 -7.4,-2.1 -7.7,-2 -15.4,-3.7 -23.1,-5.3 -13.1,-2.7 -26.2,-5.1 -39.4,-7.4 -1.4,-0.2 -2.7,-0.5 -4.1,-0.6 -1.5,-0 -2.9,0.2 -4.3,0.6 -3.1,1 -5.9,3 -8,5.4 -2.4,2.7 -4.1,6.1 -5,9.5 -0.3,0.9 -0.4,1.8 -0.6,2.7 -0.2,0.9 -0.4,1.8 -0.6,2.7 -0.4,1.8 -0.8,3.6 -1.2,5.3 -2.9,13.1 -6.1,26 -9.8,38.9 -7.4,25.4 -16.8,51 -29.4,74.5 -1.8,3.4 -3.7,6.7 -5.6,10 -0.9,1.5 -1.8,2.9 -2.2,4.6 -0.3,1.3 -0.4,2.6 0.2,3.8 0.6,1.2 1.6,2 2.7,2.5 1.5,0.6 3.2,0.8 4.8,0.8 1.1,-0 4.5,-0.2 5.6,-0.2 1.8,-0.1 3.5,-0.1 5.3,-0.2 7.7,-0.4 15.5,-0.8 23.2,-1.6 5.6,-0.5 11.2,-1.2 16.7,-2.3 45.2,-32.1 76.1,-80.5 86.1,-135.1 0,-1.2 0,-2.4 -0.2,-3.6"
|
||||
android:fillColor="#ffffff"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m428,394.1c-0.6,0.8 -1.4,1.6 -2.1,2.4 -2.1,2.3 -4.1,4.6 -6.2,6.8 -2.4,2.6 -4.9,5.3 -7.3,7.9 -0.3,0.4 -0.7,0.7 -0.9,1.2 1.2,2.8 3.4,4.7 7.2,4.5 3.5,-0.2 6.3,-1.7 8.6,-3.1 0.7,-6 1.2,-13 0.9,-19.6 -0,-0 -0,-0.1 -0,-0"
|
||||
android:fillColor="#ffffff"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m427.5,385.7c0,-0.3 -0.1,-0.8 -0.1,-1.3 -0.7,-6.4 -1.9,-12.8 -3.4,-18.2 -2,2.5 -3.7,5.2 -5.2,8.2 -1.5,2.9 -2.9,5.9 -4.1,9.1 -2.3,6.4 -4.4,13.6 -4.5,21.6 5.3,-5.8 10.9,-12.3 16.2,-18.3 0.3,-0.4 1,-0.9 1.1,-1.3"
|
||||
android:fillColor="#ffffff"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m447.2,373.6c-1.3,1.5 -2.9,2.9 -4.3,4.5 -2.3,2.5 -5,5.3 -7.4,7.9 -0.3,0.4 -1,1 -1,1.2 -0.1,0.3 0.1,0.8 0.1,1.3 0.5,6.8 0.2,12.9 -0.3,19.4 0.7,-0.5 1.2,-1.1 1.8,-1.7 4,-4.3 7.3,-9.3 10.1,-14.8 3.1,-6.3 5.7,-13.7 5.6,-22.4 -0,-0 -0,-0.1 -0,-0 -1.5,1.5 -3,3 -4.4,4.6"
|
||||
android:fillColor="#ffffff"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m435.8,377.1c4.7,-5.3 9.4,-10.5 14.1,-15.7 -1.8,-3.2 -4.7,-6.1 -9.6,-5.7 -4.5,0.3 -7.7,2.8 -10.3,4.9 1.7,5.8 3,12 3.9,18.6 0.4,-0.2 0.7,-0.7 1,-1 0.3,-0.4 0.7,-0.8 1,-1.1"
|
||||
android:fillColor="#ffffff"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m352.1,222.2c-0.5,5.9 -1.1,11.4 -1.6,17.4 -10.9,-1.7 -21.8,-3.5 -32.7,-5.2 0.9,-6.2 1.6,-12.1 2.5,-18.3 0.3,-2 0.7,-4.1 0.7,-6.2 0.2,-4.8 -1,-8.3 -2.6,-11.2 -1.4,-2.6 -3.1,-4.8 -5.4,-6.8 -0.2,-0.2 -0.9,-0.7 -0.9,-0.8 -0,-0 0.4,-0.5 0.6,-0.7 0.5,-0.7 1,-1.7 1.3,-2.5 0.5,-1.5 1.3,-3.9 0.6,-5.7 -0.5,-1.3 -1.5,-2.3 -1.9,-4 -0.2,-0.8 -0.3,-1.6 -0.4,-2.5 -0.1,-0.8 0,-2.1 -0.3,-2.8 -0.4,-0.9 -1.5,-1.2 -2,-2.2 -1,-2.3 -0,-5.9 1.3,-6.9 0.2,-0.2 0.5,-0.2 0.6,-0.4 0.2,-0.4 0.2,-1.1 0.2,-1.7 0.5,-3.9 0.9,-7.6 2.6,-10.3 1.9,-3.1 4.8,-5.3 9.4,-5.6 2.5,-0.2 4.9,0.3 7,0.8 2.1,0.6 3.9,1.4 5.3,2.5 2.9,2.1 5.1,5.8 5.1,10.5 0,2.1 -0.3,4.2 -0.5,6.2 -0.1,0.6 -0.3,1.4 -0.3,1.9 0,0.4 0.7,0.9 0.9,1.3 1,2.1 0.1,6.3 -1.7,7.2 -0.8,0.4 -1.7,0.4 -2.1,1.1 -0.4,0.7 -0.6,1.7 -0.9,2.5 -0.3,0.8 -0.7,1.6 -1.1,2.2 -0.9,1.3 -2.4,2.1 -3.2,3.4 -0.8,1.2 -0.9,3.7 -0.8,5.8 0.1,4.6 2.6,6.8 5.4,8.8 3.7,2.7 8.4,4.3 11.5,7.5 1.6,1.6 2.9,3.6 3.5,6 0.6,2.7 0.1,5.8 -0.1,8.7m-39,-8.8c-0.7,6.6 -1.5,12.9 -2.3,19.7 -26.1,-3.8 -52.9,-7.5 -80.1,-10.3 -0.1,-0.4 0.1,-0.8 0.1,-1.2 1.3,-5.8 2.7,-11.9 4.1,-17.6 0.8,-3.1 1.5,-6.1 3.1,-8.5 3,-4.5 8.1,-7.5 14.3,-8.9 6.3,-1.5 12.6,-2.6 15.5,-7.7 1,-1.8 1.6,-4.2 2.1,-6.6 0.2,-0.8 0.3,-1.7 0.3,-2.6 -0.1,-1 -0.7,-1.8 -1.2,-2.6 -1,-1.6 -1.6,-3.3 -1.8,-5.7 -0.1,-1.1 0.2,-2.7 -0.2,-3.7 -0.4,-1 -1.6,-1.3 -2.1,-2.1 -0.7,-1.2 -0.6,-3.3 -0.3,-4.8 0.3,-1.8 0.9,-3.2 2.1,-4.1 0.3,-0.2 0.7,-0.4 0.8,-0.7 0.2,-0.6 0.3,-1.3 0.4,-2 0.4,-1.9 0.9,-3.9 1.3,-5.8 0.6,-2.5 1.6,-4.7 2.8,-6.6 1.2,-2 2.9,-3.6 4.7,-4.7 1,-0.6 2.1,-1.1 3.3,-1.5 4.5,-1.4 10.5,-0.3 14.3,1.1 3,1.1 5.2,2.8 6.9,5.1 1.8,2.3 2.8,5.2 2.8,9.1 0.1,2.9 -0.5,5.3 -1,8 -0.1,0.4 -0.1,0.8 -0.2,1.3 -0.1,0.4 -0.3,0.9 -0.3,1.2 0,0.3 0.8,1 0.9,1.4 0.6,1.4 0.4,3.5 -0.1,5 -0.5,1.5 -1.1,2.9 -2.3,3.5 -0.9,0.5 -2,0.6 -2.6,1.5 -0.5,0.9 -0.8,2 -1.2,2.9 -0.9,1.9 -1.9,3.5 -3.4,4.7 -0.7,0.6 -1.6,1.2 -2.1,2 -0.8,1.1 -0.8,2.7 -1.1,4.5 -0.2,1.7 -0.4,3.4 -0.2,5.1 0.4,3.1 2.4,5.2 4.3,6.7 2.1,1.6 4.4,3 6.8,4.2 4.7,2.5 9.1,5.7 10.9,11 0.5,1.4 0.8,3 0.8,4.7 0,1.7 -0.2,3.3 -0.4,5.1m75.6,-9.6c-0.4,-14.5 -1.6,-28.9 -3.7,-43.3 -1.8,-12 -4.3,-23.7 -7.7,-35.3 -0.3,-1.2 -0.7,-2.3 -1.1,-3.4 -0.2,-0.6 -0.4,-1.1 -0.6,-1.7 -0.3,-0.6 -0.6,-1.2 -1,-1.7 -1.7,-2.6 -4.1,-4.8 -6.7,-6.4 -2.9,-1.9 -6.2,-3.3 -9.6,-4.2 -1.6,-0.4 -8.4,-1.8 -10.1,-2.1 -13.9,-2.7 -27.8,-5 -41.8,-6.8 -14.2,-1.9 -28.5,-3.4 -42.8,-4.6 -2,-0.2 -3.2,-0.3 -5.3,-0.3 -1.8,0 -3.6,0.2 -5.4,0.6 -3.3,0.6 -6.6,1.7 -9.5,3.5 -1.2,0.7 -2.3,1.6 -3.3,2.6 -0.7,0.7 -1.7,2.2 -2.2,3 -1.5,2.1 -2.9,4.2 -4.3,6.4 -6.7,10.3 -12.3,21 -17.3,32.2 -5.9,13.2 -10.8,26.7 -15.1,40.5 -3.9,12.7 -7.3,25.5 -10.3,38.5 -0.4,1.7 -0.8,3.4 -1.1,5 -0.4,1.7 -0.6,3.4 -0.5,5.1 0.1,3.3 1,6.5 2.8,9.3 1.8,2.7 4.3,4.8 7.3,6.1 1.5,0.7 3.1,1.1 4.7,1.3 0.8,0.1 1.7,0.2 2.5,0.3 0.8,0.1 1.7,0.2 2.5,0.3 13,1.5 25.9,3 38.8,4.6 13.5,1.7 26.9,3.4 40.4,5.3 26.3,3.6 52.6,7.5 78.8,11.8 6.7,1.1 13.3,-1.5 17.2,-7.2 1.9,-2.8 3,-6.1 3.3,-9.5 0.2,-2 0.5,-8.3 0.6,-10.3 0.6,-13.2 0.8,-26.3 0.4,-39.5"
|
||||
android:fillColor="#ffffff"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m382.6,341.1c0.1,-0.4 0.1,-0.7 0.1,-1.1"
|
||||
android:fillColor="#ffffff"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m313.4,369.5c-0.1,0.7 -0.3,1.5 -0.4,2.2 -0.2,0.7 -0.3,1.5 -0.5,2.2 -1.2,5.7 -2.6,11.3 -4.2,16.9 -1.7,6 -3.7,11.8 -6,17.6 -2,5 -4.3,9.9 -6.8,14.7 -0.6,1 -1.1,2.1 -1.7,3.1 -0.7,1.2 -1.6,2 -2.7,2.7 -1.3,0.7 -2.8,1.2 -4.3,1.4 -0.8,0.1 -1.5,0.1 -2.3,0.1 -0.3,-0 -1.9,-0.2 -2.2,-0.2 -6.1,-0.6 -12.2,-1.4 -18.3,-2.2 -6,-0.8 -12.1,-1.7 -18.1,-2.6 -0.7,-0.1 -1.5,-0.2 -2.2,-0.3 -0.7,-0.1 -1.5,-0.3 -2.2,-0.5 -1.4,-0.5 -2.8,-1.2 -3.9,-2.3 -1,-0.9 -1.8,-2 -2.3,-3.2 -0.2,-0.6 -0.8,-2.8 -1,-3.4 -1.4,-5.3 -2.4,-10.5 -3.1,-15.9 -0.8,-6.1 -1.3,-12.3 -1.4,-18.5 -0.2,-5.8 -0.1,-11.6 0.2,-17.4 0.1,-1.5 0.2,-3 0.2,-4.5 0,-0.7 0.1,-1.5 0.2,-2.2 0.2,-0.7 0.4,-1.4 0.7,-2.1 1.3,-2.6 3.8,-4.4 6.8,-4.4 0.7,-0 1.4,0.1 2,0.2 0.7,0.1 1.4,0.2 2.1,0.2 1.4,0.2 2.8,0.3 4.2,0.5 2.9,0.3 5.7,0.7 8.6,1.1 5.9,0.7 11.8,1.5 17.7,2.3 11.5,1.6 23,3.3 34.5,5 2.9,0.5 5.2,2.5 6.1,5.3 0.5,1.4 0.5,2.9 0.3,4.4m-62.1,-45.3c1.2,-9.2 8.5,-16 17.7,-16.6 0.9,-0.1 1.7,-0.1 2.6,0 4.9,0.6 9.9,1.2 14.8,2 8.2,1.4 14.7,9.1 15,17.5 0,1.3 -0,2.6 -0.2,3.9l-3.6,18.9 -8.8,-1.4c1.3,-6 3.1,-13.5 3.9,-19.4 -0,-7.2 -5.8,-10.8 -9.6,-11.4 -4.1,-0.6 -8.1,-1.1 -12.2,-1.6 -3.8,-0.5 -9.3,2.6 -10.6,9.8l-1.7,18.4 -8.6,-1.1zM378.9,305c-2.2,-6.7 -7.7,-11.5 -14.7,-12.6 -27.4,-4.3 -54.9,-8.3 -82.4,-12.1 -14.1,-1.9 -28.1,-3.8 -42.2,-5.5 -6.8,-0.9 -13.7,-1.7 -20.5,-2.5 -3.3,-0.4 -6.7,-0.8 -10,-1.2 -1.6,-0.2 -3.3,-0.4 -4.9,-0.6 -1.6,-0.2 -3.2,-0.4 -4.9,-0.4 -7.1,0.1 -13.1,4.2 -16.2,10.5 -0.8,1.6 -1.3,3.3 -1.7,5 -0.4,1.8 -0.4,3.5 -0.6,5.3 -0.2,3.6 -0.4,7.1 -0.6,10.7 -0.7,13.9 -0.9,27.8 -0.5,41.7 0.4,14.8 1.4,29.5 3.4,44.2 1.7,12.9 4.1,25.5 7.5,38.1 0.4,1.6 1.8,6.6 2.4,8.2 1.1,3 3.1,5.6 5.4,7.7 2.7,2.4 6,4.2 9.4,5.4 1.7,0.6 3.4,1 5.2,1.3 1.7,0.3 3.5,0.5 5.2,0.8 14.4,2.2 28.8,4.3 43.3,6.2 14.5,1.9 29.1,3.7 43.7,5.2 0.6,0.1 4.7,0.5 5.3,0.5 1.8,0.1 3.6,0.1 5.4,-0.1 3.5,-0.4 7.1,-1.5 10.2,-3.3 2.7,-1.6 5,-3.6 6.6,-6.4 1.4,-2.5 2.7,-4.9 4.1,-7.4 6.1,-11.4 11.5,-23.2 16.3,-35.2 5.5,-13.8 10.2,-27.8 14.4,-42.1 3.9,-13.3 7.2,-26.8 10.1,-40.4 0.4,-1.7 0.7,-3.5 1.1,-5.2 0.4,-1.7 0.7,-3.5 1,-5.2 0.6,-3.5 0.5,-7.1 -0.6,-10.5"
|
||||
android:fillColor="#00a990"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m274.4,410.4c-5,-0.7 -9.8,-1.3 -14.8,-2 0.6,-1.8 1.2,-3.6 1.9,-5.4 1.1,-3.1 2.2,-6.3 3.4,-9.4 0.2,-0.6 -0,-1 -0.4,-1.4 -2.7,-3.4 -2.6,-7.5 0.1,-10.3 2.1,-2.2 4.7,-2.9 7.6,-2 3,0.9 4.8,3.1 5.2,6.2 0.4,3.1 -0.7,5.6 -3.3,7.3 -0.7,0.4 -0.8,0.8 -0.8,1.6 0.4,4.8 0.7,9.6 1.1,14.5 0,0.3 0,0.5 0,0.9"
|
||||
android:fillColor="#00a990"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m150.6,397.4c-0.4,0.6 -0.9,1 -1.6,1.2 -0.8,0.2 -1.7,0.2 -2.5,0 -0.5,-0.1 -2.4,-0.6 -2.9,-0.7 -0.9,-0.2 -1.8,-0.5 -2.8,-0.7 -4.1,-1.1 -8.2,-2.4 -12.2,-3.8 -2.9,-1 -8.3,-2.1 -11.1,-3.4 -14.9,-21.1 -26.4,-48 -28.8,-76.5 3.8,8.1 8.8,18.4 13.8,27 1.7,7.1 3.6,14.2 5.7,21.2 1.1,3.7 2.3,7.4 3.6,11 1.3,3.6 2.7,7.3 4.7,10.6 -1.6,-3.5 -2.6,-7.2 -3.4,-11 -0.9,-3.7 -1.6,-7.5 -2.3,-11.3 -0.6,-3.4 -1.1,-6.8 -1.7,-10.3 1.7,2.2 3.2,4 4.7,5.2l2.7,2.1 4.7,-10.2c3.1,6.4 6.2,12.8 9.4,19.2 2,4 4.1,8 6.2,11.9 1.1,2 2.1,3.9 3.3,5.9 0.6,1 1.1,1.9 1.7,2.9l0.9,1.4 1.1,1.3 -0.9,-1.4 -0.8,-1.5c-0.5,-1 -1,-2 -1.4,-3 -0.9,-2 -1.8,-4.1 -2.6,-6.2 -1.7,-4.1 -3.3,-8.3 -4.9,-12.5 -3.1,-8 -6.1,-16.1 -9,-24.3l15.4,-33.2 0.3,4.4c0.1,1 0,1.9 -0,2.9 -0,1.9 -0.1,3.9 -0.1,5.8 0,7.3 0.3,14.6 0.8,21.9 1.1,14.5 3.6,29 7.8,43 0.6,2 1.3,4 2,6 0.3,0.9 0.7,1.8 0.8,2.8 0.1,0.7 -0,1.5 -0.4,2.1M89.5,301.6c0.5,-0.1 1.1,-0.1 1.7,-0.2 1.5,-0.1 4.3,-0.2 5.8,-0.2 4.7,-0.1 9.4,-0 14,0.1 3.4,0.1 6.7,0.2 10.1,0.4 1.9,0.1 3.8,0.2 5.7,0.3 1,0.1 2,0.1 3,0.2 0.5,0 1,0.1 1.5,0.1 0.5,0 1,0.2 1.5,0.3 1.3,0.1 2.3,0.2 3.2,0.3l-21.4,46.3c-2.1,-2.6 -4.6,-6.4 -7.2,-10.8 -0,-0.1 -0,-0.1 -0,-0.2l-0.1,0c-6.6,-11.5 -13.9,-27 -18.1,-36.5 0.1,-0 0.3,-0 0.3,-0m85.3,126.2c-1.1,-3.6 -2.1,-7.3 -3.1,-11 -6.6,-25.3 -9.8,-51.7 -10.8,-77.7 -0.5,-13.1 -0.4,-26.2 0.2,-39.3 0.2,-3.5 0.3,-6.9 0.5,-10.4 0.1,-1.7 0.3,-3.5 0.2,-5.2 -0,-1.8 -0.2,-3.5 -0.6,-5.2 -0.7,-3.2 -2,-6.3 -4,-8.9 -1.8,-2.2 -4.1,-4.1 -6.8,-5 -0.9,-0.3 -1.8,-0.5 -2.8,-0.6 -0.9,-0.1 -1.8,-0.2 -2.7,-0.3 -1.8,-0.2 -3.6,-0.3 -5.4,-0.5 -3.4,-0.3 -6.8,-0.6 -10.2,-0.9 -6,-0.5 -12.1,-1 -18.1,-1.5 -8.4,-0.6 -16.8,-1.1 -25.2,-1.3 -2.7,-0 -5.4,-0.1 -8.1,0 -1,0 -2,0.1 -3,0.2 -0.2,0 -1.1,0.1 -1.3,0.1 -0.6,0.1 -0.9,0.8 -1.1,1.3 -6.2,57.5 11.3,115 48.3,159.3 4.8,2.5 9.8,4.7 14.8,6.8 7.1,2.9 14.3,5.4 21.6,7.8 1.6,0.5 3.3,1 4.9,1.5 0.8,0.3 4.3,1.3 5.1,1.5 1.4,0.3 3.1,0.5 4.5,0.2 1.2,-0.3 2.3,-0.9 3,-2 0.7,-1.1 0.9,-2.5 0.9,-3.8 -0.1,-1.8 -0.6,-3.4 -1.2,-5.1"
|
||||
android:fillColor="#ffffff"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
<path
|
||||
android:pathData="m152.5,164.3 l-0.2,0.3 16.2,4.7 -5.9,10.8 -12.9,-10.8 -0.2,0.3 -1.2,24.1 -9.2,2.4 6.4,-25.4 -0.2,-0.1 -18.4,19 -2.3,-8.7 19.7,-14.4 0.2,-0.3 -15.8,-4.7 5.9,-10.8 12.4,10.7 0.2,-0.3 1.6,-24.3 8.9,-2.4 -6.1,25.3 0.2,0.1 18,-19.1 2.8,8.5zM147.3,213.4c-12.2,-2.5 -35.5,-2.8 -36.3,-2.8 -0,-0 -2.8,0.1 -2.8,0.1l2.8,-7.6c-3,0 21.6,-0.8 38.5,2.7zM219.8,94c-1.7,-0.3 -3.3,-0.2 -5,-0 -1.8,0.2 -3.6,0.4 -5.4,0.7 -6.8,0.9 -13.6,2 -20.3,3.6 -5.4,1.2 -10.6,2.7 -15.8,4.6 -50.3,30.8 -85.6,81 -97.4,138.8 0.2,0.4 0.4,0.6 0.9,0.5 0.4,-0.1 0.8,-0.2 1.3,-0.2 1,-0.2 2,-0.3 2.9,-0.4 2.6,-0.3 5.2,-0.4 7.8,-0.6 7.9,-0.3 15.9,-0.2 23.8,0 12.3,0.4 24.7,1.1 37,2 1.5,0.1 2.3,0.2 3.8,0 1.4,-0.2 2.7,-0.5 4,-1 2.9,-1.2 5.3,-3.1 7.4,-5.4 2.2,-2.5 3.9,-5.5 5.1,-8.6 0.7,-1.9 0.9,-2.9 1.3,-4.8 0.4,-1.6 0.7,-3.2 1.1,-4.8 2.8,-12 6.1,-23.9 9.9,-35.7 7.5,-23.3 17.3,-46.5 30.3,-67.4 1.9,-3 3.8,-5.9 5.8,-8.8 1,-1.4 2,-2.8 3,-4.1 0.9,-1.2 1.7,-2.3 2.1,-3.8 0.7,-2.7 -1.1,-4 -3.5,-4.5"
|
||||
android:fillColor="#ffffff"
|
||||
android:strokeColor="#00000000"
|
||||
android:fillType="nonZero"/>
|
||||
</vector>
|
||||
|
|
@ -116,7 +116,7 @@
|
|||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:adjustViewBounds="true"
|
||||
android:src="?attr/secusoLogoDrawable" />
|
||||
android:src="@drawable/secuso_logo_gruen" />
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
|
|
|
|||
|
|
@ -46,6 +46,7 @@
|
|||
android:layout_height="match_parent"
|
||||
android:layout_gravity="start"
|
||||
android:fitsSystemWindows="true"
|
||||
android:background="?attr/colorBackground"
|
||||
app:headerLayout="@layout/nav_header"
|
||||
app:menu="@menu/nav_drawer" />
|
||||
|
||||
|
|
|
|||
|
|
@ -85,6 +85,7 @@
|
|||
android:layout_height="match_parent"
|
||||
android:layout_gravity="start"
|
||||
android:fitsSystemWindows="true"
|
||||
android:background="?attr/colorBackground"
|
||||
app:headerLayout="@layout/nav_header"
|
||||
app:menu="@menu/nav_drawer" />
|
||||
|
||||
|
|
|
|||
|
|
@ -1,81 +1,13 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:id="@+id/drawer_layout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:fitsSystemWindows="true"
|
||||
tools:openDrawer="start">
|
||||
|
||||
<androidx.coordinatorlayout.widget.CoordinatorLayout
|
||||
tools:context="org.secuso.aktivpause.activities.SettingsActivity">
|
||||
<fragment
|
||||
android:id="@+id/fragment_settings"
|
||||
android:name="org.secuso.aktivpause.activities.fragments.SettingsFragment"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
tools:context="org.secuso.aktivpause.activities.EditExerciseSetActivity">
|
||||
android:layout_height="match_parent" />
|
||||
|
||||
<include layout="@layout/layout_toolbar"/>
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:layout_width="match_parent"
|
||||
app:layout_behavior="@string/appbar_scrolling_view_behavior"
|
||||
android:id="@+id/main_content"
|
||||
android:layout_height="match_parent">
|
||||
|
||||
<LinearLayout
|
||||
android:orientation="horizontal"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0px"
|
||||
android:layout_weight="1">
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/headers"
|
||||
android:orientation="vertical"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
|
||||
<ListView android:id="@android:id/list"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:clipToPadding="false"
|
||||
android:drawSelectorOnTop="false"
|
||||
android:cacheColorHint="@android:color/transparent"
|
||||
android:listPreferredItemHeight="48dp"
|
||||
android:scrollbarAlwaysDrawVerticalTrack="true" />
|
||||
|
||||
<FrameLayout android:id="@+id/list_footer"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="0" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
||||
<LinearLayout
|
||||
android:id="@+id/prefs_frame"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical"
|
||||
android:visibility="visible" >
|
||||
|
||||
<android.preference.PreferenceFrameLayout android:id="@+id/prefs"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dip"
|
||||
android:layout_weight="1" />
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
||||
|
||||
<com.google.android.material.navigation.NavigationView
|
||||
android:id="@+id/nav_view"
|
||||
tools:visibility="gone"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_gravity="start"
|
||||
android:fitsSystemWindows="true"
|
||||
app:headerLayout="@layout/nav_header"
|
||||
app:menu="@menu/nav_drawer" />
|
||||
|
||||
</androidx.drawerlayout.widget.DrawerLayout>
|
||||
</RelativeLayout>
|
||||
|
|
|
|||
|
|
@ -323,6 +323,7 @@
|
|||
android:layout_height="match_parent"
|
||||
android:layout_gravity="start"
|
||||
android:fitsSystemWindows="true"
|
||||
android:background="?attr/colorBackground"
|
||||
app:headerLayout="@layout/nav_header"
|
||||
app:menu="@menu/nav_drawer" />
|
||||
|
||||
|
|
|
|||
|
|
@ -2,38 +2,41 @@
|
|||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/nav_header_height"
|
||||
android:background="@color/colorAccent"
|
||||
android:background="?attr/colorNavbarHeaderBackground"
|
||||
android:gravity="bottom"
|
||||
android:orientation="vertical"
|
||||
android:paddingBottom="@dimen/activity_vertical_margin"
|
||||
android:paddingTop="@dimen/activity_vertical_margin"
|
||||
android:paddingLeft="@dimen/activity_vertical_margin"
|
||||
android:paddingRight="@dimen/activity_vertical_margin"
|
||||
android:theme="@style/ThemeOverlay.AppCompat.Dark">
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="#ffffff"
|
||||
android:orientation="horizontal"
|
||||
android:background="?attr/colorNavbarHeaderSurface"
|
||||
android:paddingTop="7dp"
|
||||
android:paddingBottom="7dp"
|
||||
android:orientation="horizontal">
|
||||
android:paddingBottom="7dp">
|
||||
|
||||
<ImageView
|
||||
android:paddingLeft="@dimen/activity_horizontal_margin"
|
||||
android:id="@+id/imageView"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:src="@mipmap/ic_app"/>
|
||||
|
||||
android:paddingStart="@dimen/activity_horizontal_margin"
|
||||
android:paddingEnd="@dimen/activity_horizontal_margin"
|
||||
android:src="@mipmap/ic_drawer"/>
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingLeft="@dimen/activity_horizontal_margin"
|
||||
android:text="@string/app_name_short"
|
||||
android:textColor="@color/colorPrimary"
|
||||
android:textSize="18sp"
|
||||
android:text="@string/app_name"
|
||||
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_toEndOf="@+id/imageView" />
|
||||
android:layout_toEndOf="@id/imageView"
|
||||
android:layout_toRightOf="@id/imageView"
|
||||
android:textColor="?attr/colorNavbarHeaderText"
|
||||
android:textSize="18sp"/>
|
||||
|
||||
</RelativeLayout>
|
||||
|
||||
|
|
|
|||
|
|
@ -177,4 +177,12 @@
|
|||
<string name="dialog_evaluation_yes">Ja</string>
|
||||
<string name="menu_display_evaluation_dialog">Online-Befragung</string>
|
||||
|
||||
<string name="settings_appearance_heading">Darstellung</string>
|
||||
<string-array name="array_day_night_theme">
|
||||
<item>System</item>
|
||||
<item>Hell</item>
|
||||
<item>Dunkel</item>
|
||||
</string-array>
|
||||
<string name="select_day_night_theme">Aussehen</string>
|
||||
|
||||
</resources>
|
||||
32
app/src/main/res/values-night/styles.xml
Normal file
32
app/src/main/res/values-night/styles.xml
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<style name="AppTheme" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
|
||||
<item name="colorPrimary">@color/colorPrimary</item>
|
||||
<item name="colorOnPrimary">@color/white</item>
|
||||
<item name="colorAccent">@color/colorAccent</item>
|
||||
<item name="colorSurface">@color/colorSurfaceDark</item>
|
||||
<item name="colorOnSurface">@color/white</item>
|
||||
<item name="colorSurfaceSecondary">@color/colorSurfaceSecondaryDark</item>
|
||||
<item name="colorBackground">@color/colorBackgroundDark</item>
|
||||
<item name="colorOnBackground">@color/white</item>
|
||||
<item name="android:windowBackground">@color/colorBackgroundDark</item>
|
||||
|
||||
<item name="colorNavbarHeaderBackground">@color/colorPrimaryDark</item>
|
||||
<item name="colorNavbarHeaderSurface">#476885</item>
|
||||
<item name="colorNavbarHeaderText">@color/white</item>
|
||||
|
||||
<item name="colorIconFill">@color/white</item>
|
||||
|
||||
</style>
|
||||
|
||||
<style name="AppTheme.PopupOverlay.DialogAlert" parent="Theme.MaterialComponents.DayNight.Dialog.Alert">
|
||||
<item name="colorPrimary">?attr/colorOnSurface</item>
|
||||
</style>
|
||||
<style name="AppTheme.PopupOverlay.Calendar" parent="ThemeOverlay.MaterialComponents.MaterialCalendar">
|
||||
<item name="buttonBarButtonStyle">@style/AppTheme.PopupOverlay.Button</item>
|
||||
</style>
|
||||
<style name="AppTheme.PopupOverlay.Button" parent="ThemeOverlay.MaterialComponents.MaterialAlertDialog">
|
||||
<item name="android:textColor">?attr/colorOnSurface</item>
|
||||
</style>
|
||||
|
||||
</resources>
|
||||
|
|
@ -18,4 +18,9 @@
|
|||
<item>Sa</item>
|
||||
<item>So</item>
|
||||
</string-array>
|
||||
<string-array name="array_day_night_theme_values">
|
||||
<item>-1</item>
|
||||
<item>1</item>
|
||||
<item>2</item>
|
||||
</string-array>
|
||||
</resources>
|
||||
|
|
@ -1,8 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<declare-styleable name="AppTheme">
|
||||
<attr name="secusoLogoDrawable" format="reference"/>
|
||||
</declare-styleable>
|
||||
<declare-styleable name="FlowLayout">
|
||||
<attr name="horizontalSpacing" format="dimension" />
|
||||
<attr name="verticalSpacing" format="dimension" />
|
||||
|
|
@ -11,4 +8,12 @@
|
|||
<attr name="layout_breakLine" format="boolean" />
|
||||
<attr name="layout_horizontalSpacing" format="dimension" />
|
||||
</declare-styleable>
|
||||
<declare-styleable name="AppTheme">
|
||||
<attr name="colorSurfaceSecondary" format="color" />
|
||||
<attr name="colorBackground" format="color" />
|
||||
<attr name="colorNavbarHeaderBackground" format="color" />
|
||||
<attr name="colorNavbarHeaderSurface" format="color" />
|
||||
<attr name="colorNavbarHeaderText" format="color"/>
|
||||
<attr name="colorIconFill" format="color" />
|
||||
</declare-styleable>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -2,18 +2,25 @@
|
|||
<resources>
|
||||
<color name="colorPrimary">#024265</color>
|
||||
<color name="colorPrimaryDark">#024265</color>
|
||||
<color name="colorAccent">#0274B2</color>
|
||||
<color name="colorSurface">#FFFFFF</color>
|
||||
<color name="colorSurfaceDark">#373a3d</color>
|
||||
<color name="colorBackground">#FFFFFF</color>
|
||||
<color name="colorBackgroundDark">#050a0f</color>
|
||||
<color name="colorSurfaceSecondary">#FFFFFF</color>
|
||||
<color name="colorSurfaceSecondaryDark">#222222</color>
|
||||
<color name="colorLightAccent">#8aa5ce</color>
|
||||
<color name="colorAccent">#0274B2</color>
|
||||
<color name="transparent">#00000000</color>
|
||||
<color name="white">#ffffff</color>
|
||||
<color name="black">#000000</color>
|
||||
<color name="lightblue">#0274B2</color>
|
||||
<color name="middleblue">#8aa5ce</color>
|
||||
<color name="darkblue">#024265</color>
|
||||
<color name="middlegrey">#A8A8A8</color>
|
||||
<color name="white">#ffffff</color>
|
||||
<color name="yellow">#f6d126</color>
|
||||
<color name="black">#000000</color>
|
||||
<color name="middleblue">#8aa5ce</color>
|
||||
<color name="lightblue">#0274B2</color>
|
||||
<color name="darkblue">#024265</color>
|
||||
<color name="red">#B71C1C</color>
|
||||
<color name="green">#388E3C</color>
|
||||
|
||||
<color name="KITgreen">#008C84</color>
|
||||
<color name="aktivpauseGreen">#00d67d</color>
|
||||
<color name="KITlightgreen">#3BAAA2</color>
|
||||
|
|
|
|||
|
|
@ -169,5 +169,12 @@
|
|||
<string name="dialog_evaluation_yes">Yes</string>
|
||||
<string name="menu_display_evaluation_dialog">Online Evaluation</string>
|
||||
|
||||
<string name="settings_appearance_heading">Appearance</string>
|
||||
<string-array name="array_day_night_theme">
|
||||
<item>System</item>
|
||||
<item>Light</item>
|
||||
<item>Dark</item>
|
||||
</string-array>
|
||||
<string name="select_day_night_theme">Design</string>
|
||||
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
|
||||
<!-- Base application theme. -->
|
||||
<style name="AppTheme" parent="Theme.MaterialComponents.Light.DarkActionBar">
|
||||
<item name="secusoLogoDrawable">@drawable/secuso_logo_black</item>
|
||||
<!-- Customize your theme here. -->
|
||||
<item name="colorPrimary">@color/colorPrimary</item>
|
||||
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
|
||||
|
|
|
|||
|
|
@ -1,35 +0,0 @@
|
|||
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<PreferenceCategory android:title="@string/pref_category_exercise">
|
||||
|
||||
<SwitchPreference
|
||||
android:defaultValue="true"
|
||||
android:key="pref_keep_screen_on_during_exercise"
|
||||
android:title="@string/pref_keep_screen_on_during_exercise" />
|
||||
|
||||
<EditTextPreference
|
||||
android:defaultValue="30"
|
||||
android:inputType="number"
|
||||
android:numeric="integer"
|
||||
android:maxLength="2"
|
||||
android:key="pref_exercise_time"
|
||||
android:title="@string/pref_exercise_time"/>
|
||||
|
||||
<SwitchPreference
|
||||
android:defaultValue="false"
|
||||
android:key="pref_exercise_continuous"
|
||||
android:title="@string/pref_exercise_continuous"
|
||||
android:summary="@string/pref_exercise_continuous_summary"/>
|
||||
|
||||
</PreferenceCategory>
|
||||
|
||||
<PreferenceCategory android:title="@string/pref_category_default_exercise_sets">
|
||||
|
||||
<SwitchPreference
|
||||
android:defaultValue="false"
|
||||
android:key="pref_hide_default_exercise_sets"
|
||||
android:title="@string/pref_hide_default_exercise_sets" />
|
||||
|
||||
</PreferenceCategory>
|
||||
|
||||
</PreferenceScreen>
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
<preference-headers xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<!-- These settings headers are only used on tablets. -->
|
||||
|
||||
<header
|
||||
android:fragment="org.secuso.aktivpause.activities.SettingsActivity$ExercisePreferenceFragment"
|
||||
android:icon="@drawable/ic_info_black"
|
||||
android:title="@string/pref_header_exercises" />
|
||||
|
||||
<header
|
||||
android:fragment="org.secuso.aktivpause.activities.SettingsActivity$TimerSchedulePreferenceFragment"
|
||||
android:icon="@drawable/ic_alarm_black"
|
||||
android:title="@string/pref_header_schedule" />
|
||||
|
||||
</preference-headers>
|
||||
|
|
@ -1,5 +1,46 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<PreferenceCategory android:title="@string/settings_appearance_heading">
|
||||
<ListPreference
|
||||
android:key="settings_day_night_theme"
|
||||
android:title="@string/select_day_night_theme"
|
||||
android:summary="%s"
|
||||
android:defaultValue="-1"
|
||||
android:entries="@array/array_day_night_theme"
|
||||
android:entryValues="@array/array_day_night_theme_values"
|
||||
/>
|
||||
</PreferenceCategory>
|
||||
<PreferenceCategory android:title="@string/pref_category_exercise">
|
||||
|
||||
<SwitchPreference
|
||||
android:defaultValue="true"
|
||||
android:key="pref_keep_screen_on_during_exercise"
|
||||
android:title="@string/pref_keep_screen_on_during_exercise" />
|
||||
|
||||
<EditTextPreference
|
||||
android:defaultValue="30"
|
||||
android:inputType="number"
|
||||
android:numeric="integer"
|
||||
android:maxLength="2"
|
||||
android:key="pref_exercise_time"
|
||||
android:title="@string/pref_exercise_time"/>
|
||||
|
||||
<SwitchPreference
|
||||
android:defaultValue="false"
|
||||
android:key="pref_exercise_continuous"
|
||||
android:title="@string/pref_exercise_continuous"
|
||||
android:summary="@string/pref_exercise_continuous_summary"/>
|
||||
|
||||
</PreferenceCategory>
|
||||
|
||||
<PreferenceCategory android:title="@string/pref_category_default_exercise_sets">
|
||||
|
||||
<SwitchPreference
|
||||
android:defaultValue="false"
|
||||
android:key="pref_hide_default_exercise_sets"
|
||||
android:title="@string/pref_hide_default_exercise_sets" />
|
||||
|
||||
</PreferenceCategory>
|
||||
<PreferenceCategory android:title="@string/pref_category_schedule">
|
||||
|
||||
<SwitchPreference
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildscript {
|
||||
repositories {
|
||||
mavenCentral()
|
||||
jcenter()
|
||||
maven {
|
||||
url 'https://maven.google.com/'
|
||||
name 'Google'
|
||||
|
|
@ -10,9 +10,9 @@ buildscript {
|
|||
google()
|
||||
}
|
||||
|
||||
ext.kotlin_version = "2.0.21"
|
||||
ext.kotlin_version = "1.7.20"
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:8.3.2'
|
||||
classpath 'com.android.tools.build:gradle:7.4.2'
|
||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
||||
|
||||
// NOTE: Do not place your application dependencies here; they belong
|
||||
|
|
@ -22,7 +22,7 @@ buildscript {
|
|||
|
||||
allprojects {
|
||||
repositories {
|
||||
mavenCentral()
|
||||
jcenter()
|
||||
google()
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,16 +1,7 @@
|
|||
Die Aktivpause-App ermöglicht es Ihnen, selbstständig Bewegungspausen durchzuführen und so ganz individuell eine gezielte Auszeit in Ihren Arbeitsalltag zu integrieren. Wann, wo und wie lange Sie aktive Pausen machen, können Sie somit für sich persönlich entscheiden. Das breite Übungsspektrum stammt aus dem etablierten Aktivpause-Programm am KIT und wurde von Wissenschaftler*innen am Institut für Sport und Sportwissenschaft des KIT zusammengestellt.
|
||||
|
||||
Folgende Features bietet die Aktivpause-App:
|
||||
|
||||
1. Auswahl und Erstellung von Übungssets: Aus den vorhandenen Übungen lassen sich individuelle Übungssets zusammenstellen, die für die Pausen ausgewählt werden können. Es stehen auch vordefinierte Übungssets zur Verfügung, die Ihnen den Start erleichtern.
|
||||
2. Das Übungsspektrum reicht von Übungen zur Aktivierung des Herz-Kreislauf-Systems über Dehnungs- und Kräftigungs- bis hin zu Entspannungsübungen.
|
||||
3. Mit der Filterfunktion können Sie gezielt Übungen nach Körperregion auswählen und etwaige Beschwerden vorbeugen.
|
||||
4. Pausen-Timer: Über das Hauptmenü lässt sich festlegen, wann und wie lange Sie Ihre Aktivpause durchführen möchten. Sobald es an der Zeit ist, bekommen Sie eine Benachrichtigung. Sie haben dann die Möglichkeit, die Aktivpause zu starten oder zu verschieben.
|
||||
5. Integrieren Sie die Aktivpause in Ihren Alltag: Sie können mit einem selbst bestimmten Zeitplan festlegen, um wie viel Uhr und an welchem Tag Sie automatisch an die Pause erinnert werden.
|
||||
|
||||
|
||||
Kontaktieren Sie uns gerne über:
|
||||
|
||||
* Bluesky - @secusoresearch.bsky.social https://bsky.app/profile/secusoresearch.bsky.social
|
||||
* Mastodon - @SECUSO_Research@bawü.social https://xn--baw-joa.social/@SECUSO_Research/
|
||||
* Offene Stellen - https://secuso.aifb.kit.edu/83.php
|
||||
|
|
@ -1,15 +1,8 @@
|
|||
The Aktivpause to Go App allows you to integrate planned breaks into your daily work. You can decide when, where and for how long you want to take breaks and this app will help shape your break in a healthy way. It offers a wide variety of exercises from the well-established Aktivpause program at KIT and was developed by Scientists at the Institute of Sports and Sports Science (IfSS) of KIT. Exercises are currently only provided in german.
|
||||
|
||||
The following features are provided by the app:
|
||||
|
||||
1. Creation and Choice of exercise sets: Individual exercise sets can be created. This makes it easier to complete your favorite exercises faster. The exercise sets can then be chosen to perform during breaks. There are also predefined exercise sets to ease the start into the app.
|
||||
2. There are a wide variety of exercises: Exercises to activate the cardiovascular system, stretching, strength, and relaxation exercises.
|
||||
3. The filter feature lets you easily choose exercises for specific body regions that may help you prevent potential complaints.
|
||||
4. Pause timer: You can choose work and break intervals via the main menu. After the work time is up you will be reminded to take a break. You then are able to start, skip, or postpone the break.
|
||||
5. Integrate the Aktivpause break into your daily routine. You can schedule breaks to start at specific times and days, so you don’t have to think about starting the timer manually to be reminded to take breaks.
|
||||
|
||||
Feel free to contact us via:
|
||||
|
||||
* Bluesky - @secusoresearch.bsky.social https://bsky.app/profile/secusoresearch.bsky.social
|
||||
* Mastodon - @SECUSO_Research@bawü.social https://xn--baw-joa.social/@SECUSO_Research/
|
||||
* Job opening - https://secuso.aifb.kit.edu/english/Job_Offers.php
|
||||
5. Integrate the Aktivpause break into your daily routine. You can schedule breaks to start at specific times and days, so you don’t have to think about starting the timer manually to be reminded to take breaks.
|
||||
|
|
@ -16,8 +16,5 @@
|
|||
# This option should only be used with decoupled projects. More details, visit
|
||||
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
|
||||
# org.gradle.parallel=true
|
||||
android.defaults.buildfeatures.buildconfig=true
|
||||
android.enableJetifier=true
|
||||
android.nonFinalResIds=false
|
||||
android.nonTransitiveRClass=false
|
||||
android.useAndroidX=true
|
||||
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
|
|
@ -1,6 +1,6 @@
|
|||
#Wed May 24 23:28:16 CEST 2023
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit 14ee29f59bc7c3fbaa765cb1be0fcaab4f948b88
|
||||
Subproject commit d9e4a62a7c667de2538681c39394c828f8d26a37
|
||||
Loading…
Add table
Add a link
Reference in a new issue