Merge remote-tracking branch 'origin/main'

# Conflicts:
#	app/src/main/res/layout/activity_calendar.xml

Author: SoohyeonB

README.md

@@ -1,3 +1,48 @@
-# Midstart_repo
 제 2회 여대 연대 해커톤 light IT up
-<밋스타트:갱년기 여성을 위한 건강 관리어플>
+
+## MIDSTART, 갱년기 여성을 위한 정신건강 관리어플 👋  
+
+
+
+
+#### Firebase를 이용한 로그인 /  회원관리
+
+<img src="images\login.png" width="500"/>
+
+<br>
+
+#### 메인 화면 
+
+<img src="images\main.png" width="500"/>
+
+<br>
+
+#### AI 챗봇
+
+
+
+<br>
+
+#### 감정 일기
+
+<img src="images\diary.png" width="500"/>
+
+<br>
+
+#### 우울증 자가진단
+
+<img src="images\cse.png" width="500"/>
+
+<br>
+
+#### 갱년기 증상 자가진단
+
+<img src="images\kupperman.png" width="500"/>
+
+<br>
+
+#### 정보성 카드뉴스
+
+<img src="images\cardnews.png" width="500"/>
+
+

app/src/main/java/com/example/midstart/ChatBotActivity.java

@@ -60,11 +60,8 @@ public void onClick(View v) {
 
     private void getResponse(String msg){
         chatsModalArrayList.add(new ChatsModal(msg, USER_KEY));
-
-        String url="http://urlurlurlurl/?msg="+msg;
-
-        String BASE_URL="http://urlurlurlurl/";
-
+        String url=" http://18607213ec4f.ngrok.io/?msg="+msg;
+        String BASE_URL=" http://18607213ec4f.ngrok.io/";
         Retrofit retrofit = new Retrofit.Builder()
                 .baseUrl(BASE_URL)
                 .addConverterFactory(GsonConverterFactory.create())
@@ -73,11 +70,9 @@ private void getResponse(String msg){
         RetrofitAPI retrofitAPI = retrofit.create(RetrofitAPI.class);
 
         Call<MsgModal> call = retrofitAPI.getMessage(url);
-        Log.v("checkcall", String.valueOf(retrofitAPI.getMessage(url)));
         call.enqueue(new Callback<MsgModal>() {
             @Override
             public void onResponse(Call<MsgModal> call, Response<MsgModal> response) {
-
                 if(response.isSuccessful()){
                     MsgModal modal = response.body();
                     chatsModalArrayList.add(new ChatsModal(modal.getAnswer(),BOT_KEY));

app/src/main/java/com/example/midstart/DiaryActivity.java

@@ -132,7 +132,7 @@ public void onClick(View v) {
                 "Q. 죽기 전에 꼭 하고 싶은 일이 있다면?",
                 "Q. 나에게 주고 싶은 선물이 있다면?",
                 "Q. 나의 신조는 무엇인가?",
-                "Q.닮고 싶은 문학작품 속 주인공은?.",
+                "Q. 닮고 싶은 문학작품 속 주인공은?.",
                 "Q. _____은 재미있다.",
                 "Q. 여름이 좋은가, 겨울이 좋은가?",
                 "Q. 내 묘비에 남기고 싶은 말은?",

app/src/main/java/com/example/midstart/MainActivity.java

@@ -53,14 +53,14 @@ public class MainActivity extends AppCompatActivity implements SensorEventListen
     private TextView stepSinceReboot;   // 걸음수
     int stepNow;
 
-    // 날씨, 위치 관련
+
+    // 날씨, 위치
     final String APP_ID = "ac5471e3caa6df5bb40fbe111f57c735";
     final String WEATHER_URL = "https://api.openweathermap.org/data/2.5/weather";
     final long MIN_TIME = 5000; // 5sec
     final float MIN_DISTANCE = 1000;
     final int REQUEST_CODE = 101;
 
-
     TextView weatherState, Temperature;
     ImageView mweatherIcon;
     LocationManager mLocationManager;
@@ -179,6 +179,19 @@ public void onClick(View v) {
             }
         });
 
+        //로그아웃 누르면 로그인화면으로
+        Button logout = (Button) findViewById(R.id.logout);
+        logout.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                mFirebaseAuth.signOut();
+                Intent intent = new Intent(getApplicationContext(), LoginActivity.class);
+                startActivity(intent);
+
+
+            }
+        });
+
 
 
     }

app/src/main/java/com/example/midstart/RegisterActivity.java

@@ -4,6 +4,7 @@
 import androidx.appcompat.app.AppCompatActivity;
 
 import android.content.Intent;
+import android.content.res.ColorStateList;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
@@ -99,4 +100,5 @@ public void onClick(View view){
             }
         });
     }
+
 }

app/src/main/java/com/example/midstart/calendarActivity.java

@@ -80,15 +80,18 @@ public void onCancelled(@NonNull DatabaseError error) {
             }
         });
 
+
+
+ */
+        btn=findViewById(R.id.cal_home);
         btn.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                    Intent intent = new Intent(getApplicationContext(), MainActivity.class);
-                    startActivity(intent);
+                Intent intent = new Intent(getApplicationContext(), MainActivity.class);
+                startActivity(intent);
             }
         });
 
- */
         calendarRecyclerView = findViewById(R.id.calendarRecyclerView);
         calCell = findViewById(R.id.parentView);
         monthYearText = findViewById(R.id.monthYearTV);

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

@@ -6,30 +6,6 @@
     android:layout_height="match_parent"
     tools:context=".calendarActivity">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/layoutTop"
-        android:layout_width="match_parent"
-        android:layout_height="60dp"
-        android:elevation="10dp"
-        android:background="#F0E3FF"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <ImageView
-            android:id="@+id/diaryBack"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="16dp"
-            android:src="@drawable/ic_back"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-
-
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
     <LinearLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -39,13 +15,11 @@
         android:orientation="vertical"
         tools:context=".MainActivity">
 
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
         android:layout_marginBottom="20dp"
-        android:layout_marginTop="60dp"
         >
         <Button
             android:layout_width="0dp"
@@ -91,7 +65,6 @@
         android:layout_height="wrap_content"
         android:orientation="horizontal">
 
-
         <TextView
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -165,6 +138,5 @@
         android:id="@+id/calendarRecyclerView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>
-
     </LinearLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -55,7 +55,7 @@
         app:sliderAutoCycleEnabled="false"
         app:sliderIndicatorAnimationDuration="600"
         app:sliderIndicatorGravity="center_horizontal|bottom"
-        app:sliderIndicatorMargin="15dp"
+        app:sliderIndicatorMarginTop="30dp"
         app:sliderIndicatorOrientation="horizontal"
         app:sliderIndicatorPadding="3dp"
         app:sliderIndicatorRadius="2dp"

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

@@ -13,7 +13,7 @@
         android:id="@+id/et_email"
         android:layout_width="270dp"
         android:layout_height="60dp"
-        android:fontFamily="@font/cafe24oneprettynight"
+
         android:ems="10"
         android:textColor="@color/black"
         android:hint="이메일을 입력하세요"
@@ -27,10 +27,10 @@
         android:id="@+id/et_pwd"
         android:layout_width="270dp"
         android:layout_height="60dp"
-        android:fontFamily="@font/cafe24oneprettynight"
+
         android:ems="10"
         android:textColor="@color/black"
-
+        app:passwordToggleTint="@color/black"
         android:inputType="textPassword"
         android:hint="비밀번호를 입력하세요"
 

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

@@ -88,6 +88,7 @@
         android:elevation="12dp"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+
         tools:layout_editor_absoluteX="0dp"
         tools:layout_editor_absoluteY="0dp">
 
@@ -348,6 +349,25 @@
 
                 </androidx.cardview.widget.CardView>
 
+                <Button
+                    android:id="@+id/logout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10dp"
+                    android:layout_marginTop="20dp"
+                    android:layout_marginRight="10dp"
+                    android:layout_marginBottom="20dp"
+                    android:background="@drawable/button_design_2"
+                    android:text="로그아웃"
+                    android:textColor="#AD8EDB"
+                    app:layout_constraintBottom_toBottomOf="parent"
+
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/cardView11" />
+
+
+
             </androidx.constraintlayout.widget.ConstraintLayout>
 
 

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

@@ -25,7 +25,7 @@
         android:id="@+id/et_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:fontFamily="@font/cafe24oneprettynight"
+
         android:ems="10"
         android:hint="이름을 입력하세요"
         android:textColor="@color/black"
@@ -55,7 +55,7 @@
         android:ems="10"
         android:hint="이메일을 입력하세요"
         android:inputType="textEmailAddress"
-        android:fontFamily="@font/cafe24oneprettynight"
+
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/email"/>
@@ -79,10 +79,14 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:ems="10"
-        android:textColor="@color/black"
+
+
+
         android:inputType="textPassword"
+        app:passwordToggleTint="@color/black"
         android:hint="비밀번호를 입력하세요"
-        android:fontFamily="@font/cafe24oneprettynight"
+
+        android:fontFamily="sans-serif"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.497"
         app:layout_constraintStart_toStartOf="parent"