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

Fixed App Theme & Splash.

This commit is contained in:
Neil Marietta 2021-05-03 19:22:38 +02:00
parent 599b6d6d24
commit 7e82e972c7
13 changed files with 34 additions and 264 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -134,7 +134,7 @@
android:name=".activities.SplashActivity"
android:clearTaskOnLaunch="true"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.Immersive">
android:theme="@style/ProtonTheme.Splash.Mail">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@ -263,7 +263,6 @@
android:name=".settings.pin.ValidatePinActivity"
android:exported="false"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.Immersive"
android:windowSoftInputMode="stateAlwaysHidden|adjustNothing" />
<activity
android:name=".contacts.details.ContactDetailsActivity"
@ -361,27 +360,21 @@
<!-- Core -->
<activity
android:name="me.proton.core.auth.presentation.ui.AuthHelpActivity"
android:theme="@style/ProtonTheme"
android:windowSoftInputMode="adjustResize" />
<activity
android:name="me.proton.core.auth.presentation.ui.ChooseAddressActivity"
android:theme="@style/ProtonTheme"
android:windowSoftInputMode="adjustResize" />
<activity
android:name="me.proton.core.auth.presentation.ui.CreateAddressActivity"
android:theme="@style/ProtonTheme"
android:windowSoftInputMode="adjustResize" />
<activity
android:name="me.proton.core.auth.presentation.ui.LoginActivity"
android:theme="@style/ProtonTheme"
android:windowSoftInputMode="adjustResize" />
<activity
android:name="me.proton.core.auth.presentation.ui.TwoPassModeActivity"
android:theme="@style/ProtonTheme"
android:windowSoftInputMode="adjustResize" />
<activity
android:name="me.proton.core.auth.presentation.ui.SecondFactorActivity"
android:theme="@style/ProtonTheme"
android:windowSoftInputMode="adjustResize" />
</application>

2
app/src/main/java/ch/protonmail/android/activities/SplashActivity.kt
View File

@ -22,7 +22,6 @@ package ch.protonmail.android.activities
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
import androidx.lifecycle.lifecycleScope
import ch.protonmail.android.R
import ch.protonmail.android.feature.account.AccountStateManager
import ch.protonmail.android.utils.startMailboxActivity
import dagger.hilt.android.AndroidEntryPoint
@ -38,7 +37,6 @@ class SplashActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_splash)
accountStateManager.register(this)

2
app/src/main/java/ch/protonmail/android/activities/multiuser/AccountManagerActivity.kt
View File

@ -32,7 +32,6 @@ import ch.protonmail.android.api.models.User
import ch.protonmail.android.core.UserManager
import ch.protonmail.android.domain.entity.Id
import ch.protonmail.android.uiModel.DrawerUserModel
import ch.protonmail.android.utils.extensions.setBarColors
import ch.protonmail.android.utils.extensions.showToast
import ch.protonmail.android.utils.ui.dialogs.DialogUtils.Companion.showTwoButtonInfoDialog
import dagger.hilt.android.AndroidEntryPoint
@ -62,7 +61,6 @@ class AccountManagerActivity : BaseActivity() {
toolbar.setNavigationIcon(R.drawable.ic_close)
setSupportActionBar(toolbar)
supportActionBar?.setDisplayHomeAsUpEnabled(true)
window?.setBarColors(getColor(R.color.new_purple_dark))
accountsAdapter.apply {
onLoginAccount = { userId -> accountStateManager.login() }

27
app/src/main/java/ch/protonmail/android/utils/extensions/ViewExtensions.kt
View File

@ -18,15 +18,11 @@
*/
package ch.protonmail.android.utils.extensions
import android.graphics.PorterDuff
import android.text.Editable
import android.text.TextUtils
import android.text.TextWatcher
import android.view.Window
import android.widget.EditText
import android.widget.ProgressBar
import android.widget.TextView
import androidx.annotation.ColorInt
import androidx.annotation.StyleRes
import ch.protonmail.android.views.contactsList.ContactGroupEmailAvatarView
@ -37,19 +33,21 @@ import ch.protonmail.android.views.contactsList.ContactGroupEmailAvatarView
*/
/** Execute the [listener] on [TextWatcher.onTextChanged] */
inline fun EditText.onTextChange( crossinline listener: (CharSequence) -> Unit ): TextWatcher {
inline fun EditText.onTextChange(crossinline listener: (CharSequence) -> Unit): TextWatcher {
val watcher = object : TextWatcher {
override fun afterTextChanged( editable: Editable ) {
override fun afterTextChanged(editable: Editable) {
/* Do nothing */
}
override fun beforeTextChanged( text: CharSequence, start: Int, count: Int, after: Int ) {
override fun beforeTextChanged(text: CharSequence, start: Int, count: Int, after: Int) {
/* Do nothing */
}
override fun onTextChanged( text: CharSequence, start: Int, before: Int, count: Int ) {
listener( text )
override fun onTextChanged(text: CharSequence, start: Int, before: Int, count: Int) {
listener(text)
}
}
addTextChangedListener( watcher )
addTextChangedListener(watcher)
return watcher
}
@ -57,15 +55,6 @@ fun TextView.setStyle(@StyleRes styleId: Int) {
setTextAppearance(styleId)
}
fun Window.setBarColors(@ColorInt colorId: Int) {
statusBarColor = colorId
navigationBarColor = colorId
}
fun ProgressBar.setcolor(@ColorInt colorId: Int) {
indeterminateDrawable.setColorFilter(colorId, PorterDuff.Mode.SRC_IN)
}
fun ContactGroupEmailAvatarView.setAccountLetters(displayName: String) {
when (displayName.length) {
0 -> setLetters("")

17
app/src/main/res/drawable/splash_logo.xml Normal file
View File

@ -0,0 +1,17 @@
<vector android:alpha="0.9" android:height="22dp"
android:viewportHeight="22" android:viewportWidth="132"
android:width="132dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@color/cornflower_blue" android:fillType="evenOdd" android:pathData="M4,6.926C5.231,0.305 11.2,0.501 11.2,0.501C11.2,0.501 17.169,0.306 18.4,6.926V11.435C18.4,11.435 18.349,11.918 16.992,12.898C16.756,13.068 16.455,13.292 16.115,13.546C14.493,14.753 11.96,16.639 11.2,16.639C10.44,16.639 7.907,14.754 6.285,13.546C5.945,13.292 5.644,13.068 5.408,12.898C4.051,11.918 4,11.435 4,11.435V6.926ZM7.113,6.926V9.384H15.287V6.926C14.458,3.638 11.2,3.592 11.2,3.592C11.2,3.592 7.942,3.638 7.113,6.926Z"/>
<path android:fillColor="@color/cornflower_blue" android:pathData="M9.551,17.062C10.275,17.565 11.2,17.655 11.2,17.655C11.2,17.655 12.126,17.564 12.85,17.061C13.574,16.558 18.4,13.109 18.4,13.109V19.938C18.4,19.938 18.359,20.732 17.484,20.732H4.916C4.041,20.732 4.001,19.938 4.001,19.938V13.111C4.001,13.111 8.827,16.56 9.551,17.062Z"/>
<path android:fillColor="@color/cornflower_blue" android:pathData="M120.326,2.93C119.854,2.93 119.445,3.085 119.125,3.405C118.807,3.723 118.65,4.123 118.65,4.585C118.65,5.046 118.807,5.446 119.125,5.764L119.131,5.77C119.452,6.073 119.859,6.218 120.326,6.218C120.805,6.218 121.22,6.075 121.543,5.77L121.549,5.764C121.867,5.446 122.024,5.046 122.024,4.585C122.024,4.123 121.867,3.723 121.549,3.405C121.227,3.083 120.81,2.93 120.326,2.93Z"/>
<path android:fillColor="@color/cornflower_blue" android:pathData="M127.533,17.721V3.537L124.955,3.845V17.764C124.955,18.605 125.177,19.303 125.659,19.818L125.666,19.825C126.163,20.323 126.826,20.558 127.62,20.558C128.24,20.558 128.813,20.418 129.333,20.134L129.562,20.01L128.847,18.103L128.562,18.216C128.388,18.286 128.183,18.324 127.942,18.324C127.747,18.324 127.663,18.274 127.624,18.229C127.579,18.158 127.533,18.006 127.533,17.721Z"/>
<path android:fillColor="@color/cornflower_blue" android:fillType="evenOdd" android:pathData="M25.85,4.887H30.042C31.913,4.887 33.406,5.281 34.481,6.109C35.574,6.938 36.104,8.175 36.104,9.766C36.104,11.455 35.554,12.759 34.415,13.618C33.302,14.456 31.841,14.861 30.063,14.861H28.493V20.3H25.85V4.887ZM28.493,7.078V12.648H29.977C31.135,12.648 31.964,12.424 32.507,12.019L32.509,12.017C33.028,11.64 33.332,10.933 33.332,9.788C33.332,8.786 33.037,8.125 32.506,7.727L32.503,7.725C31.96,7.308 31.146,7.078 30.02,7.078H28.493Z"/>
<path android:fillColor="@color/cornflower_blue" android:pathData="M94.553,4.887H91.299L90.024,20.3H92.563L93.078,13.487C93.202,11.922 93.285,10.48 93.327,9.16L96.212,18.623H98.573L101.324,9.134C101.385,10.3 101.484,11.702 101.618,13.338L102.155,20.3H104.737L103.461,4.887H100.183L97.438,14.854L94.553,4.887Z"/>
<path android:fillColor="@color/cornflower_blue" android:pathData="M61.039,5.537V8.37H63.771L63.472,10.496H61.039V16.947C61.039,17.506 61.135,17.855 61.276,18.052C61.413,18.211 61.66,18.324 62.093,18.324C62.471,18.324 62.923,18.195 63.456,17.908L63.713,17.77L64.748,19.574L64.522,19.731C63.724,20.283 62.818,20.558 61.814,20.558C60.795,20.558 59.958,20.267 59.344,19.653L59.339,19.648C58.739,19.015 58.461,18.128 58.461,17.033V10.496H56.483V8.37H58.461V5.845L61.039,5.537Z"/>
<path android:fillColor="@color/cornflower_blue" android:pathData="M43.136,8.112C42.38,8.112 41.709,8.35 41.138,8.826C40.82,9.091 40.545,9.423 40.309,9.817L40.187,8.37H37.913V20.3H40.491V13.562C40.729,12.509 41.05,11.771 41.432,11.313C41.802,10.868 42.282,10.647 42.9,10.647C43.188,10.647 43.493,10.686 43.816,10.767L44.124,10.844L44.602,8.318L44.327,8.25C43.956,8.157 43.559,8.112 43.136,8.112Z"/>
<path android:fillColor="@color/cornflower_blue" android:fillType="evenOdd" android:pathData="M47.439,8.913C48.255,8.374 49.224,8.112 50.333,8.112C51.998,8.112 53.321,8.67 54.262,9.811C55.208,10.94 55.664,12.456 55.664,14.324C55.664,15.533 55.458,16.615 55.036,17.563L55.035,17.565C54.613,18.501 53.996,19.242 53.186,19.777L53.183,19.78C52.367,20.303 51.406,20.558 50.312,20.558C48.647,20.558 47.317,19.999 46.362,18.86C45.416,17.73 44.959,16.214 44.959,14.346C44.959,13.137 45.166,12.061 45.587,11.127C46.01,10.177 46.626,9.434 47.439,8.913ZM48.372,11.257C47.931,11.908 47.688,12.922 47.688,14.346C47.688,15.762 47.929,16.771 48.367,17.419C48.791,18.045 49.423,18.367 50.312,18.367C51.2,18.367 51.831,18.044 52.256,17.414C52.694,16.762 52.936,15.748 52.936,14.324C52.936,12.908 52.696,11.898 52.261,11.25C51.84,10.623 51.214,10.303 50.333,10.303C49.437,10.303 48.8,10.626 48.372,11.257Z"/>
<path android:fillColor="@color/cornflower_blue" android:fillType="evenOdd" android:pathData="M70.657,8.112C69.549,8.112 68.579,8.374 67.763,8.913C66.951,9.434 66.334,10.177 65.911,11.127C65.49,12.061 65.283,13.137 65.283,14.346C65.283,16.214 65.74,17.73 66.686,18.86C67.641,19.999 68.971,20.558 70.636,20.558C71.73,20.558 72.691,20.303 73.507,19.78L73.51,19.777C74.321,19.242 74.937,18.501 75.36,17.565L75.36,17.563C75.782,16.615 75.988,15.533 75.988,14.324C75.988,12.456 75.532,10.941 74.586,9.811C73.646,8.67 72.322,8.112 70.657,8.112ZM74.586,9.811L74.587,9.812L74.355,10.002L74.585,9.81L74.586,9.811ZM67.763,8.913L67.765,8.912L67.927,9.164L67.761,8.914L67.763,8.913ZM68.012,14.346C68.012,12.922 68.255,11.908 68.697,11.257C69.124,10.626 69.761,10.303 70.657,10.303C71.538,10.303 72.164,10.623 72.585,11.25C73.02,11.898 73.26,12.908 73.26,14.324C73.26,15.748 73.019,16.762 72.58,17.414C72.156,18.044 71.524,18.367 70.636,18.367C69.747,18.367 69.115,18.045 68.691,17.419C68.253,16.771 68.012,15.762 68.012,14.346Z"/>
<path android:fillColor="@color/cornflower_blue" android:pathData="M81.731,8.667C82.38,8.296 83.091,8.112 83.858,8.112C84.952,8.112 85.842,8.441 86.484,9.13C87.137,9.816 87.448,10.743 87.448,11.873V20.3H84.869V12.153C84.869,11.371 84.72,10.901 84.496,10.656C84.269,10.407 83.916,10.26 83.385,10.26C82.844,10.26 82.378,10.413 81.974,10.716C81.569,11.019 81.178,11.459 80.804,12.046V20.3H78.226V8.37H80.495L80.619,9.573C80.944,9.213 81.314,8.911 81.729,8.669L81.731,8.667Z"/>
<path android:fillColor="@color/cornflower_blue" android:fillType="evenOdd" android:pathData="M111.384,8.112C110.137,8.112 108.797,8.379 107.367,8.904L107.091,9.005L107.778,11.005L108.06,10.911C109.248,10.515 110.231,10.324 111.018,10.324C111.786,10.324 112.294,10.49 112.603,10.764C112.898,11.026 113.083,11.496 113.083,12.26V12.799H111.642C110.015,12.799 108.71,13.128 107.765,13.825L107.764,13.826C106.818,14.535 106.354,15.554 106.354,16.84C106.354,17.927 106.701,18.832 107.411,19.527C108.125,20.225 109.089,20.558 110.266,20.558C111.646,20.558 112.755,20.094 113.56,19.16C113.737,19.51 113.969,19.796 114.261,20.007C114.672,20.303 115.198,20.48 115.819,20.556L116.064,20.586L116.683,18.699L116.41,18.6C116.138,18.501 115.957,18.368 115.842,18.214C115.736,18.057 115.661,17.786 115.661,17.356V12.174C115.661,10.916 115.315,9.904 114.583,9.187C113.847,8.452 112.761,8.112 111.384,8.112ZM109.061,16.732C109.061,16.033 109.292,15.551 109.724,15.232C110.172,14.9 110.881,14.71 111.9,14.71H113.083V16.934C112.484,17.988 111.697,18.475 110.717,18.475C110.124,18.475 109.727,18.317 109.472,18.051C109.214,17.782 109.061,17.361 109.061,16.732Z"/>
<path android:fillColor="@color/cornflower_blue" android:pathData="M119.059,8.37H121.637V20.3H119.059V8.37Z"/>
</vector>

1
app/src/main/res/layout/activity_contacts_v2.xml
View File

@ -48,7 +48,6 @@ along with ProtonMail. If not, see https://www.gnu.org/licenses/.
style="@style/CustomTabLayout"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:tabGravity="fill"
app:tabMode="fixed" />

139
app/src/main/res/layout/activity_first.xml
View File

@ -1,139 +0,0 @@
<!--
Copyright (c) 2020 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/.
-->
<RelativeLayout
android:id="@+id/container"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/dark_purple"
android:fitsSystemWindows="true">
<include layout="@layout/splash_background_mountain" />
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scrollbars="none">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin_large">
<FrameLayout
android:id="@+id/layout_no_connectivity_info"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="100dp"
android:layout_gravity="center"
android:layout_marginTop="50dp"
android:paddingBottom="0dp"
android:paddingTop="10dp"
android:src="@drawable/logo" />
<ch.protonmail.android.views.CustomFontTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal"
android:paddingBottom="5dp"
android:paddingLeft="20dp"
android:paddingRight="20dp"
android:text="@string/secure_email_swiss"
android:textColor="@android:color/white"
android:textSize="@dimen/h1"
app:fontName="Roboto-Thin.ttf" />
<ch.protonmail.android.views.CustomFontButton
android:id="@+id/create_account"
android:layout_width="match_parent"
android:layout_height="42dp"
android:layout_gravity="center"
android:layout_marginLeft="40dp"
android:layout_marginRight="40dp"
android:layout_marginTop="40dp"
android:text="@string/create_account_"
android:textAllCaps="false"
android:textColor="@color/dark_purple"
android:textSize="@dimen/h3"
app:fontName="Roboto-Light.ttf" />
<ch.protonmail.android.views.CustomFontButton
android:id="@+id/sign_in"
android:layout_width="match_parent"
android:layout_height="42dp"
android:layout_gravity="center"
android:layout_marginLeft="40dp"
android:layout_marginRight="40dp"
android:layout_marginTop="40dp"
android:background="@drawable/button_selector_inverted"
android:text="@string/sign_in_"
android:textAllCaps="false"
android:textColor="@color/white"
android:textSize="@dimen/h3"
app:fontName="Roboto-Light.ttf" />
<TextView
android:id="@+id/sign_up"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="20dp"
android:padding="5dp"
android:textColor="@android:color/white"
android:textColorLink="@color/glacier_blue"
android:textSize="@dimen/h5" />
<TextView
android:id="@+id/forgot_password"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="16dp"
android:padding="5dp"
android:textColor="@android:color/white"
android:textColorLink="@color/glacier_blue"
android:textSize="@dimen/h5" />
<Space
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="3" />
</LinearLayout>
</ScrollView>
<ProgressBar
android:id="@+id/progress_circular"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:indeterminate="true"
android:visibility="gone" />
</RelativeLayout>

2
app/src/main/res/layout/activity_fragment_container.xml
View File

@ -33,8 +33,6 @@ along with ProtonMail. If not, see https://www.gnu.org/licenses/.
android:layout_centerInParent="true"
android:visibility="gone">
<include layout="@layout/splash_background_mountain" />
<ProgressBar
android:id="@+id/progress_circular"
android:layout_width="wrap_content"

50
app/src/main/res/layout/activity_splash.xml
View File

@ -1,50 +0,0 @@
<!--
Copyright (c) 2020 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/.
-->
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="ch.protonmail.android.activities.SplashActivity">
<include
layout="@layout/splash_background_mountain"/>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:orientation="vertical">
<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:src="@drawable/logo"/>
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="8dp"
android:text="@string/encrypted_emails"
android:gravity="center"
android:textColor="@color/white"/>
</LinearLayout>
</FrameLayout>

36
app/src/main/res/layout/splash_background_mountain.xml
View File

@ -1,36 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (c) 2020 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/.
-->
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<ImageView
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:scaleType="centerCrop"
android:src="@drawable/v3_new_mountain"/>
<View
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/bg_overlay"
android:visibility="gone"/>
</FrameLayout>

3
app/src/main/res/layout/toolbar_v2.xml
View File

@ -22,8 +22,7 @@ along with ProtonMail. If not, see https://www.gnu.org/licenses/.
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:contentInsetStartWithNavigation="0dp"
app:layout_scrollFlags="scroll|enterAlways"
app:popupTheme="@style/AppTheme.PopupOverlay"
android:theme="@style/ToolbarStyle"/>
/>

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

@ -20,6 +20,10 @@
<resources xmlns:tools="http://schemas.android.com/tools">
<!-- V4 -->
<style name="ProtonTheme.Splash.Mail" parent="ProtonTheme.Splash">
<item name="brand_splash_logo">@drawable/splash_logo</item>
</style>
<style name="ProtonTheme.Mail" parent="ProtonTheme">
<item name="windowActionModeOverlay">true</item>
<item name="actionModeStyle">@style/ProtonMailActionMode</item>
@ -584,10 +588,10 @@
</style>
<style name="CustomTabLayout" parent="Widget.Design.TabLayout">
<item name="tabIndicatorColor">@android:color/white</item>
<item name="tabIndicatorHeight">3dp</item>
<item name="tabBackground">?attr/selectableItemBackground</item>
<item name="tabSelectedTextColor">@android:color/white</item>
<item name="tabTextColor">?proton_text_weak</item>
<item name="tabSelectedTextColor">?proton_text_norm</item>
</style>
<style name="CustomSearchView" parent="@android:style/Widget.EditText">

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

@ -72,7 +72,7 @@ const val `Proton-android-instr-test version` = "0.3.3" // Released: Mar
const val `Proton-kotlin-test version` = "0.2" // Released: Oct 21, 2020
const val `Proton-domain version` = "1.0" // Released: Feb 17, 2021
const val `Proton-presentation version` = "0.7.2" // Released: May 04, 2021
const val `Proton-presentation version` = "0.7.3" // Released: May 03, 2021
const val `Proton-data version` = "1.0.1" // Released: Mar 22, 2021
const val `Proton-network version` = "1.0.4" // Released: Apr 07, 2021
const val `Proton-crypto version` = "1.0.2" // Released: Mar 05, 2021