From e14259bbdbe2583bc1f93c37965ee4df0c6ef036 Mon Sep 17 00:00:00 2001 From: taehun Date: Tue, 29 Oct 2024 19:13:14 +0900 Subject: [PATCH] =?UTF-8?q?=EB=A7=88=EC=9D=B4=ED=8E=98=EC=9D=B4=EC=A7=80?= =?UTF-8?q?=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/deploymentTargetSelector.xml | 3 - app/src/main/AndroidManifest.xml | 21 ++ .../com/example/yesable/ApplyListActivity.kt | 20 ++ .../com/example/yesable/LikeListActivity.kt | 20 ++ .../example/yesable/MemberResignActivity.kt | 20 ++ .../yesable/MemberResignCompleteActivity.kt | 20 ++ .../com/example/yesable/MyInfoActivity.kt | 20 ++ .../com/example/yesable/MyInfoCorrActivity.kt | 20 ++ .../com/example/yesable/MypageMainActivity.kt | 20 ++ app/src/main/res/drawable/error_popup.xml | 6 + .../res/layout/activity_application_form.xml | 210 +++++++++++++-- .../main/res/layout/activity_apply_list.xml | 91 +++++++ .../main/res/layout/activity_like_list.xml | 197 ++++++++++++++ .../res/layout/activity_member_resign.xml | 62 +++++ .../activity_member_resign_complete.xml | 32 +++ app/src/main/res/layout/activity_my_info.xml | 114 ++++++++ .../main/res/layout/activity_my_info_corr.xml | 166 ++++++++++++ .../main/res/layout/activity_mypage_main.xml | 249 ++++++++++++++++++ .../main/res/layout/fragment_onboarding10.xml | 39 +-- .../res/layout/fragmnet_onboarding_error.xml | 43 +++ app/src/main/res/layout/logout_popup.xml | 52 ++++ 21 files changed, 1358 insertions(+), 67 deletions(-) create mode 100644 app/src/main/java/com/example/yesable/ApplyListActivity.kt create mode 100644 app/src/main/java/com/example/yesable/LikeListActivity.kt create mode 100644 app/src/main/java/com/example/yesable/MemberResignActivity.kt create mode 100644 app/src/main/java/com/example/yesable/MemberResignCompleteActivity.kt create mode 100644 app/src/main/java/com/example/yesable/MyInfoActivity.kt create mode 100644 app/src/main/java/com/example/yesable/MyInfoCorrActivity.kt create mode 100644 app/src/main/java/com/example/yesable/MypageMainActivity.kt create mode 100644 app/src/main/res/drawable/error_popup.xml create mode 100644 app/src/main/res/layout/activity_apply_list.xml create mode 100644 app/src/main/res/layout/activity_like_list.xml create mode 100644 app/src/main/res/layout/activity_member_resign.xml create mode 100644 app/src/main/res/layout/activity_member_resign_complete.xml create mode 100644 app/src/main/res/layout/activity_my_info.xml create mode 100644 app/src/main/res/layout/activity_my_info_corr.xml create mode 100644 app/src/main/res/layout/activity_mypage_main.xml create mode 100644 app/src/main/res/layout/fragmnet_onboarding_error.xml create mode 100644 app/src/main/res/layout/logout_popup.xml diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml index 2c3708f..4fd2adc 100644 --- a/.idea/deploymentTargetSelector.xml +++ b/.idea/deploymentTargetSelector.xml @@ -13,9 +13,6 @@ - - \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a2e1a88..a31835b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -12,6 +12,27 @@ android:supportsRtl="true" android:theme="@style/Theme.Yesable" tools:targetApi="31"> + + + + + + + diff --git a/app/src/main/java/com/example/yesable/ApplyListActivity.kt b/app/src/main/java/com/example/yesable/ApplyListActivity.kt new file mode 100644 index 0000000..41f0c43 --- /dev/null +++ b/app/src/main/java/com/example/yesable/ApplyListActivity.kt @@ -0,0 +1,20 @@ +package com.example.yesable + +import android.os.Bundle +import androidx.activity.enableEdgeToEdge +import androidx.appcompat.app.AppCompatActivity +import androidx.core.view.ViewCompat +import androidx.core.view.WindowInsetsCompat + +class ApplyListActivity : AppCompatActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + enableEdgeToEdge() + setContentView(R.layout.activity_apply_list) + ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main)) { v, insets -> + val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars()) + v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom) + insets + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/yesable/LikeListActivity.kt b/app/src/main/java/com/example/yesable/LikeListActivity.kt new file mode 100644 index 0000000..419d5c8 --- /dev/null +++ b/app/src/main/java/com/example/yesable/LikeListActivity.kt @@ -0,0 +1,20 @@ +package com.example.yesable + +import android.os.Bundle +import androidx.activity.enableEdgeToEdge +import androidx.appcompat.app.AppCompatActivity +import androidx.core.view.ViewCompat +import androidx.core.view.WindowInsetsCompat + +class LikeListActivity : AppCompatActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + enableEdgeToEdge() + setContentView(R.layout.activity_like_list) + ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main)) { v, insets -> + val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars()) + v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom) + insets + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/yesable/MemberResignActivity.kt b/app/src/main/java/com/example/yesable/MemberResignActivity.kt new file mode 100644 index 0000000..7bb1655 --- /dev/null +++ b/app/src/main/java/com/example/yesable/MemberResignActivity.kt @@ -0,0 +1,20 @@ +package com.example.yesable + +import android.os.Bundle +import androidx.activity.enableEdgeToEdge +import androidx.appcompat.app.AppCompatActivity +import androidx.core.view.ViewCompat +import androidx.core.view.WindowInsetsCompat + +class MemberResignActivity : AppCompatActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + enableEdgeToEdge() + setContentView(R.layout.activity_member_resign) + ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main)) { v, insets -> + val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars()) + v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom) + insets + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/yesable/MemberResignCompleteActivity.kt b/app/src/main/java/com/example/yesable/MemberResignCompleteActivity.kt new file mode 100644 index 0000000..43cdada --- /dev/null +++ b/app/src/main/java/com/example/yesable/MemberResignCompleteActivity.kt @@ -0,0 +1,20 @@ +package com.example.yesable + +import android.os.Bundle +import androidx.activity.enableEdgeToEdge +import androidx.appcompat.app.AppCompatActivity +import androidx.core.view.ViewCompat +import androidx.core.view.WindowInsetsCompat + +class MemberResignCompleteActivity : AppCompatActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + enableEdgeToEdge() + setContentView(R.layout.activity_member_resign_complete) + ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main)) { v, insets -> + val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars()) + v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom) + insets + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/yesable/MyInfoActivity.kt b/app/src/main/java/com/example/yesable/MyInfoActivity.kt new file mode 100644 index 0000000..9b9cab9 --- /dev/null +++ b/app/src/main/java/com/example/yesable/MyInfoActivity.kt @@ -0,0 +1,20 @@ +package com.example.yesable + +import android.os.Bundle +import androidx.activity.enableEdgeToEdge +import androidx.appcompat.app.AppCompatActivity +import androidx.core.view.ViewCompat +import androidx.core.view.WindowInsetsCompat + +class MyInfoActivity : AppCompatActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + enableEdgeToEdge() + setContentView(R.layout.activity_my_info) + ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main)) { v, insets -> + val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars()) + v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom) + insets + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/yesable/MyInfoCorrActivity.kt b/app/src/main/java/com/example/yesable/MyInfoCorrActivity.kt new file mode 100644 index 0000000..2f92223 --- /dev/null +++ b/app/src/main/java/com/example/yesable/MyInfoCorrActivity.kt @@ -0,0 +1,20 @@ +package com.example.yesable + +import android.os.Bundle +import androidx.activity.enableEdgeToEdge +import androidx.appcompat.app.AppCompatActivity +import androidx.core.view.ViewCompat +import androidx.core.view.WindowInsetsCompat + +class MyInfoCorrActivity : AppCompatActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + enableEdgeToEdge() + setContentView(R.layout.activity_my_info_corr) + ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main)) { v, insets -> + val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars()) + v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom) + insets + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/yesable/MypageMainActivity.kt b/app/src/main/java/com/example/yesable/MypageMainActivity.kt new file mode 100644 index 0000000..cfc1980 --- /dev/null +++ b/app/src/main/java/com/example/yesable/MypageMainActivity.kt @@ -0,0 +1,20 @@ +package com.example.yesable + +import android.os.Bundle +import androidx.activity.enableEdgeToEdge +import androidx.appcompat.app.AppCompatActivity +import androidx.core.view.ViewCompat +import androidx.core.view.WindowInsetsCompat + +class MypageMainActivity : AppCompatActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + enableEdgeToEdge() + setContentView(R.layout.activity_mypage_main) + ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main)) { v, insets -> + val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars()) + v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom) + insets + } + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/error_popup.xml b/app/src/main/res/drawable/error_popup.xml new file mode 100644 index 0000000..0913a8f --- /dev/null +++ b/app/src/main/res/drawable/error_popup.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_application_form.xml b/app/src/main/res/layout/activity_application_form.xml index 5409ba2..2a18973 100644 --- a/app/src/main/res/layout/activity_application_form.xml +++ b/app/src/main/res/layout/activity_application_form.xml @@ -53,7 +53,7 @@ android:layout_height="wrap_content" android:layout_marginStart="16dp" android:layout_marginTop="30dp" - android:text="이력서 제목 *" + android:text="지원서 제목 *" android:textSize="16sp" android:textStyle="bold" app:layout_constraintStart_toStartOf="parent" @@ -67,7 +67,7 @@ android:layout_marginTop="8dp" android:layout_marginEnd="16dp" android:background="@drawable/edit_text_background" - android:hint="장애를 극복하여 긍정적인 변화를 이끈 사람" + android:hint="지원서 제목" android:inputType="text" android:minHeight="48dp" app:layout_constraintEnd_toEndOf="parent" @@ -105,20 +105,91 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/tv_ai_info" /> - + android:padding="16dp" + tools:layout_editor_absoluteX="0dp" + tools:layout_editor_absoluteY="123dp"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + android:padding="16dp" + tools:layout_editor_absoluteX="0dp" + tools:layout_editor_absoluteY="123dp"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + +