made welcome better, changed little bit email writer

app/src/main/java/com/noahvogt/miniprojekt/DataBase/MessageDao.java

@@ -19,62 +19,37 @@ public interface MessageDao {
     @Insert(onConflict = OnConflictStrategy.IGNORE)
     void insert(Message message);
 
-    @Query("DELETE FROM message_table WHERE folder = :folder")
-    void deleteFolder(String folder);
-
     @Delete(entity = Message.class)
     void delete(Message message);
 
-    @Delete(entity = Message.class)
-    void deleteAll(String folder);
-
     @Query("UPDATE message_table SET folder = :folder WHERE id = :id")
     void updateFolder(int id, String folder);
 
     @Query("UPDATE message_table SET date = :date WHERE id = :id")
     void updateDate(int id, String date);
 
-    @Query("SELECT * FROM message_table ORDER BY id ASC")
-    List<Message> getAllMessages();
-
-    /*gets messages all messages ordered by date */
-    @Query("SELECT * FROM message_table ORDER BY date ASC")
-    LiveData<List<Message>> getDateMessages();
-
     /* get Draft messages*/
     @Query("SELECT * FROM message_table WHERE user = :user AND folder LIKE 'Draft' ORDER BY date DESC")
     LiveData<List<Message>> getLiveDraftMessages(String user);
 
-    @Query("SELECT * FROM message_table WHERE folder LIKE 'Draft' ORDER BY date DESC")
-    List<Message> getDraftMessages();
-
     /* get Inbox messages*/
     @Query("SELECT * FROM message_table WHERE user = :user AND folder LIKE 'Inbox' ORDER BY date DESC")
     LiveData<List<Message>> getLiveInboxMessages(String user);
 
-    @Query("SELECT * FROM message_table WHERE folder LIKE 'Inbox' ORDER BY date DESC")
-    List<Message> getInboxMessages();
 
     /* get Sent messages*/
     @Query("SELECT * FROM message_table WHERE user = :user AND folder LIKE 'Sent' ORDER BY date DESC")
     LiveData<List<Message>> getLiveSentMessages(String user);
 
-    @Query("SELECT * FROM message_table WHERE folder LIKE 'Sent' ORDER BY date DESC")
-    List<Message> getSentMessages();
-
     /* get Archive messages*/
     @Query("SELECT * FROM message_table WHERE user = :user AND folder LIKE 'Archive' ORDER BY date DESC")
     LiveData<List<Message>> getLiveArchiveMessages(String user);
 
-    @Query("SELECT * FROM message_table WHERE folder LIKE 'Archive' ORDER BY date DESC")
-    List<Message> getArchiveMessages();
-
     /* get Spam messages*/
     @Query("SELECT * FROM message_table WHERE user = :user AND folder LIKE 'Spam' ORDER BY date DESC")
     LiveData<List<Message>> getLiveSpamMessages(String user);
 
-    @Query("SELECT * FROM message_table WHERE folder LIKE 'Spam' ORDER BY date DESC")
-    List<Message> getSpamMessages();
+
 
 
 }

app/src/main/java/com/noahvogt/miniprojekt/MainActivity.java

@@ -512,7 +512,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
         final View emailPopupView = getLayoutInflater().inflate(R.layout.welcome, null);
 
         /* init text field variables */
-        TextView shedText = emailPopupView.findViewById(R.id.backgroun);
+        TextView shedText = emailPopupView.findViewById(R.id.background);
         Button okayButton = emailPopupView.findViewById(R.id.okay_button);
 
         /* open View window */

app/src/main/java/com/noahvogt/miniprojekt/MessageCreateFragment.java

@@ -126,7 +126,6 @@ public class MessageCreateFragment extends DialogFragment implements PopupMenu.O
 
 
         /* button listeners */
-
         closeButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -237,8 +236,7 @@ public class MessageCreateFragment extends DialogFragment implements PopupMenu.O
                 
                 /* check for valid input */
                 if (MailFunctions.validateMessageBody(messageBodyObject) && MailFunctions.validateSubject(subjectObject) &&
-                MailFunctions.validateEmail(receivingAddressObject) && MailFunctions.validateEmail(sendingAddressObject) &&
-                !MailFunctions.checkForSameEmail(sendingAddressObject, receivingAddressObject)) {
+                MailFunctions.validateEmail(receivingAddressObject) && MailFunctions.validateEmail(sendingAddressObject)) {
                     MailFunctions.sendStarttlsMail(smtpHost, sendingAddress, receivingAddress, password, messageBody,
                             subject, ccStr, bccStr, smtpPort);
                     Toast.makeText(getActivity(), "sending ... ", Toast.LENGTH_SHORT).show();

app/src/main/java/com/noahvogt/miniprojekt/workers/DownloadWorker.java

@@ -129,13 +129,16 @@ public class DownloadWorker extends Worker {
                     for (int k = 0; k < messages.size(); k++) {
                         Message message = messages.get(k);
                         message.putUser(currentUser);
+                        /*
                         System.out.println("oldDate: " + message.getDate());
-                        //SimpleDateFormat rawDate = new SimpleDateFormat("EEE, d MMM yyyy HH:mm:ss Z");
-                        //SimpleDateFormat date = new SimpleDateFormat("dd.MM.yy");
-                        //Date middleDate = rawDate.parse(message.getDate());
-                        //String newDate = date.format(middleDate);
-                        //System.out.println("middle Date: " + middleDate);
-                        //System.out.println("New Date: " + newDate);
+                        SimpleDateFormat rawDate = new SimpleDateFormat("EEE, d MMM yyyy HH:mm:ss Z");
+                        SimpleDateFormat date = new SimpleDateFormat("dd.MM.yy");
+                        Date middleDate = rawDate.parse(message.getDate());
+                        String newDate = date.format(middleDate);
+                        System.out.println("middle Date: " + middleDate);
+                        System.out.println("New Date: " + newDate);
+
+                         */
 
                         mEmailViewModel.insert(message);
                         //TODO: make it work

app/src/main/res/drawable/ic_baseline_arrow_forward_ios_24.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M5.88,4.12L13.76,12l-7.88,7.88L8,22l10,-10L8,2z"/>
+</vector>

app/src/main/res/drawable/ic_baseline_attachment_24.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M2,12.5C2,9.46 4.46,7 7.5,7H18c2.21,0 4,1.79 4,4s-1.79,4 -4,4H9.5C8.12,15 7,13.88 7,12.5S8.12,10 9.5,10H17v2H9.41c-0.55,0 -0.55,1 0,1H18c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2H7.5C5.57,9 4,10.57 4,12.5S5.57,16 7.5,16H17v2H7.5C4.46,18 2,15.54 2,12.5z"/>
+</vector>

app/src/main/res/drawable/ic_baseline_close_24.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
+</vector>

app/src/main/res/drawable/ic_round_pending_24.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,2C6.48,2 2,6.48 2,12c0,5.52 4.48,10 10,10s10,-4.48 10,-10C22,6.48 17.52,2 12,2zM7,13.5c-0.83,0 -1.5,-0.67 -1.5,-1.5c0,-0.83 0.67,-1.5 1.5,-1.5s1.5,0.67 1.5,1.5C8.5,12.83 7.83,13.5 7,13.5zM12,13.5c-0.83,0 -1.5,-0.67 -1.5,-1.5c0,-0.83 0.67,-1.5 1.5,-1.5s1.5,0.67 1.5,1.5C13.5,12.83 12.83,13.5 12,13.5zM17,13.5c-0.83,0 -1.5,-0.67 -1.5,-1.5c0,-0.83 0.67,-1.5 1.5,-1.5s1.5,0.67 1.5,1.5C18.5,12.83 17.83,13.5 17,13.5z"/>
+</vector>

app/src/main/res/layout/message_create_fragment.xml

@@ -27,7 +27,7 @@
             android:layout_marginStart="8dp"
             android:background="?attr/selectableItemBackgroundBorderless"
             android:padding="8dp"
-            android:src="@mipmap/ic_close_purple" />
+            android:src="@drawable/ic_baseline_close_24" />
 
         <TextView
             android:id="@+id/create_message_text_text"
@@ -48,7 +48,6 @@
             android:layout_width="56dp"
             android:layout_height="match_parent"
 
-
             android:layout_marginStart="0dp"
             android:layout_marginLeft="0dp"
             android:layout_marginEnd="40dp"
@@ -59,7 +58,7 @@
             android:layout_toRightOf="@+id/create_message_text_text"
             android:background="?attr/selectableItemBackgroundBorderless"
             android:padding="8dp"
-            android:src="@mipmap/ic_attach_purple" />
+            android:src="@drawable/ic_baseline_attachment_24" />
 
         <ImageButton
         android:id="@+id/create_message_dots_button"
@@ -76,7 +75,7 @@
         android:layout_toRightOf="@+id/create_message_text_text"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:padding="8dp"
-        android:src="@mipmap/ic_more_vert_dots_purple" />
+        android:src="@drawable/ic_round_pending_24" />
 
         <ImageButton
             android:id="@+id/create_message_send_button"
@@ -89,7 +88,7 @@
             android:layout_marginEnd="8dp"
             android:background="?attr/selectableItemBackground"
             android:padding="8dp"
-            android:src="@mipmap/ic_send_purple"
+            android:src="@drawable/ic_baseline_arrow_forward_ios_24"
             android:textColor="@android:color/white" />
 
     </RelativeLayout>

app/src/main/res/layout/welcome.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout 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"
@@ -7,40 +7,74 @@
     android:orientation="vertical">
 
 
-    <TextView
-        android:id="@+id/backgroun"
-        android:layout_width="321dp"
-        android:layout_height="596dp"
-        android:gravity="center_horizontal"
-
-        android:text="@string/text_welcome"
-        android:textAlignment="center"
-        android:textAppearance="@style/TextAppearance.AppCompat.Body1"
-        android:textSize="@dimen/text_size_welcome"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.495"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.142" />
-
-    <Button
-        android:id="@+id/okay_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-
-        android:layout_marginEnd="16dp"
-
-        android:layout_marginRight="16dp"
-        android:layout_marginBottom="36dp"
-        android:text="@string/text_ok"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.524"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/backgroun"
-        app:layout_constraintVertical_bias="0.937"
-        tools:ignore="MissingConstraints" />
-
-
-</androidx.constraintlayout.widget.ConstraintLayout>
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center_horizontal">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:gravity="top">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+
+                android:layout_marginStart="12dp"
+                android:layout_marginLeft="12dp"
+                android:layout_marginTop="12dp"
+                android:layout_marginEnd="12dp"
+                android:layout_marginRight="12dp"
+                android:layout_marginBottom="12dp">
+
+                <TextView
+                    android:id="@+id/background"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_horizontal"
+
+                    android:text="@string/text_welcome"
+                    android:textAlignment="center"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+                    android:textSize="@dimen/text_size_welcome"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="0.495"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintVertical_bias="0.142" />
+
+                <Button
+                    android:id="@+id/okay_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+
+                    android:layout_marginEnd="16dp"
+
+                    android:layout_marginRight="16dp"
+                    android:layout_marginBottom="36dp"
+                    android:text="@string/text_ok"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="0.524"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/background"
+                    app:layout_constraintVertical_bias="0.937"
+                    tools:ignore="MissingConstraints" />
+
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+        </LinearLayout>
+
+
+
+    </ScrollView>
+
+
+
+
+
+</LinearLayout>

app/src/main/res/values/strings.xml

@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">Mini Projekt</string>
+    <string name="app_name">snailmail</string>
     <string name="navigation_drawer_open">Open navigation drawer</string>
     <string name="navigation_drawer_close">Close navigation drawer</string>
     <string name="nav_header_title">Max Mustermann</string>