Merge branch 'develop' of https://github.com/artic-development/artic_…

…android into develop

app/src/main/java/com/articrew/artic/ui/collect_archive/CollectArchiveDialogFragment.kt

@@ -33,6 +33,31 @@ class CollectArchiveDialogFragment : BottomSheetDialogFragment() {
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         return inflater.inflate(R.layout.dialog_put_archive, container)
+
+    }
+
+
+    // @수민) 새 아카이브를 만들고 돌아오면 서버에서 데이터를 다시 받아와서 RecyclerView를 설정해준다.
+    override fun onResume() {
+        super.onResume()
+
+        repository.getMyPageMe()
+            .subscribe(
+                {
+                    if(it.isNotEmpty()) {
+                        collectArchiveListAdapter.dataList = it
+                        collectArchiveListAdapter.notifyDataSetChanged()
+
+                        linear_dialog_put_archive_make_new_archive.visibility=View.GONE
+                    }
+                    else{ // 내 아카이브가 없을 때
+                        linear_dialog_put_archive_make_new_archive.visibility=View.VISIBLE
+                    }
+                },
+                {
+                    toast(R.string.network_error)
+                }
+            ).apply { compositeDisposable.add(this) }
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {

app/src/main/java/com/articrew/artic/ui/mypage/mypage/MyPageMeAdapter.kt

@@ -30,7 +30,6 @@ class MyPageMeAdapter(val ctx: Context, var data:List<Archive>): RecyclerView.Ad
                     .load(cur.title_img_url)
                     .apply(defaultHolderOptions)
                     .into(it)
-
             }
 
             directory_name?.text=cur.title

app/src/main/java/com/articrew/artic/ui/setting/setting_editprofile/SettingEditProfileActivity.kt

@@ -151,6 +151,7 @@ class SettingEditProfileActivity : BaseActivity() {
 
         })
 
+        // 완료 버튼
         edit_profile_finish_btn.setOnClickListener {
             if (flag == 1) {
                 logger.log("edit profile finish btn")
@@ -180,6 +181,8 @@ class SettingEditProfileActivity : BaseActivity() {
                         }
                         )
                 }
+
+
             }
             else {
                 toast("정보를 바꿔주세요")

app/src/main/java/com/articrew/artic/ui/signup/signup/SignupPrivateActivity.kt

@@ -78,10 +78,21 @@ class SignupPrivateActivity : BaseActivity() {
         })
 
         et_act_signup_private_birth.addTextChangedListener(object : TextWatcher {
+
+            var prevL = 0
+
             override fun afterTextChanged(p0: Editable?) {
+
+                if ((prevL < p0?.length!!) && (p0?.length == 4 || p0?.length == 7)) {
+                    p0.append('-')
+                }
+
             }
 
             override fun beforeTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) {
+
+                prevL = et_act_signup_private_birth.text.toString().length
+
             }
 
             override fun onTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) {

app/src/main/res/layout/activity_login.xml

@@ -14,7 +14,7 @@
         android:layout_marginStart="120dp"
         android:layout_marginTop="64dp"
         android:layout_marginEnd="120dp"
-        android:src="@drawable/artic_logo"
+        android:src="@drawable/logo_login"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -24,8 +24,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="20dp"
-        android:layout_marginTop="53dp"
-        android:layout_marginEnd="36dp"
+        android:layout_marginTop="56dp"
+        android:layout_marginEnd="20dp"
         android:orientation="vertical"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -62,8 +62,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="20dp"
-        android:layout_marginTop="55dp"
-        android:layout_marginEnd="36dp"
+        android:layout_marginTop="50dp"
+        android:layout_marginEnd="20dp"
         android:orientation="vertical"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -100,7 +100,7 @@
         android:layout_width="match_parent"
         android:layout_height="37dp"
         android:layout_marginStart="80dp"
-        android:layout_marginTop="50dp"
+        android:layout_marginTop="41dp"
         android:layout_marginEnd="80dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -112,4 +112,40 @@
         android:fontFamily="@font/nanum_barungothic_regular"
         android:includeFontPadding="false"/>
 
+    <LinearLayout
+        android:id="@+id/linear_act_login_start_go_to_signup_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/btn_login_complete"
+        android:orientation="vertical"
+        android:layout_marginTop="26dp"
+        android:layout_gravity="center">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="비밀번호를 잊어버리셨나요?"
+            android:textSize="14sp"
+            android:textColor="#242424"
+            android:fontFamily="@font/nanum_barungothic_light"
+            android:includeFontPadding="false"/>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="#242424"
+            android:layout_marginTop="-2dp"/>
+
+    </LinearLayout>
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:src="@drawable/login_character"/>
+
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/activity_make_new_archive.xml

@@ -33,7 +33,7 @@
             android:textColor="#707070"
             android:fontFamily="@font/nanum_barungothic_regular"
             android:includeFontPadding="false"
-            android:padding="20dp"/>
+            android:padding="11dp"/>
 
     </RelativeLayout>
 
@@ -62,7 +62,7 @@
         android:paddingRight="20dp"
         android:paddingTop="15dp"
         android:paddingBottom="300dp"
-        android:hint="브랜드 디자인"
+        android:hint="이름을 입력하세요"
         android:textSize="14sp"
         android:textColor="@color/black"
         android:fontFamily="@font/nanum_barungothic_regular"