Merge remote-tracking branch 'origin/master'

# Conflicts:
#	Code/LeudaemiaLikeMe/app/src/main/AndroidManifest.xml

Code/LeudaemiaLikeMe/app/src/main/AndroidManifest.xml

@@ -9,8 +9,8 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.LeudaemiaLikeMe">
-        <activity android:name=".SendQuestionActivity"></activity>
-        <activity android:name=".MainActivity">
+        <activity android:name=".Activity.SendQuestionActivity"></activity>
+        <activity android:name=".Activity.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/MainActivity.java

@@ -1,4 +1,4 @@
-package com.example.leudaemialikeme;
+package com.example.leudaemialikeme.Activity;
 
 import android.os.Bundle;
 import android.view.View;
@@ -11,6 +11,12 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
 
+import com.example.leudaemialikeme.Fragment.CommunityFragment;
+import com.example.leudaemialikeme.Fragment.IndexFragment;
+import com.example.leudaemialikeme.Fragment.MessageFragment;
+import com.example.leudaemialikeme.Fragment.MyFragment;
+import com.example.leudaemialikeme.R;
+
 import java.util.ArrayList;
 import java.util.List;
 

Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/SendQuestionActivity.java

@@ -1,9 +1,11 @@
-package com.example.leudaemialikeme;
+package com.example.leudaemialikeme.Activity;
 
 import androidx.appcompat.app.AppCompatActivity;
 
 import android.os.Bundle;
 
+import com.example.leudaemialikeme.R;
+
 public class SendQuestionActivity extends AppCompatActivity {
 
     @Override

Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/CommunityFragment.java

@@ -1,4 +1,4 @@
-package com.example.leudaemialikeme;
+package com.example.leudaemialikeme.Fragment;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -7,6 +7,8 @@ import android.view.ViewGroup;
 
 import androidx.fragment.app.Fragment;
 
+import com.example.leudaemialikeme.R;
+
 /**
  * A simple {@link Fragment} subclass.
  * Use the {@link CommunityFragment#newInstance} factory method to

Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/IndexFragment.java

@@ -1,4 +1,4 @@
-package com.example.leudaemialikeme;
+package com.example.leudaemialikeme.Fragment;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -7,6 +7,8 @@ import android.view.ViewGroup;
 
 import androidx.fragment.app.Fragment;
 
+import com.example.leudaemialikeme.R;
+
 /**
  * A simple {@link Fragment} subclass.
  * Use the {@link IndexFragment#newInstance} factory method to

Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/MessageFragment.java

@@ -1,4 +1,4 @@
-package com.example.leudaemialikeme;
+package com.example.leudaemialikeme.Fragment;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -7,6 +7,8 @@ import android.view.ViewGroup;
 
 import androidx.fragment.app.Fragment;
 
+import com.example.leudaemialikeme.R;
+
 /**
  * A simple {@link Fragment} subclass.
  * Use the {@link MessageFragment#newInstance} factory method to

Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/MyFragment.java

@@ -1,4 +1,4 @@
-package com.example.leudaemialikeme;
+package com.example.leudaemialikeme.Fragment;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -7,6 +7,8 @@ import android.view.ViewGroup;
 
 import androidx.fragment.app.Fragment;
 
+import com.example.leudaemialikeme.R;
+
 /**
  * A simple {@link Fragment} subclass.
  * Use the {@link MyFragment#newInstance} factory method to

Code/LeudaemiaLikeMe/app/src/main/res/layout/activity_main.xml

@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context=".MainActivity">
+    tools:context=".Activity.MainActivity">
 
     <FrameLayout
         android:id="@+id/frag_layout"

Code/LeudaemiaLikeMe/app/src/main/res/layout/activity_send_question.xml

@@ -4,6 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.example.leudaemialikeme.SendQuestionActivity">
+    tools:context="com.example.leudaemialikeme.Activity.SendQuestionActivity">
 
 </LinearLayout>

Code/LeudaemiaLikeMe/app/src/main/res/layout/fragment_community.xml

@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".CommunityFragment">
+    tools:context=".Fragment.CommunityFragment">
 
     <!-- TODO: Update blank fragment layout -->
     <TextView

Code/LeudaemiaLikeMe/app/src/main/res/layout/fragment_index.xml

@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".IndexFragment">
+    tools:context=".Fragment.IndexFragment">
 
     <!-- TODO: Update blank fragment layout -->
     <TextView

Code/LeudaemiaLikeMe/app/src/main/res/layout/fragment_message.xml

@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MessageFragment">
+    tools:context=".Fragment.MessageFragment">
 
     <!-- TODO: Update blank fragment layout -->
     <TextView

Code/LeudaemiaLikeMe/app/src/main/res/layout/fragment_my.xml

@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MyFragment">
+    tools:context=".Fragment.MyFragment">
 
     <!-- TODO: Update blank fragment layout -->
     <TextView