Funkwhale/ultrasonic-app-subsonic-android
1
0
Fork 0
mirror of https://github.com/ultrasonic/ultrasonic synced 2025-02-19 21:20:52 +01:00
Code Issues Releases Wiki Activity

Change default theme to Dark, fix spacing in DownloadActivity page

Browse Source
This commit is contained in:
Joshua Bahnsen 2013-01-07 01:58:43 -07:00
parent 25a32cd934
commit db26dc6e82
6 changed files with 87 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AndroidManifest.xml
View File

@ -2,7 +2,7 @@
<manifest xmlns:a="http://schemas.android.com/apk/res/android" <manifest xmlns:a="http://schemas.android.com/apk/res/android"
package="net.sourceforge.subsonic.androidapp" package="net.sourceforge.subsonic.androidapp"
a:versionCode="47" a:versionCode="47"
a:versionName="3.9.9.4" a:installLocation="auto"> a:versionName="3.9.9.5" a:installLocation="auto">
<uses-permission a:name="android.permission.INTERNET"/> <uses-permission a:name="android.permission.INTERNET"/>
<uses-permission a:name="android.permission.READ_PHONE_STATE"/> <uses-permission a:name="android.permission.READ_PHONE_STATE"/>
@ -16,7 +16,7 @@
<supports-screens a:anyDensity="true" a:xlargeScreens="true" a:largeScreens="true" a:normalScreens="true" a:smallScreens="true"/> <supports-screens a:anyDensity="true" a:xlargeScreens="true" a:largeScreens="true" a:normalScreens="true" a:smallScreens="true"/>
<application a:label="@string/common.appname" a:icon="@drawable/ic_launcher" a:theme="@style/Dark" a:allowBackup="false"> <application a:label="@string/common.appname" a:icon="@drawable/ic_launcher" a:allowBackup="false">
<activity a:name="net.sourceforge.subsonic.androidapp.activity.MainActivity" <activity a:name="net.sourceforge.subsonic.androidapp.activity.MainActivity"
a:label="Subsonic" a:label="Subsonic"

8
gen/net/sourceforge/subsonic/androidapp/R.java
View File

@ -169,8 +169,8 @@ public final class R {
public static final int download_control_layout=0x7f0d0011; public static final int download_control_layout=0x7f0d0011;
public static final int download_duration=0x7f0d0026; public static final int download_duration=0x7f0d0026;
public static final int download_empty=0x7f0d0029; public static final int download_empty=0x7f0d0029;
public static final int download_equalizer=0x7f0d001c; public static final int download_equalizer=0x7f0d001b;
public static final int download_jukebox=0x7f0d001d; public static final int download_jukebox=0x7f0d001c;
public static final int download_list=0x7f0d002a; public static final int download_list=0x7f0d002a;
public static final int download_next=0x7f0d0016; public static final int download_next=0x7f0d0016;
public static final int download_pause=0x7f0d0013; public static final int download_pause=0x7f0d0013;
@ -184,8 +184,8 @@ public final class R {
public static final int download_start=0x7f0d0015; public static final int download_start=0x7f0d0015;
public static final int download_status=0x7f0d0017; public static final int download_status=0x7f0d0017;
public static final int download_stop=0x7f0d0014; public static final int download_stop=0x7f0d0014;
public static final int download_toggle_list=0x7f0d001b; public static final int download_toggle_list=0x7f0d001f;
public static final int download_visualizer=0x7f0d001f; public static final int download_visualizer=0x7f0d001d;
public static final int download_visualizer_view_layout=0x7f0d0023; public static final int download_visualizer_view_layout=0x7f0d0023;
public static final int equalizer_bar=0x7f0d0031; public static final int equalizer_bar=0x7f0d0031;
public static final int equalizer_frequency=0x7f0d002f; public static final int equalizer_frequency=0x7f0d002f;

24
res/layout-land/download.xml
View File

@ -62,32 +62,30 @@
a:background="@android:color/transparent" a:padding="9dip" a:background="@android:color/transparent" a:padding="9dip"
a:src="@drawable/media_repeat_off" /> a:src="@drawable/media_repeat_off" />
<ImageButton a:id="@+id/download_toggle_list"
a:layout_width="0dp" a:layout_height="match_parent"
a:layout_weight="1" a:background="@android:color/transparent"
a:padding="9dip" a:src="@drawable/media_toggle_list_normal" />
<Button a:id="@+id/download_equalizer" a:layout_width="0dp" <Button a:id="@+id/download_equalizer" a:layout_width="0dp"
a:layout_height="wrap_content" a:layout_marginTop="3dip" a:layout_height="match_parent" a:layout_marginTop="3dip" a:layout_marginBottom="4dip"
a:layout_weight="1" a:background="@android:color/transparent" a:layout_weight="1" a:background="@android:color/transparent"
a:padding="9dip" a:text="EQ" a:textSize="22sp" a:textStyle="bold" a:padding="9dip" a:text="EQ" a:textSize="22sp" a:textStyle="bold" />
a:visibility="gone" />
<Button a:id="@+id/download_jukebox" a:layout_width="0dp" <Button a:id="@+id/download_jukebox" a:layout_width="0dp"
a:layout_height="match_parent" a:layout_marginTop="3dip" a:layout_height="match_parent" a:layout_marginTop="3dip" a:layout_marginBottom="4dip"
a:layout_weight="1" a:background="@android:color/transparent" a:layout_weight="1" a:background="@android:color/transparent"
a:padding="9dip" a:text="RC" a:textSize="22sp" a:textStyle="bold" /> a:padding="9dip" a:text="RC" a:textSize="22sp" a:textStyle="bold" />
<Button a:id="@+id/download_visualizer" a:layout_width="0dp"
a:layout_height="match_parent" a:layout_marginTop="3dip" a:layout_marginBottom="4dip"
a:layout_weight="1" a:background="@android:color/transparent"
a:padding="9dip" a:text="VIS" a:textSize="22sp" a:textStyle="bold" />
<ImageButton a:id="@+id/menu_selector" a:layout_width="0dp" <ImageButton a:id="@+id/menu_selector" a:layout_width="0dp"
a:layout_height="match_parent" a:layout_weight="1" a:layout_height="match_parent" a:layout_weight="1"
a:background="@drawable/list_selector_holo_dark" a:padding="9dip" a:background="@drawable/list_selector_holo_dark" a:padding="9dip"
a:src="@drawable/ic_menu_moreoverflow" /> a:src="@drawable/ic_menu_moreoverflow" />
<Button a:id="@+id/download_visualizer" a:layout_width="0dp" <ImageButton a:id="@+id/download_toggle_list"
a:layout_height="wrap_content" a:layout_marginTop="3dip" a:layout_width="0dp" a:layout_height="match_parent"
a:layout_weight="1" a:background="@android:color/transparent" a:layout_weight="1" a:background="@android:color/transparent"
a:padding="9dip" a:text="VIS" a:textSize="22sp" a:textStyle="bold" a:padding="9dip" a:src="@drawable/media_toggle_list_normal" />
a:visibility="gone" />
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>

92
res/layout-port/download.xml
View File

@ -6,34 +6,68 @@
a:id="@+id/download_playlist_flipper" a:layout_width="fill_parent" a:id="@+id/download_playlist_flipper" a:layout_width="fill_parent"
a:layout_height="0dip" a:layout_weight="1"> a:layout_height="0dip" a:layout_weight="1">
<RelativeLayout a:id="@+id/download_album_art_layout" <RelativeLayout
a:orientation="vertical" a:layout_width="fill_parent" a:id="@+id/download_album_art_layout"
a:layout_height="fill_parent" a:layout_weight="1" a:layout_width="fill_parent"
a:background="@drawable/album_art_background"> a:layout_height="fill_parent"
a:layout_weight="1"
a:background="@drawable/album_art_background"
a:gravity="left"
a:orientation="vertical" >
<ImageButton a:id="@+id/download_repeat" a:src="@drawable/media_repeat_off" <ImageButton
a:background="@color/transparent" a:layout_width="wrap_content" a:id="@+id/download_repeat"
a:layout_height="wrap_content" a:layout_gravity="top|right" a:layout_width="60dp"
a:paddingTop="24dip" a:paddingLeft="8dip" a:paddingBottom="12dip" /> a:layout_height="60dp"
a:layout_gravity="top|right"
a:layout_alignParentLeft="true"
a:background="@color/transparent"
a:paddingBottom="12dip"
a:paddingLeft="12dip"
a:paddingTop="24dip"
a:src="@drawable/media_repeat_off" />
<Button a:id="@+id/download_jukebox" a:text="RC" a:textStyle="bold" <Button
a:textSize="22sp" a:background="@android:color/transparent" a:id="@+id/download_jukebox"
a:layout_width="wrap_content" a:layout_height="wrap_content" a:text="RC"
a:layout_gravity="top|right" a:layout_below="@+id/download_repeat" a:textStyle="bold"
a:paddingTop="12dip" a:paddingLeft="0dip" a:paddingBottom="15dip" /> a:textSize="22sp"
a:background="@android:color/transparent"
a:layout_width="60dp"
a:layout_height="60dp"
a:layout_gravity="top|left"
a:layout_alignParentLeft="true"
a:layout_below="@+id/download_repeat"
a:paddingTop="12dip"
a:paddingLeft="12dip"
a:paddingBottom="15dip" />
<Button a:id="@+id/download_equalizer" a:text="EQ" <Button a:id="@+id/download_equalizer"
a:textStyle="bold" a:textSize="22sp" a:background="@android:color/transparent" a:text="EQ"
a:layout_width="wrap_content" a:layout_height="wrap_content" a:textStyle="bold"
a:layout_gravity="top|right" a:layout_alignParentRight="true" a:textSize="22sp"
a:paddingTop="24dip" a:paddingRight="16dip" a:paddingBottom="12dip" /> a:background="@android:color/transparent"
a:layout_width="60dp"
a:layout_height="60dp"
a:layout_gravity="top|right"
a:layout_alignParentRight="true"
a:paddingTop="24dip"
a:paddingRight="0dip"
a:paddingBottom="12dip" />
<Button a:id="@+id/download_visualizer" a:text="VIS" <Button a:id="@+id/download_visualizer"
a:textStyle="bold" a:textSize="22sp" a:background="@android:color/transparent" a:text="VIS"
a:layout_width="wrap_content" a:layout_height="wrap_content" a:textStyle="bold"
a:layout_gravity="top|right" a:layout_alignParentRight="true" a:textSize="22sp"
a:layout_below="@+id/download_equalizer" a:layout_alignBottom="@+id/download_jukebox" a:background="@android:color/transparent"
a:paddingTop="12dip" a:paddingRight="12dip" a:paddingBottom="12dip" /> a:layout_width="60dp"
a:layout_height="60dp"
a:layout_gravity="top|right"
a:layout_alignParentRight="true"
a:layout_below="@+id/download_equalizer"
a:paddingTop="12dip"
a:paddingRight="12dip"
a:paddingBottom="12dip" />
<ImageView a:id="@+id/download_album_art_image" <ImageView a:id="@+id/download_album_art_image"
a:layout_width="wrap_content" a:layout_height="wrap_content" a:layout_width="wrap_content" a:layout_height="wrap_content"
@ -67,11 +101,6 @@
a:layout_height="wrap_content" a:layout_marginTop="0dip" a:layout_height="wrap_content" a:layout_marginTop="0dip"
a:background="@color/mediaControlBackground" a:orientation="horizontal" a:background="@color/mediaControlBackground" a:orientation="horizontal"
a:paddingBottom="0dip" a:paddingTop="0dip"> a:paddingBottom="0dip" a:paddingTop="0dip">
<ImageButton a:id="@+id/menu_selector" a:layout_width="0dp"
a:layout_height="wrap_content" a:layout_weight="1"
a:background="@drawable/list_selector_holo_dark" a:paddingBottom="12dip"
a:paddingLeft="8dip" a:paddingTop="12dip" a:src="@drawable/ic_menu_moreoverflow" />
<ImageButton a:id="@+id/download_shuffle" a:layout_width="0dip" <ImageButton a:id="@+id/download_shuffle" a:layout_width="0dip"
a:layout_height="fill_parent" a:layout_gravity="center_vertical|left" a:layout_height="fill_parent" a:layout_gravity="center_vertical|left"
a:layout_weight="1" a:background="@drawable/list_selector_holo_dark" a:layout_weight="1" a:background="@drawable/list_selector_holo_dark"
@ -102,6 +131,11 @@
a:layout_weight="1" a:background="@drawable/list_selector_holo_dark" a:layout_weight="1" a:background="@drawable/list_selector_holo_dark"
a:padding="0dip" a:src="@drawable/media_forward_normal" /> a:padding="0dip" a:src="@drawable/media_forward_normal" />
<ImageButton a:id="@+id/menu_selector" a:layout_width="0dp"
a:layout_height="wrap_content" a:layout_weight="1"
a:background="@drawable/list_selector_holo_dark" a:paddingBottom="12dip"
a:paddingLeft="8dip" a:paddingTop="12dip" a:src="@drawable/ic_menu_moreoverflow" />
<ImageButton a:id="@+id/download_toggle_list" <ImageButton a:id="@+id/download_toggle_list"
a:layout_width="0dip" a:layout_height="fill_parent" a:layout_weight="1" a:layout_width="0dip" a:layout_height="fill_parent" a:layout_weight="1"
a:background="@drawable/list_selector_holo_dark" a:paddingRight="4dip" a:background="@drawable/list_selector_holo_dark" a:paddingRight="4dip"

8
src/net/sourceforge/subsonic/androidapp/activity/SubsonicTabActivity.java
View File

@ -232,13 +232,13 @@ public class SubsonicTabActivity extends Activity implements OnClickListener{
private void applyTheme() { private void applyTheme() {
String theme = Util.getTheme(this); String theme = Util.getTheme(this);
if ("dark".equals(theme)) { if ("dark".equalsIgnoreCase(theme)) {
setTheme(R.style.Dark); setTheme(R.style.Dark);
} else if ("light".equals(theme)) { } else if ("light".equalsIgnoreCase(theme)) {
setTheme(R.style.Light); setTheme(R.style.Light);
} else if ("fullscreen".equals(theme)) { } else if ("fullscreen".equalsIgnoreCase(theme)) {
setTheme(R.style.Fullscreen); setTheme(R.style.Fullscreen);
} else if ("fullscreenlight".equals(theme)) { } else if ("fullscreenlight".equalsIgnoreCase(theme)) {
setTheme(R.style.Fullscreenlight); setTheme(R.style.Fullscreenlight);
} }
} }

2
src/net/sourceforge/subsonic/androidapp/util/Util.java
View File

@ -179,7 +179,7 @@ public class Util extends DownloadActivity {
public static String getTheme(Context context) { public static String getTheme(Context context) {
SharedPreferences prefs = getPreferences(context); SharedPreferences prefs = getPreferences(context);
return prefs.getString(Constants.PREFERENCES_KEY_THEME, null); return prefs.getString(Constants.PREFERENCES_KEY_THEME, "dark");
} }
public static int getMaxBitrate(Context context) { public static int getMaxBitrate(Context context) {