last

InventoryBox · Sep 20, 2020 · 71bf463 · 71bf463
1 parent 35c8ca5
commit 71bf463
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 22 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -71,7 +71,6 @@
         <activity android:name=".activity.FindEmailActivity" />
         <activity android:name=".activity.ServiceActivity" />
         <activity android:name=".activity.ServiceTermActivity" />
-        <activity android:name=".activity.ServiceLicenseActivity" />
         <activity android:name=".activity.ServicePrivacyActivity" />
         <activity android:name=".activity.SettingInstructionsActivity"></activity>
         <activity android:name=".activity.TermsPersonal"/>

diff --git a/app/src/main/java/com/example/inventorybox/activity/HomePersonalActivity.kt b/app/src/main/java/com/example/inventorybox/activity/HomePersonalActivity.kt
@@ -104,8 +104,9 @@ class HomePersonalActivity : AppCompatActivity() {
             ).customEnqueue(
                 onSuccess = {
                     Log.d("personal", "개인 정보 변경 성공")
-                    val intent = Intent(this, MainActivity::class.java)
-                    startActivity(intent)
+//                    val intent = Intent(this, MainActivity::class.java)
+//                    startActivity(intent)
+                    finish()
                 }
             )
         }

diff --git a/app/src/main/java/com/example/inventorybox/activity/HomeProfileActivity.kt b/app/src/main/java/com/example/inventorybox/activity/HomeProfileActivity.kt
@@ -151,10 +151,11 @@ class HomeProfileActivity : AppCompatActivity() {
                     Log.d("profile request", "프로필 변경 실패")
                 },
                 onSuccess = {
-                    Log.d("profile request", "프로필 변경 성공")
-                    Log.d("profile request", "${rqNickname}")
-                    val intent = Intent(this, MainActivity::class.java)
-                    startActivity(intent)
+//                    Log.d("profile request", "프로필 변경 성공")
+//                    Log.d("profile request", "${rqNickname}")
+//                    val intent = Intent(this, MainActivity::class.java)
+//                    startActivity(intent)
+                    finish()
                 },
                 onError = {
                     Log.d("profile request", "에러")

diff --git a/app/src/main/java/com/example/inventorybox/activity/MainActivity.kt b/app/src/main/java/com/example/inventorybox/activity/MainActivity.kt
@@ -48,7 +48,7 @@ class MainActivity : AppCompatActivity() {
 //        main_bottom_navigation.setItemIconSize(50)  //하단바 아이콘 사이즈
 
         //유저 개인 정보 가져오기
-        getPersonal()
+//        getPersonal()
 
         //드로워 선택
         drawerSelected()
@@ -158,6 +158,11 @@ class MainActivity : AppCompatActivity() {
         )
     }
 
+    override fun onStart() {
+        super.onStart()
+        getPersonal()
+    }
+
 
 
 }
diff --git a/app/src/main/java/com/example/inventorybox/activity/ServiceActivity.kt b/app/src/main/java/com/example/inventorybox/activity/ServiceActivity.kt
@@ -17,7 +17,8 @@ class ServiceActivity : AppCompatActivity() {
         }
 
         service_term.setOnClickListener {
-            startActivity(Intent(this, ServiceTermActivity::class.java))
+//            startActivity(Intent(this, ServiceTermActivity::class.java))
+            startActivity(Intent(this, TermsConditionsActivity::class.java))
         }
 
         service_privacy.setOnClickListener {

diff --git a/app/src/main/java/com/example/inventorybox/network/RequestToServer.kt b/app/src/main/java/com/example/inventorybox/network/RequestToServer.kt
@@ -4,15 +4,15 @@ import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
 
 object RequestToServer {
-    private val baseURL = "http//ec2-13-209-128-238.ap-northeast-2.compute.amazonaws.com:3000"
 //    private val baseURL = "ec2-13-209-128-238.ap-northeast-2.compute.amazonaws.com:3000"
     val retrofit_kakao  = Retrofit.Builder()
         .baseUrl("https://dapi.kakao.com")
         .addConverterFactory(GsonConverterFactory.create())
         .build()
 
     val retrofit: Retrofit = Retrofit.Builder()
-        .baseUrl("http://ec2-13-209-128-238.ap-northeast-2.compute.amazonaws.com:3000")
+//        .baseUrl("http://ec2-13-209-128-238.ap-northeast-2.compute.amazonaws.com:3000")
+        .baseUrl("https://ec2.inventoryboxserver.com")
         .addConverterFactory(GsonConverterFactory.create())
         .build()
 

diff --git a/app/src/main/res/layout/activity_home_order_detail.xml b/app/src/main/res/layout/activity_home_order_detail.xml
@@ -79,8 +79,9 @@
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/rv_home_order_detail"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="16dp"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp"
+            android:layout_height="match_parent"
             android:orientation="vertical"
             app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
             tools:listitem="@layout/item_home_orderlist" />

diff --git a/app/src/main/res/layout/activity_home_order_edit.xml b/app/src/main/res/layout/activity_home_order_edit.xml
@@ -53,7 +53,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:paddingTop="16dp"
-            android:layout_marginHorizontal="16dp"
             android:orientation="vertical"
             app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
             tools:listitem="@layout/item_home_edit_memo" />

diff --git a/app/src/main/res/layout/item_home_edit_memo.xml b/app/src/main/res/layout/item_home_edit_memo.xml
@@ -5,16 +5,19 @@
     android:id="@+id/rv_home_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/shadow">
+    android:elevation="2dp"
+    android:layout_marginHorizontal="16dp"
+    android:layout_marginTop="4dp"
+    android:layout_marginBottom="4dp"
+    android:background="@drawable/graph_rec9_white">
 
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/constraintLayout"
         android:layout_width="83dp"
         android:layout_height="84dp"
-        android:layout_marginTop="2dp"
+        android:layout_marginTop="9dp"
         android:layout_marginStart="2dp"
-        android:background="@drawable/shadow"
         android:orientation="vertical"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">

diff --git a/app/src/main/res/layout/item_home_orderlist.xml b/app/src/main/res/layout/item_home_orderlist.xml
@@ -5,7 +5,11 @@
     android:id="@+id/rv_home_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/shadow">
+    android:layout_marginHorizontal="16dp"
+    android:layout_marginTop="4dp"
+    android:layout_marginBottom="4dp"
+    android:elevation="2dp"
+    android:background="@drawable/graph_rec9_white">
 
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -14,7 +18,6 @@
         android:layout_height="84dp"
         android:layout_marginTop="2dp"
         android:layout_marginStart="2dp"
-        android:background="@drawable/shadow"
         android:orientation="vertical"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
@@ -25,7 +28,7 @@
             android:layout_height="45dp"
             android:layout_gravity="center"
             android:layout_marginStart="17dp"
-            android:layout_marginTop="9dp"
+            android:layout_marginTop="15dp"
             android:layout_marginEnd="17dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -39,14 +42,16 @@
             android:layout_gravity="center"
             android:layout_marginStart="29dp"
             android:layout_marginEnd="29dp"
+            android:layout_marginBottom="6dp"
+            android:layout_marginTop="4dp"
             android:fontFamily="@font/nanum_square_bold"
             android:gravity="center"
             android:text="우유"
             android:textColor="#414743"
             android:textSize="11sp"
-            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/img_rv_product" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <CheckBox