diff --git a/Code/LeudaemiaLikeMe/app/src/main/AndroidManifest.xml b/Code/LeudaemiaLikeMe/app/src/main/AndroidManifest.xml
index 9f33bc3..b7766de 100644
--- a/Code/LeudaemiaLikeMe/app/src/main/AndroidManifest.xml
+++ b/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
+=======
+
+
+
+>>>>>>> origin/master
diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/GoAnswerActivity.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/GoAnswerActivity.java
new file mode 100644
index 0000000..f43b1af
--- /dev/null
+++ b/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);
+ }
+}
\ No newline at end of file
diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/MainActivity.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/MainActivity.java
similarity index 94%
rename from Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/MainActivity.java
rename to Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/MainActivity.java
index e2f9ca3..28fb351 100644
--- a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/MainActivity.java
+++ b/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;
diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/SendQuestionActivity.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/SendQuestionActivity.java
new file mode 100644
index 0000000..a1a884c
--- /dev/null
+++ b/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);
+ }
+}
diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/CommunityFragment.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/CommunityFragment.java
similarity index 95%
rename from Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/CommunityFragment.java
rename to Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/CommunityFragment.java
index 06d2cf7..846cc53 100644
--- a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/CommunityFragment.java
+++ b/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
diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/IndexFragment.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/IndexFragment.java
similarity index 95%
rename from Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/IndexFragment.java
rename to Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/IndexFragment.java
index dedcd55..f159b6c 100644
--- a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/IndexFragment.java
+++ b/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
diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/MessageFragment.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/MessageFragment.java
similarity index 95%
rename from Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/MessageFragment.java
rename to Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/MessageFragment.java
index 978af02..ce5a8cf 100644
--- a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/MessageFragment.java
+++ b/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
diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/MyFragment.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/MyFragment.java
similarity index 95%
rename from Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/MyFragment.java
rename to Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Fragment/MyFragment.java
index c14bee2..e75e9cb 100644
--- a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/MyFragment.java
+++ b/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
diff --git a/Code/LeudaemiaLikeMe/app/src/main/res/layout/activity_go_answer.xml b/Code/LeudaemiaLikeMe/app/src/main/res/layout/activity_go_answer.xml
new file mode 100644
index 0000000..6b2601e
--- /dev/null
+++ b/Code/LeudaemiaLikeMe/app/src/main/res/layout/activity_go_answer.xml
@@ -0,0 +1,9 @@
+
+
+
+
\ No newline at end of file
diff --git a/Code/LeudaemiaLikeMe/app/src/main/res/layout/activity_main.xml b/Code/LeudaemiaLikeMe/app/src/main/res/layout/activity_main.xml
index d30d6fe..ad3aa11 100644
--- a/Code/LeudaemiaLikeMe/app/src/main/res/layout/activity_main.xml
+++ b/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">
-
-
-
-
-
+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"
+android:orientation="vertical"
+ tools:context="com.example.leudaemialikeme.SendInvitationActivity" >
-
+
-
+
-
-
+
-
+
-
-
+
-
+
-
-
-
-
-
-
-
-
+ android:layout_height="42dp"
+ android:ems="10"
+ android:maxlength="40"
+ android:inputType="textPersonName"
+ android:layout_margin="10dp"
+ android:hint="请输入你的标题" />
-
+
-
-
-
+ android:src="@mipmap/img_upload_img"
+ android:layout_margin="10dp"
+ />
+
diff --git a/Code/LeudaemiaLikeMe/app/src/main/res/layout/activity_send_question.xml b/Code/LeudaemiaLikeMe/app/src/main/res/layout/activity_send_question.xml
new file mode 100644
index 0000000..154526f
--- /dev/null
+++ b/Code/LeudaemiaLikeMe/app/src/main/res/layout/activity_send_question.xml
@@ -0,0 +1,9 @@
+
+
+
+
diff --git a/Code/LeudaemiaLikeMe/app/src/main/res/layout/fragment_community.xml b/Code/LeudaemiaLikeMe/app/src/main/res/layout/fragment_community.xml
index fa00226..af6457d 100644
--- a/Code/LeudaemiaLikeMe/app/src/main/res/layout/fragment_community.xml
+++ b/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">
+ tools:context=".Fragment.IndexFragment">
+ tools:context=".Fragment.MessageFragment">
+ tools:context=".Fragment.MyFragment">