I2P_Developers/i2p.i2p-bote.android
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

View email layout tweaks

Browse Source
This commit is contained in:
str4d
2014-11-17 01:03:36 +00:00
parent d05daa4e8d
commit d3e06e36e8
5 changed files with 115 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/java/i2p/bote/android/ViewEmailFragment.java
View File

@@ -2,6 +2,7 @@ package i2p.bote.android;
import android.content.Intent;
import android.graphics.Bitmap;
import android.graphics.Typeface;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.view.LayoutInflater;
@@ -14,6 +15,7 @@ import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TableRow;
import android.widget.TextView;
import android.widget.Toast;
import java.io.IOException;
import java.security.GeneralSecurityException;
@@ -74,6 +76,7 @@ public class ViewEmailFragment extends Fragment {
}
private void displayEmail(Email email, View v) {
View sigInvalid = v.findViewById(R.id.signature_invalid);
TextView subject = (TextView) v.findViewById(R.id.email_subject);
ImageView picture = (ImageView) v.findViewById(R.id.picture);
TextView sender = (TextView) v.findViewById(R.id.email_sender);
@@ -95,13 +98,28 @@ public class ViewEmailFragment extends Fragment {
picture.setImageBitmap(BoteHelper.getIdenticonForAddress(fromAddress, lp.width, lp.height));
}
sender.setText(BoteHelper.getDisplayAddress(fromAddress));
final String senderDisplay = BoteHelper.getDisplayAddress(fromAddress);
if (!email.isSignatureValid() && !email.isAnonymous()) {
sigInvalid.setVisibility(View.VISIBLE);
sigInvalid.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
Toast.makeText(getActivity(), getString(R.string.signature_invalid, senderDisplay), Toast.LENGTH_LONG).show();
}
});
}
sender.setText(senderDisplay);
if (email.isAnonymous() && !BoteHelper.isSentEmail(email))
sender.setTypeface(Typeface.DEFAULT, Typeface.ITALIC);
Address[] emailRecipients = email.getToAddresses();
if (emailRecipients != null) {
for (Address recipient : emailRecipients) {
TextView tv = new TextView(getActivity());
tv.setText(BoteHelper.getDisplayAddress(recipient.toString()));
tv.setTextAppearance(getActivity(), R.style.TextAppearance_AppCompat_Secondary);
recipients.addView(tv);
}
}

144
app/src/main/res/layout/fragment_view_email.xml
View File

@@ -1,126 +1,162 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent" >
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/darker_gray"
android:orientation="vertical" >
android:orientation="vertical"
android:paddingBottom="@dimen/activity_vertical_margin">
<TextView
android:id="@+id/email_subject"
android:layout_width="wrap_content"
<LinearLayout
android:id="@+id/email_subject_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="5dp"
android:text="Subject"
android:textAppearance="?android:attr/textAppearanceMedium" />
android:orientation="horizontal"
android:padding="@dimen/listitem_horizontal_margin">
<ImageView
android:id="@+id/signature_invalid"
android:layout_width="@dimen/listitem_icon_size"
android:layout_height="@dimen/listitem_icon_size"
android:layout_gravity="center_vertical"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:scaleType="centerCrop"
android:src="@drawable/ic_error_red_24dp"
android:visibility="gone"/>
<TextView
android:id="@+id/email_subject"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_toEndOf="@id/signature_invalid"
android:layout_toRightOf="@id/signature_invalid"
android:text="Subject"
android:textAppearance="@style/TextAppearance.AppCompat.Subject"/>
</LinearLayout>
<ImageView
android:id="@+id/picture"
android:layout_width="54dp"
android:layout_height="54dp"
android:layout_width="@dimen/listitem_picture_size"
android:layout_height="@dimen/listitem_picture_size"
android:layout_below="@+id/email_subject_container"
android:layout_marginLeft="@dimen/listitem_horizontal_margin"
android:layout_marginStart="@dimen/listitem_horizontal_margin"
android:layout_marginTop="2dp"
android:scaleType="centerCrop"
android:layout_alignLeft="@+id/email_subject"
android:layout_below="@+id/email_subject"
android:src="@drawable/ic_contact_picture" />
android:src="@drawable/ic_contact_picture"/>
<TextView
android:id="@+id/email_sender"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_below="@+id/email_subject_container"
android:layout_marginEnd="@dimen/listitem_horizontal_margin"
android:layout_marginLeft="@dimen/listitem_text_left_margin"
android:layout_marginRight="@dimen/listitem_horizontal_margin"
android:layout_marginStart="@dimen/listitem_text_left_margin"
android:text="From"
android:textAppearance="@style/TextAppearance.AppCompat.Primary"/>
<TableLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_below="@+id/email_subject"
android:layout_marginBottom="5dp"
android:layout_marginLeft="5dp"
android:layout_toRightOf="@+id/picture" >
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_below="@+id/email_sender"
android:layout_marginEnd="@dimen/listitem_horizontal_margin"
android:layout_marginLeft="@dimen/listitem_text_left_margin"
android:layout_marginRight="@dimen/listitem_horizontal_margin"
android:layout_marginStart="@dimen/listitem_text_left_margin">
<TableRow
android:layout_width="wrap_content"
android:layout_height="wrap_content" >
android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="3dp"
android:text="@string/email_from" />
<TextView
android:id="@+id/email_sender"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</TableRow>
<TableRow
android:layout_width="wrap_content"
android:layout_height="wrap_content" >
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="3dp"
android:text="@string/email_to" />
android:layout_marginEnd="4dp"
android:layout_marginRight="4dp"
android:text="@string/email_to"
android:textAppearance="@style/TextAppearance.AppCompat.Secondary"/>
<LinearLayout
android:id="@+id/email_recipients"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >
android:orientation="vertical">
</LinearLayout>
</TableRow>
<TableRow
android:layout_width="wrap_content"
android:layout_height="wrap_content" >
android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="3dp"
android:text="@string/label_sent" />
android:layout_marginEnd="4dp"
android:layout_marginRight="4dp"
android:text="@string/label_sent"
android:textAppearance="@style/TextAppearance.AppCompat.Secondary"/>
<TextView
android:id="@+id/email_sent"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
android:layout_height="wrap_content"
android:textAppearance="@style/TextAppearance.AppCompat.Secondary"/>
</TableRow>
<TableRow
android:layout_width="wrap_content"
android:layout_height="wrap_content" >
android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="3dp"
android:text="@string/email_received" />
android:layout_marginEnd="4dp"
android:layout_marginRight="4dp"
android:text="@string/email_received"
android:textAppearance="@style/TextAppearance.AppCompat.Secondary"/>
<TextView
android:id="@+id/email_received"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
android:layout_height="wrap_content"
android:textAppearance="@style/TextAppearance.AppCompat.Secondary"/>
</TableRow>
<TableRow
android:id="@+id/email_status_row"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone" >
android:visibility="gone">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="3dp"
android:text="@string/email_status" />
android:layout_marginEnd="4dp"
android:layout_marginRight="4dp"
android:text="@string/email_status"
android:textAppearance="@style/TextAppearance.AppCompat.Secondary"/>
<TextView
android:id="@+id/email_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
android:layout_height="wrap_content"
android:textAppearance="@style/TextAppearance.AppCompat.Secondary"/>
</TableRow>
</TableLayout>
</RelativeLayout>
@@ -129,10 +165,10 @@
android:id="@+id/email_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:paddingBottom="@dimen/activity_vertical_margin" />
android:paddingTop="@dimen/activity_vertical_margin"/>
</LinearLayout>
</ScrollView>

1
app/src/main/res/values/dimens.xml
View File

@@ -6,6 +6,7 @@
<dimen name="nav_horizontal_margin">16dp</dimen>
<dimen name="nav_entry_height">48dp</dimen>
<dimen name="text_size_subject">18sp</dimen>
<dimen name="text_size_primary">16sp</dimen>
<dimen name="text_size_secondary">14sp</dimen>

1
app/src/main/res/values/strings.xml
View File

@@ -98,6 +98,7 @@
<string name="error_sending">Error while sending email: %s</string>
<string name="error_saving_metadata">Error saving email metadata: %s</string>
<string name="email_not_found">Email not found</string>
<string name="signature_invalid">This email does not have a valid signature. It was probably not sent by %s.</string>
<string name="email_from">From:</string>
<string name="email_to">To:</string>
<string name="label_sent">Sent:</string>

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

@@ -25,6 +25,10 @@
<item name="android:textSize">@dimen/text_size_primary</item>
</style>
<style name="TextAppearance.AppCompat.Subject" parent="TextAppearance.AppCompat.Primary">
<item name="android:textSize">@dimen/text_size_subject</item>
</style>
<style name="TextAppearance.AppCompat.Secondary" parent="TextAppearance.AppCompat.Body1">
<item name="android:textColor">@color/secondary_text_default_material_light</item>
<item name="android:textSize">@dimen/text_size_secondary</item>