Merge pull request #21 from soma-hamburger/develop_app_main

feat : main view
soma-hamburger · Sep 25, 2019 · a2f55ce · a2f55ce
2 parents 4a629b1 + 98d471b
commit a2f55ce
Show file tree

Hide file tree

Showing 23 changed files with 684 additions and 138 deletions.
diff --git a/FashionToday_App/.DS_Store b/FashionToday_App/.DS_Store
diff --git a/FashionToday_App/Pashion_Today/app/build.gradle b/FashionToday_App/Pashion_Today/app/build.gradle
@@ -11,8 +11,8 @@ android {
         applicationId "com.soma.pashion_today"
         minSdkVersion 15
         targetSdkVersion 29
-        versionCode 2
-        versionName "1.1"
+        versionCode 5
+        versionName "1.5"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -22,7 +22,7 @@ android {
         }
     }
     sourceSets {
-        main{
+        main {
             res.srcDir([
                     'src/main/res/layouts/closet',
                     'src/main/res']
@@ -44,4 +44,5 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
     implementation("com.squareup.okhttp3:okhttp:4.0.1")
     implementation 'com.prolificinteractive:material-calendarview:1.4.3'
+    implementation 'androidx.gridlayout:gridlayout:1.0.0'
 }
diff --git a/...Pashion_Today/app/release/app-release.apk → ...day_App/Pashion_Today/app/release/app.aab b/...Pashion_Today/app/release/app-release.apk → ...day_App/Pashion_Today/app/release/app.aab
diff --git a/FashionToday_App/Pashion_Today/app/release/output.json b/FashionToday_App/Pashion_Today/app/release/output.json
diff --git a/FashionToday_App/Pashion_Today/app/src/main/AndroidManifest.xml b/FashionToday_App/Pashion_Today/app/src/main/AndroidManifest.xml
@@ -2,45 +2,54 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.soma.pashion_today">
 
+    <uses-permission android:name="android.permission.CAMERA"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.INTERNET"/>
+
     <application
             android:allowBackup="true"
             android:icon="@mipmap/ic_launcher"
             android:label="@string/app_name"
             android:roundIcon="@mipmap/ic_launcher_round"
             android:supportsRtl="true"
             android:theme="@style/AppTheme">
-        <activity android:name="com.soma.pashion_today.Page.ClosetActivity"
-                  android:theme="@style/AppTheme.NoActionBar">
+        <activity
+                android:name=".Page.PashionDetail"
+                android:theme="@style/AppTheme.NoActionBar">
         </activity>
         <activity
-                android:name="com.soma.pashion_today.Page.CalendarActivity"
+                android:name=".Page.Closet"
                 android:theme="@style/AppTheme.NoActionBar">
         </activity>
         <activity
-                android:name="com.soma.pashion_today.Page.PashionActivity"
+                android:name=".Page.CalendarActivity"
+                android:theme="@style/AppTheme.NoActionBar">
+        </activity>
+        <activity
+                android:name=".Page.Pashion"
                 android:label="@string/title_activity_pashion"
                 android:theme="@style/AppTheme.NoActionBar">
         </activity>
-        <activity android:name="com.soma.pashion_today.Login.RegisterActivity">
+        <activity android:name=".Login.RegisterActivity">
         </activity>
-        <activity android:name="com.soma.pashion_today.Login.LoginActivity">
+        <activity android:name=".Login.LoginActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
 
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <provider android:authorities="com.soma.pashion_today.httpmultipart.file_provider"
-                  android:name="androidx.core.content.FileProvider"
-                  android:exported="false"
-                  android:grantUriPermissions="true">
+
+        <provider
+                android:name="androidx.core.content.FileProvider"
+                android:authorities="com.soma.pashion_today.httpmultipart.file_provider"
+                android:exported="false"
+                android:grantUriPermissions="true">
             <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/file_path"/>
+                    android:name="android.support.FILE_PROVIDER_PATHS"
+                    android:resource="@xml/file_path"/>
         </provider>
     </application>
-    <uses-permission android:name="android.permission.CAMERA"/>
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 
 </manifest>
diff --git a/...onToday_App/Pashion_Today/app/src/main/java/com/soma/pashion_today/Login/LoginActivity.kt b/...onToday_App/Pashion_Today/app/src/main/java/com/soma/pashion_today/Login/LoginActivity.kt
@@ -4,7 +4,7 @@ import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.widget.Toast
-import com.soma.pashion_today.Page.PashionActivity
+import com.soma.pashion_today.Page.Pashion
 import com.soma.pashion_today.R
 import kotlinx.android.synthetic.main.login_acitivity.*
 import okhttp3.*
@@ -52,7 +52,7 @@ class LoginActivity : AppCompatActivity() {
                         flag=true
                         var t1=Toast.makeText(this,"로그인 되었습니다",Toast.LENGTH_SHORT)
                         t1.show()
-                        var intent=Intent(this,PashionActivity::class.java)
+                        var intent=Intent(this,Pashion::class.java)
                         startActivity(intent)
                     }
                 }
@@ -65,7 +65,7 @@ class LoginActivity : AppCompatActivity() {
                 if("ppp"==Login_user_pw.text.toString()){
                     var toast_msg= Toast.makeText(this,"로그인 되었습니다", Toast.LENGTH_SHORT)
                     toast_msg.show()
-                    var pashion_intent=Intent(this, PashionActivity::class.java)
+                    var pashion_intent=Intent(this, Pashion::class.java)
                     startActivity(pashion_intent)
 
                 }

diff --git a/...Today_App/Pashion_Today/app/src/main/java/com/soma/pashion_today/Page/CalendarActivity.kt b/...Today_App/Pashion_Today/app/src/main/java/com/soma/pashion_today/Page/CalendarActivity.kt
@@ -1,6 +1,5 @@
 package com.soma.pashion_today.Page
 
-import android.app.Activity
 import android.content.DialogInterface
 import android.content.Intent
 import android.graphics.Color
@@ -12,7 +11,6 @@ import android.text.style.RelativeSizeSpan
 import android.text.style.StyleSpan
 import android.view.Menu
 import android.view.MenuItem
-import android.widget.DatePicker
 import androidx.appcompat.app.ActionBarDrawerToggle
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.widget.Toolbar
@@ -27,7 +25,6 @@ import com.prolificinteractive.materialcalendarview.MaterialCalendarView
 import com.prolificinteractive.materialcalendarview.OnDateSelectedListener
 import com.prolificinteractive.materialcalendarview.spans.DotSpan
 import kotlinx.android.synthetic.main.calendar_content.*
-import kotlinx.android.synthetic.main.calendar_content.view.*
 import kotlinx.android.synthetic.main.calendar_do.view.*
 import java.util.*
 import kotlin.collections.HashSet
@@ -141,15 +138,16 @@ class CalendarActivity : AppCompatActivity(), NavigationView.OnNavigationItemSel
         // Handle navigation view item clicks here.
         when (item.itemId) {
             R.id.menu_closet -> {
-                var intent=Intent(this,ClosetActivity::class.java)
+                var intent=Intent(this,Closet::class.java)
                 startActivity(intent)
 
             }
             R.id.menu_daily_look -> {
 
             }
             R.id.menu_calendar -> {
-
+                var intent=Intent(this,CalendarActivity::class.java)
+                startActivity(intent)
             }
             R.id.menu_recommend -> {
 

diff --git a/...soma/pashion_today/Page/ClosetActivity.kt → ...ava/com/soma/pashion_today/Page/Closet.kt b/...soma/pashion_today/Page/ClosetActivity.kt → ...ava/com/soma/pashion_today/Page/Closet.kt
@@ -31,12 +31,11 @@ import java.io.File
 
 /*****
  * 프로그램 ID : HAM-PA-400
- * 프로그램명 : ClosetActivity.kt
- * 작성자명 : 오원석
+ * 프로그램명 : Closet.kt : 오원석
  * 작성일자 : 2019.09.04
  * 버전 : v0.1
  */
-class ClosetActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelectedListener {
+class Closet : AppCompatActivity(), NavigationView.OnNavigationItemSelectedListener {
 
     val CAMERA_ACTIVITY = 1
 
@@ -73,7 +72,7 @@ class ClosetActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelec
     // 액티비티 create 메서드
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.closet_activity)
+        setContentView(R.layout.closet)
         val toolbar: Toolbar = findViewById(R.id.toolbar)
         setSupportActionBar(toolbar)
 
@@ -250,7 +249,7 @@ class ClosetActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelec
 
         when (item.itemId) {
             R.id.menu_closet -> {
-                var intent = Intent(this, ClosetActivity::class.java)
+                var intent = Intent(this, Closet::class.java)
                 startActivity(intent)
             }
             R.id.menu_daily_look -> {