Feature/temp writing

DdamiApp/app/build.gradle

@@ -96,8 +96,14 @@ dependencies {
 //    implementation 'com.google.firebase:firebase-core:16.0.4'
 //    implementation 'com.google.firebase:firebase-analytics:17.2.2'
 
+
     //noinspection GradleCompatible
     implementation 'com.android.support:design:23.2.0'
+
+    //okhttp
+    implementation 'com.squareup.okhttp3:logging-interceptor:3.12.1'
+//    implementation 'com.android.support:appcompat-v7:27.1.1'
+
 }
 repositories {
     mavenCentral()

DdamiApp/app/local.properties

@@ -4,5 +4,5 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Tue Jul 28 00:12:45 KST 2020
-sdk.dir=C\:\\Users\\USER\\AppData\\Local\\Android\\Sdk
+#Wed Aug 12 19:38:15 KST 2020
+sdk.dir=C\:\\Users\\Hello\\AppData\\Local\\Android\\Sdk

DdamiApp/app/src/main/AndroidManifest.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:Android="http://schemas.android.com/apk/distribution"
     package="com.doubleslash.ddamiapp">
     <!-- camera, gallery -->
     <application
@@ -31,8 +32,11 @@
                 android:resource="@xml/filepaths" />
         </provider>
 
-        <activity android:name=".activity.WritingActivity" />
 
+        <activity android:name=".activity.WritingActivity"
+            android:theme="@style/Theme.AppCompat.DayNight.NoActionBar"
+            Android:windowSoftInputMode="stateVisible|adjustResize"
+            />
         <activity android:name=".activity.DetailActivity" />
         <activity
             android:name=".activity.shop.ShopWritingActivity2_1"

DdamiApp/app/src/main/java/com/doubleslash/ddamiapp/activity/BackPopUP.java

@@ -0,0 +1,56 @@
+package com.doubleslash.ddamiapp.activity;
+
+import android.app.Activity;
+import android.app.Dialog;
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.os.Bundle;
+import android.view.KeyboardShortcutGroup;
+import android.view.Menu;
+import android.view.View;
+import android.widget.Button;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.doubleslash.ddamiapp.R;
+
+import java.util.List;
+
+public class BackPopUP extends Dialog implements View.OnClickListener {
+    Context context;
+    Button cancelWriting, noCancel;
+    protected void onCreate(Bundle savedInstanceState){
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.writing_back_pop_up);
+        cancelWriting = findViewById(R.id.cancelWriting);
+        noCancel = findViewById(R.id.noCancel);
+        cancelWriting.setOnClickListener(this);
+        noCancel.setOnClickListener(this);
+    }
+    public BackPopUP(@NonNull Context context) {
+        super(context);
+        this.context = context;
+
+    }
+
+    @Override
+    public void onClick(View view) {
+        switch (view.getId()){
+            case R.id.cancelWriting:
+                ((WritingActivity)context).finish();
+            case R.id.noCancel:
+                this.dismiss();
+        }
+    }
+
+    @Override
+    public void onProvideKeyboardShortcuts(List<KeyboardShortcutGroup> data, @Nullable Menu menu, int deviceId) {
+
+    }
+
+    @Override
+    public void onPointerCaptureChanged(boolean hasCapture) {
+
+    }
+}

DdamiApp/app/src/main/java/com/doubleslash/ddamiapp/activity/MainActivity.java

@@ -728,6 +728,7 @@
 import com.doubleslash.ddamiapp.R;
 import com.doubleslash.ddamiapp.activity.verification.VerificationActivity;
 import com.doubleslash.ddamiapp.fragment.ActivitisFragment;
+import com.doubleslash.ddamiapp.fragment.GetItemFragment;
 import com.doubleslash.ddamiapp.fragment.LikeFragment;
 import com.doubleslash.ddamiapp.fragment.MainFragment;
 import com.doubleslash.ddamiapp.fragment.MyRoomFragment;
@@ -762,15 +763,15 @@ public class MainActivity extends AppCompatActivity {
     TextView nav_header_program;
     ImageView nav_profile_img;
     Fragment fragment;
-
+    String token;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
         initViews();
 
         String id = getIntent().getStringExtra("id");
-        String token = getIntent().getStringExtra("token");
+        token = getIntent().getStringExtra("token");
 
         Toast.makeText(this, "id = " + id + "token = " + token, Toast.LENGTH_LONG).show();
 
@@ -865,9 +866,15 @@ public void onClick(View v) {
             @Override
             public void onClick(View v) {
                 MyRoomFragment myroom = new MyRoomFragment();
+                MyRoomFragment myroom2 = new MyRoomFragment();
                 drawerLayout.closeDrawers();
                 myroom.setArguments(bundle);
+                System.out.println(token);
+                Bundle bundle2 = new Bundle();
+                bundle2.putString("token",token);
+                myroom2.setArguments(bundle2);
                 replaceFragment(myroom);
+
             }
         });
 
@@ -879,7 +886,14 @@ public void onClick(View v) {
                 replaceFragment(like);
             }
         });
-
+        nav_shop_like.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                GetItemFragment getItem = new GetItemFragment();
+                drawerLayout.closeDrawers();
+                replaceFragment(getItem);
+            }
+        });
         nav_shop.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {