From 3ae9e754addbf0c01ebfef293c19f91901362a84 Mon Sep 17 00:00:00 2001 From: Yerin Date: Tue, 8 Aug 2023 15:12:01 +0900 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=EC=8B=A0=EA=B3=A0=ED=95=98?= =?UTF-8?q?=EA=B8=B0=20=EB=B7=B0=20=EC=9E=91=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/app/src/main/AndroidManifest.xml | 3 + .../presentation/report/ReportActivity.kt | 13 ++ .../src/main/res/layout/activity_report.xml | 130 ++++++++++++++++++ android/app/src/main/res/values/strings.xml | 8 ++ 4 files changed, 154 insertions(+) create mode 100644 android/app/src/main/java/com/created/team201/presentation/report/ReportActivity.kt create mode 100644 android/app/src/main/res/layout/activity_report.xml diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 1eb2e997c..4a2ac8e88 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -16,6 +16,9 @@ android:theme="@style/Theme.Team201" android:usesCleartextTraffic="true" tools:targetApi="31"> + diff --git a/android/app/src/main/java/com/created/team201/presentation/report/ReportActivity.kt b/android/app/src/main/java/com/created/team201/presentation/report/ReportActivity.kt new file mode 100644 index 000000000..5a1f873c6 --- /dev/null +++ b/android/app/src/main/java/com/created/team201/presentation/report/ReportActivity.kt @@ -0,0 +1,13 @@ +package com.created.team201.presentation.report + +import android.os.Bundle +import com.created.team201.R +import com.created.team201.databinding.ActivityReportBinding +import com.created.team201.presentation.common.BindingActivity + +class ReportActivity : BindingActivity(R.layout.activity_report) { + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + } +} diff --git a/android/app/src/main/res/layout/activity_report.xml b/android/app/src/main/res/layout/activity_report.xml new file mode 100644 index 000000000..b21bb2463 --- /dev/null +++ b/android/app/src/main/res/layout/activity_report.xml @@ -0,0 +1,130 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml index b38ff5b02..cb1dcb2db 100644 --- a/android/app/src/main/res/values/strings.xml +++ b/android/app/src/main/res/values/strings.xml @@ -166,4 +166,12 @@ 계정 관리 서비스 탈퇴하기 + + 신고하기 + 제목을 입력해 주세요 + 제출하기 + 신고 내용을 입력해 주세요 + 달력 날짜 선택 + + From 563379bdb3ed36b7134fbc1817450e6fdc8371d6 Mon Sep 17 00:00:00 2001 From: Yerin Date: Tue, 8 Aug 2023 15:13:54 +0900 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=ED=88=B4=EB=B0=94=EC=97=90=20?= =?UTF-8?q?=EB=92=A4=EB=A1=9C=EA=B0=80=EA=B8=B0=20=EB=B2=84=ED=8A=BC=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../presentation/report/ReportActivity.kt | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/android/app/src/main/java/com/created/team201/presentation/report/ReportActivity.kt b/android/app/src/main/java/com/created/team201/presentation/report/ReportActivity.kt index 5a1f873c6..e4b697309 100644 --- a/android/app/src/main/java/com/created/team201/presentation/report/ReportActivity.kt +++ b/android/app/src/main/java/com/created/team201/presentation/report/ReportActivity.kt @@ -1,6 +1,7 @@ package com.created.team201.presentation.report import android.os.Bundle +import android.view.MenuItem import com.created.team201.R import com.created.team201.databinding.ActivityReportBinding import com.created.team201.presentation.common.BindingActivity @@ -9,5 +10,29 @@ class ReportActivity : BindingActivity(R.layout.activity_ override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + + initToolBar() + } + + private fun initToolBar() { + setSupportActionBar(binding.tbReport) + supportActionBar?.apply { + setDisplayHomeAsUpEnabled(true) + setHomeAsUpIndicator(R.drawable.ic_back) + setHomeActionContentDescription(R.string.toolbar_back_text) + } + } + + override fun onOptionsItemSelected(item: MenuItem): Boolean { + return when (item.itemId) { + android.R.id.home -> { + finish() + true + } + + else -> { + false + } + } } } From a391ce426c2d736e2a98aece1d5a2142d3f0ea3d Mon Sep 17 00:00:00 2001 From: Yerin Date: Tue, 8 Aug 2023 15:45:31 +0900 Subject: [PATCH 3/3] =?UTF-8?q?style:=20=EC=BD=94=EB=93=9C=EC=97=90=20?= =?UTF-8?q?=EA=B0=9C=ED=96=89=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/app/src/main/AndroidManifest.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 4a2ac8e88..4007d975e 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -19,6 +19,7 @@ +