08.17 - main->Koominji pull request

README.md

@@ -1,2 +1,42 @@
-# Front-End
-Front-End
+
+## ⏰ 타임튜닝을 소개합니다!
+![image](https://github.com/TIME-TUNNING/Front-End-Android/assets/90263843/b73e62e8-26e6-4cde-9494-368a824a5aed)
+
+
+## 서비스 소개
+
+
+
+> 사람들간의 일정조율을 편리하게 해주는 서비스입니다.<br/>
+
+
+<br/>
+<br/>
+
+> 지금까지 했던 팀프로젝트, 스터디에서 다른 팀원들과의 시간조율을 위해 시간과 에너지를 소모해본 기억이 있으신가요? 시중에는 “개인의 일정관리” 어플은 많지만 여러 사람들이 공통적으로 가능한 시간을 찾아주는 일정조율 어플은 찾기 어렵습니다. 팀원이 많으면 많을수록 일정조율에 더 많은 시간을 소모하게 되는 어려움을 일정조율 어플을 통해 해결하고자 합니다. <br/>
+
+
+<br/>
+<br/>
+
+## 주요 기능
+
+### 😀 공통일정을 잡아야하는 기간을 설정한 후 팀원 각각 본인이 참여가능한 시간을 입력하면 시스템에서 모두가 가능한 시간들을 알려준다.
+
+- 공통일정(스터디, 회의)을 잡아야하는 기간설정
+
+- 날짜별로 각자 본인이 가능한 시간 표시
+
+- 최종적으로 시스템에서 모두가 겹치는 날짜, 시간 결과를 알려준다 
+<br/>
+<br/>
+
+## 주요 기술스택
+- Android(java)
+
+## 👪 fontend 팀원 소개
+
+- 김민지
+- 신미림
+
+

app/src/main/AndroidManifest.xml

@@ -2,6 +2,16 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.kmj.timetuning_hackathon">
 
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+
+    <uses-feature
+        android:name="android.hardware.camera"
+        android:required="true" />
+
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
@@ -22,20 +32,21 @@
 
         <activity
             android:name=".LoginActivity"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER"/>
-            </intent-filter>
+            android:exported="false">
+
 
         </activity>
         <activity
             android:name=".SignUpActivity"
             android:exported="false" />
         <activity
             android:name=".MainActivity"
-            android:exported="false"
+            android:exported="true"
             android:theme="@style/SplashTheme">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
 
         </activity>
     </application>

app/src/main/java/com/kmj/timetuning_hackathon/MyPageFragment.kt

@@ -1,19 +1,47 @@
 package com.kmj.timetuning_hackathon
 
+import android.app.Activity
+import android.app.AlertDialog
+import android.content.ContentResolver
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.graphics.Bitmap
+import android.net.Uri
 import android.os.Bundle
+import android.provider.MediaStore
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.Toast
+import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
+import kotlinx.android.synthetic.main.fragment_mypage.*
+import java.io.File
+import java.lang.Exception
 
 class MyPageFragment : Fragment(){
+
+
+
+
+
+
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
+
+
+
+
+
     ): View? {
         // Inflate the layout for this fragment
         return inflater.inflate(R.layout.fragment_mypage, container, false)
     }
 
 
+
+
 }

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

@@ -1,14 +1,129 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout 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=".MyPageFragment">
+    android:background="@color/mainBackgroundColor"
+    tools:context=".UpdatePlanFragment">
 
-    <TextView
+
+
+
+
+
+
+
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/mypage_top_bar"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        />
+        android:layout_height="60dp"
+        android:background="#FFFFFF"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageView
+            android:id="@+id/create_mypage_logo"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:layout_margin="7dp"
+            android:rotation="180"
+            android:src="@drawable/activitiy_login_logo"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="개인정보 관리"
+            android:textColor="#000000"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+
+
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+    <LinearLayout
+        android:id="@+id/mypage_linear"
+        android:layout_width="413dp"
+        android:layout_height="550dp"
+        android:layout_marginTop="65dp"
+        android:orientation="vertical">
+
+
+        <ImageView
+            android:id="@+id/mypage_profile"
+            android:layout_width="200dp"
+            android:layout_height="200dp"
+            android:layout_marginStart="105dp"
+            android:layout_marginTop="50dp"
+            android:background="?attr/selectableItemBackground"
+            android:src="@drawable/mypage_profile" />
+
+        <TextView
+            android:id="@+id/mypage_name_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:text="신미림"
+            android:textStyle="bold"
+            android:textColor="#3F3F3F"
+            android:textSize="25sp"/>
+
+        <TextView
+            android:id="@+id/mypage_id_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="tlsalfla96"
+            android:layout_gravity="center_horizontal"
+            android:textColor="#858585"/>
+
+        <Button
+            android:id="@+id/mupage_logout_btn"
+            android:layout_width="156dp"
+            android:layout_height="50dp"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="25dp"
+            android:text="로그아웃"
+            android:textColor="#4B77F2"
+            android:textStyle="bold"
+            android:backgroundTint="#FFFFFF"/>
+
+        <Button
+            android:id="@+id/mypage_dropout_btn"
+            android:layout_width="156dp"
+            android:layout_height="50dp"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="5dp"
+            android:text="탈퇴하기"
+            android:textColor="#4B77F2"
+            android:textStyle="bold"
+            android:backgroundTint="#FFFFFF"/>
+
+        <Button
+            android:id="@+id/mypage_ask_btn"
+            android:layout_width="156dp"
+            android:layout_height="50dp"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="5dp"
+            android:text="문의하기"
+            android:textColor="#4B77F2"
+            android:textStyle="bold"
+            android:backgroundTint="#FFFFFF"/>
+
+
+
+
+
+    </LinearLayout>
+
 
-</FrameLayout>
+</FrameLayout>