diff --git "a/Icon\r" "b/Icon\r" new file mode 100644 index 0000000..e69de29 diff --git a/app/src/main/java/com/articrew/artic/ui/collect_archive/CollectArchiveDialogFragment.kt b/app/src/main/java/com/articrew/artic/ui/collect_archive/CollectArchiveDialogFragment.kt index 06eb6da..113303d 100644 --- a/app/src/main/java/com/articrew/artic/ui/collect_archive/CollectArchiveDialogFragment.kt +++ b/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?) { diff --git a/app/src/main/java/com/articrew/artic/ui/mypage/mypage/MyPageMeAdapter.kt b/app/src/main/java/com/articrew/artic/ui/mypage/mypage/MyPageMeAdapter.kt index 061778d..70990f8 100644 --- a/app/src/main/java/com/articrew/artic/ui/mypage/mypage/MyPageMeAdapter.kt +++ b/app/src/main/java/com/articrew/artic/ui/mypage/mypage/MyPageMeAdapter.kt @@ -30,7 +30,6 @@ class MyPageMeAdapter(val ctx: Context, var data:List): RecyclerView.Ad .load(cur.title_img_url) .apply(defaultHolderOptions) .into(it) - } directory_name?.text=cur.title diff --git a/app/src/main/java/com/articrew/artic/ui/setting/setting_editprofile/SettingEditProfileActivity.kt b/app/src/main/java/com/articrew/artic/ui/setting/setting_editprofile/SettingEditProfileActivity.kt index b475bf0..5daa535 100644 --- a/app/src/main/java/com/articrew/artic/ui/setting/setting_editprofile/SettingEditProfileActivity.kt +++ b/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("정보를 바꿔주세요") diff --git a/app/src/main/java/com/articrew/artic/ui/signup/signup/SignupPrivateActivity.kt b/app/src/main/java/com/articrew/artic/ui/signup/signup/SignupPrivateActivity.kt index ae2fc19..831a7d8 100644 --- a/app/src/main/java/com/articrew/artic/ui/signup/signup/SignupPrivateActivity.kt +++ b/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) { diff --git a/app/src/main/res/alarmCharacter.png b/app/src/main/res/alarmCharacter.png deleted file mode 100644 index b5c57a4..0000000 Binary files a/app/src/main/res/alarmCharacter.png and /dev/null differ diff --git a/app/src/main/res/alarmCharacter@2x.png b/app/src/main/res/alarmCharacter@2x.png deleted file mode 100644 index 7c102dc..0000000 Binary files a/app/src/main/res/alarmCharacter@2x.png and /dev/null differ diff --git a/app/src/main/res/alarmCharacter@3x.png b/app/src/main/res/alarmCharacter@3x.png deleted file mode 100644 index 1802fe8..0000000 Binary files a/app/src/main/res/alarmCharacter@3x.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/login_character.png b/app/src/main/res/drawable-hdpi/login_character.png new file mode 100644 index 0000000..3c73bb8 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/login_character.png differ diff --git a/app/src/main/res/drawable-hdpi/logo_login.png b/app/src/main/res/drawable-hdpi/logo_login.png new file mode 100644 index 0000000..395f9c5 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/logo_login.png differ diff --git a/app/src/main/res/drawable-mdpi/login_character.png b/app/src/main/res/drawable-mdpi/login_character.png new file mode 100644 index 0000000..4afd77c Binary files /dev/null and b/app/src/main/res/drawable-mdpi/login_character.png differ diff --git a/app/src/main/res/drawable-mdpi/logo_login.png b/app/src/main/res/drawable-mdpi/logo_login.png new file mode 100644 index 0000000..9dac251 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/logo_login.png differ diff --git a/app/src/main/res/drawable-xhdpi/login_character.png b/app/src/main/res/drawable-xhdpi/login_character.png new file mode 100644 index 0000000..272bcf7 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/login_character.png differ diff --git a/app/src/main/res/drawable-xhdpi/logo_login.png b/app/src/main/res/drawable-xhdpi/logo_login.png new file mode 100644 index 0000000..a32cf93 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/logo_login.png differ diff --git a/app/src/main/res/drawable-xxhdpi/login_character.png b/app/src/main/res/drawable-xxhdpi/login_character.png new file mode 100644 index 0000000..ff80a44 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/login_character.png differ diff --git a/app/src/main/res/drawable-xxhdpi/logo_login.png b/app/src/main/res/drawable-xxhdpi/logo_login.png new file mode 100644 index 0000000..9f476fb Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/logo_login.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/login_character.png b/app/src/main/res/drawable-xxxhdpi/login_character.png new file mode 100644 index 0000000..eaabf7e Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/login_character.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/logo_login.png b/app/src/main/res/drawable-xxxhdpi/logo_login.png new file mode 100644 index 0000000..c3fdfbe Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/logo_login.png differ diff --git a/app/src/main/res/drawable/drawable-hdpi/logo_login.png b/app/src/main/res/drawable/drawable-hdpi/logo_login.png new file mode 100644 index 0000000..395f9c5 Binary files /dev/null and b/app/src/main/res/drawable/drawable-hdpi/logo_login.png differ diff --git a/app/src/main/res/drawable/drawable-mdpi/logo_login.png b/app/src/main/res/drawable/drawable-mdpi/logo_login.png new file mode 100644 index 0000000..9dac251 Binary files /dev/null and b/app/src/main/res/drawable/drawable-mdpi/logo_login.png differ diff --git a/app/src/main/res/drawable/drawable-xhdpi/logo_login.png b/app/src/main/res/drawable/drawable-xhdpi/logo_login.png new file mode 100644 index 0000000..a32cf93 Binary files /dev/null and b/app/src/main/res/drawable/drawable-xhdpi/logo_login.png differ diff --git a/app/src/main/res/drawable/drawable-xxhdpi/logo_login.png b/app/src/main/res/drawable/drawable-xxhdpi/logo_login.png new file mode 100644 index 0000000..9f476fb Binary files /dev/null and b/app/src/main/res/drawable/drawable-xxhdpi/logo_login.png differ diff --git a/app/src/main/res/drawable/drawable-xxxhdpi/logo_login.png b/app/src/main/res/drawable/drawable-xxxhdpi/logo_login.png new file mode 100644 index 0000000..c3fdfbe Binary files /dev/null and b/app/src/main/res/drawable/drawable-xxxhdpi/logo_login.png differ diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index cd5e862..e39b8bf 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/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"/> + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_make_new_archive.xml b/app/src/main/res/layout/activity_make_new_archive.xml index e33129d..018c9a7 100644 --- a/app/src/main/res/layout/activity_make_new_archive.xml +++ b/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"/> @@ -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"