nutomic/controldna
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Formatting fixes.

Browse source
This commit is contained in:
Felix Ableitner 2014-05-14 17:24:51 +02:00
parent 6b1fa69b82
commit 87ad67ca82
8 changed files with 187 additions and 193 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

108
src/main/AndroidManifest.xml
View file

@ -1,78 +1,72 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.github.nutomic.controldlna" package="com.github.nutomic.controldlna"
android:versionCode="14" android:versionCode="14"
android:versionName="1.0.2" > android:versionName="1.0.2" >
<uses-permission android:name="android.permission.INTERNET"/> <uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/> <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/> <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
<uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE"/> <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.READ_PHONE_STATE"/> <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
<uses-sdk <uses-sdk
android:minSdkVersion="8" android:minSdkVersion="8"
android:targetSdkVersion="19" /> android:targetSdkVersion="19" />
<application <application
android:allowBackup="true" android:allowBackup="true"
android:icon="@drawable/ic_launcher" android:icon="@drawable/ic_launcher"
android:label="@string/app_name" android:label="@string/app_name"
android:theme="@style/Theme.AppCompat.Light" > android:theme="@style/Theme.AppCompat.Light" >
<!-- <!--
NOTE: configChanges is needed to avoid MediaRouterPlayService being NOTE: configChanges is needed to avoid MediaRouterPlayService being
killed on screen rotate. (why do you do this, Google???). killed on screen rotate. (why do you do this, Google???).
This comes with some rendering issues on screen rotate (sometimes) This comes with some rendering issues on screen rotate (sometimes)
on Android 4.4 (but that's not my error). on Android 4.4 (but that's not my error).
--> -->
<activity <activity
android:name=".gui.MainActivity" android:name=".gui.MainActivity"
android:label="@string/app_name" android:label="@string/app_name"
android:launchMode="singleTop" android:launchMode="singleTop"
android:configChanges="orientation|keyboardHidden|screenSize" > android:configChanges="orientation|keyboardHidden|screenSize" >
<intent-filter android:label="@string/app_name" >
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<intent-filter android:label="@string/app_name" > <activity
android:name=".gui.PreferencesActivity"
<action android:name="android.intent.action.MAIN" /> android:label="@string/settings_title" >
<category android:name="android.intent.category.LAUNCHER" /> <meta-data
android:name="android.support.PARENT_ACTIVITY"
</intent-filter> android:value=".gui.MainActivity" />
</activity>
</activity>
<activity
android:name=".gui.PreferencesActivity"
android:label="@string/settings_title" >
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".gui.MainActivity" />
</activity>
<service android:name="org.teleal.cling.android.AndroidUpnpServiceImpl" /> <service android:name="org.teleal.cling.android.AndroidUpnpServiceImpl" />
<service android:name=".mediarouter.MediaRouterPlayService" /> <service android:name=".mediarouter.MediaRouterPlayService" />
<service android:name=".upnp.RemotePlayService" /> <service android:name=".upnp.RemotePlayService" />
<service android:name=".upnp.ProviderService" <service android:name=".upnp.ProviderService"
android:label="@string/upnp_route_provider_service" android:label="@string/upnp_route_provider_service"
android:process=":mrp"> android:process=":mrp">
<intent-filter> <intent-filter>
<action android:name="android.media.MediaRouteProviderService" /> <action android:name="android.media.MediaRouteProviderService" />
</intent-filter> </intent-filter>
</service> </service>
<service android:name=".localroute.ProviderService" <service android:name=".localroute.ProviderService"
android:process=":mrp"> android:process=":mrp">
<intent-filter> <intent-filter>
<action android:name="android.media.MediaRouteProviderService" /> <action android:name="android.media.MediaRouteProviderService" />
</intent-filter> </intent-filter>
</service> </service>
</application> </application>
</manifest> </manifest>

8
src/main/res/layout/activity_main.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<android.support.v4.view.ViewPager <android.support.v4.view.ViewPager
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/pager" android:id="@+id/pager"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" /> android:layout_height="match_parent" />

48
src/main/res/layout/list_item.xml
View file

@ -1,38 +1,38 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="?android:attr/listPreferredItemHeight" android:layout_height="?android:attr/listPreferredItemHeight"
android:orientation="horizontal" > android:orientation="horizontal" >
<com.github.nutomic.controldlna.utility.RemoteImageView <com.github.nutomic.controldlna.utility.RemoteImageView
android:id="@+id/image" android:id="@+id/image"
android:layout_width="?android:attr/listPreferredItemHeight" android:layout_width="?android:attr/listPreferredItemHeight"
android:layout_height="?android:attr/listPreferredItemHeight" android:layout_height="?android:attr/listPreferredItemHeight"
android:padding="4dip" android:padding="4dip"
android:contentDescription="@string/album_art" /> android:contentDescription="@string/album_art" />
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:orientation="vertical" android:orientation="vertical"
android:layout_marginTop="4dip" > android:layout_marginTop="4dip" >
<TextView <TextView
android:id="@+id/title" android:id="@+id/title"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:lines="1" android:lines="1"
android:ellipsize="end" /> android:ellipsize="end" />
<TextView <TextView
android:id="@+id/subtitle" android:id="@+id/subtitle"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:lines="1" android:lines="1"
android:ellipsize="end" /> android:ellipsize="end" />
</LinearLayout> </LinearLayout>

152
src/main/res/layout/route_fragment.xml
View file

@ -1,99 +1,99 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" > android:orientation="vertical" >
<ListView <ListView
android:id="@+id/listview" android:id="@+id/listview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_above="@+id/controls"
android:layout_alignParentRight="true"
android:layout_alignParentTop="true" />
<TextView
android:id="@id/android:empty"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="10dip"
android:text="@string/route_list_empty"
android:layout_centerInParent="true"
android:gravity="center" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:orientation="vertical"
android:id="@+id/controls"
android:visibility="gone"
android:background="@android:color/white" >
<SeekBar
android:id="@+id/progressBar"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:layout_above="@+id/controls"
android:paddingLeft="10dip" android:layout_alignParentRight="true"
android:paddingRight="10dip" > android:layout_alignParentTop="true" />
<TextView
android:id="@id/android:empty"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="10dip"
android:text="@string/route_list_empty"
android:layout_centerInParent="true"
android:gravity="center" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:orientation="vertical"
android:id="@+id/controls"
android:visibility="gone"
android:background="@android:color/white" >
<SeekBar
android:id="@+id/progressBar"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingLeft="10dip"
android:paddingRight="10dip" >
<TextView <TextView
android:id="@+id/current_time" android:id="@+id/current_time"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:gravity="right" android:gravity="right"
android:minEms="2" /> android:minEms="2" />
<ImageButton <ImageButton
android:id="@+id/shuffle" android:id="@+id/shuffle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:contentDescription="@string/shuffle" android:contentDescription="@string/shuffle"
android:layout_toLeftOf="@+id/previous" /> android:layout_toLeftOf="@+id/previous" />
<ImageButton <ImageButton
android:id="@+id/previous" android:id="@+id/previous"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:contentDescription="@string/previous" android:contentDescription="@string/previous"
android:layout_toLeftOf="@+id/playpause" /> android:layout_toLeftOf="@+id/playpause" />
<ImageButton <ImageButton
android:id="@+id/playpause" android:id="@+id/playpause"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:contentDescription="@string/play" android:contentDescription="@string/play"
android:layout_centerHorizontal="true"/> android:layout_centerHorizontal="true"/>
<ImageButton <ImageButton
android:id="@+id/next" android:id="@+id/next"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:contentDescription="@string/next" android:contentDescription="@string/next"
android:layout_toRightOf="@id/playpause" /> android:layout_toRightOf="@id/playpause" />
<ImageButton <ImageButton
android:id="@+id/repeat" android:id="@+id/repeat"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:contentDescription="@string/repeat" android:contentDescription="@string/repeat"
android:layout_toRightOf="@id/next" /> android:layout_toRightOf="@id/next" />
<TextView <TextView
android:id="@+id/total_time" android:id="@+id/total_time"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:gravity="right" android:gravity="right"
android:minEms="2"/> android:minEms="2"/>
</RelativeLayout> </RelativeLayout>

26
src/main/res/layout/server_fragment.xml
View file

@ -1,21 +1,21 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" > android:orientation="vertical" >
<ListView <ListView
android:id="@id/android:list" android:id="@id/android:list"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" /> android:layout_height="match_parent" />
<TextView <TextView
android:id="@id/android:empty" android:id="@id/android:empty"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="10dip" android:layout_margin="10dip"
android:text="@string/device_list_empty" android:text="@string/device_list_empty"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:gravity="center" /> android:gravity="center" />
</RelativeLayout> </RelativeLayout>

4
src/main/res/menu/menu.xml
View file

@ -3,7 +3,7 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"> <menu xmlns:android="http://schemas.android.com/apk/res/android">
<item <item
android:id="@+id/preferences" android:id="@+id/preferences"
android:title="@string/settings_title" /> android:title="@string/settings_title" />
</menu> </menu>

4
src/main/res/values/strings.xml
View file

@ -61,7 +61,7 @@
<!-- Title for the contact developer preference --> <!-- Title for the contact developer preference -->
<string name="contact_dev_title">Contact Developer</string> <string name="contact_dev_title">Contact Developer</string>
<!-- Appended to all routes provided by a debug build --> <!-- Appended to all routes provided by a debug build -->
<string name="debug">Debug</string> <string name="debug">Debug</string>
</resources> </resources>

20
src/main/res/xml/preferences.xml
View file

@ -2,19 +2,19 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<ListPreference <ListPreference
android:key="enable_wifi_on_start" android:key="enable_wifi_on_start"
android:title="@string/enable_wifi_title" android:title="@string/enable_wifi_title"
android:entries="@array/enable_wifi_value_titles" android:entries="@array/enable_wifi_value_titles"
android:entryValues="@array/enable_wifi_values" android:entryValues="@array/enable_wifi_values"
android:defaultValue="ask"/> android:defaultValue="ask"/>
<CheckBoxPreference <CheckBoxPreference
android:key="incoming_phone_call_pause" android:key="incoming_phone_call_pause"
android:title="@string/incoming_phone_call_pause" android:title="@string/incoming_phone_call_pause"
android:defaultValue="true" /> android:defaultValue="true" />
<Preference <Preference
android:key="contact_dev" android:key="contact_dev"
android:title="@string/contact_dev_title" /> android:title="@string/contact_dev_title" />
</PreferenceScreen> </PreferenceScreen>