Skip to content
Open
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
1 change: 1 addition & 0 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ dependencies {

implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
implementation platform('androidx.compose:compose-bom:2023.03.00')
implementation 'com.google.firebase:firebase-database:20.3.0'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
Expand Down
5 changes: 3 additions & 2 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,14 @@
android:supportsRtl="true"
android:theme="@style/Theme.Article"
tools:targetApi="31">
<activity
android:name=".presentation.gacha.GachaActivity"
android:exported="true" />
<activity
android:name=".presentation.article_webview.ArticleWebViewActivity"
android:exported="false" />

<activity
android:name=".presentation.my_keywords_select.MyKeywordSelectActivity"
android:exported="true"
android:label="@string/title_activity_my_keyword_select"
android:theme="@style/Theme.Article" />
<activity
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,43 @@ class UserPreference private constructor(context: Context) {
}


var coin :Int
get() = userPreference.getInt("coin", 0)
set(v) {
userPreferenceEditor.putInt("coin", v)
userPreferenceEditor.apply()
}

var userInventory :String
get() = userPreference.getString("userInventory", "").toString()
set(v) {
userPreferenceEditor.putString("userInventory", v)
userPreferenceEditor.apply()
}

var userChair:Int
get() = userPreference.getInt("userChair", -1)
set(v) {
userPreferenceEditor.putInt("userChair", v)
userPreferenceEditor.apply()
}

var userDesk:Int
get() = userPreference.getInt("userDesk", -1)
set(v) {
userPreferenceEditor.putInt("userDesk", v)
userPreferenceEditor.apply()
}
var userComputer:Int
get() = userPreference.getInt("userComputer", -1)
set(v) {
userPreferenceEditor.putInt("userComputer", v)
userPreferenceEditor.apply()
}
var userSubItem:Int
get() = userPreference.getInt("userSubItem", -1)
set(v) {
userPreferenceEditor.putInt("userSubItem", v)
userPreferenceEditor.apply()
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ import android.webkit.WebViewClient
import com.devlog.article.data.entity.naver.ApiData
import com.devlog.article.data.entity.naver.Document
import com.devlog.article.data.entity.naver.OptionObject
import com.devlog.article.data.preference.UserPreference
import com.devlog.article.databinding.ActivityArticleWebViewBinding
import com.google.android.material.snackbar.Snackbar

class ArticleWebViewActivity : AppCompatActivity() {
lateinit var binding: ActivityArticleWebViewBinding
Expand All @@ -22,16 +24,18 @@ class ArticleWebViewActivity : AppCompatActivity() {
lateinit var postTextSummary :()->Unit
var url =""
lateinit var articleGetbody:ArticleGetbody
lateinit var userPreference: UserPreference
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
binding = ActivityArticleWebViewBinding.inflate(layoutInflater)
setContentView(binding.root)
url=intent.getStringExtra("url")!!
initWebView()
userPreference=UserPreference.getInstance(this)
articleWebViewModel = ArticleWebViewModel()
articleGetbody = ArticleGetbody(binding.webView)


userPreference.coin+=1
Snackbar.make(binding.root, "기사를 읽어 1 코인을 얻었어요!", Snackbar.LENGTH_SHORT).show()
postTextSummary={
cutString()
articleWebViewModel.textSummary(ApiData(Document(title = "", content = body)))
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,187 @@
package com.devlog.article.presentation.gacha

import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
import android.util.Log
import android.widget.Toast
import androidx.activity.compose.setContent
import androidx.compose.foundation.Image
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.Button
import androidx.compose.material3.Surface
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.MutableState
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.devlog.article.R
import com.devlog.article.data.preference.UserPreference
import com.devlog.article.presentation.ui.theme.BaseColumn
import java.util.Random


class GachaActivity : AppCompatActivity() {
var random = Random()

lateinit var userPreference: UserPreference
lateinit var item :Item
lateinit var popUpOpen : MutableState<Boolean>

var userInventoryList = arrayListOf<String>()
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_gacha)
userPreference = UserPreference.getInstance(this)
userPreference.userInventory.map {
userInventoryList.add(it.toString())
}
if ( userPreference.userDesk!=-1){

}

setContent {
GachaView()
}

}

@Composable
fun GachaView(){
popUpOpen = remember {
mutableStateOf(false)
}
Box() {
Image(
modifier = Modifier.fillMaxSize(1f),
painter = painterResource(id = R.drawable.gacha2),
contentDescription = null,
contentScale = ContentScale.FillBounds
)
Column(
modifier = Modifier
.fillMaxSize(1f)
.padding(bottom = 20.dp),
verticalArrangement = Arrangement.Bottom,
horizontalAlignment = Alignment.CenterHorizontally
) {
Button(onClick = {
if ( userPreference.coin>=5){
val r= random()
userPreference.coin = userPreference.coin-5
popUpOpen.value=true
item = itemList[r]
if (!userInventoryList.contains(r.toString())){
userPreference.userInventory+=r.toString()
userInventoryList.add(r.toString())
}
Log.e("아이템",userInventoryList.toString())

}else{
Toast.makeText(this@GachaActivity,"코인이 부족해요",Toast.LENGTH_SHORT).show()
}

}, modifier = Modifier.fillMaxWidth(1f)) {
Text(text = "뽑기")
}

}
Column(modifier = Modifier.fillMaxWidth(1f), horizontalAlignment = Alignment.End) {
Text(modifier = Modifier.background(Color.White), text = userPreference.coin.toString())
}
if (popUpOpen.value){
popUp(item)
}

}
}

@Preview(showBackground = true)
@Composable
fun preView() {

userPreference.userInventory.map {
userInventoryList.add(it.toString())
}
GachaView()



}
@Preview(showBackground = false)
@Composable
fun preViewPopUp(){
var item=Item(
"사과 노트북 듀얼 모니터 세트",
"이 애플 노트북 듀얼 모니터 세트는 스타일과 성능을 결합한 완벽한 작업 환경을 제공하는 특별한 아이템입니다. 애플 노트북과 더블 모니터를 조합하여 사용자가 생산성을 극대화하고 창의성을 높일 수 있도록 돕습니다.",
R.drawable.computer_2
,0)
popUp(item)
}


@Composable
fun popUp(item: Item) {

Column(
Modifier
.fillMaxSize(1f)
.padding(horizontal = 30.dp),verticalArrangement = Arrangement.Center) {
Surface(shape = RoundedCornerShape(10), ) {
Column(
modifier = Modifier
.fillMaxWidth(1f)
.padding(horizontal = 20.dp),
horizontalAlignment = Alignment.CenterHorizontally,
verticalArrangement = Arrangement.Center
) {
Text(modifier = Modifier.padding(vertical = 10.dp), text = item.name)
Image(
modifier = Modifier.padding(vertical = 10.dp),
painter = painterResource(id = item.image),
contentDescription = null
)
Text(modifier = Modifier.padding(vertical = 10.dp),text = item.subTitle)
Button(modifier = Modifier.padding(vertical = 10.dp),onClick = { popUpOpen.value =false }) {
Text(text = "닫기")
}
}
}

}



}

fun random(): Int = random.nextInt(18)
fun item(int: Int) {
when (int) {
1 -> {}
2 -> {}
3 -> {}
4 -> {}
5 -> {}
6 -> {}
7 -> {}
8 -> {}
9 -> {}
10 -> {}
}
}

}
Loading