Commit fd7aa7f2 authored by Francisco Cunha's avatar Francisco Cunha

P4A-901 - Remove from MessageCompose tokenization

parent 6aa78fda
......@@ -3,15 +3,12 @@ package security.pEp.ui.message_compose
import android.content.Context
import android.util.AttributeSet
import android.widget.LinearLayout
import com.fsck.k9.helper.ContactPicture
import com.fsck.k9.mail.Address
import kotlinx.android.synthetic.main.compose_account_item.view.*
class ComposeAccountRecipient(context: Context?, attrs: AttributeSet?) : LinearLayout(context, attrs) {
fun bindView(name: String) {
ContactPicture.getContactPictureLoader(context).loadContactPicture(Address(name), accountImage)
accountName.text = name
}
......
......@@ -4,21 +4,12 @@
android:id="@+id/identity"
android:layout_width="wrap_content"
android:layout_height="32dp"
android:background="@drawable/recipient_token_shape"
android:orientation="horizontal"
android:padding="0dp">
<com.fsck.k9.pEp.ui.PEpContactBadge
android:id="@+id/accountImage"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_marginStart="3dp"
android:clickable="false"
android:gravity="center_vertical"
tools:src="@drawable/ic_contact_picture" />
<TextView
android:id="@+id/accountName"
style="@style/MediumComposeText"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
......
......@@ -270,7 +270,7 @@
<com.fsck.k9.pEp.ui.ActionRecipientSelectView
android:id="@+id/to"
style="@style/ComposeTextLarge"
style="@style/MediumComposeText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
......@@ -339,7 +339,7 @@
<com.fsck.k9.pEp.ui.ActionRecipientSelectView
android:id="@+id/cc"
style="@style/ComposeTextLarge"
style="@style/MediumComposeText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/transparent"
......@@ -382,7 +382,7 @@
<com.fsck.k9.pEp.ui.ActionRecipientSelectView
android:id="@+id/bcc"
style="@style/ComposeTextLarge"
style="@style/MediumComposeText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
......
......@@ -35,28 +35,6 @@
<item name="android:shadowRadius">4.0</item>
</style>
<style name="ComposeLabel" parent="@android:style/TextAppearance.Small">
<item name="android:textColor">@color/compose_gray</item>
</style>
<style name="ComposeLabelLarge" parent="@android:style/TextAppearance.Medium">
<item name="android:textColor">@color/compose_gray</item>
</style>
<style name="ComposeText" parent="@android:style/TextAppearance.Small">
<item name="android:textColorHint">@color/compose_gray</item>
</style>
<style name="ComposeTextLarge" parent="@android:style/TextAppearance.Medium">
<item name="android:textColorHint">@color/compose_gray</item>
</style>
<style name="ComposeEditTextLarge" parent="ComposeTextLarge">
<item name="background">@android:color/transparent</item>
<item name="android:background">@android:color/transparent</item>
<item name="android:inputType">textMultiLine|textAutoCorrect|textCapSentences</item>
</style>
<style name="ShowcaseTheme" parent="ShowcaseView.Light">
<item name="sv_backgroundColor">#99444444</item>
</style>
......
......@@ -5,5 +5,33 @@
<item name="android:fontFamily">@font/univers_lts_sd</item>
<item name="android:textColor">@color/light_black</item>
</style>
<style name="MediumComposeText">
<item name="android:textSize">16sp</item>
<item name="android:textColor">@color/light_black</item>
</style>
<style name="ComposeLabel" parent="@android:style/TextAppearance.Small">
<item name="android:textColor">@color/compose_gray</item>
</style>
<style name="ComposeLabelLarge" parent="@android:style/TextAppearance.Medium">
<item name="android:textColor">@color/compose_gray</item>
</style>
<style name="ComposeText" parent="@android:style/TextAppearance.Small">
<item name="android:textColorHint">@color/compose_gray</item>
</style>
<style name="ComposeTextLarge" parent="@android:style/TextAppearance.Medium">
<item name="android:textColorHint">@color/compose_gray</item>
</style>
<style name="ComposeEditTextLarge" parent="ComposeTextLarge">
<item name="background">@android:color/transparent</item>
<item name="android:background">@android:color/transparent</item>
<item name="android:inputType">textMultiLine|textAutoCorrect|textCapSentences</item>
</style>
</resources>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment