Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 331a6ca9 authored by cketti's avatar cketti
Browse files

- Always use light theme for the message view since we don't change the colors... 

- Always use light theme for the message view since we don't change the colors of the WebView (i.e. it always uses black text on a white background).
- Always display the date in the message view
parent d67307a2

AndroidManifest.xml

+2 −1
Original line number Original line Diff line number Diff line
@@ -171,7 +171,8 @@ 
            -->

            -->

        </activity>

        </activity>

        <activity

        <activity

            android:name="com.fsck.k9.activity.MessageView">

            android:name="com.fsck.k9.activity.MessageView"

            android:theme="@android:style/Theme.Light">

            <intent-filter>

            <intent-filter>

                <action android:name="android.intent.action.VIEW" />

                <action android:name="android.intent.action.VIEW" />

                <data

                <data

src/com/fsck/k9/K9Activity.java

+10 −1
Original line number Original line Diff line number Diff line
@@ -20,8 +20,16 @@ public class K9Activity extends Activity 




    @Override

    @Override

    public void onCreate(Bundle icicle)

    public void onCreate(Bundle icicle)

    {

        onCreate(icicle, true);

    }



    public void onCreate(Bundle icicle, boolean useTheme)

    {

        if (useTheme)

        {

        {

            setTheme(K9.getK9Theme());

            setTheme(K9.getK9Theme());

        }

        super.onCreate(icicle);

        super.onCreate(icicle);

        setupFormats();

        setupFormats();
@@ -29,6 +37,7 @@ public class K9Activity extends Activity 
        gestureDetector = new GestureDetector(new MyGestureDetector());

        gestureDetector = new GestureDetector(new MyGestureDetector());





    }

    }



    @Override

    @Override

    public boolean dispatchTouchEvent(MotionEvent ev)

    public boolean dispatchTouchEvent(MotionEvent ev)

    {

    {

src/com/fsck/k9/activity/MessageView.java

+2 −4
Original line number Original line Diff line number Diff line
@@ -442,7 +442,7 @@ public class MessageView extends K9Activity implements OnClickListener 
    @Override

    @Override

    public void onCreate(Bundle icicle)

    public void onCreate(Bundle icicle)

    {

    {

        super.onCreate(icicle);

        super.onCreate(icicle, false);









        requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);

        requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
@@ -1322,9 +1322,7 @@ public class MessageView extends K9Activity implements OnClickListener 
    {

    {

        String subjectText = message.getSubject();

        String subjectText = message.getSubject();

        String fromText = Address.toFriendly(message.getFrom());

        String fromText = Address.toFriendly(message.getFrom());

        String dateText = Utility.isDateToday(message.getSentDate()) ?

        String dateText = getDateFormat().format(message.getSentDate());

                          null :

                          getDateFormat().format(message.getSentDate());

        String timeText = getTimeFormat().format(message.getSentDate());

        String timeText = getTimeFormat().format(message.getSentDate());

        String toText = Address.toFriendly(message.getRecipients(RecipientType.TO));

        String toText = Address.toFriendly(message.getRecipients(RecipientType.TO));

        String ccText = Address.toFriendly(message.getRecipients(RecipientType.CC));

        String ccText = Address.toFriendly(message.getRecipients(RecipientType.CC));