Merge remote-tracking branch 'origin/master'

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

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

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

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

@@ -0,0 +1,16 @@
+package com.example.leudaemialikeme.Activity;
+
+import android.os.Bundle;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import com.example.leudaemialikeme.R;
+
+public class GoAnswerActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_go_answer);
+    }
+}

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

@@ -0,0 +1,16 @@
+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
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_send_question);
+    }
+}

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_go_answer.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout 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"
+    android:layout_height="match_parent"
+    tools:context=".Activity.GoAnswerActivity">
+
+</androidx.constraintlayout.widget.ConstraintLayout>

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_invitation.xml

@@ -9,83 +9,71 @@
 
 <LinearLayout
     android:layout_width="match_parent"
-        android:layout_height="60dp">
-        <LinearLayout
-        android:layout_width="97dp"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
+    android:layout_height="wrap_content"
+    android:layout_marginTop="15dp"
+    android:layout_marginBottom="15dp"
+    android:orientation="horizontal">
 
-        <Button
-            android:id="@+id/button3"
-            android:layout_width="match_parent"
+    <TextView
+        android:id="@+id/cancel0"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:textSize="20dp"
+        android:gravity="center"
         android:text="取消" />
 
-    </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="217dp"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
-
     <TextView
-                android:id="@+id/textView5"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
+        android:id="@+id/text_release"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_weight="3"
         android:gravity="center"
-                android:textSize="20sp"
-                android:text="发帖" />
-        </LinearLayout>
+        android:textSize="25dp"
+        android:text="发布" />
 
-        <LinearLayout
-            android:layout_width="97dp"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
-
-            <Button
-                android:id="@+id/button4"
-                android:layout_width="match_parent"
+    <TextView
+        android:id="@+id/commit0"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-                android:text="发送" />
-        </LinearLayout>
+        android:layout_weight="1"
+        android:textSize="20dp"
+        android:gravity="center"
+        android:text="提交" />
 
 </LinearLayout>
 
 <LinearLayout
     android:layout_width="match_parent"
-        android:layout_height="308dp"
-        android:orientation="vertical">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="42dp"
+    android:layout_height="wrap_content"
     android:orientation="vertical">
 
     <EditText
-                android:id="@+id/textView3"
+        android:id="@+id/editText_release"
         android:layout_width="match_parent"
         android:layout_height="42dp"
-                android:text=""
+        android:ems="10"
+        android:maxlength="40"
+        android:inputType="textPersonName"
+        android:layout_margin="10dp"
         android:hint="请输入你的标题" />
-        </LinearLayout>
+
     <EditText
-            android:id="@+id/textView4"
+        android:id="@+id/editText_question_detail"
         android:layout_width="match_parent"
-            android:layout_height="42dp"
+        android:layout_height="280dp"
+        android:ems="10"
+        android:inputType="textPersonName"
+        android:maxLines="4"
+        android:gravity="start"
+        android:layout_margin="10dp"
         android:hint="分享你的经验，互帮互助，大家一起好起来呀！" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="93dp"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
-
     <ImageButton
-            android:id="@+id/imageButton3"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-            android:layout_weight="1"
-            app:srcCompat="@mipmap/img_upload_img" />
+        android:src="@mipmap/img_upload_img"
+        android:layout_margin="10dp"
+        />
 </LinearLayout>
 
 </LinearLayout>

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

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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"
+    android:layout_height="match_parent"
+    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