From 337d501b8fdb4218c10aca078f770a4b455b02fd Mon Sep 17 00:00:00 2001 From: ss99x2002 Date: Sun, 9 Jul 2023 21:18:36 +0900 Subject: [PATCH 1/4] =?UTF-8?q?[Design/#19]=20=ED=99=88=20fragment=20UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../presentation/home/HomeFragment.kt | 4 ++ .../res/drawable/shape_grey_fill_r84_rect.xml | 6 +++ .../res/layout/activity_question_answer.xml | 42 ++++++++++--------- app/src/main/res/layout/fragment_home.xml | 32 +++++++++++++- app/src/main/res/values/strings.xml | 1 + 5 files changed, 64 insertions(+), 21 deletions(-) create mode 100644 app/src/main/java/com/sopt/umbba_android/presentation/home/HomeFragment.kt create mode 100644 app/src/main/res/drawable/shape_grey_fill_r84_rect.xml diff --git a/app/src/main/java/com/sopt/umbba_android/presentation/home/HomeFragment.kt b/app/src/main/java/com/sopt/umbba_android/presentation/home/HomeFragment.kt new file mode 100644 index 00000000..8f07e9eb --- /dev/null +++ b/app/src/main/java/com/sopt/umbba_android/presentation/home/HomeFragment.kt @@ -0,0 +1,4 @@ +package com.sopt.umbba_android.presentation.home + +class HomeFragment { +} \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_grey_fill_r84_rect.xml b/app/src/main/res/drawable/shape_grey_fill_r84_rect.xml new file mode 100644 index 00000000..dd094136 --- /dev/null +++ b/app/src/main/res/drawable/shape_grey_fill_r84_rect.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_question_answer.xml b/app/src/main/res/layout/activity_question_answer.xml index 336a8581..d54c5ec9 100644 --- a/app/src/main/res/layout/activity_question_answer.xml +++ b/app/src/main/res/layout/activity_question_answer.xml @@ -45,16 +45,17 @@ android:textAppearance="@style/AndroidSubHead1SemiBold20" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tv_title" /> - - + + - - + + + + - \ No newline at end of file + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 67a0363f..3df4e492 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -70,4 +70,5 @@ 할머니와 엄마의 꿈은 달랐어? 당신과 어머니의 꿈은 달라? sdlkfjslkdjfklsdjfksdf\nsldkfjsldkjflksdjf + 질문 답변하기 \ No newline at end of file From 29cd049957748aec855670fe431852f202a1dc8a Mon Sep 17 00:00:00 2001 From: ss99x2002 Date: Sun, 9 Jul 2023 21:20:02 +0900 Subject: [PATCH 2/4] =?UTF-8?q?[Design/#19]=20=ED=99=88=20fragment=20bindi?= =?UTF-8?q?ng?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../presentation/home/HomeFragment.kt | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/sopt/umbba_android/presentation/home/HomeFragment.kt b/app/src/main/java/com/sopt/umbba_android/presentation/home/HomeFragment.kt index 8f07e9eb..f8061cef 100644 --- a/app/src/main/java/com/sopt/umbba_android/presentation/home/HomeFragment.kt +++ b/app/src/main/java/com/sopt/umbba_android/presentation/home/HomeFragment.kt @@ -1,4 +1,19 @@ package com.sopt.umbba_android.presentation.home -class HomeFragment { +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import com.sopt.umbba_android.R +import com.sopt.umbba_android.databinding.FragmentHomeBinding +import com.sopt.umbba_android.util.binding.BindingFragment + +class HomeFragment : BindingFragment(R.layout.fragment_home) { + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + return super.onCreateView(inflater, container, savedInstanceState) + } } \ No newline at end of file From e8a0ae557eeeedbccc5210322c0c7e565c51932f Mon Sep 17 00:00:00 2001 From: ss99x2002 Date: Sun, 9 Jul 2023 22:13:18 +0900 Subject: [PATCH 3/4] =?UTF-8?q?[Feat/#19]=20=ED=99=88=20=EB=B7=B0=20?= =?UTF-8?q?=EB=B0=B0=EA=B2=BD=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../umbba_android/presentation/MainActivity.kt | 15 ++++++++++++--- .../presentation/home/HomeFragment.kt | 15 +++++++++------ app/src/main/res/drawable/iv_maru.jpg | Bin 0 -> 27247 bytes app/src/main/res/layout/activity_main.xml | 13 +++---------- app/src/main/res/layout/activity_set_time.xml | 4 ++-- app/src/main/res/layout/fragment_home.xml | 8 ++++++++ 6 files changed, 34 insertions(+), 21 deletions(-) create mode 100644 app/src/main/res/drawable/iv_maru.jpg diff --git a/app/src/main/java/com/sopt/umbba_android/presentation/MainActivity.kt b/app/src/main/java/com/sopt/umbba_android/presentation/MainActivity.kt index ee45db23..2c842b84 100644 --- a/app/src/main/java/com/sopt/umbba_android/presentation/MainActivity.kt +++ b/app/src/main/java/com/sopt/umbba_android/presentation/MainActivity.kt @@ -3,13 +3,22 @@ package com.sopt.umbba_android.presentation import android.content.Intent import androidx.appcompat.app.AppCompatActivity import android.os.Bundle +import androidx.fragment.app.Fragment import com.sopt.umbba_android.R +import com.sopt.umbba_android.databinding.ActivityMainBinding +import com.sopt.umbba_android.presentation.home.HomeFragment import com.sopt.umbba_android.presentation.qna.QuestionAnswerActivity +import com.sopt.umbba_android.util.binding.BindingActivity -class MainActivity : AppCompatActivity() { +class MainActivity :BindingActivity(R.layout.activity_main){ override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - setContentView(R.layout.activity_main) - startActivity(Intent(this, QuestionAnswerActivity::class.java)) + changeFragment(HomeFragment()) + } + + private fun changeFragment(fragment: Fragment) { + supportFragmentManager.beginTransaction() + .add(R.id.fragment_fv, fragment) + .commit() } } \ No newline at end of file diff --git a/app/src/main/java/com/sopt/umbba_android/presentation/home/HomeFragment.kt b/app/src/main/java/com/sopt/umbba_android/presentation/home/HomeFragment.kt index f8061cef..a5954d02 100644 --- a/app/src/main/java/com/sopt/umbba_android/presentation/home/HomeFragment.kt +++ b/app/src/main/java/com/sopt/umbba_android/presentation/home/HomeFragment.kt @@ -4,16 +4,19 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import coil.load import com.sopt.umbba_android.R import com.sopt.umbba_android.databinding.FragmentHomeBinding import com.sopt.umbba_android.util.binding.BindingFragment class HomeFragment : BindingFragment(R.layout.fragment_home) { - override fun onCreateView( - inflater: LayoutInflater, - container: ViewGroup?, - savedInstanceState: Bundle? - ): View? { - return super.onCreateView(inflater, container, savedInstanceState) + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + setBackground() + } + private fun setBackground(){ + with(binding){ + ivBackground.load("https://i.ibb.co/sRV9Vr4/iv-maru.jpg") + } } } \ No newline at end of file diff --git a/app/src/main/res/drawable/iv_maru.jpg b/app/src/main/res/drawable/iv_maru.jpg new file mode 100644 index 0000000000000000000000000000000000000000..86c5a14c0ffa363966480010b9c3ab33b33ab32c GIT binary patch literal 27247 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 C# + - - - \ No newline at end of file + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_set_time.xml b/app/src/main/res/layout/activity_set_time.xml index 378bb067..86863969 100644 --- a/app/src/main/res/layout/activity_set_time.xml +++ b/app/src/main/res/layout/activity_set_time.xml @@ -58,9 +58,9 @@ android:layout_height="60dp" android:layout_marginHorizontal="24dp" android:layout_marginVertical="24dp" - android:background="@drawable/sel_invite_code_btn_next" + android:background="@drawable/sel_btn_next" android:enabled="true" - android:text="@string/invite_code_next" + android:text="@string/btn_next" android:textColor="@color/white" android:textSize="16sp" app:layout_constraintBottom_toBottomOf="parent" /> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 9539b04c..5bc2d20a 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -1,8 +1,16 @@ + Date: Sun, 9 Jul 2023 22:15:52 +0900 Subject: [PATCH 4/4] =?UTF-8?q?[Del/#19]=20=EC=9E=84=EC=8B=9C=20frame=20la?= =?UTF-8?q?yout=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/sopt/umbba_android/presentation/MainActivity.kt | 7 ------- app/src/main/res/layout/activity_main.xml | 9 +++++++++ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/sopt/umbba_android/presentation/MainActivity.kt b/app/src/main/java/com/sopt/umbba_android/presentation/MainActivity.kt index 2c842b84..55991e0c 100644 --- a/app/src/main/java/com/sopt/umbba_android/presentation/MainActivity.kt +++ b/app/src/main/java/com/sopt/umbba_android/presentation/MainActivity.kt @@ -13,12 +13,5 @@ import com.sopt.umbba_android.util.binding.BindingActivity class MainActivity :BindingActivity(R.layout.activity_main){ override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - changeFragment(HomeFragment()) - } - - private fun changeFragment(fragment: Fragment) { - supportFragmentManager.beginTransaction() - .add(R.id.fragment_fv, fragment) - .commit() } } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 517ea130..0185a2a2 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -6,5 +6,14 @@ android:layout_width="match_parent" android:layout_height="match_parent" tools:context=".presentation.MainActivity"> + + \ No newline at end of file