Merge branch 'origin-6.711' into upstream-6.711 (23f18e18) · Commits · e / os / Mail

.github/ISSUE_TEMPLATE/bug_report.yml

+1 −1

Original line number	Diff line number	Diff line
		@@ -57,7 +57,7 @@ body:
		id: expected
		attributes:
		label: Expected behavior
		description: After following the steps, what did you think K-9 Mail would do?
		description: After following the steps, what did you think Mail would do?
		validations:
		required: true
		- type: textarea

.gitlab-ci.yml

0 → 100644

+79 −0

Original line number	Diff line number	Diff line
		image: "registry.gitlab.e.foundation/e/os/docker-android-apps-cicd:master"

		stages:
		- update-from-upstream
		- build

		before_script:
		- export GRADLE_USER_HOME=$(pwd)/.gradle
		- chmod +x ./gradlew

		cache:
		key: ${CI_PROJECT_ID}
		paths:
		- .gradle/

		test:
		stage: build
		script:
		- ./gradlew test

		build:
		stage: build
		script:
		- ./gradlew :app:k9mail:build
		artifacts:
		paths:
		- app/k9mail/build/outputs/apk/

		.update-from-upstream:
		image: registry.gitlab.e.foundation/e/tools/docker-tools:latest
		stage: update-from-upstream
		rules:
		- if: '$CI_PIPELINE_SOURCE == "schedule" && $CI_COMMIT_REF_NAME == $LOCAL_BRANCH'
		variables:
		CI_PROJECT_SSH_URL: git@gitlab.e.foundation:$CI_PROJECT_PATH
		GIT_STRATEGY: none
		before_script:
		- 'command -v ssh-agent >/dev/null \|\| ( apt-get update -y && apt-get install openssh-client -y )'
		- eval $(ssh-agent -s)
		- echo "${SSH_E_ROBOT_PRIVATE_KEY}" \| tr -d '\r' \| ssh-add -
		- mkdir -p ~/.ssh
		- chmod 700 ~/.ssh
		- echo "${SSH_KNOWN_HOSTS}" > ~/.ssh/known_hosts
		- echo "${SSH_KNOWN_HOSTS}"
		- chmod 644 ~/.ssh/known_hosts
		- git config --global user.email $GITLAB_USER_EMAIL
		- git config --global user.name "$GITLAB_USER_NAME"
		- cd $CI_BUILD_DIR
		- rm -rf $CI_PROJECT_DIR
		- git clone $CI_PROJECT_SSH_URL $CI_PROJECT_DIR
		- cd $CI_PROJECT_DIR
		script:
		# update $UPSTREAM_BRANCH & tags
		- git fetch origin
		- git checkout $UPSTREAM_BRANCH
		- git remote add upstream $UPSTREAM_URL
		- git fetch upstream
		- git pull upstream $UPSTREAM_DEFAULT_BRANCH
		- git push origin $UPSTREAM_BRANCH
		- git push origin --tags
		# checkout to latest tag commit to $TEMP_LATEST_TAG_BRANCH
		- git checkout $(git describe --tags --abbrev=0)
		- git checkout -b $TEMP_LATEST_TAG_BRANCH
		# merge $LOCAL_BRANCH with $TEMP_LATEST_TAG_BRANCH & push
		- git checkout $LOCAL_BRANCH
		- git merge $TEMP_LATEST_TAG_BRANCH
		- git push origin $LOCAL_BRANCH
		# remove unwanted local branch & remote
		- git branch -D $TEMP_LATEST_TAG_BRANCH
		- git remote remove upstream

		update-default-branch:
		extends: .update-from-upstream
		variables:
		LOCAL_BRANCH: main
		UPSTREAM_BRANCH: upstream/master
		UPSTREAM_DEFAULT_BRANCH: main
		UPSTREAM_URL: https://github.com/k9mail/k-9.git
		TEMP_LATEST_TAG_BRANCH: latest_upstream_tag_branch

README.md

+10 −46

Original line number	Diff line number	Diff line
		# K-9 Mail
		# Mail

		[![Latest release](https://img.shields.io/github/release/thundernest/k-9.svg?style=flat-square)](https://github.com/thundernest/k-9/releases/latest)
		[![Latest beta release](https://img.shields.io/github/v/release/thundernest/k-9.svg?include_prereleases&style=flat-square)](https://github.com/thundernest/k-9/releases)
		Mail is an open-source email client for Android.
		Mail is forked from [k9 Mail](https://github.com/k9mail/k-9)

		K-9 Mail is an open-source email client for Android.
		## Authors

		## Download

		K-9 Mail can be downloaded from a couple of sources:

		- [Google Play](https://play.google.com/store/apps/details?id=com.fsck.k9)
		- [F-Droid](https://f-droid.org/repository/browse/?fdid=com.fsck.k9)
		- [Github Releases](https://github.com/thundernest/k-9/releases)

		You might also be interested in becoming a [tester](https://forum.k9mail.app/t/how-do-i-become-a-beta-tester/68) to get an early look at new versions.
		[Authors](https://gitlab.e.foundation/e/os/Mail/-/blob/master/AUTHORS)

		## Release Notes

		Check out the [Release Notes](https://github.com/thundernest/k-9/wiki/ReleaseNotes) to find out what changed
		in each version of K-9 Mail.

		## Need Help?

		If the app is not behaving like it should, you might find these resources helpful:

		- [User Manual](https://docs.k9mail.app/)
		- [Frequently Asked Questions](https://forum.k9mail.app/c/faq)
		- [Support Forum](https://forum.k9mail.app/)

		## Translations

		Interested in helping to translate K-9 Mail? Contribute here:

		- [K-9 Mail localization](https://explore.transifex.com/k-9/k9mail/)

		## Contributing

		Thank you for contributing! If you're unfamiliar with the code, start by reading the [developer documentation](docs/DESIGN.md)

		Please fork this repository and contribute back using [pull requests](https://github.com/thundernest/k-9/pulls).

		Any contributions, large or small, major features, bug fixes, unit/integration tests are welcomed and appreciated
		but will be thoroughly reviewed and discussed.
		Please make sure you read the [Code Style Guidelines](https://github.com/thundernest/k-9/wiki/CodeStyle).

		## Communication
		Check out the [Release Notes](https://gitlab.e.foundation/e/os/Mail/-/releases) to find out what changed
		in each version of Mail.

		Aside from discussing changes in [pull requests](https://github.com/thundernest/k-9/pulls) and
		[issues](https://github.com/thundernest/k-9/issues) we use the following communication services:
		## Privacy Policy

		- Matrix: [#k9mail:matrix.org](https://matrix.to/#/#tb-android:mozilla.org)
		- IRC: [#k9mail on Libera Chat](https://web.libera.chat/#k9mail)
		- [Developer mailing list](https://groups.google.com/forum/#!forum/k-9-dev)
		[Privacy Policy](https://e.foundation/legal-notice-privacy)
		[Terms of service](https://e.foundation/legal-notice-privacy)

		## License

app-feature-preview/src/main/res/drawable-v26/ic_launcher_monochrome.xml

+73 −64

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		~ Copyright ECORP SAS 2022
		~ This program 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
		~ (at your option) any later version.
		~
		~ This program 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 this program. If not, see <https://www.gnu.org/licenses/>.
		-->
		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:aapt="http://schemas.android.com/aapt"
		android:width="108dp"
		android:height="108dp"
		android:viewportWidth="108"
		android:viewportHeight="108">
		<path
		android:pathData="m33.37,60.39l0,3.87l8.26,12.25c0.67,1.16 1.91,1.93 3.35,1.93l18.05,0c1.44,0 2.68,-0.78 3.35,-1.93l0,0L74.63,64.26l0,-3.87z"
		android:strokeLineJoin="miter"
		android:strokeWidth="1.2"
		android:fillColor="#00000000"
		android:strokeColor="#000000"
		android:fillType="evenOdd"
		android:strokeLineCap="butt"/>
		android:pathData="M61.88,55.68L79.19,72.99C79.73,72.26 80.02,71.37 80.02,70.46V37.55L61.88,55.68Z">
		<aapt:attr name="android:fillColor">
		<gradient
		android:startX="70.95"
		android:startY="49.34"
		android:endX="70.95"
		android:endY="91.83"
		android:type="linear">
		<item android:offset="0" android:color="#000000"/>
		<item android:offset="1" android:color="#000000"/>
		</gradient>
		</aapt:attr>
		</path>
		<path
		android:pathData="M43.68,32.02l2.58,0l0,5.16l-2.58,0z"
		android:strokeLineJoin="miter"
		android:strokeWidth="1.46"
		android:fillColor="#000000"
		android:strokeColor="#00000000"
		android:fillType="nonZero"
		android:strokeLineCap="round"/>
		android:pathData="M28.46,36.17L49.27,56.98C49.89,57.6 50.62,58.09 51.44,58.43C52.25,58.77 53.12,58.94 54,58.94C54.88,58.94 55.75,58.77 56.56,58.43C57.38,58.09 58.12,57.6 58.74,56.98L79.54,36.17C79.62,36.1 79.71,36.04 79.81,36.01C79.54,35.14 79,34.38 78.27,33.84C77.53,33.29 76.64,33 75.73,33H32.27C31.35,33 30.46,33.29 29.73,33.83C28.99,34.38 28.45,35.14 28.18,36.01C28.28,36.04 28.38,36.09 28.46,36.17Z">
		<aapt:attr name="android:fillColor">
		<gradient
		android:startX="53.99"
		android:startY="47.89"
		android:endX="53.99"
		android:endY="93.78"
		android:type="linear">
		<item android:offset="0" android:color="#000000"/>
		<item android:offset="1" android:color="#000000"/>
		</gradient>
		</aapt:attr>
		</path>
		<path
		android:pathData="M61.74,32.02l2.58,0l0,5.16l-2.58,0z"
		android:strokeLineJoin="miter"
		android:strokeWidth="1.46"
		android:fillColor="#000000"
		android:strokeColor="#00000000"
		android:fillType="nonZero"
		android:strokeLineCap="round"/>
		android:pathData="M28,37.55V70.46C28,71.37 28.29,72.26 28.83,72.99L46.14,55.68L28,37.55Z">
		<aapt:attr name="android:fillColor">
		<gradient
		android:startX="37.07"
		android:startY="49.34"
		android:endX="37.07"
		android:endY="91.83"
		android:type="linear">
		<item android:offset="0" android:color="#000000"/>
		<item android:offset="1" android:color="#000000"/>
		</gradient>
		</aapt:attr>
		</path>
		<path
		android:pathData="M48.84,27.51L48.84,30.09A1.93,1.93 0,0 1,46.91 32.02L39.17,32.02A1.93,1.93 0,0 1,37.24 30.09L37.24,27.51A1.93,1.93 0,0 1,39.17 25.57L46.91,25.57A1.93,1.93 0,0 1,48.84 27.51z"
		android:strokeLineJoin="miter"
		android:strokeWidth="1.2"
		android:fillColor="#00000000"
		android:strokeColor="#000000"
		android:fillType="nonZero"
		android:strokeLineCap="round"/>
		<path
		android:pathData="M70.76,27.51L70.76,30.09A1.93,1.93 0,0 1,68.83 32.02L61.09,32.02A1.93,1.93 0,0 1,59.16 30.09L59.16,27.51A1.93,1.93 0,0 1,61.09 25.57L68.83,25.57A1.93,1.93 0,0 1,70.76 27.51z"
		android:strokeLineJoin="miter"
		android:strokeWidth="1.2"
		android:fillColor="#00000000"
		android:strokeColor="#000000"
		android:fillType="nonZero"
		android:strokeLineCap="round"/>
		<path
		android:pathData="M33.37,34.6C31.23,34.6 29.5,36.33 29.5,38.47L29.5,60.39C29.5,62.53 31.23,64.26 33.37,64.26L74.63,64.26C76.77,64.26 78.5,62.53 78.5,60.39L78.5,38.47C78.5,36.33 76.77,34.6 74.63,34.6L33.37,34.6zM34.38,38.83A0.97,0.97 82.66,0 1,35.11 38.91L54,48.98L72.89,38.91A0.97,0.97 124.49,0 1,74.2 39.3A0.97,0.97 60.28,0 1,73.8 40.61L54,51.17L34.2,40.61A0.97,0.97 0,0 1,33.8 39.3A0.97,0.97 65.26,0 1,34.38 38.83z"
		android:strokeLineJoin="miter"
		android:strokeWidth="0.11"
		android:fillColor="#000000"
		android:strokeColor="#00000000"
		android:fillType="nonZero"
		android:strokeLineCap="round"/>
		<path
		android:pathData="M57.87,73.93L57.87,77.8A1.93,1.93 0,0 1,55.93 79.73L52.07,79.73A1.93,1.93 125.04,0 1,50.13 77.8L50.13,73.93A1.93,1.93 87.01,0 1,52.07 72L55.93,72A1.93,1.93 0,0 1,57.87 73.93z"
		android:strokeLineJoin="miter"
		android:strokeWidth="0.11"
		android:fillColor="#000000"
		android:strokeColor="#00000000"
		android:fillType="nonZero"
		android:strokeLineCap="round"/>
		<path
		android:pathData="M54,78.44m-3.87,0a3.87,3.87 134.88,1 1,7.74 0a3.87,3.87 45.24,1 1,-7.74 0"
		android:strokeLineJoin="miter"
		android:strokeWidth="2.9"
		android:fillColor="#000000"
		android:strokeColor="#00000000"
		android:fillType="nonZero"
		android:strokeLineCap="round"/>
		android:pathData="M60.96,56.6L59.66,57.9C58.92,58.65 58.04,59.24 57.08,59.64C56.11,60.04 55.07,60.25 54.03,60.25C52.98,60.25 51.94,60.04 50.97,59.64C50.01,59.24 49.13,58.65 48.39,57.9L47.09,56.6L29.78,73.91C30.51,74.45 31.4,74.74 32.31,74.74H75.77C76.68,74.74 77.57,74.45 78.3,73.91L60.96,56.6Z">
		<aapt:attr name="android:fillColor">
		<gradient
		android:startX="54.04"
		android:startY="52.48"
		android:endX="54.04"
		android:endY="92.63"
		android:type="linear">
		<item android:offset="0" android:color="#000000"/>
		<item android:offset="1" android:color="#000000"/>
		</gradient>
		</aapt:attr>
		</path>
		</vector>

app-feature-preview/src/main/res/drawable/ic_launcher_foreground.xml

+75 −95

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		~ Copyright ECORP SAS 2022
		~ This program 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
		~ (at your option) any later version.
		~
		~ This program 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 this program. If not, see <https://www.gnu.org/licenses/>.
		-->
		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:aapt="http://schemas.android.com/aapt"
		android:width="108dp"
		android:height="108dp"
		android:viewportWidth="192"
		android:viewportHeight="192">
		<group
		android:scaleX="0.52411765"
		android:scaleY="0.52411765"
		android:translateX="45.684708"
		android:translateY="44.75294">
		<path
		android:fillAlpha="0.2"
		android:fillColor="#000000"
		android:pathData="M50,12C46.68,12 44,14.68 44,18V26C44,29.32 46.68,32 50,32H64V48H72V32H74C77.32,32 80,29.32 80,26V18C80,14.68 77.32,12 74,12H50ZM118,12C114.68,12 112,14.68 112,18V26C112,29.32 114.68,32 118,32H120V48H128V32H142C145.32,32 148,29.32 148,26V18C148,14.68 145.32,12 142,12H118ZM32,120V132L57.61,170C59.68,173.59 63.54,176 68,176H124C128.46,176 132.32,173.59 134.39,170H134.4L160,132V120H32Z"
		android:strokeAlpha="0.2" />
		<path
		android:fillAlpha="0.2"
		android:fillColor="#000000"
		android:pathData="M50,8C46.68,8 44,10.68 44,14V22C44,25.32 46.68,28 50,28H64V44H72V28H74C77.32,28 80,25.32 80,22V14C80,10.68 77.32,8 74,8H50ZM118,8C114.68,8 112,10.68 112,14V22C112,25.32 114.68,28 118,28H120V44H128V28H142C145.32,28 148,25.32 148,22V14C148,10.68 145.32,8 142,8H118ZM32,116V128L57.61,166C59.68,169.59 63.54,172 68,172H124C128.46,172 132.32,169.59 134.39,166H134.4L160,128V116H32Z"
		android:strokeAlpha="0.2" />
		<path
		android:fillAlpha="0.2"
		android:fillColor="#000000"
		android:pathData="M24,116L32,128L57.61,166C59.68,169.59 63.54,172 68,172H124C128.46,172 132.32,169.59 134.39,166H134.4L160,128L168,116H24Z"
		android:strokeAlpha="0.2" />
		<path
		android:fillColor="#607D8B"
		android:pathData="M32,116V128L57.61,166C59.68,169.59 63.54,172 68,172H124C128.46,172 132.32,169.59 134.39,166H134.4L160.01,128V116H32Z" />
		<path
		android:fillColor="#263238"
		android:pathData="M72,16H64V44H72V16Z" />
		<path
		android:fillColor="#263238"
		android:pathData="M128,16H120V44H128V16Z" />
		<path
		android:fillColor="#4D6570"
		android:pathData="M32,127V128L57.61,166C59.68,169.59 63.54,172 68,172H124C128.46,172 132.32,169.59 134.39,166H134.4L160,128V127L134.4,165H134.39C132.32,168.59 128.46,171 124,171H68C63.54,171 59.68,168.59 57.61,165L32,127Z" />
		<path
		android:fillColor="#607D8B"
		android:pathData="M80,22V14C80,10.69 77.31,8 74,8L50,8C46.69,8 44,10.69 44,14V22C44,25.31 46.69,28 50,28L74,28C77.31,28 80,25.31 80,22Z" />
		<path
		android:fillColor="#607D8B"
		android:pathData="M148,22V14C148,10.69 145.31,8 142,8L118,8C114.69,8 112,10.69 112,14V22C112,25.31 114.69,28 118,28L142,28C145.31,28 148,25.31 148,22Z" />
		<path
		android:fillColor="#4D6570"
		android:pathData="M44,21V22C44,25.32 46.68,28 50,28H74C77.32,28 80,25.32 80,22V21C80,24.32 77.32,27 74,27H50C46.68,27 44,24.32 44,21Z" />
		<path
		android:fillColor="#4D6570"
		android:pathData="M112,21V22C112,25.32 114.68,28 118,28H142C145.32,28 148,25.32 148,22V21C148,24.32 145.32,27 142,27H118C114.68,27 112,24.32 112,21Z" />
		<path
		android:fillColor="#8097A2"
		android:pathData="M50,8C46.68,8 44,10.68 44,14V15C44,11.68 46.68,9 50,9H74C77.32,9 80,11.68 80,15V14C80,10.68 77.32,8 74,8H50Z" />
		<path
		android:fillColor="#8097A2"
		android:pathData="M118,8C114.68,8 112,10.68 112,14V15C112,11.68 114.68,9 118,9H142C145.32,9 148,11.68 148,15V14C148,10.68 145.32,8 142,8H118Z" />
		<path
		android:fillAlpha="0.2"
		android:fillColor="#1A252A"
		android:pathData="M171.99,120V52C171.99,45.37 166.62,40 159.99,40L31.99,40C25.37,40 19.99,45.37 19.99,52V120C19.99,126.62 25.37,132 31.99,132H159.99C166.62,132 171.99,126.62 171.99,120Z"
		android:strokeAlpha="0.2" />
		<path
		android:fillColor="@color/ic_launcher_logo_main"
		android:pathData="M172,116V48C172,41.37 166.63,36 160,36L32,36C25.37,36 20,41.37 20,48V116C20,122.63 25.37,128 32,128H160C166.63,128 172,122.63 172,116Z" />
		<path
		android:fillColor="#00000000"
		android:pathData="M36,52L96,84L156,52"
		android:strokeWidth="6"
		android:strokeColor="#FBE9E7"
		android:strokeLineCap="round" />
		<path
		android:fillColor="@color/ic_launcher_logo_main"
		android:pathData="M32,36C25.35,36 20,41.35 20,48V49C20,42.35 25.35,37 32,37H160C166.65,37 172,42.35 172,49V48C172,41.35 166.65,36 160,36H32Z" />
		<path
		android:fillColor="@color/ic_launcher_logo_shadow"
		android:pathData="M20,115V116C20,122.65 25.35,128 32,128H160C166.65,128 172,122.65 172,116V115C172,121.65 166.65,127 160,127H32C25.35,127 20,121.65 20,115Z" />
		<path
		android:fillAlpha="0.2"
		android:fillColor="#000000"
		android:pathData="M90,156C86.68,156 84,158.68 84,162V174C84,174.27 84.03,174.54 84.06,174.8C84.06,174.8 84.06,174.81 84.06,174.81C84.02,175.2 84,175.6 84,176C84,179.18 85.26,182.23 87.51,184.48C89.77,186.73 92.82,188 96,188C99.18,188 102.24,186.73 104.49,184.48C106.74,182.23 108,179.18 108,176C108,175.61 107.97,175.23 107.93,174.85C107.97,174.57 108,174.29 108,174V162C108,158.67 105.33,156 102,156L90,156Z"
		android:strokeAlpha="0.2" />
		<path
		android:fillAlpha="0.2"
		android:fillColor="#000000"
		android:pathData="M90,152C86.68,152 84,154.68 84,158V170C84,170.27 84.03,170.54 84.06,170.8C84.06,170.8 84.06,170.81 84.06,170.81C84.02,171.2 84,171.6 84,172C84,175.18 85.26,178.23 87.51,180.48C89.77,182.73 92.82,184 96,184C99.18,184 102.24,182.73 104.49,180.48C106.74,178.23 108,175.18 108,172C108,171.61 107.97,171.23 107.93,170.85C107.97,170.57 108,170.29 108,170V158C108,154.67 105.33,152 102,152L90,152Z"
		android:strokeAlpha="0.2" />
		<path
		android:fillColor="#263238"
		android:pathData="M108,170V158C108,154.69 105.31,152 102,152H90C86.69,152 84,154.69 84,158V170C84,173.31 86.69,176 90,176H102C105.31,176 108,173.31 108,170Z" />
		<path
		android:fillColor="#263238"
		android:pathData="M96,184C102.63,184 108,178.63 108,172C108,165.37 102.63,160 96,160C89.37,160 84,165.37 84,172C84,178.63 89.37,184 96,184Z" />
		<path
		android:fillColor="#37474F"
		android:pathData="M90,152C86.68,152 84,154.68 84,158V159C84,155.68 86.68,153 90,153H102C105.32,153 108,155.68 108,159V158C108,154.68 105.32,152 102,152H90Z" />
		<path
		android:fillColor="#1A252A"
		android:pathData="M84.02,171.43C84.01,171.62 84,171.81 84,172C84,175.18 85.26,178.24 87.51,180.49C89.77,182.74 92.82,184 96,184C99.18,184 102.24,182.74 104.49,180.49C106.74,178.24 108,175.18 108,172C108,171.86 107.99,171.73 107.98,171.59C107.83,174.67 106.5,177.57 104.27,179.69C102.04,181.81 99.08,183 96,183C92.89,183 89.91,181.79 87.68,179.63C85.44,177.47 84.13,174.53 84.02,171.43Z" />
		</group>
		android:viewportWidth="108"
		android:viewportHeight="108">
		<path
		android:pathData="M61.88,55.68L79.19,72.99C79.73,72.26 80.02,71.37 80.02,70.46V37.55L61.88,55.68Z">
		<aapt:attr name="android:fillColor">
		<gradient
		android:startX="70.95"
		android:startY="49.34"
		android:endX="70.95"
		android:endY="91.83"
		android:type="linear">
		<item android:offset="0" android:color="#FFFFFFFF"/>
		<item android:offset="1" android:color="#FFCBD6EA"/>
		</gradient>
		</aapt:attr>
		</path>
		<path
		android:pathData="M28.46,36.17L49.27,56.98C49.89,57.6 50.62,58.09 51.44,58.43C52.25,58.77 53.12,58.94 54,58.94C54.88,58.94 55.75,58.77 56.56,58.43C57.38,58.09 58.12,57.6 58.74,56.98L79.54,36.17C79.62,36.1 79.71,36.04 79.81,36.01C79.54,35.14 79,34.38 78.27,33.84C77.53,33.29 76.64,33 75.73,33H32.27C31.35,33 30.46,33.29 29.73,33.83C28.99,34.38 28.45,35.14 28.18,36.01C28.28,36.04 28.38,36.09 28.46,36.17Z">
		<aapt:attr name="android:fillColor">
		<gradient
		android:startX="53.99"
		android:startY="47.89"
		android:endX="53.99"
		android:endY="93.78"
		android:type="linear">
		<item android:offset="0" android:color="#FFFFFFFF"/>
		<item android:offset="1" android:color="#FFCBD6EA"/>
		</gradient>
		</aapt:attr>
		</path>
		<path
		android:pathData="M28,37.55V70.46C28,71.37 28.29,72.26 28.83,72.99L46.14,55.68L28,37.55Z">
		<aapt:attr name="android:fillColor">
		<gradient
		android:startX="37.07"
		android:startY="49.34"
		android:endX="37.07"
		android:endY="91.83"
		android:type="linear">
		<item android:offset="0" android:color="#FFFFFFFF"/>
		<item android:offset="1" android:color="#FFCBD6EA"/>
		</gradient>
		</aapt:attr>
		</path>
		<path
		android:pathData="M60.96,56.6L59.66,57.9C58.92,58.65 58.04,59.24 57.08,59.64C56.11,60.04 55.07,60.25 54.03,60.25C52.98,60.25 51.94,60.04 50.97,59.64C50.01,59.24 49.13,58.65 48.39,57.9L47.09,56.6L29.78,73.91C30.51,74.45 31.4,74.74 32.31,74.74H75.77C76.68,74.74 77.57,74.45 78.3,73.91L60.96,56.6Z">
		<aapt:attr name="android:fillColor">
		<gradient
		android:startX="54.04"
		android:startY="52.48"
		android:endX="54.04"
		android:endY="92.63"
		android:type="linear">
		<item android:offset="0" android:color="#FFFFFFFF"/>
		<item android:offset="1" android:color="#FFCBD6EA"/>
		</gradient>
		</aapt:attr>
		</path>
		</vector>