From d60f2029d1cc86346bbc3a07a9c8b6afdfa19eaf Mon Sep 17 00:00:00 2001
From: Annnnnn <658117188@qq.com>
Date: Tue, 9 Nov 2021 17:12:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

# Conflicts:
#	Code/LeudaemiaLikeMe/app/src/main/AndroidManifest.xml
---
 Code/LeudaemiaLikeMe/app/src/main/AndroidManifest.xml       | 6 +-----
 .../{ => Activity}/SendInvitationActivity.java              | 4 +++-
 .../app/src/main/res/layout/activity_send_invitation.xml    | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)
 rename Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/{ => Activity}/SendInvitationActivity.java (79%)

diff --git a/Code/LeudaemiaLikeMe/app/src/main/AndroidManifest.xml b/Code/LeudaemiaLikeMe/app/src/main/AndroidManifest.xml
index b7766de..cd877d1 100644
--- a/Code/LeudaemiaLikeMe/app/src/main/AndroidManifest.xml
+++ b/Code/LeudaemiaLikeMe/app/src/main/AndroidManifest.xml
@@ -9,14 +9,10 @@
         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.SendInvitationActivity"></activity>
         <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" />
 
diff --git a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/SendInvitationActivity.java b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/SendInvitationActivity.java
similarity index 79%
rename from Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/SendInvitationActivity.java
rename to Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/SendInvitationActivity.java
index 9a056a1..e4e0469 100644
--- a/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/SendInvitationActivity.java
+++ b/Code/LeudaemiaLikeMe/app/src/main/java/com/example/leudaemialikeme/Activity/SendInvitationActivity.java
@@ -1,9 +1,11 @@
-package com.example.leudaemialikeme;
+package com.example.leudaemialikeme.Activity;
 
 import android.os.Bundle;
 
 import androidx.appcompat.app.AppCompatActivity;
 
+import com.example.leudaemialikeme.R;
+
 public class SendInvitationActivity extends AppCompatActivity {
 
     @Override
diff --git a/Code/LeudaemiaLikeMe/app/src/main/res/layout/activity_send_invitation.xml b/Code/LeudaemiaLikeMe/app/src/main/res/layout/activity_send_invitation.xml
index 831bbf8..bcf06d4 100644
--- a/Code/LeudaemiaLikeMe/app/src/main/res/layout/activity_send_invitation.xml
+++ b/Code/LeudaemiaLikeMe/app/src/main/res/layout/activity_send_invitation.xml
@@ -5,7 +5,7 @@ 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" >
+    tools:context="com.example.leudaemialikeme.Activity.SendInvitationActivity" >
 
 <LinearLayout
     android:layout_width="match_parent"