From b7563c91c140efb011c3a67ec8bb059b5e2b96de Mon Sep 17 00:00:00 2001 From: bhindor Date: Wed, 9 Jul 2025 18:35:30 +0900 Subject: [PATCH 01/10] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20::activity?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 3 ++ .../screen/allow/AllowActivity.kt | 28 +++++++++++++++++++ app/src/main/res/layout/activity_allow.xml | 10 +++++++ 3 files changed, 41 insertions(+) create mode 100644 app/src/main/java/kr/hs/anu/nobet/presentation/screen/allow/AllowActivity.kt create mode 100644 app/src/main/res/layout/activity_allow.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8004036..6d8139c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -12,6 +12,9 @@ android:supportsRtl="true" android:theme="@style/Theme.NoBet" tools:targetApi="31"> + diff --git a/app/src/main/java/kr/hs/anu/nobet/presentation/screen/allow/AllowActivity.kt b/app/src/main/java/kr/hs/anu/nobet/presentation/screen/allow/AllowActivity.kt new file mode 100644 index 0000000..3dcf59c --- /dev/null +++ b/app/src/main/java/kr/hs/anu/nobet/presentation/screen/allow/AllowActivity.kt @@ -0,0 +1,28 @@ +package kr.hs.anu.nobet.presentation.screen.allow + +import android.os.Bundle +import androidx.activity.enableEdgeToEdge +import androidx.appcompat.app.AppCompatActivity +import androidx.core.view.ViewCompat +import androidx.core.view.WindowInsetsCompat +import kr.hs.anu.nobet.R +import kr.hs.anu.nobet.databinding.ActivityAllowBinding + +class AllowActivity : AppCompatActivity() { + + private lateinit var binding : ActivityAllowBinding + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + enableEdgeToEdge() + binding = ActivityAllowBinding.inflate(layoutInflater) + setContentView(binding.root) + 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/layout/activity_allow.xml b/app/src/main/res/layout/activity_allow.xml new file mode 100644 index 0000000..90b3a9d --- /dev/null +++ b/app/src/main/res/layout/activity_allow.xml @@ -0,0 +1,10 @@ + + + + \ No newline at end of file From 47e161d1ea09d81c66ecf572fe241c8d7979c14f Mon Sep 17 00:00:00 2001 From: bhindor Date: Wed, 9 Jul 2025 22:09:42 +0900 Subject: [PATCH 02/10] =?UTF-8?q?=F0=9F=9A=80=20::=20agp=20version=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 976ebf3..40d247c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -agp = "8.10.0" +agp = "8.10.1" kotlin = "2.0.21" coreKtx = "1.16.0" junit = "4.13.2" From 16aeffdd4c23e8e730d7f15204bb2fdac58ab68c Mon Sep 17 00:00:00 2001 From: bhindor Date: Wed, 9 Jul 2025 22:10:20 +0900 Subject: [PATCH 03/10] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20::=20finish=20activi?= =?UTF-8?q?ty?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 로고 눌렀을때 하도록 --- .../screen/allow/AllowActivity.kt | 4 +++- app/src/main/res/layout/activity_allow.xml | 20 +++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/kr/hs/anu/nobet/presentation/screen/allow/AllowActivity.kt b/app/src/main/java/kr/hs/anu/nobet/presentation/screen/allow/AllowActivity.kt index 3dcf59c..b225618 100644 --- a/app/src/main/java/kr/hs/anu/nobet/presentation/screen/allow/AllowActivity.kt +++ b/app/src/main/java/kr/hs/anu/nobet/presentation/screen/allow/AllowActivity.kt @@ -23,6 +23,8 @@ class AllowActivity : AppCompatActivity() { insets } - + binding.ivTopbarLogo.setOnClickListener { + finish() + } } } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_allow.xml b/app/src/main/res/layout/activity_allow.xml index 90b3a9d..ff77fab 100644 --- a/app/src/main/res/layout/activity_allow.xml +++ b/app/src/main/res/layout/activity_allow.xml @@ -7,4 +7,24 @@ android:layout_height="match_parent" tools:context=".presentation.screen.allow.AllowActivity"> + + + + + + \ No newline at end of file From 5fccb293fb9ba6a62e75e8018994706c7f42f3e0 Mon Sep 17 00:00:00 2001 From: bhindor Date: Wed, 9 Jul 2025 22:27:14 +0900 Subject: [PATCH 04/10] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20::=20allow=20site=20?= =?UTF-8?q?UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 접근허용 UI --- app/src/main/res/drawable/add_btn.xml | 11 ++ .../drawable/allow_site_list_background.xml | 8 ++ .../main/res/drawable/et_site_background.xml | 13 ++ app/src/main/res/layout/activity_allow.xml | 125 ++++++++++++++++++ 4 files changed, 157 insertions(+) create mode 100644 app/src/main/res/drawable/add_btn.xml create mode 100644 app/src/main/res/drawable/allow_site_list_background.xml create mode 100644 app/src/main/res/drawable/et_site_background.xml diff --git a/app/src/main/res/drawable/add_btn.xml b/app/src/main/res/drawable/add_btn.xml new file mode 100644 index 0000000..f32ee1f --- /dev/null +++ b/app/src/main/res/drawable/add_btn.xml @@ -0,0 +1,11 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/allow_site_list_background.xml b/app/src/main/res/drawable/allow_site_list_background.xml new file mode 100644 index 0000000..44047aa --- /dev/null +++ b/app/src/main/res/drawable/allow_site_list_background.xml @@ -0,0 +1,8 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/et_site_background.xml b/app/src/main/res/drawable/et_site_background.xml new file mode 100644 index 0000000..750a4aa --- /dev/null +++ b/app/src/main/res/drawable/et_site_background.xml @@ -0,0 +1,13 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_allow.xml b/app/src/main/res/layout/activity_allow.xml index ff77fab..dbc657f 100644 --- a/app/src/main/res/layout/activity_allow.xml +++ b/app/src/main/res/layout/activity_allow.xml @@ -5,6 +5,7 @@ android:id="@+id/main" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" tools:context=".presentation.screen.allow.AllowActivity"> + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 9f2ad44d4a1d89b266722eca3af03230e96861b9 Mon Sep 17 00:00:00 2001 From: bhindor Date: Wed, 9 Jul 2025 22:27:30 +0900 Subject: [PATCH 05/10] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20::=20activity=20back?= =?UTF-8?q?ground=20color?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 배경 색 지정 --- app/src/main/res/layout/activity_login.xml | 1 + app/src/main/res/layout/activity_main.xml | 1 + 2 files changed, 2 insertions(+) diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 162f212..2b736be 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -5,6 +5,7 @@ android:id="@+id/main" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" tools:context=".presentation.screen.login.LoginActivity"> Date: Thu, 10 Jul 2025 16:46:26 +0900 Subject: [PATCH 06/10] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20::=20add=20viewmodel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 뷰모델 추가 --- .../anu/nobet/presentation/screen/allow/AllowActivity.kt | 7 +++++++ .../anu/nobet/presentation/screen/allow/AllowViewModel.kt | 7 +++++++ 2 files changed, 14 insertions(+) create mode 100644 app/src/main/java/kr/hs/anu/nobet/presentation/screen/allow/AllowViewModel.kt diff --git a/app/src/main/java/kr/hs/anu/nobet/presentation/screen/allow/AllowActivity.kt b/app/src/main/java/kr/hs/anu/nobet/presentation/screen/allow/AllowActivity.kt index b225618..2f41b86 100644 --- a/app/src/main/java/kr/hs/anu/nobet/presentation/screen/allow/AllowActivity.kt +++ b/app/src/main/java/kr/hs/anu/nobet/presentation/screen/allow/AllowActivity.kt @@ -2,14 +2,17 @@ package kr.hs.anu.nobet.presentation.screen.allow import android.os.Bundle import androidx.activity.enableEdgeToEdge +import androidx.activity.viewModels import androidx.appcompat.app.AppCompatActivity import androidx.core.view.ViewCompat import androidx.core.view.WindowInsetsCompat import kr.hs.anu.nobet.R import kr.hs.anu.nobet.databinding.ActivityAllowBinding +import kr.hs.anu.nobet.utils.openPage class AllowActivity : AppCompatActivity() { + private val viewModel : AllowViewModel by viewModels() private lateinit var binding : ActivityAllowBinding override fun onCreate(savedInstanceState: Bundle?) { @@ -26,5 +29,9 @@ class AllowActivity : AppCompatActivity() { binding.ivTopbarLogo.setOnClickListener { finish() } + + binding.tvMobile.setOnClickListener { + this.openPage() + } } } \ No newline at end of file diff --git a/app/src/main/java/kr/hs/anu/nobet/presentation/screen/allow/AllowViewModel.kt b/app/src/main/java/kr/hs/anu/nobet/presentation/screen/allow/AllowViewModel.kt new file mode 100644 index 0000000..9f818fe --- /dev/null +++ b/app/src/main/java/kr/hs/anu/nobet/presentation/screen/allow/AllowViewModel.kt @@ -0,0 +1,7 @@ +package kr.hs.anu.nobet.presentation.screen.allow + +import androidx.lifecycle.ViewModel + +class AllowViewModel : ViewModel() { + +} \ No newline at end of file From 9a3efce42988ac722d587ba430dba3cc66db6232 Mon Sep 17 00:00:00 2001 From: bhindor Date: Fri, 11 Jul 2025 21:36:20 +0900 Subject: [PATCH 07/10] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20::=20intent=20(main?= =?UTF-8?q?=20to=20allow)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit main이랑 allow 이어주기 --- .../kr/hs/anu/nobet/presentation/screen/main/MainActivity.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/kr/hs/anu/nobet/presentation/screen/main/MainActivity.kt b/app/src/main/java/kr/hs/anu/nobet/presentation/screen/main/MainActivity.kt index 86cc5cb..d6997f0 100644 --- a/app/src/main/java/kr/hs/anu/nobet/presentation/screen/main/MainActivity.kt +++ b/app/src/main/java/kr/hs/anu/nobet/presentation/screen/main/MainActivity.kt @@ -19,6 +19,7 @@ import androidx.core.view.ViewCompat import androidx.core.view.WindowInsetsCompat import kr.hs.anu.nobet.R import kr.hs.anu.nobet.databinding.ActivityMainBinding +import kr.hs.anu.nobet.presentation.screen.allow.AllowActivity import kr.hs.anu.nobet.presentation.screen.login.LoginActivity class MainActivity : AppCompatActivity() { @@ -104,7 +105,8 @@ class MainActivity : AppCompatActivity() { } popupMenu.findViewById(R.id.menu_block_pass).setOnClickListener { - Toast.makeText(anchor.context, "차단 제외 하기", Toast.LENGTH_SHORT).show() + val intent = Intent(this, AllowActivity::class.java) + startActivity(intent) popupWindow.dismiss() } From 062e6b7ec315e52cbc5938c5591177b3c3796cf0 Mon Sep 17 00:00:00 2001 From: bhindor Date: Sat, 12 Jul 2025 12:20:31 +0900 Subject: [PATCH 08/10] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20::=20online=20counse?= =?UTF-8?q?l?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 메인에 온라인 상담 연결 --- .../hs/anu/nobet/presentation/screen/main/MainActivity.kt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/src/main/java/kr/hs/anu/nobet/presentation/screen/main/MainActivity.kt b/app/src/main/java/kr/hs/anu/nobet/presentation/screen/main/MainActivity.kt index d6997f0..1d69196 100644 --- a/app/src/main/java/kr/hs/anu/nobet/presentation/screen/main/MainActivity.kt +++ b/app/src/main/java/kr/hs/anu/nobet/presentation/screen/main/MainActivity.kt @@ -21,6 +21,7 @@ import kr.hs.anu.nobet.R import kr.hs.anu.nobet.databinding.ActivityMainBinding import kr.hs.anu.nobet.presentation.screen.allow.AllowActivity import kr.hs.anu.nobet.presentation.screen.login.LoginActivity +import kr.hs.anu.nobet.utils.openPage class MainActivity : AppCompatActivity() { @@ -74,6 +75,11 @@ class MainActivity : AppCompatActivity() { binding.ivMenu.setOnClickListener { showMenu(it) } + + //온라인 상담 연결 + binding.tvMobile.setOnClickListener { + this.openPage() + } } // 메뉴 커스텀 함수 From 6f477c96617976f4391d300876b92cef92fbbbc6 Mon Sep 17 00:00:00 2001 From: bhindor Date: Sat, 12 Jul 2025 13:48:56 +0900 Subject: [PATCH 09/10] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20::=20recycler=20dumm?= =?UTF-8?q?y=20data?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 허용 사이트 리사이클러 + 더미 데이터 작업 --- .../kr/hs/anu/nobet/domain/model/.gitkeep | 0 .../anu/nobet/domain/model/AllowSiteData.kt | 5 ++ .../screen/allow/AllowActivity.kt | 12 +++++ .../screen/allow/AllowRecyclerAdapter.kt | 46 +++++++++++++++++++ .../screen/allow/AllowViewModel.kt | 17 +++++++ app/src/main/res/drawable/allow_del_btn.xml | 12 +++++ .../res/drawable/allow_list_background.xml | 8 ++++ app/src/main/res/layout/activity_allow.xml | 7 +++ app/src/main/res/layout/allow_item.xml | 45 ++++++++++++++++++ 9 files changed, 152 insertions(+) delete mode 100644 app/src/main/java/kr/hs/anu/nobet/domain/model/.gitkeep create mode 100644 app/src/main/java/kr/hs/anu/nobet/domain/model/AllowSiteData.kt create mode 100644 app/src/main/java/kr/hs/anu/nobet/presentation/screen/allow/AllowRecyclerAdapter.kt create mode 100644 app/src/main/res/drawable/allow_del_btn.xml create mode 100644 app/src/main/res/drawable/allow_list_background.xml create mode 100644 app/src/main/res/layout/allow_item.xml diff --git a/app/src/main/java/kr/hs/anu/nobet/domain/model/.gitkeep b/app/src/main/java/kr/hs/anu/nobet/domain/model/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/app/src/main/java/kr/hs/anu/nobet/domain/model/AllowSiteData.kt b/app/src/main/java/kr/hs/anu/nobet/domain/model/AllowSiteData.kt new file mode 100644 index 0000000..192dd1c --- /dev/null +++ b/app/src/main/java/kr/hs/anu/nobet/domain/model/AllowSiteData.kt @@ -0,0 +1,5 @@ +package kr.hs.anu.nobet.domain.model + +data class AllowSiteData( + val siteUrl: String +) diff --git a/app/src/main/java/kr/hs/anu/nobet/presentation/screen/allow/AllowActivity.kt b/app/src/main/java/kr/hs/anu/nobet/presentation/screen/allow/AllowActivity.kt index 2f41b86..3099b8a 100644 --- a/app/src/main/java/kr/hs/anu/nobet/presentation/screen/allow/AllowActivity.kt +++ b/app/src/main/java/kr/hs/anu/nobet/presentation/screen/allow/AllowActivity.kt @@ -6,6 +6,7 @@ import androidx.activity.viewModels import androidx.appcompat.app.AppCompatActivity import androidx.core.view.ViewCompat import androidx.core.view.WindowInsetsCompat +import androidx.recyclerview.widget.LinearLayoutManager import kr.hs.anu.nobet.R import kr.hs.anu.nobet.databinding.ActivityAllowBinding import kr.hs.anu.nobet.utils.openPage @@ -14,6 +15,7 @@ class AllowActivity : AppCompatActivity() { private val viewModel : AllowViewModel by viewModels() private lateinit var binding : ActivityAllowBinding + private lateinit var allowAdapter: AllowRecyclerAdapter override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -33,5 +35,15 @@ class AllowActivity : AppCompatActivity() { binding.tvMobile.setOnClickListener { this.openPage() } + + allowAdapter = AllowRecyclerAdapter() + binding.recyclerAllow.apply { + layoutManager = LinearLayoutManager(this@AllowActivity) + adapter = allowAdapter + } + + viewModel.siteList.observe(this) { list -> + allowAdapter.submitList(list) + } } } \ No newline at end of file diff --git a/app/src/main/java/kr/hs/anu/nobet/presentation/screen/allow/AllowRecyclerAdapter.kt b/app/src/main/java/kr/hs/anu/nobet/presentation/screen/allow/AllowRecyclerAdapter.kt new file mode 100644 index 0000000..7bff1cc --- /dev/null +++ b/app/src/main/java/kr/hs/anu/nobet/presentation/screen/allow/AllowRecyclerAdapter.kt @@ -0,0 +1,46 @@ +package kr.hs.anu.nobet.presentation.screen.allow + +import android.view.LayoutInflater +import android.view.ViewGroup +import androidx.recyclerview.widget.RecyclerView +import kr.hs.anu.nobet.databinding.AllowItemBinding +import kr.hs.anu.nobet.domain.model.AllowSiteData + +class AllowRecyclerAdapter : RecyclerView.Adapter() { + + private val itemList = mutableListOf() + + fun submitList(newList: List) { + itemList.clear() + itemList.addAll(newList) + notifyDataSetChanged() + } + + inner class AllowViewHolder(private val binding: AllowItemBinding) : + RecyclerView.ViewHolder(binding.root) { + + fun bind(item: AllowSiteData) { + //TODO 데이터 넣어주기 + binding.tvAllowSite.text = item.siteUrl + + binding.btnDel.setOnClickListener { + //TODO 삭제 + } + } + } + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): AllowViewHolder { + val binding = AllowItemBinding.inflate( + LayoutInflater.from(parent.context), + parent, + false + ) + return AllowViewHolder(binding) + } + + override fun onBindViewHolder(holder: AllowViewHolder, position: Int) { + holder.bind(itemList[position]) + } + + override fun getItemCount(): Int = itemList.size +} diff --git a/app/src/main/java/kr/hs/anu/nobet/presentation/screen/allow/AllowViewModel.kt b/app/src/main/java/kr/hs/anu/nobet/presentation/screen/allow/AllowViewModel.kt index 9f818fe..b080171 100644 --- a/app/src/main/java/kr/hs/anu/nobet/presentation/screen/allow/AllowViewModel.kt +++ b/app/src/main/java/kr/hs/anu/nobet/presentation/screen/allow/AllowViewModel.kt @@ -1,7 +1,24 @@ package kr.hs.anu.nobet.presentation.screen.allow +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel +import kr.hs.anu.nobet.domain.model.AllowSiteData class AllowViewModel : ViewModel() { + private val _siteList = MutableLiveData>() + val siteList: LiveData> get() = _siteList + init { + loadAllowSites() + } + + private fun loadAllowSites() { + // 임시 데이터 + _siteList.value = listOf( + AllowSiteData("naver.com"), + AllowSiteData("google.com"), + AllowSiteData("youtube.com") + ) + } } \ No newline at end of file diff --git a/app/src/main/res/drawable/allow_del_btn.xml b/app/src/main/res/drawable/allow_del_btn.xml new file mode 100644 index 0000000..8835c95 --- /dev/null +++ b/app/src/main/res/drawable/allow_del_btn.xml @@ -0,0 +1,12 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/allow_list_background.xml b/app/src/main/res/drawable/allow_list_background.xml new file mode 100644 index 0000000..3c31a4a --- /dev/null +++ b/app/src/main/res/drawable/allow_list_background.xml @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_allow.xml b/app/src/main/res/layout/activity_allow.xml index dbc657f..2a57d22 100644 --- a/app/src/main/res/layout/activity_allow.xml +++ b/app/src/main/res/layout/activity_allow.xml @@ -99,6 +99,13 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/et_allow_site"> + + + + + + + + + + + + \ No newline at end of file From 78b38bfe94746b378407c6661b3570b327f0cc08 Mon Sep 17 00:00:00 2001 From: bhindor Date: Mon, 14 Jul 2025 13:39:07 +0900 Subject: [PATCH 10/10] =?UTF-8?q?=F0=9F=8E=A8=20::=20ktlint?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ktlint --- .../hs/anu/nobet/presentation/screen/allow/AllowActivity.kt | 6 +++--- .../nobet/presentation/screen/allow/AllowRecyclerAdapter.kt | 4 ++-- .../anu/nobet/presentation/screen/allow/AllowViewModel.kt | 2 +- .../hs/anu/nobet/presentation/screen/main/MainActivity.kt | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/kr/hs/anu/nobet/presentation/screen/allow/AllowActivity.kt b/app/src/main/java/kr/hs/anu/nobet/presentation/screen/allow/AllowActivity.kt index 3099b8a..87979ee 100644 --- a/app/src/main/java/kr/hs/anu/nobet/presentation/screen/allow/AllowActivity.kt +++ b/app/src/main/java/kr/hs/anu/nobet/presentation/screen/allow/AllowActivity.kt @@ -13,8 +13,8 @@ import kr.hs.anu.nobet.utils.openPage class AllowActivity : AppCompatActivity() { - private val viewModel : AllowViewModel by viewModels() - private lateinit var binding : ActivityAllowBinding + private val viewModel: AllowViewModel by viewModels() + private lateinit var binding: ActivityAllowBinding private lateinit var allowAdapter: AllowRecyclerAdapter override fun onCreate(savedInstanceState: Bundle?) { @@ -46,4 +46,4 @@ class AllowActivity : AppCompatActivity() { allowAdapter.submitList(list) } } -} \ No newline at end of file +} diff --git a/app/src/main/java/kr/hs/anu/nobet/presentation/screen/allow/AllowRecyclerAdapter.kt b/app/src/main/java/kr/hs/anu/nobet/presentation/screen/allow/AllowRecyclerAdapter.kt index 7bff1cc..14de09a 100644 --- a/app/src/main/java/kr/hs/anu/nobet/presentation/screen/allow/AllowRecyclerAdapter.kt +++ b/app/src/main/java/kr/hs/anu/nobet/presentation/screen/allow/AllowRecyclerAdapter.kt @@ -20,11 +20,11 @@ class AllowRecyclerAdapter : RecyclerView.Adapter