riff
/
riff_app
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed DST for Paris

remotes/origin/devel
yattoz 2020-04-02 15:44:01 +02:00
parent 3de813b524
commit c8abee4e97
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/assets/planning_example.json
View File

@ -62,5 +62,5 @@
} }
], ],
"regular_programme" : "Programmation habituelle", "regular_programme" : "Programmation habituelle",
"timezone": "GMT+1" "timezone": "Europe/Paris"
} }

3
app/src/main/java/fr/forum_thalie/tsumugi/playerstore/PlayerStore.kt
View File

@ -12,6 +12,7 @@ import org.json.JSONObject
import java.net.URL import java.net.URL
import java.text.ParseException import java.text.ParseException
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
import java.time.format.TextStyle
import java.util.* import java.util.*
import kotlin.collections.ArrayList import kotlin.collections.ArrayList
@ -61,7 +62,7 @@ class PlayerStore {
{ {
val dateFormat = SimpleDateFormat("yyyy-MM-dd hh:mm:ss z", Locale.getDefault()) val dateFormat = SimpleDateFormat("yyyy-MM-dd hh:mm:ss z", Locale.getDefault())
try { try {
val t: Date? = dateFormat.parse("$s ${Planning.instance.timeZone.id}") val t: Date? = dateFormat.parse("$s ${Planning.instance.timeZone.getDisplayName(Planning.instance.timeZone.useDaylightTime(), TimeZone.SHORT)}")
//[REMOVE LOG CALLS]Log.d(tag, "date: $s -> $t") //[REMOVE LOG CALLS]Log.d(tag, "date: $s -> $t")
return t!!.time return t!!.time
} catch (e: ParseException) { } catch (e: ParseException) {

8
app/src/main/java/fr/forum_thalie/tsumugi/ui/programme/ProgrammeAdapter.kt
View File

@ -1,18 +1,18 @@
package fr.forum_thalie.tsumugi.ui.programme package fr.forum_thalie.tsumugi.ui.programme
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.util.TypedValue
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.ViewGroup import android.view.ViewGroup
import android.widget.TextView import android.widget.TextView
import androidx.constraintlayout.widget.ConstraintLayout import androidx.constraintlayout.widget.ConstraintLayout
import androidx.core.widget.TextViewCompat
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import fr.forum_thalie.tsumugi.* import fr.forum_thalie.tsumugi.R
import fr.forum_thalie.tsumugi.colorAccent
import fr.forum_thalie.tsumugi.colorWhited
import fr.forum_thalie.tsumugi.planning.Planning import fr.forum_thalie.tsumugi.planning.Planning
import fr.forum_thalie.tsumugi.planning.Programme import fr.forum_thalie.tsumugi.planning.Programme
import fr.forum_thalie.tsumugi.weekdaysSundayFirst
import java.util.* import java.util.*
import kotlin.collections.ArrayList
class ProgrammeAdapter(private val dataSet: ArrayList<Programme>, private val day: String class ProgrammeAdapter(private val dataSet: ArrayList<Programme>, private val day: String
/*, /*,