Skip to content

Commit

Permalink
録画ルールを新しい順/古い順に並べ替え 機能の追加
Browse files Browse the repository at this point in the history
  • Loading branch information
daigorian committed Jul 8, 2021
1 parent 355fe5e commit 1173b08
Show file tree
Hide file tree
Showing 2 changed files with 62 additions and 31 deletions.
91 changes: 61 additions & 30 deletions app/src/main/java/com/daigorian/epcltvapp/MainFragment.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
package com.daigorian.epcltvapp
import android.annotation.SuppressLint
import com.daigorian.epcltvapp.epgstationcaller.*
import com.daigorian.epcltvapp.epgstationv2caller.*

Expand Down Expand Up @@ -218,48 +219,56 @@ class MainFragment : BrowseSupportFragment() {
mMainMenuAdapter.addToCategory(Category.SEARCH_HISTORY,historyRow)
}

//ルールの並び順を表すフラグ。デフォルトfalse。
val isNewestFirst = PreferenceManager.getDefaultSharedPreferences(context).getBoolean(getString(R.string.pref_key_rules_order_is_newest_first),false)

//次の横の列。録画ルール。録画ルールの数だけ行が増える。
EpgStation.api?.getRulesList()?.enqueue(object : Callback<Array<RuleList>> {
override fun onResponse(call: Call<Array<RuleList>>, response: Response<Array<RuleList>>) {
response.body()?.forEach { rule ->

//録画ルールにキーワードが設定されていない場合、キーワードの代わりにルールIDをセット
val keyword:String = if ( rule.keyword.isNullOrEmpty() ){
getString(R.string.rule_id_is_x, rule.id.toString())
}else{
rule.keyword
}
val recordedByRule = contentsListRowBuilder(
GetRecordedParam(rule= rule.id),
GetRecordedParamV2(ruleId= rule.id),
keyword
)
mMainMenuAdapter.addToCategory(Category.RECORDED_BY_RULES,recordedByRule)
EpgStation.api?.getRulesList()?.enqueue(object : Callback<List<RuleList>> {
override fun onResponse(call: Call<List<RuleList>>, response: Response<List<RuleList>>) {
response.body()?.let{ it ->
val rules = if(isNewestFirst){it.reversed()}else{it}
rules.forEach { rule ->

//録画ルールにキーワードが設定されていない場合、キーワードの代わりにルールIDをセット
val keyword:String = if ( rule.keyword.isNullOrEmpty() ){
getString(R.string.rule_id_is_x, rule.id.toString())
}else{
rule.keyword
}
val recordedByRule = contentsListRowBuilder(
GetRecordedParam(rule= rule.id),
GetRecordedParamV2(ruleId= rule.id),
keyword
)
mMainMenuAdapter.addToCategory(Category.RECORDED_BY_RULES,recordedByRule)

}
}
}
override fun onFailure(call: Call<Array<RuleList>>, t: Throwable) {
override fun onFailure(call: Call<List<RuleList>>, t: Throwable) {
Log.d(TAG,"loadRows() getRulesList API Failure")
Toast.makeText(context!!, R.string.connect_epgstation_failed, Toast.LENGTH_LONG).show()
}
})
EpgStationV2.api?.getRules(limit=Int.MAX_VALUE)?.enqueue(object : Callback<Rules> {
override fun onResponse(call: Call<Rules>, response: Response<Rules>) {
response.body()?.rules?.forEach { rule ->

//録画ルールにキーワードが設定されていない場合、キーワードの代わりにルールIDをセット
val keyword:String = if ( rule.searchOption?.keyword.isNullOrEmpty() ){
getString(R.string.rule_id_is_x, rule.id.toString())
}else{
rule.searchOption?.keyword!!
response.body()?.rules?.let{ it ->
val rules = if(isNewestFirst){it.reversed()}else{it}
rules.forEach { rule ->

//録画ルールにキーワードが設定されていない場合、キーワードの代わりにルールIDをセット
val keyword:String = if ( rule.searchOption?.keyword.isNullOrEmpty() ){
getString(R.string.rule_id_is_x, rule.id.toString())
}else{
rule.searchOption?.keyword!!
}
val recordedByRule = contentsListRowBuilder(
GetRecordedParam(rule= rule.id),
GetRecordedParamV2(ruleId= rule.id),
keyword
)
mMainMenuAdapter.addToCategory(Category.RECORDED_BY_RULES,recordedByRule)
}
val recordedByRule = contentsListRowBuilder(
GetRecordedParam(rule= rule.id),
GetRecordedParamV2(ruleId= rule.id),
keyword
)
mMainMenuAdapter.addToCategory(Category.RECORDED_BY_RULES,recordedByRule)
}
}
override fun onFailure(call: Call<Rules>, t: Throwable) {
Expand All @@ -274,6 +283,13 @@ class MainFragment : BrowseSupportFragment() {
val gridRowAdapter = ArrayObjectAdapter(gridPresenter)
gridRowAdapter.add(resources.getString(R.string.settings))
gridRowAdapter.add(resources.getString(R.string.reload))
if (isNewestFirst){
gridRowAdapter.add(resources.getString(R.string.set_oldest_rule_first))
}else{
gridRowAdapter.add(resources.getString(R.string.set_newest_rule_first))
}


mMainMenuAdapter.addToCategory(Category.SETTINGS,ListRow(gridHeader, gridRowAdapter))

}
Expand All @@ -291,6 +307,7 @@ class MainFragment : BrowseSupportFragment() {
}

private inner class ItemViewClickedListener : OnItemViewClickedListener {
@SuppressLint("ApplySharedPref")
override fun onItemClicked(
itemViewHolder: Presenter.ViewHolder,
item: Any,
Expand Down Expand Up @@ -338,6 +355,20 @@ class MainFragment : BrowseSupportFragment() {
item.contains(getString(R.string.reload)) -> {
loadRows()
}
item.contains(getString(R.string.set_newest_rule_first)) -> {
PreferenceManager.getDefaultSharedPreferences(context)
.edit()
.putBoolean(getString(R.string.pref_key_rules_order_is_newest_first),true)
.commit()
loadRows()
}
item.contains(getString(R.string.set_oldest_rule_first)) -> {
PreferenceManager.getDefaultSharedPreferences(context)
.edit()
.putBoolean(getString(R.string.pref_key_rules_order_is_newest_first),false)
.commit()
loadRows()
}
else -> {
Toast.makeText(context!!, item, Toast.LENGTH_LONG).show()
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/daigorian/epcltvapp/epgstationcaller/EpgStation.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ object EpgStation {
): Call<GetRecordedResponse>

@GET("rules/list")
fun getRulesList(): Call<Array<RuleList>>
fun getRulesList(): Call<List<RuleList>>
}

private var ip:String = "192.168.0.0"
Expand Down

0 comments on commit 1173b08

Please sign in to comment.