diff --git a/app/src/main/assets/planning_example.json b/app/src/main/assets/planning_example.json index 94c582a..1ef0236 100644 --- a/app/src/main/assets/planning_example.json +++ b/app/src/main/assets/planning_example.json @@ -62,5 +62,5 @@ } ], "regular_programme" : "Programmation habituelle", - "timezone": "GMT+1" + "timezone": "Europe/Paris" } \ No newline at end of file diff --git a/app/src/main/java/fr/forum_thalie/tsumugi/playerstore/PlayerStore.kt b/app/src/main/java/fr/forum_thalie/tsumugi/playerstore/PlayerStore.kt index e37fde9..7e2e03a 100644 --- a/app/src/main/java/fr/forum_thalie/tsumugi/playerstore/PlayerStore.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/playerstore/PlayerStore.kt @@ -12,6 +12,7 @@ import org.json.JSONObject import java.net.URL import java.text.ParseException import java.text.SimpleDateFormat +import java.time.format.TextStyle import java.util.* import kotlin.collections.ArrayList @@ -61,7 +62,7 @@ class PlayerStore { { val dateFormat = SimpleDateFormat("yyyy-MM-dd hh:mm:ss z", Locale.getDefault()) 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") return t!!.time } catch (e: ParseException) { diff --git a/app/src/main/java/fr/forum_thalie/tsumugi/ui/programme/ProgrammeAdapter.kt b/app/src/main/java/fr/forum_thalie/tsumugi/ui/programme/ProgrammeAdapter.kt index 6742d87..2869b81 100644 --- a/app/src/main/java/fr/forum_thalie/tsumugi/ui/programme/ProgrammeAdapter.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/ui/programme/ProgrammeAdapter.kt @@ -1,18 +1,18 @@ package fr.forum_thalie.tsumugi.ui.programme import android.annotation.SuppressLint -import android.util.TypedValue import android.view.LayoutInflater import android.view.ViewGroup import android.widget.TextView import androidx.constraintlayout.widget.ConstraintLayout -import androidx.core.widget.TextViewCompat 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.Programme +import fr.forum_thalie.tsumugi.weekdaysSundayFirst import java.util.* -import kotlin.collections.ArrayList class ProgrammeAdapter(private val dataSet: ArrayList, private val day: String /*,