Skip to content

modify search home #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
seunghee63 wants to merge 2 commits into
base: feature/api_song_upload_complete
Choose a base branch
from
Open

modify search home #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b321ec2
modify search home
sssungeun Jul 12, 2019
aa7f72d
Merge branch 'feature/api_song_upload_complete' into feature/modify_s…
seunghee63 Jul 13, 2019
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
2 changes: 1 addition & 1 deletion app/src/main/java/com/song2/wave/UI/Main/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ class MainActivity : AppCompatActivity() {
nowFrag = LibraryFragment()
}
"myPage" ->{
nowFrag = PointHistoryFragment()
nowFrag = MyPageHitSuccessFragment()
}
}

Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/song2/wave/UI/Main/MyPage/Adapter/MyPageHitSuccessAdapter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ class MyPageHitSuccessAdapter(val ctx: Context, val datalist: ArrayList<HitSucce
}

inner class Holder(ItemView : View): RecyclerView.ViewHolder(ItemView){
var failFilter : RelativeLayout = itemView!!.findViewById(R.id.rl_hit_success_pass)
var passFilter : RelativeLayout = itemView!!.findViewById(R.id.rl_hit_success_fail)
var failFilter : RelativeLayout = itemView!!.findViewById(R.id.rl_hit_success_fail)
var passFilter : RelativeLayout = itemView!!.findViewById(R.id.rl_hit_success_pass)

var songCoverImg = itemView.findViewById(R.id.img_hit_success) as ImageView
var songName = itemView.findViewById(R.id.tv_hit_success_song_item_song_name) as TextView
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/com/song2/wave/UI/Main/Search/Adapter/SongSearchAdapter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ class SongSearchAdapter (private var songData : ArrayList<SongData>, var request
val mainView : View = LayoutInflater.from(parent.context)
.inflate(R.layout.item_song_view, parent, false)
return SongSearchViewHolder(mainView)

}

override fun getItemCount(): Int = songData.size
Expand Down
29 changes: 24 additions & 5 deletions app/src/main/java/com/song2/wave/UI/Main/Search/SearchHomeFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import android.os.Bundle
import android.support.v4.app.Fragment
import android.support.v7.widget.LinearLayoutManager
import android.util.Log
import android.view.KeyEvent
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
Expand All @@ -13,7 +14,6 @@ import com.bumptech.glide.RequestManager
import com.song2.wave.Data.GET.GetSearchResponse
import com.song2.wave.Data.model.*
import com.song2.wave.Data.model.SignUp.OriginArtistData
import com.song2.wave.R
import com.song2.wave.UI.Main.MainActivity
import com.song2.wave.UI.Main.Search.Adapter.CoverArtistSearchAdapter
import com.song2.wave.UI.Main.Search.Adapter.OriginArtistSearchAdapter
Expand All @@ -27,6 +27,15 @@ import kotlinx.android.synthetic.main.fragment_search_home.view.*
import org.jetbrains.anko.support.v4.toast
import retrofit2.Call
import retrofit2.Response
import android.view.inputmethod.EditorInfo
import android.widget.TextView
import android.text.InputType







class SearchHomeFragment : Fragment(), OnBackPressedListener {

Expand Down Expand Up @@ -60,25 +69,31 @@ class SearchHomeFragment : Fragment(), OnBackPressedListener {
var searchBackFlag: Int = 0 // editText 비활성화 : 0

override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
var v: View = inflater.inflate(R.layout.fragment_search_home, container, false)
var v: View = inflater.inflate(com.song2.wave.R.layout.fragment_search_home, container, false)

originDataArr = ArrayList<OriginArtistData>()
/* if(getArguments() != null){
getSearchResponse(getArguments()!!.getString("searchData"))
}*/




v.btn_search_home_frag_searchbar.setOnClickListener {
getSearchResponse(edit_search_home_frag_searchbar.text.toString())



ll_search_home_frag_focus_off.visibility = View.VISIBLE
ll_search_home_frag_focus_on.visibility = View.GONE
rv_search_background.visibility = View.GONE

edit_search_home_frag_searchbar.clearFocus()
searchBackFlag = 0

}



v.ll_search_home_frag_focus_on.visibility = View.GONE
songDataArr = ArrayList<SongData>()
coverArtistDataArr = ArrayList<CoverArtistData>()
Expand All @@ -87,15 +102,18 @@ class SearchHomeFragment : Fragment(), OnBackPressedListener {
// Edittext focus off
v.ll_search_home_frag_focus.setOnClickListener {
searchEditTextFocusOff()
//rv_search_background.visibility = View.VISIBLE

}

insertExampleData()


insertSearchHistoryData(v)
insertSearchHistoryData(v)

// Edittext focus ON
v.edit_search_home_frag_searchbar.setOnFocusChangeListener { view, hasFocus ->
rv_search_background.visibility = View.GONE
if (hasFocus) {
searchEditTextFocusOn()
}
Expand All @@ -104,12 +122,13 @@ class SearchHomeFragment : Fragment(), OnBackPressedListener {


// "all delte" button is clicked
v.tv_search_home_frag_all_delete.setOnClickListener {
v.tv_search_home_frag_all_delete.setOnClickListener {
searchData.clear()
searchDataHistoryAdapter = SearchDataHistoryAdapter(searchData)
v.recycler_search_home_frag_search_home_hisory.adapter = searchDataHistoryAdapter
v.recycler_search_home_frag_search_home_hisory.layoutManager = LinearLayoutManager(context)
v.recycler_search_home_frag_search_home_hisory.isNestedScrollingEnabled = false
v.rv_search_background.visibility = View.VISIBLE
}

// artist is clicked
Expand Down
Binary file added app/src/main/res/drawable-hdpi/img_home_weeklychalenge.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable-hdpi/img_search_before_def.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable-hdpi/img_search_noresult_def.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable-mdpi/img_home_weeklychalenge.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable-mdpi/img_search_before_def.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable-mdpi/img_search_noresult_def.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable-xhdpi/img_home_weeklychalenge.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable-xhdpi/img_search_before_def.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable-xhdpi/img_search_noresult_def.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable-xxhdpi/img_home_weeklychalenge.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable-xxhdpi/img_search_before_def.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable-xxhdpi/img_search_noresult_def.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable-xxxhdpi/img_home_weeklychalenge.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable-xxxhdpi/img_search_before_def.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable-xxxhdpi/img_search_noresult_def.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions app/src/main/res/layout/activity_main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
android:id="@+id/iv_main_act_bottom_play"
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_marginLeft="16dp"
android:layout_marginLeft="30dp"
android:layout_gravity="center_vertical"
android:scaleType="fitXY"
android:src="@drawable/btn_play_sm"/>
Expand All @@ -195,7 +195,7 @@
android:layout_width="186dp"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_marginLeft="35.5dp"
android:layout_marginLeft="40dp"
android:gravity="center_horizontal"
>
<TextView
Expand Down Expand Up @@ -227,7 +227,7 @@
android:layout_height="36dp"
android:background="@drawable/btn_playlist_sm"
android:layout_gravity="center_vertical"
android:layout_marginLeft="34.5dp"
android:layout_marginLeft="54.5dp"
/>

</LinearLayout>
Expand Down
8 changes: 7 additions & 1 deletion app/src/main/res/layout/activity_main_player.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@
android:fontFamily="@font/noto_sans_kr_bold_hestia"
android:layout_marginLeft="16dp"
android:textColor="#e5e5e5"
android:maxLines="1"
android:ellipsize="end"
android:textSize="22sp"
android:includeFontPadding="false"/>

Expand All @@ -59,6 +61,8 @@
android:lineSpacingExtra="8sp"
android:gravity="center_horizontal"
android:text="Covered by Blotto"
android:maxLines="1"
android:ellipsize="end"
/>
<ImageView
android:id="@+id/img_main_player_act_cover_img"
Expand Down Expand Up @@ -229,7 +233,9 @@
android:textColor="#ffffff"
android:lineSpacingExtra="6sp"
android:gravity="center_horizontal"
android:text="록 메탈 POP"/>
android:text="록 메탈 POP"
android:maxLines="1"
android:ellipsize="end"/>

<ImageView
android:layout_gravity="right"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/bottom_play_list.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
android:layout_height="36dp"
android:background="@drawable/btn_play_sm"
android:layout_marginTop="14dp"
android:layout_marginLeft="16dp"
android:layout_marginLeft="25dp"
/>
<LinearLayout
android:layout_width="match_parent"
Expand Down
15 changes: 8 additions & 7 deletions app/src/main/res/layout/fragment_home_on.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
android:layout_marginStart="22dp"
android:orientation="vertical"
android:layout_marginTop="174dp"
android:layout_width="match_parent" android:layout_height="match_parent">
android:layout_width="match_parent" android:layout_height="397dp">
<TextView
android:id="@+id/tv_home_frag_ment"
android:includeFontPadding="false"
Expand Down Expand Up @@ -135,7 +135,7 @@
android:layout_centerHorizontal="true"
android:src="@drawable/btn_more"
android:layout_width="24dp" android:layout_height="24dp"
android:layout_centerVertical="true" />
android:layout_centerVertical="true"/>
</RelativeLayout>

<ImageView
Expand Down Expand Up @@ -262,13 +262,14 @@
android:fontFamily="@font/noto_sans_kr_bold_hestia"/>

<ImageView
android:layout_marginHorizontal="13dp"
android:background="@color/colorPrimary"
android:layout_marginHorizontal="12dp"
android:layout_marginTop="16dp"
android:scaleType="fitXY"
android:id="@+id/iv_home_frag_challenge_img"
android:layout_below="@+id/tv_home_frag_challenge"
android:layout_width="match_parent" android:layout_height="134dp"
android:src="@drawable/img_artwork_1"
android:layout_width="match_parent"
android:layout_height="134dp"
android:src="@drawable/img_home_weeklychalenge"
android:layout_alignParentStart="true"/>

<!--TOP10 : 장르-->
Expand Down Expand Up @@ -333,7 +334,7 @@
android:layout_below="@+id/rv_home_frag_top10_mood"
android:layout_marginHorizontal="4dp"
android:layout_marginTop="16dp"
android:layout_width="match_parent" android:layout_height="132dp">
android:layout_width="match_parent" android:layout_height="140dp">

</android.support.v7.widget.RecyclerView>
</RelativeLayout>
Expand Down
17 changes: 12 additions & 5 deletions app/src/main/res/layout/fragment_my_page.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,12 +205,14 @@
</RelativeLayout>

<LinearLayout
android:layout_marginStart="15dp"
android:orientation="vertical"
android:layout_width="match_parent" android:layout_height="match_parent">
android:layout_width="match_parent"
android:layout_height="match_parent">
<RelativeLayout
android:layout_marginTop="63dp"
android:layout_width="match_parent" android:layout_height="56dp">
android:layout_width="match_parent"
android:layout_height="56dp"
android:layout_marginStart="15dp">
<TextView
android:id="@+id/tv_mypage_frag_scoring_result"
android:fontFamily="@font/noto_sans_kr_bold_hestia"
Expand Down Expand Up @@ -246,7 +248,10 @@

<RelativeLayout
android:layout_marginTop="63dp"
android:layout_width="match_parent" android:layout_height="56dp">
android:layout_width="match_parent"
android:layout_height="56dp"
android:layout_marginStart="15dp"
>
<TextView
android:id="@+id/tv_mypage_frag_hit_scoring_result"
android:fontFamily="@font/noto_sans_kr_bold_hestia"
Expand All @@ -272,7 +277,9 @@

<android.support.v7.widget.RecyclerView
android:id="@+id/rv_mypage_frag_score_hit_result"
android:layout_width="match_parent" android:layout_height="170dp">
android:layout_width="match_parent"
android:layout_marginStart="15dp"
android:layout_height="170dp">

</android.support.v7.widget.RecyclerView>
</LinearLayout>
Expand Down
Loading