last

InventoryBox · Sep 21, 2020 · 17d684b · 17d684b
1 parent 71bf463
commit 17d684b
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 23 deletions.
diff --git a/app/release/output.json b/app/release/output.json
@@ -0,0 +1,20 @@
+{
+  "version": 1,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "com.example.inventorybox",
+  "variantName": "release",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "properties": [],
+      "versionCode": 1,
+      "versionName": "1",
+      "enabled": true,
+      "outputFile": "app-release.apk"
+    }
+  ]
+}
diff --git a/app/src/main/java/com/example/inventorybox/activity/MainActivity.kt b/app/src/main/java/com/example/inventorybox/activity/MainActivity.kt
@@ -165,4 +165,5 @@ class MainActivity : AppCompatActivity() {
 
 
 
+
 }
diff --git a/app/src/main/res/layout/activity_home_order_edit.xml b/app/src/main/res/layout/activity_home_order_edit.xml
@@ -10,8 +10,7 @@
         android:layout_width="match_parent"
         android:layout_height="56dp"
         android:background="@color/white"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/fl_today_order">
+        app:layout_constraintStart_toStartOf="parent">
 
         <TextView
             android:layout_width="wrap_content"

diff --git a/app/src/main/res/layout/activity_service.xml b/app/src/main/res/layout/activity_service.xml
@@ -27,15 +27,13 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:layout_marginStart="89dp"
             android:layout_marginTop="17dp"
-            android:layout_marginEnd="137dp"
             android:fontFamily="@font/nanum_square_bold"
             android:text="서비스 정보"
             android:textColor="@color/darkgrey"
             android:textSize="18sp"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/btn_back_home_personal"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>

diff --git a/app/src/main/res/layout/activity_service_privacy.xml b/app/src/main/res/layout/activity_service_privacy.xml
@@ -28,15 +28,13 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:layout_marginStart="67dp"
             android:layout_marginTop="17dp"
-            android:layout_marginEnd="115dp"
             android:fontFamily="@font/nanum_square_bold"
             android:text="개인정보처리방침"
             android:textColor="@color/darkgrey"
             android:textSize="18sp"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/btn_back_home_personal"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>

diff --git a/app/src/main/res/layout/activity_service_term.xml b/app/src/main/res/layout/activity_service_term.xml
@@ -36,7 +36,6 @@
             android:textColor="@color/darkgrey"
             android:textSize="18sp"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/btn_back_home_personal"
             app:layout_constraintTop_toTopOf="parent" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>

diff --git a/app/src/main/res/layout/fragment_exchange.xml b/app/src/main/res/layout/fragment_exchange.xml
@@ -142,7 +142,6 @@
             android:id="@+id/exchange_viewPager"
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            app:layout_constraintBottom_toTopOf="@+id/main_bottom_navigation"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.0"
             app:layout_constraintStart_toStartOf="parent"

diff --git a/app/src/main/res/layout/fragment_find_password.xml b/app/src/main/res/layout/fragment_find_password.xml
@@ -44,7 +44,6 @@
             android:textFontWeight="200"
             android:textColorHint="@color/middlegrey"
             android:textSize="13sp"
-            app:layout_constraintBottom_toTopOf="@+id/et_auth_num"
             app:layout_constraintEnd_toStartOf="@+id/guideline2"
             app:layout_constraintHorizontal_bias="0.0"
             app:layout_constraintStart_toStartOf="@+id/guideline"
@@ -210,18 +209,6 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintGuide_end="16dp" />
 
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/email_result"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="78dp"
-            android:visibility="invisible"
-            app:layout_constraintStart_toStartOf="@+id/guideline"
-            app:layout_constraintTop_toBottomOf="@+id/find_email_et_tel">
-
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
 
         <Button
             android:id="@+id/btn_find_pw_fin"