Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
easyhooon committed Jun 20, 2021
2 parents ad6c328 + c21d7d8 commit 299ae73
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,6 @@ class AddNewTagActivity:AppCompatActivity() {
}
companion object{
// 처음 5명이 사용하기 전까지는 추천에 뜨지 않게 하기
const val TAG_INIT_NUM = 5
const val TAG_INIT_NUM = -1
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,7 @@ class AddTagAdapter(open val context: Context, open var data: MutableList<TagMod
if(holder is DefaultViewHolder){
holder.mainTag = tagName
holder.mainTagText.text = tagName
holder.subTagView.removeAllViews()
holder.settingSubTags(tagName, 20)
}else if(holder is ValueViewHolder){
holder.mainTag = tagName
Expand Down

0 comments on commit 299ae73

Please sign in to comment.