Merge pull request #17 from soma-hamburger/develop_app_calendar

feat : calendar
soma-hamburger · Sep 9, 2019 · 4a629b1 · 4a629b1
2 parents 96a9b31 + f4ab78b
commit 4a629b1
Show file tree

Hide file tree

Showing 17 changed files with 461 additions and 234 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
@@ -8,11 +8,11 @@ android {
     compileSdkVersion 29
     buildToolsVersion "29.0.0"
     defaultConfig {
-        applicationId "com.example.pashion_today"
+        applicationId "com.soma.pashion_today"
         minSdkVersion 15
         targetSdkVersion 29
-        versionCode 1
-        versionName "1.0"
+        versionCode 2
+        versionName "1.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -43,4 +43,5 @@ dependencies {
     androidTestImplementation 'androidx.test:runner:1.2.0'
     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'
 }
diff --git a/FashionToday_App/Pashion_Today/app/release/app-release.apk b/FashionToday_App/Pashion_Today/app/release/app-release.apk
diff --git a/FashionToday_App/Pashion_Today/app/release/output.json b/FashionToday_App/Pashion_Today/app/release/output.json
@@ -0,0 +1 @@
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":2,"versionName":"1.1","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
diff --git a/.../pashion_today/ExampleInstrumentedTest.kt → .../pashion_today/ExampleInstrumentedTest.kt b/.../pashion_today/ExampleInstrumentedTest.kt → .../pashion_today/ExampleInstrumentedTest.kt
@@ -1,4 +1,4 @@
-package com.example.pashion_today
+package com.soma.pashion_today
 
 import androidx.test.InstrumentationRegistry
 import androidx.test.runner.AndroidJUnit4

diff --git a/FashionToday_App/Pashion_Today/app/src/main/AndroidManifest.xml b/FashionToday_App/Pashion_Today/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.example.pashion_today">
+          package="com.soma.pashion_today">
 
     <application
             android:allowBackup="true"
@@ -9,28 +9,28 @@
             android:roundIcon="@mipmap/ic_launcher_round"
             android:supportsRtl="true"
             android:theme="@style/AppTheme">
-        <activity android:name=".Page.ClosetActivity"
+        <activity android:name="com.soma.pashion_today.Page.ClosetActivity"
                   android:theme="@style/AppTheme.NoActionBar">
         </activity>
         <activity
-                android:name=".Page.CalendarActivity"
+                android:name="com.soma.pashion_today.Page.CalendarActivity"
                 android:theme="@style/AppTheme.NoActionBar">
         </activity>
         <activity
-                android:name=".Page.PashionActivity"
+                android:name="com.soma.pashion_today.Page.PashionActivity"
                 android:label="@string/title_activity_pashion"
                 android:theme="@style/AppTheme.NoActionBar">
         </activity>
-        <activity android:name=".Login.RegisterActivity">
+        <activity android:name="com.soma.pashion_today.Login.RegisterActivity">
         </activity>
-        <activity android:name=".Login.LoginActivity">
+        <activity android:name="com.soma.pashion_today.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.example.pashion_today.httpmultipart.file_provider"
+        <provider android:authorities="com.soma.pashion_today.httpmultipart.file_provider"
                   android:name="androidx.core.content.FileProvider"
                   android:exported="false"
                   android:grantUriPermissions="true">

diff --git a/...ay_App/Pashion_Today/app/src/main/java/com/example/pashion_today/Page/CalendarActivity.kt b/...ay_App/Pashion_Today/app/src/main/java/com/example/pashion_today/Page/CalendarActivity.kt
diff --git a/...mple/pashion_today/Login/LoginActivity.kt → ...soma/pashion_today/Login/LoginActivity.kt b/...mple/pashion_today/Login/LoginActivity.kt → ...soma/pashion_today/Login/LoginActivity.kt
@@ -1,11 +1,11 @@
-package com.example.pashion_today.Login
+package com.soma.pashion_today.Login
 
 import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.widget.Toast
-import com.example.pashion_today.Page.PashionActivity
-import com.example.pashion_today.R
+import com.soma.pashion_today.Page.PashionActivity
+import com.soma.pashion_today.R
 import kotlinx.android.synthetic.main.login_acitivity.*
 import okhttp3.*
 import org.json.JSONArray

diff --git a/...e/pashion_today/Login/RegisterActivity.kt → ...a/pashion_today/Login/RegisterActivity.kt b/...e/pashion_today/Login/RegisterActivity.kt → ...a/pashion_today/Login/RegisterActivity.kt
@@ -1,9 +1,9 @@
-package com.example.pashion_today.Login
+package com.soma.pashion_today.Login
 
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import androidx.appcompat.app.AlertDialog
-import com.example.pashion_today.R
+import com.soma.pashion_today.R
 import kotlinx.android.synthetic.main.register_activity.*
 import okhttp3.*
 import java.io.IOException