Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -136,11 +136,11 @@ plugins {
}

android {
namespace = "umc.study.umc_8th"
namespace = "umc.study.umc_9th"
compileSdk = 34

defaultConfig {
applicationId = "umc.study.umc_8th"
applicationId = "umc.study.umc_9th"
minSdk = 26
targetSdk = 34
versionCode = 1
Expand Down Expand Up @@ -170,6 +170,7 @@ android {
}
buildFeatures {
compose = true
viewBinding = true
}
composeOptions {
kotlinCompilerExtensionVersion = "1.5.1"
Expand Down
3 changes: 3 additions & 0 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name="com.example.umc_9th.SongActivity"
android:exported="false" />
</application>

</manifest>
32 changes: 32 additions & 0 deletions app/src/main/java/com/example/umc_9th/AlbumFragment.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package com.example.umc_9th

import android.os.Bundle
import androidx.fragment.app.Fragment
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import umc.study.umc_9th.R
import umc.study.umc_9th.databinding.FragmentAlbumBinding

class AlbumFragment : Fragment() {
private lateinit var binding : FragmentAlbumBinding
override fun onCreateView(
inflater: LayoutInflater, container: ViewGroup?,
savedInstanceState: Bundle?
): View? {
arguments?.let {
val title = it.getString("title")
val singer = it.getString("singer")
binding.albumTitle.text = title
binding.albumSinger.text = singer
}
binding = FragmentAlbumBinding.inflate(layoutInflater)
binding.albumBackButton.setOnClickListener {
requireActivity().supportFragmentManager.beginTransaction()
.replace(R.id.fragmentContainerView, HomeFragment())
.commit()
}
return binding.root
}

}
38 changes: 38 additions & 0 deletions app/src/main/java/com/example/umc_9th/HomeFragment.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
package com.example.umc_9th

import android.os.Bundle
import androidx.fragment.app.Fragment
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import umc.study.umc_9th.R
import umc.study.umc_9th.databinding.FragmentHomeBinding

class HomeFragment : Fragment() {

private lateinit var binding : FragmentHomeBinding
override fun onCreateView(
inflater: LayoutInflater, container: ViewGroup?,
savedInstanceState: Bundle?
): View? {
// Inflate the layout for this fragment
binding = FragmentHomeBinding.inflate(layoutInflater)
binding.MusicImage1.setOnClickListener {
val bundle = Bundle().apply {
putString("title",binding.albumTitleA.text.toString())
putString("singer",binding.albumSingerA.text.toString())
}
AlbumFragment().arguments = bundle
requireActivity().supportFragmentManager.beginTransaction()
.replace(R.id.fragmentContainerView, AlbumFragment())
.addToBackStack(null)
.commit()
}

return binding.root

}



}
20 changes: 20 additions & 0 deletions app/src/main/java/com/example/umc_9th/LockerFragment.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package com.example.umc_9th

import android.os.Bundle
import androidx.fragment.app.Fragment
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import umc.study.umc_9th.databinding.FragmentLockerBinding

class LockerFragment : Fragment() {
private lateinit var binding : FragmentLockerBinding
override fun onCreateView(
inflater: LayoutInflater, container: ViewGroup?,
savedInstanceState: Bundle?
): View? {
binding = FragmentLockerBinding.inflate(layoutInflater)
return binding.root
}

}
88 changes: 53 additions & 35 deletions app/src/main/java/com/example/umc_9th/MainActivity.kt
Original file line number Diff line number Diff line change
@@ -1,47 +1,65 @@
package com.example.umc_9th

import android.content.Intent
import android.os.Bundle
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import android.widget.Toast
import androidx.activity.enableEdgeToEdge
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
import androidx.compose.material3.Scaffold
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.tooling.preview.Preview
import com.example.umc_9th.ui.theme.UMC_9thTheme

class MainActivity : ComponentActivity() {
import androidx.activity.result.contract.ActivityResultContracts
import androidx.appcompat.app.AppCompatActivity
import umc.study.umc_9th.R
import umc.study.umc_9th.databinding.ActivityMainBinding


class MainActivity : AppCompatActivity() {
private lateinit var binding : ActivityMainBinding
companion object {const val STRING_INTENT_KEY = "title"}
private val getResultText = registerForActivityResult(
ActivityResultContracts.StartActivityForResult()
) { result ->
if(result.resultCode == RESULT_OK) {
val returnString = result.data?.getStringExtra(STRING_INTENT_KEY)
val toast = Toast.makeText(this, returnString, Toast.LENGTH_SHORT) // in Activity
toast.show()
}
}

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
enableEdgeToEdge()
setContent {
UMC_9thTheme {
Scaffold(modifier = Modifier.fillMaxSize()) { innerPadding ->
Greeting(
name = "Android",
modifier = Modifier.padding(innerPadding)
)
binding = ActivityMainBinding.inflate(layoutInflater)
setContentView(binding.root)

supportFragmentManager.beginTransaction()
.replace(R.id.fragmentContainerView, HomeFragment())
.commit()

binding.songButton.setOnClickListener {
val intent = Intent(this, SongActivity::class.java)
intent.putExtra("title", binding.miniTitle.text.toString())
intent.putExtra("singer", binding.miniSinger.text.toString())
getResultText.launch(intent)
}

binding.bottomNav.setOnItemSelectedListener { item ->
when (item.itemId){

//매인 화면
R.id.Home -> {
supportFragmentManager.beginTransaction()
.replace(R.id.fragmentContainerView, HomeFragment())
.commit()
true
}

//일기 작성 화면
R.id.Locker -> {
supportFragmentManager.beginTransaction()
.replace(R.id.fragmentContainerView, LockerFragment())
.commit()
true
}
else -> false
}
}
}
}

@Composable
fun Greeting(name: String, modifier: Modifier = Modifier) {
Text(
text = "Hello $name!",
modifier = modifier
)
}

@Preview(showBackground = true)
@Composable
fun GreetingPreview() {
UMC_9thTheme {
Greeting("Android")
}
}
32 changes: 32 additions & 0 deletions app/src/main/java/com/example/umc_9th/SongActivity.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package com.example.umc_9th

import android.content.Intent
import android.os.Bundle
import androidx.activity.enableEdgeToEdge
import androidx.appcompat.app.AppCompatActivity
import umc.study.umc_9th.databinding.ActivitySongBinding

class SongActivity : AppCompatActivity() {
private lateinit var binding : ActivitySongBinding
lateinit var title : String
lateinit var singer : String
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
enableEdgeToEdge()
binding = ActivitySongBinding.inflate(layoutInflater)
setContentView(binding.root)
title = intent.getStringExtra("title").toString()
singer = intent.getStringExtra("singer").toString()
binding.backButton.setOnClickListener {
finish()
}
}

override fun onDestroy() {
val intent = Intent(this, MainActivity::class.java).apply {
putExtra(MainActivity.STRING_INTENT_KEY, title)
}
setResult(RESULT_OK, intent)
super.onDestroy()
}
}
118 changes: 118 additions & 0 deletions app/src/main/res/layout/activity_main.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/main"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="com.example.umc_9th.MainActivity">

<FrameLayout
android:id="@+id/container"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintBottom_toTopOf="@+id/bottom_nav"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.0">

<androidx.fragment.app.FragmentContainerView
android:id="@+id/fragmentContainerView"
android:name="com.example.umc_9th.HomeFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:layout="@layout/fragment_home" />

</FrameLayout>

<com.google.android.material.bottomnavigation.BottomNavigationView
android:id="@+id/bottom_nav"
android:layout_width="0dp"
android:layout_height="wrap_content"
app:labelVisibilityMode="labeled"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:menu="@menu/nav_menu" />

<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="0dp"
android:layout_height="44dp"
android:background="#D3D1D1"
app:layout_constraintBottom_toBottomOf="@+id/container"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">

<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent">

<ImageView
android:layout_width="40dp"
android:layout_height="40dp"
android:src="@drawable/btn_miniplayer_previous" />

<ImageView
android:id="@+id/main_miniplayer_btn"
android:layout_width="40dp"
android:layout_height="40dp"
android:src="@drawable/btn_miniplayer_play" />

<ImageView
android:id="@+id/main_pause_btn"
android:layout_width="40dp"
android:layout_height="40dp"
android:src="@drawable/btn_miniplay_pause"
android:visibility="gone" />


<ImageView
android:layout_width="40dp"
android:layout_height="40dp"
android:src="@drawable/btn_miniplayer_next" />


<ImageView
android:id="@+id/songButton"
android:layout_width="25dp"
android:layout_height="25dp"
android:layout_marginHorizontal="15dp"
android:src="@drawable/btn_miniplayer_go_list" />


</LinearLayout>

<LinearLayout
android:id="@+id/linearLayout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:orientation="vertical"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">

<TextView
android:id="@+id/miniTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Love wins all"
android:textColor="@color/black"
android:textSize="13sp" />

<TextView
android:id="@+id/miniSinger"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

android:text="IU"
android:textSize="12sp" />

</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

</androidx.constraintlayout.widget.ConstraintLayout>
Loading