mirror/zapp
0
0
Fork 0
mirror of https://github.com/mediathekview/zapp.git synced 2024-09-20 20:23:04 +02:00
Code

Merge remote-tracking branch 'remotes/jspricke/radio_bremen'

Browse Source
This commit is contained in:
Christine Emrich 2020-01-14 21:20:33 +01:00
commit ec7d869d5a
4 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/de/christinecoenen/code/zapp/app/livestream/api/model/Channel.java
View File

@ -17,6 +17,7 @@ public enum Channel {
NDR_SCHLESWIG_HOLSTEIN("ndr_sh"),
RBB_BERLIN("rbb_berlin"),
RBB_BRANDENBURG("rbb_brandenburg"),
RB("rb"),
SR("sr"),
SWR_BADEN_WUERTTEMBERG("swr_bw"),
SWR_RHEINLAND_PFALZ("swr_rp"),

12
app/src/main/res/drawable-night/channel_logo_rb.xml Normal file
View File

@ -0,0 +1,12 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="607.027dp"
android:height="125.064dp"
android:viewportWidth="607.027"
android:viewportHeight="125.064">
<path
android:pathData="M50.113,29.913c-18.339,0 -33.217,14.873 -33.217,33.226c0,16.283 11.711,29.82 27.169,32.67V63.13h12.108v32.679c15.452,-2.85 27.162,-16.387 27.162,-32.67C83.334,44.786 68.46,29.913 50.113,29.913M50.113,17.809c25.036,0 45.33,20.298 45.33,45.329c0,25.036 -20.293,45.331 -45.33,45.331c-25.029,0 -45.323,-20.295 -45.323,-45.331C4.79,38.107 25.083,17.809 50.113,17.809"
android:fillColor="#CC030C"/>
<path
android:fillColor="#FFFFFFFF"
android:pathData="M118.215,64.557c0,-4.646 -0.268,-9.207 -0.353,-13.85h4.734c0.089,2.625 0.265,5.259 0.353,7.1h0.174c3.245,-6.405 7.012,-7.718 11.924,-7.718v5.442c-8.066,0 -11.749,3.499 -11.749,11.739v28.146h-5.083V64.557zM163.268,72.884c-10.519,0 -19.375,0 -19.375,10.176c0,3.767 2.803,8.234 8.242,8.234c2.37,0 11.132,-0.963 11.132,-13.146V72.884zM168.008,85.421c0,3.333 0.26,6.667 0.525,9.996h-4.562l-0.354,-6.4h-0.172c-3.07,4.916 -6.75,7.014 -12.542,7.014c-6.925,0 -12.446,-5.699 -12.446,-12.971c0,-14.297 15.167,-14.555 21.568,-14.555h3.242c0,-5.612 0,-13.681 -9.293,-13.681c-5.965,0 -10.693,4.207 -11.221,4.648l-0.787,-5.436c4.208,-2.283 7.363,-3.942 12.272,-3.942c13.769,0 13.769,11.565 13.769,14.812V85.421zM183.694,73.065c0,3.677 0,18.229 10.165,18.229c8.676,0 11.047,-8.585 11.047,-17.705c0,-5.964 0,-18.765 -10.957,-18.765C186.325,54.824 183.694,62.711 183.694,73.065M209.64,80.607c0,7.011 0.179,10.958 0.354,14.81h-4.737v-6.133h-0.18c-3.321,4.205 -6.131,6.746 -11.738,6.746c-14.557,0 -15.084,-18.409 -15.084,-24.634c0,-8.504 3.599,-21.307 14.821,-21.307c5.699,0 9.021,2.28 11.307,6.402h0.177V29.664h5.082V80.607zM221.999,32.908h6.136v7.887h-6.136V32.908zM222.525,50.708h5.085v44.709h-5.085V50.708zM255.21,96.03c-13.066,0 -16.744,-11.747 -16.744,-22.965c0,-11.23 3.678,-22.976 16.744,-22.976c13.067,0 16.742,11.745 16.742,22.976C271.953,84.283 268.278,96.03 255.21,96.03M255.21,91.304c11.313,0 11.313,-14.652 11.313,-18.239c0,-3.594 0,-18.241 -11.313,-18.241c-11.313,0 -11.313,14.647 -11.313,18.241C243.897,76.652 243.897,91.304 255.21,91.304M293.258,72.713c0,8.497 2.193,15.428 8.591,15.428c6.318,0 7.98,-5.259 7.98,-15.686c0,-9.039 -2.104,-14.912 -8.157,-14.912C295.708,57.543 293.258,63.947 293.258,72.713M293.258,29.664v27.095h0.171c1.583,-3.508 5.172,-7.193 11.668,-7.193c9.729,0 15.608,8.593 15.608,23.322c0,12.533 -4.656,23.24 -15.87,23.24c-7.022,0 -10.264,-3.87 -12.011,-7.722h-0.271c0,3.071 -0.168,5.694 -0.349,7.011h-10.171c0.262,-1.668 0.351,-4.47 0.351,-7.711V29.664H293.258zM330.513,95.417h10.867V70.698c0,-8.415 4.917,-11.137 9.387,-11.137c1.142,0 2.1,0.175 3.065,0.435V49.831c-0.608,-0.091 -1.141,-0.266 -1.837,-0.266c-6.76,0 -10.175,5.438 -11.491,8.942h-0.172c0,-2.72 -0.266,-5.525 -0.354,-8.242h-9.821c0.268,2.014 0.355,4.647 0.355,7.453V95.417zM384.149,68.938c0,-7.976 -2.628,-12.007 -7.536,-12.007c-5.695,0 -8.066,6.045 -8.066,12.007H384.149zM392.395,93.226c-2.277,0.969 -7.01,2.901 -13.5,2.901c-14.559,0 -20.87,-10.439 -20.87,-22.63c0,-13.495 7.104,-23.933 18.589,-23.933c9.731,0 18.06,5.7 18.06,24.116v2.098h-26.126c0,7.718 3.065,12.361 11.481,12.361c6.667,0 9.823,-2.015 11.841,-3.504L392.395,93.226zM404.592,95.417h10.868V68.07c0,-5.003 2.54,-9.563 7.368,-9.563c4.032,0 5.786,2.806 5.786,8.421v28.488h10.868V68.07c0,-5.003 2.541,-9.563 7.369,-9.563c4.029,0 5.787,2.806 5.787,8.421v28.488h10.867V67.533c0,-10.953 -3.153,-17.968 -12.971,-17.968c-6.662,0 -9.909,4.031 -12.104,7.193c-1.316,-2.458 -3.767,-7.193 -11.394,-7.193c-6.229,0 -9.739,4.294 -11.403,7.801h-0.175c0,-2.363 -0.264,-4.732 -0.341,-7.101h-10.883c0.172,1.668 0.355,4.118 0.355,7.367V95.417zM498.843,68.938c0,-7.976 -2.632,-12.007 -7.542,-12.007c-5.696,0 -8.057,6.045 -8.057,12.007H498.843zM507.084,93.226c-2.277,0.969 -7.008,2.901 -13.5,2.901c-14.55,0 -20.867,-10.439 -20.867,-22.63c0,-13.495 7.093,-23.933 18.584,-23.933c9.734,0 18.066,5.7 18.066,24.116v2.098h-26.123c0,7.718 3.059,12.361 11.476,12.361c6.674,0 9.819,-2.015 11.835,-3.504L507.084,93.226zM519.549,95.417h10.868V69.121c0,-5.792 2.021,-10.613 7.714,-10.613c4.48,0 6.229,2.888 6.229,9.819v27.09h10.872V66.312c0,-9.119 -3.068,-16.747 -13.328,-16.747c-7.369,0 -10.435,4.908 -12.015,7.628h0.094h-0.261c0,-2.28 -0.263,-4.648 -0.355,-6.928h-10.173c0.264,2.014 0.355,4.647 0.355,7.453V95.417zM591.165,49.966l-13.649,4.888V39.594l-6.763,2.447v-5.051l20.412,-7.327V49.966L591.165,49.966zM583.026,24.448c9.556,0 17.301,7.75 17.301,17.305s-7.745,17.313 -17.301,17.313c-9.558,0 -17.311,-7.758 -17.311,-17.313S573.469,24.448 583.026,24.448L583.026,24.448zM583.026,21.476c-11.2,0 -20.282,9.08 -20.282,20.276c0,11.202 9.082,20.286 20.282,20.286s20.274,-9.084 20.274,-20.286C603.301,30.556 594.227,21.476 583.026,21.476L583.026,21.476z"/>
</vector>

12
app/src/main/res/drawable/channel_logo_rb.xml Normal file
View File

@ -0,0 +1,12 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="607.027dp"
android:height="125.064dp"
android:viewportWidth="607.027"
android:viewportHeight="125.064">
<path
android:pathData="M50.113,29.913c-18.339,0 -33.217,14.873 -33.217,33.226c0,16.283 11.711,29.82 27.169,32.67V63.13h12.108v32.679c15.452,-2.85 27.162,-16.387 27.162,-32.67C83.334,44.786 68.46,29.913 50.113,29.913M50.113,17.809c25.036,0 45.33,20.298 45.33,45.329c0,25.036 -20.293,45.331 -45.33,45.331c-25.029,0 -45.323,-20.295 -45.323,-45.331C4.79,38.107 25.083,17.809 50.113,17.809"
android:fillColor="#CC030C"/>
<path
android:fillColor="#FF000000"
android:pathData="M118.215,64.557c0,-4.646 -0.268,-9.207 -0.353,-13.85h4.734c0.089,2.625 0.265,5.259 0.353,7.1h0.174c3.245,-6.405 7.012,-7.718 11.924,-7.718v5.442c-8.066,0 -11.749,3.499 -11.749,11.739v28.146h-5.083V64.557zM163.268,72.884c-10.519,0 -19.375,0 -19.375,10.176c0,3.767 2.803,8.234 8.242,8.234c2.37,0 11.132,-0.963 11.132,-13.146V72.884zM168.008,85.421c0,3.333 0.26,6.667 0.525,9.996h-4.562l-0.354,-6.4h-0.172c-3.07,4.916 -6.75,7.014 -12.542,7.014c-6.925,0 -12.446,-5.699 -12.446,-12.971c0,-14.297 15.167,-14.555 21.568,-14.555h3.242c0,-5.612 0,-13.681 -9.293,-13.681c-5.965,0 -10.693,4.207 -11.221,4.648l-0.787,-5.436c4.208,-2.283 7.363,-3.942 12.272,-3.942c13.769,0 13.769,11.565 13.769,14.812V85.421zM183.694,73.065c0,3.677 0,18.229 10.165,18.229c8.676,0 11.047,-8.585 11.047,-17.705c0,-5.964 0,-18.765 -10.957,-18.765C186.325,54.824 183.694,62.711 183.694,73.065M209.64,80.607c0,7.011 0.179,10.958 0.354,14.81h-4.737v-6.133h-0.18c-3.321,4.205 -6.131,6.746 -11.738,6.746c-14.557,0 -15.084,-18.409 -15.084,-24.634c0,-8.504 3.599,-21.307 14.821,-21.307c5.699,0 9.021,2.28 11.307,6.402h0.177V29.664h5.082V80.607zM221.999,32.908h6.136v7.887h-6.136V32.908zM222.525,50.708h5.085v44.709h-5.085V50.708zM255.21,96.03c-13.066,0 -16.744,-11.747 -16.744,-22.965c0,-11.23 3.678,-22.976 16.744,-22.976c13.067,0 16.742,11.745 16.742,22.976C271.953,84.283 268.278,96.03 255.21,96.03M255.21,91.304c11.313,0 11.313,-14.652 11.313,-18.239c0,-3.594 0,-18.241 -11.313,-18.241c-11.313,0 -11.313,14.647 -11.313,18.241C243.897,76.652 243.897,91.304 255.21,91.304M293.258,72.713c0,8.497 2.193,15.428 8.591,15.428c6.318,0 7.98,-5.259 7.98,-15.686c0,-9.039 -2.104,-14.912 -8.157,-14.912C295.708,57.543 293.258,63.947 293.258,72.713M293.258,29.664v27.095h0.171c1.583,-3.508 5.172,-7.193 11.668,-7.193c9.729,0 15.608,8.593 15.608,23.322c0,12.533 -4.656,23.24 -15.87,23.24c-7.022,0 -10.264,-3.87 -12.011,-7.722h-0.271c0,3.071 -0.168,5.694 -0.349,7.011h-10.171c0.262,-1.668 0.351,-4.47 0.351,-7.711V29.664H293.258zM330.513,95.417h10.867V70.698c0,-8.415 4.917,-11.137 9.387,-11.137c1.142,0 2.1,0.175 3.065,0.435V49.831c-0.608,-0.091 -1.141,-0.266 -1.837,-0.266c-6.76,0 -10.175,5.438 -11.491,8.942h-0.172c0,-2.72 -0.266,-5.525 -0.354,-8.242h-9.821c0.268,2.014 0.355,4.647 0.355,7.453V95.417zM384.149,68.938c0,-7.976 -2.628,-12.007 -7.536,-12.007c-5.695,0 -8.066,6.045 -8.066,12.007H384.149zM392.395,93.226c-2.277,0.969 -7.01,2.901 -13.5,2.901c-14.559,0 -20.87,-10.439 -20.87,-22.63c0,-13.495 7.104,-23.933 18.589,-23.933c9.731,0 18.06,5.7 18.06,24.116v2.098h-26.126c0,7.718 3.065,12.361 11.481,12.361c6.667,0 9.823,-2.015 11.841,-3.504L392.395,93.226zM404.592,95.417h10.868V68.07c0,-5.003 2.54,-9.563 7.368,-9.563c4.032,0 5.786,2.806 5.786,8.421v28.488h10.868V68.07c0,-5.003 2.541,-9.563 7.369,-9.563c4.029,0 5.787,2.806 5.787,8.421v28.488h10.867V67.533c0,-10.953 -3.153,-17.968 -12.971,-17.968c-6.662,0 -9.909,4.031 -12.104,7.193c-1.316,-2.458 -3.767,-7.193 -11.394,-7.193c-6.229,0 -9.739,4.294 -11.403,7.801h-0.175c0,-2.363 -0.264,-4.732 -0.341,-7.101h-10.883c0.172,1.668 0.355,4.118 0.355,7.367V95.417zM498.843,68.938c0,-7.976 -2.632,-12.007 -7.542,-12.007c-5.696,0 -8.057,6.045 -8.057,12.007H498.843zM507.084,93.226c-2.277,0.969 -7.008,2.901 -13.5,2.901c-14.55,0 -20.867,-10.439 -20.867,-22.63c0,-13.495 7.093,-23.933 18.584,-23.933c9.734,0 18.066,5.7 18.066,24.116v2.098h-26.123c0,7.718 3.059,12.361 11.476,12.361c6.674,0 9.819,-2.015 11.835,-3.504L507.084,93.226zM519.549,95.417h10.868V69.121c0,-5.792 2.021,-10.613 7.714,-10.613c4.48,0 6.229,2.888 6.229,9.819v27.09h10.872V66.312c0,-9.119 -3.068,-16.747 -13.328,-16.747c-7.369,0 -10.435,4.908 -12.015,7.628h0.094h-0.261c0,-2.28 -0.263,-4.648 -0.355,-6.928h-10.173c0.264,2.014 0.355,4.647 0.355,7.453V95.417zM591.165,49.966l-13.649,4.888V39.594l-6.763,2.447v-5.051l20.412,-7.327V49.966L591.165,49.966zM583.026,24.448c9.556,0 17.301,7.75 17.301,17.305s-7.745,17.313 -17.301,17.313c-9.558,0 -17.311,-7.758 -17.311,-17.313S573.469,24.448 583.026,24.448L583.026,24.448zM583.026,21.476c-11.2,0 -20.282,9.08 -20.282,20.276c0,11.202 9.082,20.286 20.282,20.286s20.274,-9.084 20.274,-20.286C603.301,30.556 594.227,21.476 583.026,21.476L583.026,21.476z"/>
</vector>

7
app/src/main/res/raw/channels.json
View File

@ -187,6 +187,13 @@
"subtitle": "Brandenburg",
"color": "#E31818"
},
{
"id": "rb",
"name": "Radio Bremen",
"stream_url": "https://rbfs-lh.akamaihd.net/i/rb_fs@438960/master.m3u8",
"logo_name": "channel_logo_rb",
"color": "#CC030C"
},
{
"id": "sr",
"name": "SR",