ProtonMail
/
proton-mail-android
mirror of https://github.com/ProtonMail/proton-mail-android
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Added Core rebranding base. 

Replaced Custom Themes by Core Themes.
Replaced Launcher Icons.
Replaced Splash Screen supporting AndroidX SplashScreen API.
This commit is contained in:
Neil Marietta 2022-03-01 10:30:33 +01:00 committed by Zorica Stojchevska
parent 30e5087084
commit c6516812cc
41 changed files with 295 additions and 211 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/build.gradle.kts
View File

@ -330,6 +330,7 @@ dependencies {
// Android
`android-annotation`,
`android-biometric`,
`android-core-splashscreen`,
`android-fragment`,
`android-flexbox`,
`android-ktx`,

BIN
app/src/beta/ic_launcher-playstore.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 18 KiB

78
app/src/beta/res/drawable-v24/ic_launcher_foreground.xml Normal file
View File

@ -0,0 +1,78 @@
<!--
~ Copyright (c) 2022 Proton Technologies AG
~
~ This file is part of ProtonMail.
~
~ ProtonMail 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.
~
~ ProtonMail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
-->
<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt">
<aapt:attr name="android:drawable">
<vector
android:width="552dp"
android:height="552dp"
android:viewportWidth="552"
android:viewportHeight="552">
<group
android:pivotX="276.0"
android:pivotY="276.0"
android:scaleX="0.70"
android:scaleY="0.70">
<path
android:fillColor="@color/pacific_base"
android:pathData="M102,149.043C102,142.266 109.898,138.559 115.111,142.888L253,257.4C266.334,268.473 285.666,268.473 299,257.4L436.889,142.888C442.102,138.559 450,142.266 450,149.043V384C450,403.882 433.882,420 414,420H138C118.118,420 102,403.882 102,384V149.043Z" />
<path
android:fillType="evenOdd"
android:pathData="M322.981,237.457L323,237.473L253.558,298.814C241.728,309.263 224.046,309.526 211.911,299.434L102,208.026V149.015C102,142.239 109.898,138.532 115.111,142.861L253,257.372C266.334,268.446 285.666,268.446 299,257.372L322.981,237.457Z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="285.177"
android:endY="-61.1683"
android:startX="364.5"
android:startY="277.473"
android:type="linear">
<item
android:color="#FFE2DBFF"
android:offset="0" />
<item
android:color="@color/pacific_base"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path
android:fillType="evenOdd"
android:pathData="M376,193.455V420H414C433.882,420 450,403.881 450,384V149.043C450,142.266 442.102,138.558 436.889,142.889L376,193.455Z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="285.302"
android:endY="25.2311"
android:startX="556"
android:startY="603.5"
android:type="linear">
<item
android:color="#FFE2DBFF"
android:offset="0.271019" />
<item
android:color="@color/pacific_base"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
</group>
</vector>
</aapt:attr>
</animated-vector>

78
app/src/beta/res/drawable-v24/ic_logo_mail_no_bg_scaled.xml Normal file
View File

@ -0,0 +1,78 @@
<!--
~ Copyright (c) 2022 Proton Technologies AG
~
~ This file is part of ProtonMail.
~
~ ProtonMail 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.
~
~ ProtonMail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
-->
<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt">
<aapt:attr name="android:drawable">
<vector
android:width="552dp"
android:height="552dp"
android:viewportWidth="552"
android:viewportHeight="552">
<group
android:pivotX="276.0"
android:pivotY="276.0"
android:scaleX="0.70"
android:scaleY="0.70">
<path
android:fillColor="@color/pacific_base"
android:pathData="M102,149.043C102,142.266 109.898,138.559 115.111,142.888L253,257.4C266.334,268.473 285.666,268.473 299,257.4L436.889,142.888C442.102,138.559 450,142.266 450,149.043V384C450,403.882 433.882,420 414,420H138C118.118,420 102,403.882 102,384V149.043Z" />
<path
android:fillType="evenOdd"
android:pathData="M322.981,237.457L323,237.473L253.558,298.814C241.728,309.263 224.046,309.526 211.911,299.434L102,208.026V149.015C102,142.239 109.898,138.532 115.111,142.861L253,257.372C266.334,268.446 285.666,268.446 299,257.372L322.981,237.457Z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="285.177"
android:endY="-61.1683"
android:startX="364.5"
android:startY="277.473"
android:type="linear">
<item
android:color="#FFE2DBFF"
android:offset="0" />
<item
android:color="@color/pacific_base"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path
android:fillType="evenOdd"
android:pathData="M376,193.455V420H414C433.882,420 450,403.881 450,384V149.043C450,142.266 442.102,138.558 436.889,142.889L376,193.455Z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="285.302"
android:endY="25.2311"
android:startX="556"
android:startY="603.5"
android:type="linear">
<item
android:color="#FFE2DBFF"
android:offset="0.271019" />
<item
android:color="@color/pacific_base"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
</group>
</vector>
</aapt:attr>
</animated-vector>

34
app/src/beta/res/drawable/ic_launcher_foreground.xml
View File

@ -1,34 +0,0 @@
<!--
~ Copyright (c) 2022 Proton AG
~
~ This file is part of Proton Mail.
~
~ Proton Mail 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.
~
~ Proton Mail 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 Proton Mail. If not, see https://www.gnu.org/licenses/.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="1055.1818"
android:viewportHeight="1055.1818">
<group android:translateX="389.9909"
android:translateY="334.1409">
<path
android:pathData="M215.7,169.9H59.4v-47c15.9,-62.9 78.1,-63.7 78.1,-63.7s62.3,0.9 78.1,63.7L215.7,169.9L215.7,169.9zM137.6,0C137.6,0 23.5,-3.7 0,122.8V209c0,0 1,9.2 26.9,28c25.9,18.7 93.1,71.5 110.7,71.5s84.8,-52.8 110.7,-71.5c25.9,-18.7 26.9,-28 26.9,-28v-86.2C251.7,-3.7 137.6,0 137.6,0"
android:fillColor="#FFFFFF"/>
<path
android:pathData="M137.6,328c0,0 -17.7,-1.7 -31.5,-11.3C92.3,307.1 0,241.2 0,241.2v130.5c0,0 0.8,15.2 17.5,15.2s120.1,0 120.1,0s103.4,0 120.1,0s17.5,-15.2 17.5,-15.2V241.1c0,0 -92.3,65.9 -106.1,75.5C155.3,326.2 137.6,328 137.6,328"
android:fillColor="#FFFFFF"/>
</group>
</vector>

20
app/src/beta/res/mipmap-anydpi-v26/ic_launcher.xml
View File

@ -1,23 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (c) 2022 Proton AG
~
~ This file is part of Proton Mail.
~
~ Proton Mail 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.
~
~ Proton Mail 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 Proton Mail. If not, see https://www.gnu.org/licenses/.
-->
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@drawable/ic_launcher_foreground"/>
</adaptive-icon>
</adaptive-icon>

20
app/src/beta/res/mipmap-anydpi-v26/ic_launcher_round.xml
View File

@ -1,23 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (c) 2022 Proton AG
~
~ This file is part of Proton Mail.
~
~ Proton Mail 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.
~
~ Proton Mail 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 Proton Mail. If not, see https://www.gnu.org/licenses/.
-->
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@drawable/ic_launcher_foreground"/>
</adaptive-icon>
</adaptive-icon>

BIN
app/src/beta/res/mipmap-hdpi/ic_launcher.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
app/src/beta/res/mipmap-hdpi/ic_launcher_round.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

BIN
app/src/beta/res/mipmap-mdpi/ic_launcher.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 992 B

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
app/src/beta/res/mipmap-mdpi/ic_launcher_round.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
app/src/beta/res/mipmap-xhdpi/ic_launcher.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
app/src/beta/res/mipmap-xhdpi/ic_launcher_round.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.7 KiB

After

Width:  |  Height:  |  Size: 5.6 KiB

BIN
app/src/beta/res/mipmap-xxhdpi/ic_launcher.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

BIN
app/src/beta/res/mipmap-xxhdpi/ic_launcher_round.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.2 KiB

After

Width:  |  Height:  |  Size: 8.8 KiB

BIN
app/src/beta/res/mipmap-xxxhdpi/ic_launcher.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

BIN
app/src/beta/res/mipmap-xxxhdpi/ic_launcher_round.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 13 KiB

22
app/src/beta/res/values/ic_launcher_background.xml
View File

@ -1,22 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (c) 2022 Proton AG
~
~ This file is part of Proton Mail.
~
~ Proton Mail 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.
~
~ Proton Mail 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 Proton Mail. If not, see https://www.gnu.org/licenses/.
-->
<resources>
<color name="ic_launcher_background">@color/icon_background</color>
</resources>
<color name="ic_launcher_background">#FFFFFF</color>
</resources>

4
app/src/main/AndroidManifest.xml
View File

@ -74,7 +74,7 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:label="@string/app_name"
android:largeHeap="true"
android:theme="@style/ProtonTheme.Mail"
android:theme="@style/ProtonTheme.Mail.V5"
android:taskAffinity=""
tools:replace="android:theme">
<!-- Disable Core SentryInitProvider. Replaced by SentryInitializer -->
@ -183,7 +183,7 @@
android:exported="true"
android:launchMode="standard"
android:maxRecents="1"
android:theme="@style/ProtonTheme.Splash.Mail.Light">
android:theme="@style/ProtonTheme.Splash.Mail.V5">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />

BIN
app/src/main/ic_launcher-playstore.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 18 KiB

6
app/src/main/java/ch/protonmail/android/mailbox/presentation/ui/MailboxActivity.kt
View File

@ -43,6 +43,7 @@ import androidx.activity.viewModels
import androidx.annotation.IdRes
import androidx.constraintlayout.widget.ConstraintLayout
import androidx.core.os.postDelayed
import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
import androidx.core.view.isVisible
import androidx.core.view.postDelayed
import androidx.lifecycle.Observer
@ -90,6 +91,7 @@ import ch.protonmail.android.events.MailboxLoadedEvent
import ch.protonmail.android.events.MailboxNoMessagesEvent
import ch.protonmail.android.events.SettingsChangedEvent
import ch.protonmail.android.events.Status
import ch.protonmail.android.feature.account.AccountStateManager
import ch.protonmail.android.labels.domain.model.Label
import ch.protonmail.android.labels.domain.model.LabelId
import ch.protonmail.android.labels.domain.model.LabelType
@ -249,7 +251,9 @@ internal class MailboxActivity :
override fun getLayoutId(): Int = R.layout.activity_mailbox
override fun onCreate(savedInstanceState: Bundle?) {
setTheme(R.style.ProtonTheme_Mail)
installSplashScreen().setKeepOnScreenCondition {
accountStateManager.state.value != AccountStateManager.State.PrimaryExist
}
super.onCreate(savedInstanceState)
// TODO if we decide to use special flag for switching (and not login), change this

78
app/src/main/res/drawable-v24/ic_launcher_foreground.xml Normal file
View File

@ -0,0 +1,78 @@
<!--
~ Copyright (c) 2022 Proton Technologies AG
~
~ This file is part of ProtonMail.
~
~ ProtonMail 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.
~
~ ProtonMail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
-->
<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt">
<aapt:attr name="android:drawable">
<vector
android:width="552dp"
android:height="552dp"
android:viewportWidth="552"
android:viewportHeight="552">
<group
android:pivotX="276.0"
android:pivotY="276.0"
android:scaleX="0.70"
android:scaleY="0.70">
<path
android:fillColor="#6D4AFF"
android:pathData="M102,149.043C102,142.266 109.898,138.559 115.111,142.888L253,257.4C266.334,268.473 285.666,268.473 299,257.4L436.889,142.888C442.102,138.559 450,142.266 450,149.043V384C450,403.882 433.882,420 414,420H138C118.118,420 102,403.882 102,384V149.043Z" />
<path
android:fillType="evenOdd"
android:pathData="M322.981,237.457L323,237.473L253.558,298.814C241.728,309.263 224.046,309.526 211.911,299.434L102,208.026V149.015C102,142.239 109.898,138.532 115.111,142.861L253,257.372C266.334,268.446 285.666,268.446 299,257.372L322.981,237.457Z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="285.177"
android:endY="-61.1683"
android:startX="364.5"
android:startY="277.473"
android:type="linear">
<item
android:color="#FFE2DBFF"
android:offset="0" />
<item
android:color="#FF6D4AFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
<path
android:fillType="evenOdd"
android:pathData="M376,193.455V420H414C433.882,420 450,403.881 450,384V149.043C450,142.266 442.102,138.558 436.889,142.889L376,193.455Z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="285.302"
android:endY="25.2311"
android:startX="556"
android:startY="603.5"
android:type="linear">
<item
android:color="#FFE2DBFF"
android:offset="0.271019" />
<item
android:color="#FF6D4AFF"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
</group>
</vector>
</aapt:attr>
</animated-vector>

34
app/src/main/res/drawable/ic_launcher_foreground.xml
View File

@ -1,34 +0,0 @@
<!--
~ Copyright (c) 2022 Proton AG
~
~ This file is part of Proton Mail.
~
~ Proton Mail 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.
~
~ Proton Mail 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 Proton Mail. If not, see https://www.gnu.org/licenses/.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="1055.1818"
android:viewportHeight="1055.1818">
<group android:translateX="389.9909"
android:translateY="334.1409">
<path
android:pathData="M215.7,169.9H59.4v-47c15.9,-62.9 78.1,-63.7 78.1,-63.7s62.3,0.9 78.1,63.7L215.7,169.9L215.7,169.9zM137.6,0C137.6,0 23.5,-3.7 0,122.8V209c0,0 1,9.2 26.9,28c25.9,18.7 93.1,71.5 110.7,71.5s84.8,-52.8 110.7,-71.5c25.9,-18.7 26.9,-28 26.9,-28v-86.2C251.7,-3.7 137.6,0 137.6,0"
android:fillColor="#FFFFFF"/>
<path
android:pathData="M137.6,328c0,0 -17.7,-1.7 -31.5,-11.3C92.3,307.1 0,241.2 0,241.2v130.5c0,0 0.8,15.2 17.5,15.2s120.1,0 120.1,0s103.4,0 120.1,0s17.5,-15.2 17.5,-15.2V241.1c0,0 -92.3,65.9 -106.1,75.5C155.3,326.2 137.6,328 137.6,328"
android:fillColor="#FFFFFF"/>
</group>
</vector>

20
app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
View File

@ -1,23 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (c) 2022 Proton AG
~
~ This file is part of Proton Mail.
~
~ Proton Mail 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.
~
~ Proton Mail 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 Proton Mail. If not, see https://www.gnu.org/licenses/.
-->
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@drawable/ic_launcher_foreground"/>
</adaptive-icon>
</adaptive-icon>

20
app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
View File

@ -1,23 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (c) 2022 Proton AG
~
~ This file is part of Proton Mail.
~
~ Proton Mail 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.
~
~ Proton Mail 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 Proton Mail. If not, see https://www.gnu.org/licenses/.
-->
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@drawable/ic_launcher_foreground"/>
</adaptive-icon>
</adaptive-icon>

BIN
app/src/main/res/mipmap-hdpi/ic_launcher.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
app/src/main/res/mipmap-hdpi/ic_launcher_round.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

BIN
app/src/main/res/mipmap-mdpi/ic_launcher.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 984 B

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
app/src/main/res/mipmap-mdpi/ic_launcher_round.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
app/src/main/res/mipmap-xhdpi/ic_launcher.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_launcher.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.9 KiB

After

Width:  |  Height:  |  Size: 8.8 KiB

BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 5.6 KiB

BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.8 KiB

After

Width:  |  Height:  |  Size: 13 KiB

22
app/src/main/res/values/ic_launcher_background.xml
View File

@ -1,22 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (c) 2022 Proton AG
~
~ This file is part of Proton Mail.
~
~ Proton Mail 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.
~
~ Proton Mail 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 Proton Mail. If not, see https://www.gnu.org/licenses/.
-->
<resources>
<color name="ic_launcher_background">@color/icon_background</color>
</resources>
<color name="ic_launcher_background">#FFFFFF</color>
</resources>

23
app/src/main/res/values/styles.xml
View File

@ -19,29 +19,6 @@
<resources>
<!-- region V4 -->
<style name="ProtonTheme.Splash.Mail.Light">
<item name="proton_background_norm">@color/background_norm</item>
<item name="proton_text_norm">@color/text_norm</item>
</style>
<style name="ProtonTheme.Mail" parent="ProtonTheme">
<item name="windowActionModeOverlay">true</item>
<item name="actionModeStyle">@style/ProtonMailActionMode</item>
<item name="actionModeCloseDrawable">@drawable/ic_arrow_left</item>
<item name="bottomSheetDialogTheme">@style/ProtonMail.BottomSheetDialogTheme</item>
<item name="colorControlHighlight">@color/interaction_weak_pressed</item>
<item name="statusBarBackground">@color/status_bar</item>
<item name="android:navigationBarColor">@color/nav_bar</item>
<item name="android:statusBarColor">@color/transparent</item>
<item name="snackbarStyle">@style/Widget.App.Snackbar</item>
<item name="snackbarButtonStyle">@style/Widget.App.SnackbarButton</item>
<item name="elevationOverlayEnabled">false</item>
</style>
<style name="ProtonMailActionMode" parent="Widget.AppCompat.ActionMode">
<item name="height">?attr/actionBarSize</item>
<item name="background">@color/background_norm</item>

42
app/src/main/res/values/themes.xml Normal file
View File

@ -0,0 +1,42 @@
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright (c) 2022 Proton Technologies AG
~
~ This file is part of ProtonMail.
~
~ ProtonMail 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.
~
~ ProtonMail 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 ProtonMail. If not, see https://www.gnu.org/licenses/.
-->
<resources>
<style name="ProtonTheme.Mail.V5" parent="ProtonTheme.Mail">
<item name="windowActionModeOverlay">true</item>
<item name="actionModeStyle">@style/ProtonMailActionMode</item>
<item name="actionModeCloseDrawable">@drawable/ic_arrow_left</item>
<item name="bottomSheetDialogTheme">@style/ProtonMail.BottomSheetDialogTheme</item>
<item name="colorControlHighlight">@color/interaction_weak_pressed</item>
<item name="statusBarBackground">@color/status_bar</item>
<item name="android:navigationBarColor">@color/nav_bar</item>
<item name="android:statusBarColor">@color/transparent</item>
<item name="snackbarStyle">@style/Widget.App.Snackbar</item>
<item name="snackbarButtonStyle">@style/Widget.App.SnackbarButton</item>
<item name="elevationOverlayEnabled">false</item>
</style>
<style name="ProtonTheme.Splash.Mail.V5" parent="ProtonTheme.Splash.Mail">
<item name="postSplashScreenTheme">@style/ProtonTheme.Mail.V5</item>
</style>
</resources>

1
buildSrc/src/main/kotlin/libraries.kt
View File

@ -68,6 +68,7 @@ fun DependencyHandler.proton(module: String, moduleSuffix: String? = null, versi
// region Android
val DependencyHandler.`android-biometric` get() = androidx("biometric") version `android-biometric version`
val DependencyHandler.`android-core-splashscreen` get() = androidx("core", moduleSuffix = "splashscreen") version `android-core-splashscreen version`
val DependencyHandler.`android-flexbox` get() = google("android", "flexbox") version `flexbox version`
val DependencyHandler.`android-fragment` get() = androidx("fragment", moduleSuffix = "ktx") version `android-fragment version`
val DependencyHandler.`android-media` get() = androidx("media") version `android-media version`

1
buildSrc/src/main/kotlin/versionsConfig.kt
View File

@ -79,6 +79,7 @@ const val `junit-ktx version` = "1.1.2" // Released: Aug
// Android
const val `android-biometric version` = "1.0.1" // Released: Jan 23, 2020
const val `android-core-splashscreen version` = "1.0.0-beta01" // Released: Jan 12, 2022
const val `android-fragment version` = "1.3.6" // Released: Jul 21, 2021
const val `android-media version` = "1.1.0" // Released: Sep 06, 2019
const val `android-preference version` = "1.1.1" // Released: Apr 15, 2020

2
gradle.properties
View File

@ -50,4 +50,4 @@ org.aspectj.weaver.Dump.exception=false
android.jetifier.ignorelist=bcprov-jdk15on
# By default use core libs from Git Submodule.
useCoreGitSubmodule=false
useCoreGitSubmodule=true