Skip to content

New EPG List activities #32

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
toggm wants to merge 45 commits into
base: master
Choose a base branch
from
Open

New EPG List activities #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
bc88998
added epg list activity
toggm Apr 10, 2013
b9e7c11
added missing files
Apr 10, 2013
3a0c69a
reimplemented timeslot based epg
toggm Apr 10, 2013
05115c0
implemented epg timeline activity
toggm Apr 11, 2013
47dca57
added libraries
toggm Apr 11, 2013
81d065b
fixed time filter in epg list activity
toggm Apr 12, 2013
f993a87
added support for context menu to record programme
toggm Apr 12, 2013
1df979a
tried synchronizing viewpage listviews
toggm Apr 15, 2013
4f8f610
fixed linking of scroll positons between listviews within page adapter
toggm Apr 16, 2013
dcac39e
fixed date parsing after midnights
toggm Apr 17, 2013
f1daede
added shared channel tag handling and channel tag filtering support f…
toggm Apr 17, 2013
704cc4a
added constant to parse initial program informations
toggm Apr 17, 2013
db99d80
added missing file
toggm Apr 19, 2013
684d159
added dynamic loading of next programmes in epg list mode
toggm Apr 19, 2013
de8c7a5
enhanced logo handling
toggm Apr 19, 2013
7478524
enhanced logo handling
toggm Apr 19, 2013
4062b2a
enhanced logo handling
toggm Apr 19, 2013
cbf9c03
added support for tag filter within timeline
toggm Apr 19, 2013
2a84e33
added onitem click listener to show program details
toggm Apr 19, 2013
396558d
fixed warnings
toggm Apr 19, 2013
e010e43
added support for context menu in horizontalview, added contextmenu t…
toggm Apr 19, 2013
45798d0
enhanded calculation of shown programme in time list, use new method …
toggm Apr 21, 2013
090986c
added link to programm list from epg list to list all available progr…
toggm Apr 21, 2013
f79ead3
disable context menu when long clicking while scrolling
toggm Apr 21, 2013
5c39fd1
synchronized scrolling of epg lists
toggm Apr 21, 2013
78a25a9
refactoring of synchronisation
toggm Apr 21, 2013
4f66c1b
fixed scaling depending on runtime
toggm Apr 21, 2013
d5b7393
adjusted layouting
toggm Apr 24, 2013
f3a6fd4
added visualizing of programm/recording
toggm Apr 24, 2013
9ec417e
added recording state informations
toggm Apr 24, 2013
6774587
added progressbar to indicate loading
toggm Apr 25, 2013
7fa062a
added missing file
toggm Apr 25, 2013
efc7d87
added support for loading next events from within timeline view
toggm Apr 25, 2013
03f4ce6
added prime time timeslots menu
toggm Apr 29, 2013
6d407dd
fixed preloading in difference to other channels
toggm Apr 29, 2013
d17311c
added time header to timeline
toggm May 4, 2013
5b28578
fixed compiler error
toggm May 4, 2013
ccb3c28
fixed errors, enhances dynamically loading of next programs in timeli…
toggm May 8, 2013
a1f0c5f
fixed synching scrolling
toggm May 8, 2013
09e97bc
adjusted colorizing of timeline
toggm May 8, 2013
c908d54
adjusted primetime slots, added verbose log output
toggm May 8, 2013
600627b
adjusted colorizing of timeline
toggm May 8, 2013
1bc552f
adjusted for honeycromb without custom window_title_feature
toggm May 9, 2013
c7ffd05
adjusted for honeycromb without custom window_title_feature
toggm May 9, 2013
90d878d
cleanup
toggm Feb 12, 2014
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
87 changes: 68 additions & 19 deletions AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,32 +2,81 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.tvheadend.tvhguide"
android:versionCode="19"
android:versionName="1.6.5"
>
android:versionName="1.6.5" >

<uses-permission android:name="android.permission.INTERNET" />
<uses-sdk android:minSdkVersion="7" android:targetSdkVersion="9" />
<application android:name="org.tvheadend.tvhguide.TVHGuideApplication" android:label="TVHGuide" android:icon="@drawable/logo_72">
<meta-data android:name="android.app.default_searchable" android:value=".SearchResultActivity" />
<activity android:name="org.tvheadend.tvhguide.ChannelListActivity" android:theme="@style/CustomTheme">

<uses-sdk
android:minSdkVersion="14"
android:targetSdkVersion="17" />

<application
android:name="org.tvheadend.tvhguide.TVHGuideApplication"
android:icon="@drawable/logo_72"
android:label="TVHGuide"
android:allowBackup="false" >
<meta-data
android:name="android.app.default_searchable"
android:value=".SearchResultActivity" />

<activity
android:name="org.tvheadend.tvhguide.ChannelListActivity" >
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name="org.tvheadend.tvhguide.RecordingListActivity" android:theme="@style/CustomTheme"/>
<activity android:name="org.tvheadend.tvhguide.SearchResultActivity" android:theme="@style/CustomTheme" android:launchMode="singleTop">
<activity
android:name="org.tvheadend.tvhguide.RecordingListActivity"
/>
<activity
android:name="org.tvheadend.tvhguide.SearchResultActivity"
android:launchMode="singleTop"
>
<intent-filter>
<action android:name="android.intent.action.SEARCH" />

<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<meta-data android:name="android.app.searchable" android:resource="@xml/searchable" />

<meta-data
android:name="android.app.searchable"
android:resource="@xml/searchable" />
</activity>
<activity android:name="org.tvheadend.tvhguide.ProgrammeListActivity" android:theme="@style/CustomTheme"/>
<activity android:name="org.tvheadend.tvhguide.ProgrammeActivity" android:theme="@style/CustomTheme"/>
<activity android:name="org.tvheadend.tvhguide.RecordingActivity" android:theme="@style/CustomTheme"/>
<activity android:name="org.tvheadend.tvhguide.SettingsActivity"/>
<activity android:name="org.tvheadend.tvhguide.ExternalPlaybackActivity" android:theme="@android:style/Theme.NoTitleBar"/>
<activity android:name="org.tvheadend.tvhguide.PlaybackActivity" android:configChanges="orientation" android:theme="@android:style/Theme.NoTitleBar"/>
<service android:name="org.tvheadend.tvhguide.htsp.HTSService" android:enabled="true"/>
<activity
android:name="org.tvheadend.tvhguide.ProgrammeListActivity"
/>
<activity
android:name="org.tvheadend.tvhguide.ProgrammeActivity"
/>
<activity
android:name="org.tvheadend.tvhguide.RecordingActivity"
/>
<activity android:name="org.tvheadend.tvhguide.SettingsActivity" />
<activity
android:name="org.tvheadend.tvhguide.ExternalPlaybackActivity"
android:theme="@android:style/Theme.NoTitleBar" />
<activity
android:name="org.tvheadend.tvhguide.PlaybackActivity"
android:configChanges="orientation"
android:theme="@android:style/Theme.NoTitleBar" />
<activity
android:name="org.tvheadend.tvhguide.EPGHourlyTimeListActivity"
/>
<activity
android:name="org.tvheadend.tvhguide.EPGPrimeTimeListActivity"
/>
<activity
android:name="org.tvheadend.tvhguide.EPGTimelineActivity"

android:label="@string/title_activity_epgtimeline" >
</activity>

<service
android:name="org.tvheadend.tvhguide.htsp.HTSService"
android:enabled="true" />

</application>
</manifest>

</manifest>
Binary file added libs/android-support-v4.jar
View file
Open in desktop
Binary file not shown.
Binary file added libs/devsmartlib.jar
View file
Open in desktop
Binary file not shown.
3 changes: 3 additions & 0 deletions lint.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<?xml version="1.0" encoding="UTF-8"?>
<lint>
</lint>
2 changes: 1 addition & 1 deletion project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
# project structure.

# Project target.
target=android-7
target=android-17
Binary file removed res/drawable/ic_error.png
View file
Open in desktop
Binary file not shown.
Binary file removed res/drawable/ic_rec.png
View file
Open in desktop
Binary file not shown.
Binary file removed res/drawable/ic_schedule.png
View file
Open in desktop
Binary file not shown.
Binary file removed res/drawable/ic_success.png
View file
Open in desktop
Binary file not shown.
Binary file removed res/drawable/logo.png
View file
Open in desktop
Binary file not shown.
67 changes: 0 additions & 67 deletions res/layout/channel_list_title.xml
View file
Open in desktop

This file was deleted.

23 changes: 10 additions & 13 deletions res/layout/channel_list_widget.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,18 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="wrap_content"
android:layout_width="fill_parent">

<LinearLayout
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:layout_marginLeft="5sp"
android:layout_marginRight="5sp"
>
android:layout_width="fill_parent"
android:layout_marginLeft="5sp"
android:layout_marginRight="5sp">

<ImageView
android:id="@+id/ch_icon"
android:layout_width="64sp"
android:layout_height="64sp"
android:layout_margin="3dip"
android:scaleType="matrix" />
android:layout_height="wrap_content"
android:scaleType="centerInside"
android:layout_margin="3dip"
android:adjustViewBounds="true"
android:contentDescription="@string/icon"/>

<LinearLayout
android:layout_width="fill_parent"
Expand Down Expand Up @@ -63,7 +60,8 @@
android:layout_width="fill_parent"
android:layout_height="1sp"
android:layout_span="2"
android:src="@android:drawable/progress_horizontal" />
android:src="@android:drawable/progress_horizontal"
android:contentDescription="@string/elapsed_time"/>
</TableRow>

<TableRow
Expand All @@ -86,5 +84,4 @@
</TableLayout>
</LinearLayout>

</LinearLayout>
</LinearLayout>
25 changes: 25 additions & 0 deletions res/layout/epgnow_list_activity.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<android.support.v4.view.ViewPager xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/pager"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".EPGTimelineActivity" >

<!--
This title strip will display the currently visible page title, as well as the page
titles for adjacent pages.
-->



<android.support.v4.view.PagerTitleStrip
android:id="@+id/pager_title_strip"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="top"
android:background="#33b5e5"
android:paddingBottom="4dp"
android:paddingTop="4dp"
android:textColor="#fff" />

</android.support.v4.view.ViewPager>
96 changes: 96 additions & 0 deletions res/layout/epgnow_list_widget.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="5sp"
android:layout_marginRight="5sp" >

<ImageView
android:id="@+id/ch_icon"
android:layout_width="64sp"
android:layout_height="wrap_content"
android:scaleType="centerInside"
android:layout_margin="3dip"
android:adjustViewBounds="true"
android:contentDescription="@string/icon"/>

<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >

<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="5sp"
android:layout_marginRight="5sp"
android:orientation="horizontal" >

<ProgressBar
android:id="@+id/ct_loading"
android:layout_width="30sp"
android:layout_height="30sp"
android:padding="3sp"
android:visibility="gone"
style="@android:style/Widget.ProgressBar.Large" />

<TextView
android:id="@+id/pr_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxLines="1"
android:textSize="18sp" >
</TextView>

<ImageView
android:id="@+id/pr_state"
android:layout_width="fill_parent"
android:layout_height="18sp"
android:layout_margin="3dip"
android:scaleType="fitEnd"
android:contentDescription="@string/state">
</ImageView>
</LinearLayout>

<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="5sp"
android:layout_marginRight="5sp"
android:orientation="horizontal" >

<TextView
android:id="@+id/pr_series_info"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:maxLines="1" >
</TextView>

<TextView
android:id="@+id/pr_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxLines="1" >
</TextView>

<TextView
android:id="@+id/pr_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxLines="1"
android:paddingLeft="3dip" >
</TextView>
</LinearLayout>

<TextView
android:id="@+id/pr_desc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5sp"
android:layout_marginRight="5sp"
android:maxLines="2" >
</TextView>
</LinearLayout>

</LinearLayout>
25 changes: 25 additions & 0 deletions res/layout/epgtimeline_programme_header.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="utf-8"?><LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/programme_container"
android:layout_width="300dp"
android:layout_height="45sp"
android:orientation="vertical">

<TextView
android:id="@+id/title_date"
android:layout_width="300dp"
android:layout_height="wrap_content"
android:maxLines="1"
android:textSize="14sp" >
</TextView>

<TextView
android:id="@+id/title_hour"
android:layout_width="300dp"
android:layout_height="wrap_content"
android:maxLines="1"
android:textSize="16sp" >
</TextView>


</LinearLayout>
Loading