Skip to content

Commit

Permalink
[ADD] #25 : NoticeScreen 추가
Browse files Browse the repository at this point in the history
  • Loading branch information
tgyuuAn committed Oct 27, 2023
1 parent b41d780 commit fa8f73b
Show file tree
Hide file tree
Showing 8 changed files with 35 additions and 46 deletions.
13 changes: 6 additions & 7 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -41,22 +41,21 @@ dependencies {
androidTestImplementation(libs.androidx.test.espresso)
}

/*tasks.getByPath(":app:preBuild").dependsOn("makeFileExecutable")
tasks.register<Exec>("makeFileExecutable") {
commandLine("chmod", "+x", "${rootProject.rootDir}/.git/hooks/pre-commit")
dependsOn("installGitHook")
}
tasks.getByPath(":app:preBuild").dependsOn("installGitHook")

tasks.register<Copy>("installGitHook") {
dependsOn("deletePreviousGitHook")
from("${rootProject.rootDir}/script/pre-commit")
into("${rootProject.rootDir}/.git/hooks")
eachFile {
fileMode = 777
}
}

tasks.register<Delete>("deletePreviousGitHook") {

val prePush = "${rootProject.rootDir}/.git/hooks/pre-commit"
if (file(prePush).exists()) {
delete(prePush)
}
}*/
}
6 changes: 6 additions & 0 deletions build-logic/convention/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ java {
targetCompatibility = JavaVersion.VERSION_17
}

kotlin {
jvmToolchain {
languageVersion.set(JavaLanguageVersion.of("17"))
}
}

dependencies {
compileOnly(libs.android.build)
compileOnly(libs.kotlin.gradle)
Expand Down
Binary file not shown.
Binary file added core/build/intermediates/ktLint/reporters.bin
Binary file not shown.
Binary file not shown.
Binary file added feature/build/intermediates/ktLint/reporters.bin
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -4,57 +4,33 @@ import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.compose.ui.platform.ComposeView
import androidx.fragment.app.Fragment
import com.wap.designsystem.WappTheme
import dagger.hilt.android.AndroidEntryPoint

// TODO: Rename parameter arguments, choose names that match
// the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
private const val ARG_PARAM1 = "param1"
private const val ARG_PARAM2 = "param2"

/**
* A simple [Fragment] subclass.
* Use the [NoticeFragment.newInstance] factory method to
* create an instance of this fragment.
*/
@AndroidEntryPoint
class NoticeFragment : Fragment() {
// TODO: Rename and change types of parameters
private var param1: String? = null
private var param2: String? = null

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
arguments?.let {
param1 = it.getString(ARG_PARAM1)
param2 = it.getString(ARG_PARAM2)
}
}
private lateinit var composeView: ComposeView

override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
savedInstanceState: Bundle?,
): View? {
// Inflate the layout for this fragment
return inflater.inflate(R.layout.fragment_notice, container, false)
return ComposeView(requireContext()).also {
composeView = it
}
}

companion object {
/**
* Use this factory method to create a new instance of
* this fragment using the provided parameters.
*
* @param param1 Parameter 1.
* @param param2 Parameter 2.
* @return A new instance of fragment NoticeFragment.
*/
// TODO: Rename and change types and number of parameters
@JvmStatic
fun newInstance(param1: String, param2: String) =
NoticeFragment().apply {
arguments = Bundle().apply {
putString(ARG_PARAM1, param1)
putString(ARG_PARAM2, param2)
}
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)

composeView.setContent {
WappTheme {
NoticeScreen()
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package com.wap.wapp.feature.notice

import androidx.compose.runtime.Composable


@Composable
internal fun NoticeScreen() {
}

0 comments on commit fa8f73b

Please sign in to comment.