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

Unverified Commit d73240d6 authored by cketti's avatar cketti Committed by GitHub
Browse files

Merge pull request #6452 from ByteHamster/message-view-date 

Display date on new MessageView
parents f1400a42 55557e77

app/ui/legacy/src/main/java/com/fsck/k9/view/KoinModule.kt

+3 −1
Original line number Diff line number Diff line 
package com.fsck.k9.view



import com.fsck.k9.ui.helper.RelativeDateTimeFormatter

import org.koin.dsl.module



val viewModule = module {

    single { WebViewConfigProvider(get()) }

    single { WebViewConfigProvider(themeManager = get()) }

    factory { RelativeDateTimeFormatter(context = get(), clock = get()) }

}

app/ui/legacy/src/main/java/com/fsck/k9/view/MessageHeader.java

+11 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import com.fsck.k9.mail.Address; 
import com.fsck.k9.mail.Flag;

import com.fsck.k9.mail.Message;

import com.fsck.k9.ui.R;

import com.fsck.k9.ui.helper.RelativeDateTimeFormatter;

import com.google.android.material.chip.Chip;

import com.google.android.material.snackbar.Snackbar;
@@ -38,8 +39,10 @@ public class MessageHeader extends LinearLayout implements OnClickListener, OnLo 
    private ImageView contactPictureView;

    private TextView fromView;

    private ImageView cryptoStatusIcon;

    private TextView dateView;



    private MessageHelper messageHelper;

    private RelativeDateTimeFormatter relativeDateTimeFormatter;



    private OnMenuItemClickListener onMenuItemClickListener;
@@ -49,6 +52,7 @@ public class MessageHeader extends LinearLayout implements OnClickListener, OnLo 


        if (!isInEditMode()) {

            messageHelper = MessageHelper.getInstance(getContext());

            relativeDateTimeFormatter = DI.get(RelativeDateTimeFormatter.class);

        }

    }
@@ -62,6 +66,7 @@ public class MessageHeader extends LinearLayout implements OnClickListener, OnLo 
        contactPictureView = findViewById(R.id.contact_picture);

        fromView = findViewById(R.id.from);

        cryptoStatusIcon = findViewById(R.id.crypto_status_icon);

        dateView = findViewById(R.id.date);



        subjectView.setOnClickListener(this);

        subjectView.setOnLongClickListener(this);
@@ -160,6 +165,12 @@ public class MessageHeader extends LinearLayout implements OnClickListener, OnLo 
            starView.setVisibility(View.GONE);

        }



        if (message.getSentDate() != null) {

            dateView.setText(relativeDateTimeFormatter.formatDate(message.getSentDate().getTime()));

        } else {

            dateView.setText("");

        }



        setVisibility(View.VISIBLE);

    }

app/ui/legacy/src/main/res/layout/message_view_header.xml

+2 −2
Original line number Diff line number Diff line
@@ -120,12 +120,12 @@ 
            android:layout_marginEnd="16dp"

            android:ellipsize="none"

            android:singleLine="true"

            android:text="Sep 19"

            android:textAppearance="@style/TextAppearance.MaterialComponents.Caption"

            android:textColor="?android:attr/textColorSecondary"

            app:layout_constraintBaseline_toBaselineOf="@+id/from"

            app:layout_constraintEnd_toStartOf="@+id/menu_primary_action"

            app:layout_constraintStart_toEndOf="@id/from" />

            app:layout_constraintStart_toEndOf="@id/from"

            tools:text="Sep 19" />



        <ImageView

            android:id="@+id/crypto_status_icon"