diff --git a/.idea/misc.xml b/.idea/misc.xml index 7bfef59..37a7509 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + 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/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 be742f8..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"/>