diff options
| author | Andrew Neal <andrewdneal@gmail.com> | 2012-11-20 18:41:37 -0600 |
|---|---|---|
| committer | Andrew Neal <andrewdneal@gmail.com> | 2012-11-20 18:41:37 -0600 |
| commit | ad90d968d80a7f57873d35d701147b5081b297a6 (patch) | |
| tree | 507e79c4668ab247245ce36922016a65ae95786c /res/layout | |
| parent | 12f4713e2c39e715240b1116d32b54496f8c958f (diff) | |
| download | android_packages_apps_Eleven-ad90d968d80a7f57873d35d701147b5081b297a6.tar.gz android_packages_apps_Eleven-ad90d968d80a7f57873d35d701147b5081b297a6.tar.bz2 android_packages_apps_Eleven-ad90d968d80a7f57873d35d701147b5081b297a6.zip | |
Play Store changes
Diffstat (limited to 'res/layout')
54 files changed, 1983 insertions, 1032 deletions
diff --git a/res/layout/action_bar.xml b/res/layout/action_bar.xml new file mode 100644 index 0000000..1fad70e --- /dev/null +++ b/res/layout/action_bar.xml @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:enabled="false"
+ android:orientation="horizontal"
+ android:paddingEnd="8dip" >
+
+ <ImageView
+ android:id="@+id/up"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical|start"
+ android:contentDescription="@null"
+ android:visibility="gone" />
+
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical|start"
+ android:orientation="vertical" >
+
+ <TextView
+ android:id="@+id/action_bar_title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:ellipsize="end"
+ android:singleLine="true"
+ android:textSize="@dimen/text_size_medium" />
+
+ <TextView
+ android:id="@+id/action_bar_subtitle"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="-3dp"
+ android:ellipsize="end"
+ android:singleLine="true"
+ android:textSize="@dimen/text_size_small"
+ android:visibility="gone" />
+ </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file diff --git a/res/layout/activity_base.xml b/res/layout/activity_base.xml new file mode 100644 index 0000000..07316d4 --- /dev/null +++ b/res/layout/activity_base.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2012 Andrew Neal + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" > + + <com.andrew.apollo.widgets.theme.ThemeableFrameLayout + android:id="@+id/activity_base_content" + android:layout_width="match_parent" + android:layout_height="0dip" + android:layout_weight="1" /> + + <include layout="@layout/bottom_action_bar"/> + +</LinearLayout>
\ No newline at end of file diff --git a/res/layout/activity_player_base.xml b/res/layout/activity_player_base.xml new file mode 100644 index 0000000..e98bbb5 --- /dev/null +++ b/res/layout/activity_player_base.xml @@ -0,0 +1,206 @@ +<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<com.andrew.apollo.widgets.theme.ThemeableFrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res/com.andrew.apollo"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
+
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
+
+ <View
+ android:id="@+id/audio_player_footer"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentBottom="true"
+ android:layout_alignTop="@android:id/progress" />
+
+ <LinearLayout
+ android:id="@+id/audio_player_header"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/audio_player_header_height"
+ android:layout_alignParentTop="true"
+ android:baselineAligned="false"
+ android:orientation="horizontal" >
+
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:layout_weight="1"
+ android:orientation="vertical"
+ android:paddingLeft="@dimen/audio_player_header_padding_left"
+ android:paddingRight="@dimen/audio_player_header_padding_right" >
+
+ <com.andrew.apollo.widgets.theme.ThemeableTextView
+ android:id="@+id/audio_player_track_name"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:ellipsize="end"
+ android:singleLine="true"
+ android:textSize="@dimen/text_size_medium"
+ android:textStyle="bold"
+ app:themeResource="audio_player_line_one" />
+
+ <com.andrew.apollo.widgets.theme.ThemeableTextView
+ android:id="@+id/audio_player_artist_name"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:ellipsize="end"
+ android:singleLine="true"
+ android:textSize="@dimen/text_size_medium"
+ app:themeResource="audio_player_line_two" />
+ </LinearLayout>
+
+ <FrameLayout
+ android:id="@+id/audio_player_switch"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:clickable="true"
+ android:focusable="true"
+ android:padding="@dimen/audio_player_switch_padding" >
+
+ <com.andrew.apollo.widgets.SquareImageView
+ android:id="@+id/audio_player_switch_queue"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:contentDescription="@null" />
+
+ <com.andrew.apollo.widgets.SquareImageView
+ android:id="@+id/audio_player_switch_album_art"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:visibility="invisible" />
+ </FrameLayout>
+ </LinearLayout>
+
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_above="@android:id/progress"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentRight="true"
+ android:layout_below="@+id/audio_player_header" >
+
+ <com.andrew.apollo.widgets.SquareImageView
+ android:id="@+id/audio_player_album_art"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_centerHorizontal="true"
+ android:scaleType="fitXY" />
+
+ <View
+ android:id="@+id/audio_player_footer_two"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentBottom="true"
+ android:layout_below="@+id/audio_player_album_art" />
+
+ <ImageView
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/shadow_height"
+ android:layout_alignTop="@+id/audio_player_album_art"
+ android:contentDescription="@null"
+ android:src="@drawable/top_shadow" />
+
+ <ImageView
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/shadow_height"
+ android:layout_alignBottom="@+id/audio_player_album_art"
+ android:contentDescription="@null"
+ android:src="@drawable/bottom_shadow" />
+
+ <FrameLayout
+ android:id="@+id/audio_player_pager_container"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignBottom="@+id/audio_player_album_art"
+ android:visibility="invisible" >
+
+ <android.support.v4.view.ViewPager
+ android:id="@+id/audio_player_pager"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
+
+ <ImageView
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/shadow_height"
+ android:layout_gravity="top"
+ android:contentDescription="@null"
+ android:src="@drawable/top_shadow" />
+
+ <ImageView
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/shadow_height"
+ android:layout_gravity="bottom"
+ android:contentDescription="@null"
+ android:src="@drawable/bottom_shadow" />
+ </FrameLayout>
+ </RelativeLayout>
+
+ <com.andrew.apollo.widgets.theme.ThemeableTextView
+ android:id="@+id/audio_player_current_time"
+ android:layout_width="@dimen/audio_player_time_width"
+ android:layout_height="wrap_content"
+ android:layout_alignBottom="@android:id/progress"
+ android:layout_alignParentLeft="true"
+ android:layout_alignTop="@android:id/progress"
+ android:gravity="center"
+ android:textSize="@dimen/text_size_micro"
+ app:themeResource="audio_player_current_time" />
+
+ <com.andrew.apollo.widgets.theme.ThemeableTextView
+ android:id="@+id/audio_player_total_time"
+ android:layout_width="@dimen/audio_player_time_width"
+ android:layout_height="wrap_content"
+ android:layout_alignBottom="@android:id/progress"
+ android:layout_alignParentRight="true"
+ android:layout_alignTop="@android:id/progress"
+ android:gravity="center"
+ android:textSize="@dimen/text_size_micro"
+ app:themeResource="audio_player_total_time" />
+
+ <com.andrew.apollo.widgets.theme.ThemeableSeekBar
+ android:id="@android:id/progress"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_above="@+id/audio_player_controlss"
+ android:layout_marginBottom="@dimen/audio_player_seek_bar_margin_bottom"
+ android:layout_toLeftOf="@+id/audio_player_total_time"
+ android:layout_toRightOf="@+id/audio_player_current_time"
+ android:max="1000"
+ android:thumb="@null" />
+
+ <LinearLayout
+ android:id="@+id/audio_player_controlss"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentRight="true"
+ android:baselineAligned="false"
+ android:gravity="center" >
+
+ <include layout="@layout/audio_player_controls" />
+ </LinearLayout>
+ </RelativeLayout>
+
+ <include layout="@layout/colorstrip" />
+
+</com.andrew.apollo.widgets.theme.ThemeableFrameLayout>
\ No newline at end of file diff --git a/res/layout/activity_profile_base.xml b/res/layout/activity_profile_base.xml new file mode 100644 index 0000000..fa8f654 --- /dev/null +++ b/res/layout/activity_profile_base.xml @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
+<com.andrew.apollo.widgets.theme.ThemeableFrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical" >
+
+ <include
+ android:id="@+id/shadow"
+ layout="@layout/top_shadow" />
+
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="0dip"
+ android:layout_weight="1" >
+
+ <android.support.v4.view.ViewPager
+ android:id="@+id/acivity_profile_base_pager"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentTop="true" />
+
+ <include
+ android:id="@+id/acivity_profile_base_tab_carousel"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentTop="true"
+ layout="@layout/profile_tab_carousel" />
+ </RelativeLayout>
+
+ <include layout="@layout/bottom_action_bar" />
+ </LinearLayout>
+
+</com.andrew.apollo.widgets.theme.ThemeableFrameLayout>
\ No newline at end of file diff --git a/res/layout/app_widget_large.xml b/res/layout/app_widget_large.xml new file mode 100644 index 0000000..7756d5f --- /dev/null +++ b/res/layout/app_widget_large.xml @@ -0,0 +1,118 @@ +<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/app_widget_large_min_height"
+ android:background="@drawable/appwidget_bg"
+ tools:ignore="ContentDescription" >
+
+ <ImageView
+ android:id="@+id/app_widget_large_image"
+ android:layout_width="@dimen/notification_expanded_height"
+ android:layout_height="@dimen/notification_expanded_height"
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentLeft="true"
+ android:background="@drawable/default_artwork"
+ android:scaleType="fitXY" />
+
+ <LinearLayout
+ android:id="@+id/app_widget_large_buttons"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentRight="true"
+ android:layout_toRightOf="@+id/app_widget_large_image"
+ android:divider="?android:listDivider"
+ android:dividerPadding="@dimen/notification_expanded_buttons_divider_padding"
+ android:gravity="center_vertical"
+ android:orientation="horizontal"
+ android:showDividers="middle" >
+
+ <ImageButton
+ android:id="@+id/app_widget_large_previous"
+ android:layout_width="0dp"
+ android:layout_height="@dimen/notification_expanded_button_height"
+ android:layout_weight="1"
+ android:background="?android:selectableItemBackground"
+ android:contentDescription="@string/accessibility_prev"
+ android:padding="@dimen/notification_expanded_button_padding"
+ android:scaleType="fitCenter"
+ android:src="@drawable/btn_playback_previous" />
+
+ <ImageButton
+ android:id="@+id/app_widget_large_play"
+ android:layout_width="0dp"
+ android:layout_height="@dimen/notification_expanded_button_height"
+ android:layout_weight="1"
+ android:background="?android:selectableItemBackground"
+ android:padding="@dimen/notification_expanded_button_padding"
+ android:scaleType="fitCenter"
+ android:src="@drawable/btn_playback_pause" />
+
+ <ImageButton
+ android:id="@+id/app_widget_large_next"
+ android:layout_width="0dp"
+ android:layout_height="@dimen/notification_expanded_button_height"
+ android:layout_weight="1"
+ android:background="?android:selectableItemBackground"
+ android:contentDescription="@string/accessibility_next"
+ android:padding="@dimen/notification_expanded_button_padding"
+ android:scaleType="fitCenter"
+ android:src="@drawable/btn_playback_next" />
+ </LinearLayout>
+
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="1dp"
+ android:layout_above="@+id/app_widget_large_buttons"
+ android:layout_alignParentRight="true"
+ android:layout_toRightOf="@+id/app_widget_large_image"
+ android:background="?android:dividerHorizontal" />
+
+ <LinearLayout
+ android:id="@+id/app_widget_large_info_container"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentTop="true"
+ android:layout_gravity="center_vertical"
+ android:layout_toRightOf="@+id/app_widget_large_image"
+ android:orientation="vertical"
+ android:paddingLeft="@dimen/notification_info_container_padding_left"
+ android:paddingTop="@dimen/notification_expanded_content_padding_top" >
+
+ <TextView
+ android:id="@+id/app_widget_large_line_one"
+ style="@style/NotificationText"
+ android:textColor="@color/white"
+ android:textSize="@dimen/text_size_medium"
+ android:textStyle="bold" />
+
+ <TextView
+ android:id="@+id/app_widget_large_line_two"
+ style="@style/NotificationText"
+ android:textColor="@color/transparent_white"
+ android:textSize="@dimen/text_size_small" />
+
+ <TextView
+ android:id="@+id/app_widget_large_line_three"
+ style="@style/NotificationText"
+ android:textColor="@color/transparent_white"
+ android:textSize="@dimen/text_size_small" />
+ </LinearLayout>
+
+</RelativeLayout>
\ No newline at end of file diff --git a/res/layout/app_widget_large_alternate.xml b/res/layout/app_widget_large_alternate.xml new file mode 100644 index 0000000..8f777dd --- /dev/null +++ b/res/layout/app_widget_large_alternate.xml @@ -0,0 +1,138 @@ +<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/app_widget_large_min_height"
+ android:background="@drawable/appwidget_bg"
+ tools:ignore="ContentDescription" >
+
+ <ImageView
+ android:id="@+id/app_widget_large_alternate_image"
+ android:layout_width="@dimen/app_widget_large_alternate_artwork_size"
+ android:layout_height="@dimen/app_widget_large_alternate_artwork_size"
+ android:layout_above="@+id/app_widget_large_alternate_buttons"
+ android:layout_alignParentLeft="true"
+ android:background="@drawable/default_artwork"
+ android:scaleType="fitXY" />
+
+ <LinearLayout
+ android:id="@+id/app_widget_large_alternate_buttons"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentBottom="true"
+ android:divider="?android:listDivider"
+ android:dividerPadding="@dimen/notification_expanded_buttons_divider_padding"
+ android:gravity="center_vertical"
+ android:orientation="horizontal"
+ android:showDividers="middle" >
+
+ <ImageButton
+ android:id="@+id/app_widget_large_alternate_shuffle"
+ android:layout_width="0dp"
+ android:layout_height="@dimen/notification_expanded_button_height"
+ android:layout_weight="1"
+ android:background="?android:selectableItemBackground"
+ android:contentDescription="@string/accessibility_shuffle"
+ android:padding="@dimen/notification_expanded_button_padding"
+ android:scaleType="fitCenter"
+ android:src="@drawable/btn_playback_shuffle" />
+
+ <ImageButton
+ android:id="@+id/app_widget_large_alternate_previous"
+ android:layout_width="0dp"
+ android:layout_height="@dimen/notification_expanded_button_height"
+ android:layout_weight="1"
+ android:background="?android:selectableItemBackground"
+ android:contentDescription="@string/accessibility_prev"
+ android:padding="@dimen/notification_expanded_button_padding"
+ android:scaleType="fitCenter"
+ android:src="@drawable/btn_playback_previous" />
+
+ <ImageButton
+ android:id="@+id/app_widget_large_alternate_play"
+ android:layout_width="0dp"
+ android:layout_height="@dimen/notification_expanded_button_height"
+ android:layout_weight="1"
+ android:background="?android:selectableItemBackground"
+ android:padding="@dimen/notification_expanded_button_padding"
+ android:scaleType="fitCenter"
+ android:src="@drawable/btn_playback_pause" />
+
+ <ImageButton
+ android:id="@+id/app_widget_large_alternate_next"
+ android:layout_width="0dp"
+ android:layout_height="@dimen/notification_expanded_button_height"
+ android:layout_weight="1"
+ android:background="?android:selectableItemBackground"
+ android:contentDescription="@string/accessibility_next"
+ android:padding="@dimen/notification_expanded_button_padding"
+ android:scaleType="fitCenter"
+ android:src="@drawable/btn_playback_next" />
+
+ <ImageButton
+ android:id="@+id/app_widget_large_alternate_repeat"
+ android:layout_width="0dp"
+ android:layout_height="@dimen/notification_expanded_button_height"
+ android:layout_weight="1"
+ android:background="?android:selectableItemBackground"
+ android:contentDescription="@string/accessibility_repeat"
+ android:padding="@dimen/notification_expanded_button_padding"
+ android:scaleType="fitCenter"
+ android:src="@drawable/btn_playback_repeat" />
+ </LinearLayout>
+
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="1dp"
+ android:layout_above="@+id/app_widget_large_alternate_buttons"
+ android:layout_alignParentRight="true"
+ android:layout_toRightOf="@+id/app_widget_large_alternate_image"
+ android:background="?android:dividerHorizontal" />
+
+ <LinearLayout
+ android:id="@+id/app_widget_large_alternate_info_container"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentTop="true"
+ android:layout_gravity="center_vertical"
+ android:layout_toRightOf="@+id/app_widget_large_alternate_image"
+ android:orientation="vertical"
+ android:paddingLeft="@dimen/notification_info_container_padding_left"
+ android:paddingTop="@dimen/notification_expanded_content_padding_top" >
+
+ <TextView
+ android:id="@+id/app_widget_large_alternate_line_one"
+ style="@style/NotificationText"
+ android:textColor="@color/white"
+ android:textSize="@dimen/text_size_medium"
+ android:textStyle="bold" />
+
+ <TextView
+ android:id="@+id/app_widget_large_alternate_line_two"
+ style="@style/NotificationText"
+ android:textColor="@color/transparent_white"
+ android:textSize="@dimen/text_size_small" />
+
+ <TextView
+ android:id="@+id/app_widget_large_alternate_line_three"
+ style="@style/NotificationText"
+ android:textColor="@color/transparent_white"
+ android:textSize="@dimen/text_size_small" />
+ </LinearLayout>
+
+</RelativeLayout>
\ No newline at end of file diff --git a/res/layout/app_widget_small.xml b/res/layout/app_widget_small.xml new file mode 100644 index 0000000..62eb356 --- /dev/null +++ b/res/layout/app_widget_small.xml @@ -0,0 +1,151 @@ +<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_gravity="top"
+ android:background="@drawable/appwidget_bg"
+ android:gravity="top"
+ android:padding="@dimen/app_widget_padding"
+ tools:ignore="NestedWeights" >
+
+ <LinearLayout
+ android:id="@+id/app_widget_small_buttons"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/app_widget_small_artwork_size"
+ android:baselineAligned="false"
+ android:focusable="true"
+ android:orientation="horizontal" >
+
+ <FrameLayout
+ android:layout_width="@dimen/app_widget_small_artwork_size"
+ android:layout_height="@dimen/app_widget_small_artwork_size"
+ android:focusable="true" >
+
+ <ImageView
+ android:id="@+id/app_widget_small_image"
+ android:layout_width="@dimen/app_widget_small_artwork_size"
+ android:layout_height="@dimen/app_widget_small_artwork_size"
+ android:background="@drawable/default_artwork"
+ android:contentDescription="@null"
+ android:scaleType="centerInside" />
+ </FrameLayout>
+
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:layout_weight="1"
+ android:focusable="true"
+ android:gravity="center_horizontal"
+ android:orientation="horizontal" >
+
+ <ImageButton
+ android:id="@+id/app_widget_small_previous"
+ android:layout_width="0dp"
+ android:layout_height="@dimen/app_widget_small_button_height"
+ android:layout_weight="1"
+ android:background="@null"
+ android:contentDescription="@string/accessibility_prev"
+ android:focusable="true"
+ android:padding="@dimen/app_widget_small_button_padding"
+ android:scaleType="fitCenter"
+ android:src="@drawable/btn_playback_previous" />
+
+ <ImageButton
+ android:id="@+id/app_widget_small_play"
+ android:layout_width="0dp"
+ android:layout_height="@dimen/app_widget_small_button_height"
+ android:layout_weight="1"
+ android:background="@null"
+ android:contentDescription="@string/accessibility_play"
+ android:focusable="true"
+ android:padding="@dimen/app_widget_small_button_padding"
+ android:scaleType="fitCenter"
+ android:src="@drawable/btn_playback_play" />
+
+ <ImageButton
+ android:id="@+id/app_widget_small_next"
+ android:layout_width="0dp"
+ android:layout_height="@dimen/app_widget_small_button_height"
+ android:layout_weight="1"
+ android:background="@null"
+ android:contentDescription="@string/accessibility_next"
+ android:focusable="true"
+ android:padding="@dimen/app_widget_small_button_padding"
+ android:scaleType="fitCenter"
+ android:src="@drawable/btn_playback_next" />
+ </LinearLayout>
+ </LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/app_widget_small_half_separator"
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:layout_below="@+id/app_widget_small_buttons"
+ android:background="@color/transparent_white" />
+
+ <RelativeLayout
+ android:id="@+id/app_widget_small_info_container"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentLeft="true"
+ android:layout_below="@+id/app_widget_small_half_separator"
+ android:focusable="true"
+ android:gravity="top"
+ android:orientation="horizontal"
+ android:paddingLeft="@dimen/app_widget_small_info_container_padding_left"
+ android:paddingRight="@dimen/app_widget_small_info_container_padding_right"
+ android:paddingTop="@dimen/app_widget_small_info_container_padding_top" >
+
+ <TextView
+ android:id="@+id/app_widget_small_line_one"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:ellipsize="none"
+ android:singleLine="true"
+ android:textColor="@color/white"
+ android:textSize="@dimen/text_size_small"
+ android:textStyle="bold" />
+
+ <TextView
+ android:id="@+id/app_widget_small_text_separator"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_toRightOf="@+id/app_widget_small_line_one"
+ android:ellipsize="none"
+ android:paddingLeft="5dp"
+ android:paddingRight="5dp"
+ android:singleLine="true"
+ android:text="@string/app_widget_text_separator"
+ android:textColor="@color/transparent_white"
+ android:textSize="@dimen/text_size_small"
+ android:textStyle="bold" />
+
+ <TextView
+ android:id="@+id/app_widget_small_line_two"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_toRightOf="@+id/app_widget_small_text_separator"
+ android:ellipsize="marquee"
+ android:singleLine="true"
+ android:textColor="@color/transparent_white"
+ android:textSize="@dimen/text_size_small" />
+ </RelativeLayout>
+
+</RelativeLayout>
\ No newline at end of file diff --git a/res/layout/audio_controls.xml b/res/layout/audio_controls.xml deleted file mode 100644 index e9602b0..0000000 --- a/res/layout/audio_controls.xml +++ /dev/null @@ -1,75 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android" >
-
- <RelativeLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content" >
-
- <SeekBar
- android:id="@android:id/progress"
- style="?android:attr/progressBarStyleHorizontal"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingTop="@dimen/audio_player_seek_bar_padding"
- android:thumb="@null" />
-
- <TextView
- android:id="@+id/audio_player_current_time"
- style="@style/AudioPlayerText"
- android:layout_alignParentLeft="true"
- android:layout_below="@android:id/progress"
- android:paddingLeft="@dimen/audio_player_info_container_padding"
- android:paddingRight="@dimen/audio_player_info_container_padding"
- android:textColor="@color/transparent_black"
- android:textSize="@dimen/text_size_small"
- android:textStyle="bold" />
-
- <TextView
- android:id="@+id/audio_player_total_time"
- style="@style/AudioPlayerText"
- android:layout_alignParentRight="true"
- android:layout_below="@android:id/progress"
- android:paddingLeft="@dimen/audio_player_info_container_padding"
- android:paddingRight="@dimen/audio_player_info_container_padding"
- android:textColor="@color/transparent_black"
- android:textSize="@dimen/text_size_small"
- android:textStyle="bold" />
- </RelativeLayout>
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="@dimen/audio_player_controls_height"
- android:layout_gravity="bottom"
- android:orientation="horizontal"
- android:paddingBottom="@dimen/audio_player_button_container_padding" >
-
- <ImageButton
- android:id="@+id/audio_player_repeat"
- style="@style/AudioPlayerButton"
- android:contentDescription="@string/cd_repeat"
- android:src="@drawable/apollo_holo_light_repeat_normal" />
-
- <com.andrew.apollo.ui.widgets.RepeatingImageButton
- android:id="@+id/audio_player_prev"
- style="@style/AudioPlayerButton"
- android:src="@drawable/apollo_holo_light_previous" />
-
- <ImageButton
- android:id="@+id/audio_player_play"
- style="@style/AudioPlayerButton"
- android:contentDescription="@string/cd_play"
- android:src="@drawable/apollo_holo_light_pause" />
-
- <com.andrew.apollo.ui.widgets.RepeatingImageButton
- android:id="@+id/audio_player_next"
- style="@style/AudioPlayerButton"
- android:src="@drawable/apollo_holo_light_next" />
-
- <ImageButton
- android:id="@+id/audio_player_shuffle"
- style="@style/AudioPlayerButton"
- android:contentDescription="@string/cd_shuffle"
- android:src="@drawable/apollo_holo_light_shuffle_normal" />
- </LinearLayout>
-
-</merge>
\ No newline at end of file diff --git a/res/layout/audio_player.xml b/res/layout/audio_player.xml deleted file mode 100644 index fa55223..0000000 --- a/res/layout/audio_player.xml +++ /dev/null @@ -1,46 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical"
- tools:ignore="ContentDescription" >
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_weight="1"
- android:background="@color/black" >
-
- <ImageView
- android:id="@+id/audio_player_album_art"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:scaleType="fitXY" />
- </LinearLayout>
-
- <RelativeLayout
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingLeft="@dimen/audio_player_info_container_padding"
- android:paddingRight="@dimen/audio_player_info_container_padding"
- android:paddingTop="@dimen/audio_player_artwork_padding" >
-
- <TextView
- android:id="@+id/audio_player_track"
- style="@style/AudioPlayerText"
- android:textColor="@color/black"
- android:textSize="@dimen/text_size_large"
- android:textStyle="bold" />
-
- <TextView
- android:id="@+id/audio_player_album_artist"
- style="@style/AudioPlayerText"
- android:layout_below="@+id/audio_player_track"
- android:textColor="@color/transparent_black"
- android:textSize="@dimen/text_size_small" />
- </RelativeLayout>
-
- <include layout="@layout/audio_controls" />
-
-</LinearLayout>
\ No newline at end of file diff --git a/res/layout/audio_player_browser.xml b/res/layout/audio_player_browser.xml deleted file mode 100644 index 9c57385..0000000 --- a/res/layout/audio_player_browser.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical" >
-
- <include layout="@layout/colorstrip" />
-
- <android.support.v4.view.ViewPager
- android:id="@+id/viewPager"
- android:layout_width="match_parent"
- android:layout_height="match_parent" />
-
-</LinearLayout>
\ No newline at end of file diff --git a/res/layout/audio_player_controls.xml b/res/layout/audio_player_controls.xml new file mode 100644 index 0000000..511aea9 --- /dev/null +++ b/res/layout/audio_player_controls.xml @@ -0,0 +1,94 @@ +<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<merge xmlns:android="http://schemas.android.com/apk/res/android" >
+
+ <FrameLayout
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1" >
+
+ <com.andrew.apollo.widgets.ShuffleButton
+ android:id="@+id/action_button_shuffle"
+ android:layout_width="@dimen/audio_player_controls_end_button_width"
+ android:layout_height="@dimen/audio_player_controls_end_button_height"
+ android:layout_gravity="center"
+ android:contentDescription="@string/accessibility_shuffle"
+ android:scaleType="centerInside"
+ android:src="@drawable/btn_playback_shuffle" />
+ </FrameLayout>
+
+ <FrameLayout
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1" >
+
+ <com.andrew.apollo.widgets.RepeatingImageButton
+ android:id="@+id/action_button_previous"
+ android:layout_width="@dimen/audio_player_controls_main_button_width"
+ android:layout_height="@dimen/audio_player_controls_main_button_height"
+ android:layout_gravity="center"
+ android:scaleType="centerInside"
+ android:src="@drawable/btn_playback_previous" />
+ </FrameLayout>
+
+ <FrameLayout
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1" >
+
+ <com.andrew.apollo.widgets.PlayPauseButton
+ android:id="@+id/action_button_play"
+ android:layout_width="@dimen/audio_player_controls_main_button_width"
+ android:layout_height="@dimen/audio_player_controls_main_button_height"
+ android:layout_gravity="center"
+ android:contentDescription="@string/accessibility_play"
+ android:focusable="true"
+ android:scaleType="centerInside"
+ android:src="@drawable/btn_playback_play" />
+ </FrameLayout>
+
+ <FrameLayout
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1" >
+
+ <com.andrew.apollo.widgets.RepeatingImageButton
+ android:id="@+id/action_button_next"
+ android:layout_width="@dimen/audio_player_controls_main_button_width"
+ android:layout_height="@dimen/audio_player_controls_main_button_height"
+ android:layout_gravity="center"
+ android:scaleType="centerInside"
+ android:src="@drawable/btn_playback_next" />
+ </FrameLayout>
+
+ <FrameLayout
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1" >
+
+ <com.andrew.apollo.widgets.RepeatButton
+ android:id="@+id/action_button_repeat"
+ android:layout_width="@dimen/audio_player_controls_end_button_width"
+ android:layout_height="@dimen/audio_player_controls_end_button_height"
+ android:layout_gravity="center"
+ android:contentDescription="@string/accessibility_repeat"
+ android:focusable="true"
+ android:scaleType="centerInside"
+ android:src="@drawable/btn_playback_repeat" />
+ </FrameLayout>
+
+</merge>
\ No newline at end of file diff --git a/res/layout/bottom_action_bar.xml b/res/layout/bottom_action_bar.xml index 2994335..2bcb032 100644 --- a/res/layout/bottom_action_bar.xml +++ b/res/layout/bottom_action_bar.xml @@ -1,69 +1,98 @@ <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/bottom_action_bar_container"
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<com.andrew.apollo.widgets.theme.BottomActionBar xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ xmlns:app="http://schemas.android.com/apk/res/com.andrew.apollo"
+ android:id="@+id/bottom_action_bar_parent"
android:layout_width="match_parent"
android:layout_height="@dimen/bottom_action_bar_height"
android:layout_gravity="bottom"
- android:orientation="vertical" >
+ tools:ignore="ContentDescription" >
- <ImageView
- android:id="@+id/bottom_action_bar_info_divider"
- android:layout_width="match_parent"
- android:layout_height="@dimen/bottom_action_bar_divider_height"
- android:background="@color/holo_blue_dark" />
+ <include
+ android:id="@+id/colorstrip"
+ layout="@layout/colorstrip" />
- <com.andrew.apollo.ui.widgets.BottomActionBar
+ <LinearLayout
android:id="@+id/bottom_action_bar"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@drawable/holo_selector"
+ android:layout_below="@+id/colorstrip"
+ android:clickable="true"
android:orientation="horizontal" >
- <ImageView
+ <com.andrew.apollo.widgets.SquareImageView
android:id="@+id/bottom_action_bar_album_art"
- android:layout_width="@dimen/bottom_action_bar_album_art_width_height"
- android:layout_height="@dimen/bottom_action_bar_album_art_width_height"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
android:layout_gravity="left|center"
- android:contentDescription="@string/cd_bottom_action_bar_album_art"
- android:scaleType="fitXY" />
+ android:background="@drawable/default_artwork" />
- <LinearLayout
+ <RelativeLayout
+ android:id="@+id/bottom_action_bar_info_container"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1"
- android:orientation="vertical"
android:paddingLeft="@dimen/bottom_action_bar_info_padding_left" >
- <TextView
- android:id="@+id/bottom_action_bar_track_name"
- style="@style/BottomActionBarText"
- android:textColor="@color/transparent_black"
- android:textStyle="bold" />
+ <com.andrew.apollo.widgets.theme.ThemeableTextView
+ android:id="@+id/bottom_action_bar_line_one"
+ style="@style/BottomActionBarLineOne"
+ app:themeResource="bab_line_one" />
+
+ <com.andrew.apollo.widgets.theme.ThemeableTextView
+ android:id="@+id/bottom_action_bar_line_two"
+ style="@style/BottomActionBarLineTwo"
+ android:layout_below="@+id/bottom_action_bar_line_one"
+ app:themeResource="bab_line_two" />
+ </RelativeLayout>
+
+ <HorizontalScrollView
+ android:layout_width="@dimen/bottom_action_bar_button_container_width"
+ android:layout_height="match_parent"
+ android:scrollbars="none" >
+
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:orientation="horizontal" >
+
+ <com.andrew.apollo.widgets.RepeatingImageButton
+ android:id="@+id/action_button_previous"
+ style="@style/BottomActionBarItem.Previous" />
- <TextView
- android:id="@+id/bottom_action_bar_artist_name"
- style="@style/BottomActionBarText"
- android:textColor="@color/transparent_black" />
- </LinearLayout>
+ <com.andrew.apollo.widgets.PlayPauseButton
+ android:id="@+id/action_button_play"
+ style="@style/BottomActionBarItem.Play" />
- <com.andrew.apollo.ui.widgets.BottomActionBarItem
- android:id="@+id/bottom_action_bar_item_one"
- style="@style/BottomActionBarItem"
- android:contentDescription="@string/cd_favorite"
- android:src="@drawable/apollo_holo_light_favorite_normal" />
+ <com.andrew.apollo.widgets.RepeatingImageButton
+ android:id="@+id/action_button_next"
+ style="@style/BottomActionBarItem.Next" />
- <com.andrew.apollo.ui.widgets.BottomActionBarItem
- android:id="@+id/bottom_action_bar_item_two"
- style="@style/BottomActionBarItem"
- android:contentDescription="@string/cd_search"
- android:src="@drawable/apollo_holo_light_search" />
+ <com.andrew.apollo.widgets.ShuffleButton
+ android:id="@+id/action_button_shuffle"
+ style="@style/BottomActionBarItem.Shuffle" />
- <com.andrew.apollo.ui.widgets.BottomActionBarItem
- android:id="@+id/bottom_action_bar_item_three"
- style="@style/BottomActionBarItem"
- android:contentDescription="@string/cd_overflow"
- android:src="@drawable/apollo_holo_light_overflow" />
- </com.andrew.apollo.ui.widgets.BottomActionBar>
+ <com.andrew.apollo.widgets.RepeatButton
+ android:id="@+id/action_button_repeat"
+ style="@style/BottomActionBarItem.Repeat" />
+ </LinearLayout>
+ </HorizontalScrollView>
+ </LinearLayout>
-</LinearLayout>
\ No newline at end of file +</com.andrew.apollo.widgets.theme.BottomActionBar>
\ No newline at end of file diff --git a/res/layout/bottom_action_bar_controls.xml b/res/layout/bottom_action_bar_controls.xml deleted file mode 100644 index 3406c00..0000000 --- a/res/layout/bottom_action_bar_controls.xml +++ /dev/null @@ -1,55 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="@dimen/bottom_action_bar_height"
- android:layout_gravity="bottom"
- android:orientation="vertical" >
-
- <ImageView
- android:id="@+id/bottom_action_bar_control_divider"
- android:layout_width="match_parent"
- android:layout_height="@dimen/bottom_action_bar_divider_height"
- android:background="@color/holo_blue_dark" />
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="horizontal" >
-
- <ImageButton
- android:id="@+id/bottom_action_bar_repeat"
- style="@style/BottomActionBarItem"
- android:layout_weight="1"
- android:contentDescription="@string/cd_repeat"
- android:src="@drawable/apollo_holo_light_repeat_normal" />
-
- <ImageButton
- android:id="@+id/bottom_action_bar_previous"
- style="@style/BottomActionBarItem"
- android:layout_weight="1"
- android:contentDescription="@string/cd_previous"
- android:src="@drawable/apollo_holo_light_previous" />
-
- <ImageButton
- android:id="@+id/bottom_action_bar_play"
- style="@style/BottomActionBarItem"
- android:layout_weight="1"
- android:contentDescription="@string/cd_play"
- android:src="@drawable/apollo_holo_light_play" />
-
- <ImageButton
- android:id="@+id/bottom_action_bar_next"
- style="@style/BottomActionBarItem"
- android:layout_weight="1"
- android:contentDescription="@string/cd_next"
- android:src="@drawable/apollo_holo_light_next" />
-
- <ImageButton
- android:id="@+id/bottom_action_bar_shuffle"
- style="@style/BottomActionBarItem"
- android:layout_weight="1"
- android:contentDescription="@string/cd_shuffle"
- android:src="@drawable/apollo_holo_light_shuffle_normal" />
- </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file diff --git a/res/layout/color_scheme_dialog.xml b/res/layout/color_scheme_dialog.xml new file mode 100644 index 0000000..49bcaf1 --- /dev/null +++ b/res/layout/color_scheme_dialog.xml @@ -0,0 +1,156 @@ +<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:padding="@dimen/color_scheme_dialog_row_padding" >
+
+ <com.andrew.apollo.widgets.ColorPickerView
+ android:id="@+id/color_picker_view"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" />
+
+ <LinearLayout
+ android:id="@+id/color_scheme_dialog_row_one"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/color_picker_view"
+ android:layout_marginBottom="4dp"
+ android:orientation="horizontal"
+ android:paddingLeft="@dimen/color_scheme_dialog_row_padding"
+ android:paddingRight="@dimen/color_scheme_dialog_row_padding" >
+
+ <Button
+ android:id="@+id/color_scheme_dialog_preset_one"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:background="@color/holo_blue_light" />
+
+ <Button
+ android:id="@+id/color_scheme_dialog_preset_two"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="@dimen/color_scheme_dialog_row_padding"
+ android:layout_weight="1"
+ android:background="@color/holo_green_light" />
+
+ <Button
+ android:id="@+id/color_scheme_dialog_preset_three"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="@dimen/color_scheme_dialog_row_padding"
+ android:layout_weight="1"
+ android:background="@color/holo_orange_dark" />
+
+ <Button
+ android:id="@+id/color_scheme_dialog_preset_four"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="@dimen/color_scheme_dialog_row_padding"
+ android:layout_weight="1"
+ android:background="@color/holo_orange_light" />
+
+ <Button
+ android:id="@+id/color_scheme_dialog_old_color"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="@dimen/color_scheme_dialog_row_padding"
+ android:layout_weight="2"
+ android:background="@color/holo_blue_light"
+ android:text="@string/current_color"
+ android:textSize="@dimen/text_size_micro"
+ android:textStyle="bold" />
+
+ <Button
+ android:id="@+id/color_scheme_dialog_new_color"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="2"
+ android:background="@color/transparent"
+ android:text="@string/new_color"
+ android:textSize="@dimen/text_size_micro"
+ android:textStyle="bold" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/color_scheme_dialog_row_one"
+ android:layout_marginBottom="4dp"
+ android:orientation="horizontal"
+ android:paddingLeft="@dimen/color_scheme_dialog_row_padding"
+ android:paddingRight="@dimen/color_scheme_dialog_row_padding" >
+
+ <Button
+ android:id="@+id/color_scheme_dialog_preset_five"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:background="@color/holo_purple" />
+
+ <Button
+ android:id="@+id/color_scheme_dialog_preset_six"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="@dimen/color_scheme_dialog_row_padding"
+ android:layout_weight="1"
+ android:background="@color/holo_red_light" />
+
+ <Button
+ android:id="@+id/color_scheme_dialog_preset_seven"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="@dimen/color_scheme_dialog_row_padding"
+ android:layout_weight="1"
+ android:background="@color/white" />
+
+ <Button
+ android:id="@+id/color_scheme_dialog_preset_eight"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="@dimen/color_scheme_dialog_row_padding"
+ android:layout_weight="1"
+ android:background="@color/black" />
+
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="@dimen/color_scheme_dialog_row_padding"
+ android:layout_weight="4"
+ android:gravity="center"
+ android:orientation="horizontal" >
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/hex" />
+
+ <EditText
+ android:id="@+id/color_scheme_dialog_hex_value"
+ android:layout_width="110dp"
+ android:layout_height="wrap_content"
+ android:digits="0123456789ABCDEFabcdef"
+ android:imeOptions="actionGo"
+ android:inputType="textFilter"
+ android:maxLength="8"
+ android:singleLine="true"
+ android:typeface="monospace" />
+ </LinearLayout>
+ </LinearLayout>
+
+</RelativeLayout>
\ No newline at end of file diff --git a/res/layout/colorstrip.xml b/res/layout/colorstrip.xml index b04eb8c..4c13b7a 100644 --- a/res/layout/colorstrip.xml +++ b/res/layout/colorstrip.xml @@ -1,8 +1,20 @@ <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License. +-->
+<com.andrew.apollo.widgets.theme.Colorstrip xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/colorstrip"
android:layout_width="match_parent"
- android:layout_height="@dimen/colorstrip_height"
- android:foreground="@drawable/colorstrip_shadow"
- tools:ignore="Overdraw" />
+ android:layout_height="@dimen/colorstrip_height"/>
\ No newline at end of file diff --git a/res/layout/context_menu.xml b/res/layout/context_menu.xml deleted file mode 100644 index 9802971..0000000 --- a/res/layout/context_menu.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/track_list_context_frame"
- android:layout_width="wrap_content"
- android:layout_height="@dimen/listview_item_height"
- android:layout_alignParentRight="true"
- android:background="@drawable/holo_selector"
- android:clickable="true"
- android:paddingRight="@dimen/quick_context_padding_right" >
-
- <ImageView
- android:id="@+id/quick_context_line"
- android:layout_width="@dimen/quick_context_line_width"
- android:layout_height="@dimen/quick_context_line_height"
- android:layout_gravity="center|left"
- android:background="@color/transparent_black" />
-
- <ImageView
- android:id="@+id/quick_context_tip"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:layout_gravity="center"
- android:layout_marginRight="@dimen/quick_context_margin_right"
- android:scaleType="centerInside"
- android:src="@drawable/dropdown_ic_arrow_normal_holo_light" />
-
-</FrameLayout>
\ No newline at end of file diff --git a/res/layout/context_menu_header.xml b/res/layout/context_menu_header.xml deleted file mode 100644 index ba41e56..0000000 --- a/res/layout/context_menu_header.xml +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="@color/black" >
-
- <ImageView
- android:id="@+id/header_image"
- android:layout_width="match_parent"
- android:layout_height="@dimen/half_and_half_image_height" />
-
- <TextView
- android:id="@+id/header_text"
- style="@style/HeaderText"
- android:layout_alignBottom="@+id/header_image" />
-
-</RelativeLayout>
\ No newline at end of file diff --git a/res/layout/custom_action_bar.xml b/res/layout/custom_action_bar.xml deleted file mode 100644 index 090bb1c..0000000 --- a/res/layout/custom_action_bar.xml +++ /dev/null @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/action_bar_layout"
- android:layout_width="96dp"
- android:layout_height="wrap_content"
- android:layout_gravity="right|center"
- android:background="@drawable/holo_selector"
- android:clickable="true"
- android:focusable="true" >
-
- <ImageView
- android:id="@+id/action_bar_album_art"
- android:layout_width="48dp"
- android:layout_height="48dp"
- android:layout_alignParentBottom="true"
- android:layout_alignParentRight="true"
- android:layout_alignParentTop="true" />
-
- <TextView
- android:id="@+id/action_bar_track_name"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentTop="true"
- android:layout_toLeftOf="@+id/action_bar_album_art"
- android:ellipsize="end"
- android:paddingRight="5dp"
- android:paddingTop="10dp"
- android:singleLine="true"
- android:textColor="@color/transparent_black"
- android:textSize="@dimen/text_size_micro"
- android:textStyle="bold" />
-
- <TextView
- android:id="@+id/action_bar_album_name"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_below="@+id/action_bar_track_name"
- android:layout_toLeftOf="@+id/action_bar_album_art"
- android:ellipsize="end"
- android:paddingRight="5dp"
- android:singleLine="true"
- android:textColor="@color/transparent_black"
- android:textSize="@dimen/text_size_micro" />
-
-</RelativeLayout>
\ No newline at end of file diff --git a/res/layout/edit_track_list_item.xml b/res/layout/edit_track_list_item.xml new file mode 100644 index 0000000..1d388d4 --- /dev/null +++ b/res/layout/edit_track_list_item.xml @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/edit_track_list_parent"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/item_normal_height" >
+
+ <ImageView
+ android:id="@+id/edit_track_list_item_handle"
+ android:layout_width="@dimen/drag_and_drop_handle"
+ android:layout_height="wrap_content"
+ android:scaleType="fitXY"
+ android:src="@drawable/playlist_tile_normal" />
+
+ <FrameLayout
+ android:id="@+id/edit_track_list_container"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/item_normal_height"
+ android:layout_toRightOf="@+id/edit_track_list_item_handle"
+ android:gravity="center_vertical" >
+
+ <include layout="@layout/list_item_simple" />
+ </FrameLayout>
+
+</RelativeLayout>
\ No newline at end of file diff --git a/res/layout/empty_view.xml b/res/layout/empty_view.xml deleted file mode 100644 index aa29c7a..0000000 --- a/res/layout/empty_view.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="wrap_content"
- android:layout_height="@dimen/bottom_action_bar_height" />
\ No newline at end of file diff --git a/res/layout/faux_carousel.xml b/res/layout/faux_carousel.xml new file mode 100644 index 0000000..e8e7564 --- /dev/null +++ b/res/layout/faux_carousel.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" >
+
+ <include
+ layout="@layout/profile_tab_carousel"
+ android:visibility="invisible" />
+
+</FrameLayout>
\ No newline at end of file diff --git a/res/layout/fourbyone_app_widget.xml b/res/layout/fourbyone_app_widget.xml deleted file mode 100644 index 8e0cf1c..0000000 --- a/res/layout/fourbyone_app_widget.xml +++ /dev/null @@ -1,86 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="@drawable/appwidget_bg"
- android:orientation="horizontal"
- tools:ignore="Overdraw" >
-
- <ImageView
- android:id="@+id/four_by_one_albumart"
- android:layout_width="@dimen/four_by_one_album_art_width"
- android:layout_height="match_parent"
- android:scaleType="centerCrop" />
-
- <LinearLayout
- android:id="@+id/four_by_one_album_appwidget"
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:layout_weight="2"
- android:background="@drawable/holo_selector"
- android:clickable="true"
- android:focusable="true"
- android:gravity="center"
- android:orientation="vertical"
- android:paddingLeft="4dp" >
-
- <TextView
- android:id="@+id/four_by_one_title"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:ellipsize="end"
- android:singleLine="true"
- android:textColor="@color/transparent_black"
- android:textSize="@dimen/text_size_small"
- android:textStyle="bold" />
-
- <TextView
- android:id="@+id/four_by_one_artist"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:ellipsize="end"
- android:singleLine="true"
- android:textColor="@color/transparent_black"
- android:textSize="@dimen/text_size_small" />
- </LinearLayout>
-
- <ImageButton
- android:id="@+id/four_by_one_control_prev"
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:layout_weight="1"
- android:background="@drawable/holo_selector"
- android:scaleType="center"
- android:src="@drawable/apollo_holo_light_previous"
- android:visibility="gone" />
-
- <ImageView
- android:layout_width="0.2dp"
- android:layout_height="match_parent"
- android:background="@color/transparent_black" />
-
- <ImageButton
- android:id="@+id/four_by_one_control_play"
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:layout_weight="1"
- android:background="@drawable/holo_selector"
- android:scaleType="center"
- android:src="@drawable/apollo_holo_light_play" />
-
- <ImageView
- android:layout_width="0.2dp"
- android:layout_height="match_parent"
- android:background="@color/transparent_black" />
-
- <ImageButton
- android:id="@+id/four_by_one_control_next"
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:layout_weight="1"
- android:background="@drawable/holo_selector"
- android:scaleType="center"
- android:src="@drawable/apollo_holo_light_next" />
-
-</LinearLayout>
\ No newline at end of file diff --git a/res/layout/fourbytwo_app_widget.xml b/res/layout/fourbytwo_app_widget.xml deleted file mode 100644 index 05fda67..0000000 --- a/res/layout/fourbytwo_app_widget.xml +++ /dev/null @@ -1,105 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/four_by_two"
- android:layout_width="match_parent"
- android:layout_height="@dimen/four_by_two_height"
- android:background="@drawable/appwidget_bg"
- android:gravity="center"
- android:orientation="horizontal" >
-
- <LinearLayout
- android:id="@+id/four_by_two_controls"
- android:layout_width="match_parent"
- android:layout_height="@dimen/four_by_two_control_height"
- android:layout_alignParentBottom="true"
- android:orientation="horizontal" >
-
- <ImageButton
- android:id="@+id/four_by_two_control_prev"
- style="@style/FourByTwoMediaButton"
- android:src="@drawable/apollo_holo_light_previous" />
-
- <ImageButton
- android:id="@+id/four_by_two_control_play"
- style="@style/FourByTwoMediaButton"
- android:src="@drawable/apollo_holo_light_play" />
-
- <ImageButton
- android:id="@+id/four_by_two_control_next"
- style="@style/FourByTwoMediaButton"
- android:src="@drawable/apollo_holo_light_next" />
-
- <ImageButton
- android:id="@+id/four_by_two_control_shuffle"
- style="@style/FourByTwoMediaButton"
- android:src="@drawable/apollo_holo_light_shuffle_normal" />
-
- <ImageButton
- android:id="@+id/four_by_two_control_repeat"
- style="@style/FourByTwoMediaButton"
- android:src="@drawable/apollo_holo_light_repeat_normal" />
- </LinearLayout>
-
- <ImageView
- android:id="@+id/four_by_two_controls_info_divider"
- android:layout_width="match_parent"
- android:layout_height="1dp"
- android:layout_above="@id/four_by_two_controls"
- android:scaleType="fitXY" />
-
- <ImageView
- android:id="@+id/four_by_two_albumart"
- android:layout_width="@dimen/four_by_two_album_art_width"
- android:layout_height="match_parent"
- android:layout_above="@id/four_by_two_controls_info_divider"
- android:adjustViewBounds="true"
- android:scaleType="fitXY" />
-
- <ImageView
- android:layout_width="match_parent"
- android:layout_height="1dp"
- android:layout_above="@id/four_by_two_controls"
- android:background="@color/holo_blue_dark" />
-
- <LinearLayout
- android:id="@+id/four_by_two_info"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_above="@id/four_by_two_controls"
- android:layout_toRightOf="@+id/four_by_two_albumart"
- android:background="@drawable/holo_selector"
- android:clickable="true"
- android:focusable="true"
- android:gravity="center"
- android:orientation="vertical" >
-
- <TextView
- android:id="@+id/four_by_two_trackname"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:ellipsize="end"
- android:singleLine="true"
- android:textColor="@color/transparent_black"
- android:textSize="@dimen/text_size_small"
- android:textStyle="bold" />
-
- <TextView
- android:id="@+id/four_by_two_albumname"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:ellipsize="end"
- android:singleLine="true"
- android:textColor="@color/transparent_black"
- android:textSize="@dimen/text_size_small" />
-
- <TextView
- android:id="@+id/four_by_two_artistname"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:ellipsize="end"
- android:singleLine="true"
- android:textColor="@color/transparent_black"
- android:textSize="@dimen/text_size_small" />
- </LinearLayout>
-
-</RelativeLayout>
\ No newline at end of file diff --git a/res/layout/fragment_music_browser_phone.xml b/res/layout/fragment_music_browser_phone.xml new file mode 100644 index 0000000..d45e8f6 --- /dev/null +++ b/res/layout/fragment_music_browser_phone.xml @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2012 Andrew Neal + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" > + + <RelativeLayout + android:id="@+id/fragment_home_phone_container" + android:layout_width="match_parent" + android:layout_height="match_parent" > + + <com.andrew.apollo.widgets.theme.ThemeableTitlePageIndicator + android:id="@+id/fragment_home_phone_pager_titles" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textSize="@dimen/text_size_micro" /> + + <android.support.v4.view.ViewPager + android:id="@+id/fragment_home_phone_pager" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_below="@+id/fragment_home_phone_pager_titles" /> + </RelativeLayout> + + <include layout="@layout/top_shadow" /> + +</FrameLayout>
\ No newline at end of file diff --git a/res/layout/fragment_themes_base.xml b/res/layout/fragment_themes_base.xml new file mode 100644 index 0000000..521cce5 --- /dev/null +++ b/res/layout/fragment_themes_base.xml @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:padding="@dimen/grid_item_spacing" >
+
+ <ImageView
+ android:id="@+id/image"
+ android:layout_width="match_parent"
+ android:layout_height="155.0dip"
+ android:scaleType="centerCrop"
+ tools:ignore="ContentDescription" />
+
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_below="@+id/image" >
+
+ <TextView
+ android:id="@+id/line_one"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_centerHorizontal="true"
+ android:layout_centerVertical="true"
+ android:background="@color/transparent_black"
+ android:gravity="center"
+ android:textColor="@color/white"
+ android:textSize="@dimen/text_size_dayum" />
+ </RelativeLayout>
+
+</RelativeLayout>
\ No newline at end of file diff --git a/res/layout/grid_base.xml b/res/layout/grid_base.xml new file mode 100644 index 0000000..6437b36 --- /dev/null +++ b/res/layout/grid_base.xml @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/grid_base_container"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:padding="@dimen/list_preferred_item_padding" >
+
+ <TextView
+ android:id="@+id/empty"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical|center"
+ android:textColor="@color/holo_blue_light"
+ android:textSize="@dimen/text_size_large"
+ android:textStyle="bold"
+ android:visibility="gone" />
+
+ <GridView
+ android:id="@+id/grid_base"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:cacheColorHint="@color/transparent"
+ android:drawSelectorOnTop="true"
+ android:fadingEdge="vertical"
+ android:fastScrollEnabled="true"
+ android:horizontalSpacing="@dimen/grid_item_spacing"
+ android:scrollbarStyle="outsideOverlay"
+ android:scrollbars="vertical"
+ android:verticalSpacing="@dimen/grid_item_spacing" />
+
+</FrameLayout>
\ No newline at end of file diff --git a/res/layout/grid_items_normal.xml b/res/layout/grid_items_normal.xml new file mode 100644 index 0000000..290a8b0 --- /dev/null +++ b/res/layout/grid_items_normal.xml @@ -0,0 +1,55 @@ +<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res/com.andrew.apollo"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:gravity="center_vertical" >
+
+ <include layout="@layout/square_image_view" />
+
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/item_normal_height"
+ android:layout_alignParentBottom="true"
+ android:background="@color/transparent_black"
+ android:gravity="center_vertical"
+ android:paddingLeft="@dimen/grid_item_padding_left" >
+
+ <com.andrew.apollo.widgets.theme.ThemeableTextView
+ android:id="@+id/line_one"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentTop="true"
+ android:maxLines="2"
+ android:textColor="@color/white"
+ android:textSize="@dimen/text_size_medium"
+ android:textStyle="bold"
+ app:themeResource="@null" />
+
+ <com.andrew.apollo.widgets.theme.ThemeableTextView
+ android:id="@+id/line_two"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/line_one"
+ android:singleLine="true"
+ android:textColor="@color/transparent_white"
+ android:textSize="@dimen/text_size_small"
+ app:themeResource="@null" />
+ </RelativeLayout>
+
+</RelativeLayout>
\ No newline at end of file diff --git a/res/layout/gridview.xml b/res/layout/gridview.xml deleted file mode 100644 index 5e3e940..0000000 --- a/res/layout/gridview.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:gravity="center_vertical"
- android:orientation="vertical" >
-
- <include layout="@layout/shadow" />
-
- <GridView
- android:id="@+id/gridview"
- android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_weight="1"
- android:cacheColorHint="@color/transparent"
- android:drawSelectorOnTop="true"
- android:numColumns="@integer/gridview_columns"
- android:scrollbars="none" />
-
- <include layout="@layout/empty_view" />
-
-</LinearLayout>
\ No newline at end of file diff --git a/res/layout/gridview_items.xml b/res/layout/gridview_items.xml deleted file mode 100644 index 2c6462f..0000000 --- a/res/layout/gridview_items.xml +++ /dev/null @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content" >
-
- <ImageView
- android:id="@+id/gridview_image"
- android:layout_width="@dimen/gridview_image_width"
- android:layout_height="@dimen/gridview_image_height"
- android:scaleType="centerCrop" />
-
- <LinearLayout
- android:id="@+id/gridview_info_holder"
- android:layout_width="match_parent"
- android:layout_height="@dimen/gridview_item_ccontainer_height"
- android:layout_alignParentBottom="true"
- android:background="@color/transparent_black"
- android:gravity="center_vertical"
- android:orientation="vertical"
- android:paddingLeft="@dimen/gridview_item_ccontainer_padding_left"
- android:paddingRight="@dimen/gridview_item_ccontainer_padding_right" >
-
- <TextView
- android:id="@+id/gridview_line_one"
- style="@style/GridViewTextItem"
- android:textStyle="bold" />
-
- <TextView
- android:id="@+id/gridview_line_two"
- style="@style/GridViewTextItem" />
- </LinearLayout>
-
- <ImageView
- android:id="@+id/peak_one"
- style="@style/PeakMeter"
- android:layout_alignParentBottom="true"
- android:paddingBottom="@dimen/peak_meter_padding_bottom"
- android:paddingRight="@dimen/peak_meter_one_padding_right" />
-
- <ImageView
- android:id="@+id/peak_two"
- style="@style/PeakMeter"
- android:layout_alignParentBottom="true"
- android:paddingBottom="@dimen/peak_meter_padding_bottom"
- android:paddingRight="@dimen/peak_meter_two_padding_right" />
-
-</RelativeLayout>
\ No newline at end of file diff --git a/res/layout/half_and_half.xml b/res/layout/half_and_half.xml deleted file mode 100644 index e9a43d0..0000000 --- a/res/layout/half_and_half.xml +++ /dev/null @@ -1,60 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- tools:ignore="UnknownIdInLayout" >
-
- <include layout="@layout/colorstrip" />
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_below="@+id/colorstrip"
- android:baselineAligned="false"
- android:orientation="horizontal" >
-
- <RelativeLayout
- android:id="@+id/artist_half_container"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:background="@color/black"
- android:padding="@dimen/half_and_half_container_padding" >
-
- <ImageView
- android:id="@+id/half_artist_image"
- android:layout_width="match_parent"
- android:layout_height="@dimen/half_and_half_image_height"
- android:scaleType="centerCrop" />
-
- <TextView
- android:id="@+id/half_artist_image_text"
- style="@style/HalfText"
- android:layout_alignBottom="@+id/half_artist_image"
- android:visibility="gone" />
- </RelativeLayout>
-
- <RelativeLayout
- android:id="@+id/album_half_container"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:background="@color/black"
- android:padding="@dimen/half_and_half_container_padding"
- android:visibility="gone" >
-
- <ImageView
- android:id="@+id/half_album_image"
- android:layout_width="match_parent"
- android:layout_height="@dimen/half_and_half_image_height"
- android:scaleType="centerCrop" />
-
- <TextView
- android:id="@+id/half_album_image_text"
- style="@style/HalfText"
- android:layout_alignBottom="@+id/half_album_image" />
- </RelativeLayout>
- </LinearLayout>
-
-</RelativeLayout>
\ No newline at end of file diff --git a/res/layout/library_browser.xml b/res/layout/library_browser.xml deleted file mode 100644 index 383694e..0000000 --- a/res/layout/library_browser.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content" >
-
- <com.andrew.apollo.ui.widgets.ScrollableTabView
- android:id="@+id/scrollingTabs"
- android:layout_width="match_parent"
- android:layout_height="wrap_content" />
-
- <android.support.v4.view.ViewPager
- android:id="@+id/viewPager"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_below="@+id/scrollingTabs" />
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="@dimen/bottom_action_bar_height"
- android:layout_alignParentBottom="true" >
-
- <android.support.v4.view.ViewPager
- android:id="@+id/bottomActionBarPager"
- android:layout_width="match_parent"
- android:layout_height="match_parent"/>
- </LinearLayout>
-
-</RelativeLayout>
\ No newline at end of file diff --git a/res/layout/list_base.xml b/res/layout/list_base.xml new file mode 100644 index 0000000..0bd7cc6 --- /dev/null +++ b/res/layout/list_base.xml @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/list_base_container"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:paddingBottom="@dimen/list_preferred_item_padding"
+ android:paddingTop="@dimen/list_preferred_item_padding" >
+
+ <TextView
+ android:id="@+id/empty"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical|center"
+ android:padding="@dimen/list_preferred_item_padding"
+ android:textColor="@color/holo_blue_light"
+ android:textSize="@dimen/text_size_large"
+ android:textStyle="bold"
+ android:visibility="gone" />
+
+ <com.andrew.apollo.dragdrop.DragSortListView
+ android:id="@+id/list_base"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:cacheColorHint="@color/transparent"
+ android:drawSelectorOnTop="false"
+ android:fadingEdge="vertical"
+ android:fastScrollAlwaysVisible="true"
+ android:fastScrollEnabled="true"
+ android:paddingLeft="@dimen/fast_scroll_padding_left"
+ android:paddingRight="@dimen/fast_scroll_padding_right" />
+
+</FrameLayout>
\ No newline at end of file diff --git a/res/layout/list_header.xml b/res/layout/list_header.xml new file mode 100644 index 0000000..b8522eb --- /dev/null +++ b/res/layout/list_header.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="32.0dip"
+ android:background="@null"
+ android:gravity="center_vertical"
+ android:paddingLeft="10.0dip"
+ android:textAllCaps="true"
+ android:textColor="@color/white"
+ android:textSize="@dimen/text_size_medium" />
diff --git a/res/layout/list_item_detailed.xml b/res/layout/list_item_detailed.xml new file mode 100644 index 0000000..6af42f5 --- /dev/null +++ b/res/layout/list_item_detailed.xml @@ -0,0 +1,78 @@ +<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res/com.andrew.apollo"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:gravity="center_vertical" >
+
+ <com.andrew.apollo.widgets.LayoutSuppressingImageView
+ android:id="@+id/list_item_background"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/list_item_detailed_height"
+ android:scaleType="centerCrop" />
+
+ <com.andrew.apollo.widgets.LayoutSuppressingImageView
+ android:id="@+id/image"
+ android:layout_width="@dimen/list_item_detailed_height"
+ android:layout_height="@dimen/list_item_detailed_height"
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentLeft="true"
+ android:scaleType="centerCrop" />
+
+ <RelativeLayout
+ android:id="@+id/image_background"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/list_item_detailed_height"
+ android:layout_toRightOf="@+id/image"
+ android:background="@color/list_item_background"
+ android:padding="@dimen/list_preferred_item_padding" >
+
+ <com.andrew.apollo.widgets.theme.ThemeableTextView
+ android:id="@+id/line_one"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentTop="true"
+ android:maxLines="2"
+ android:textColor="@color/white"
+ android:textSize="@dimen/text_size_medium"
+ android:textStyle="bold"
+ app:themeResource="@null" />
+
+ <com.andrew.apollo.widgets.theme.ThemeableTextView
+ android:id="@+id/line_two"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/line_one"
+ android:layout_marginTop="@dimen/list_item_line_two_margin_top"
+ android:maxLines="2"
+ android:textColor="@color/transparent_white"
+ android:textSize="@dimen/text_size_small"
+ app:themeResource="@null" />
+
+ <com.andrew.apollo.widgets.theme.ThemeableTextView
+ android:id="@+id/line_three"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentBottom="true"
+ android:singleLine="true"
+ android:textColor="@color/transparent_white"
+ android:textSize="@dimen/text_size_small"
+ app:themeResource="@null" />
+ </RelativeLayout>
+
+</RelativeLayout>
\ No newline at end of file diff --git a/res/layout/list_item_detailed_no_background.xml b/res/layout/list_item_detailed_no_background.xml new file mode 100644 index 0000000..b0c9f56 --- /dev/null +++ b/res/layout/list_item_detailed_no_background.xml @@ -0,0 +1,77 @@ +<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res/com.andrew.apollo"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:gravity="center_vertical" >
+
+ <com.andrew.apollo.widgets.LayoutSuppressingImageView
+ android:id="@+id/list_item_background"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/list_item_detailed_height"
+ android:scaleType="centerCrop" />
+
+ <com.andrew.apollo.widgets.LayoutSuppressingImageView
+ android:id="@+id/image"
+ android:layout_width="@dimen/list_item_detailed_height"
+ android:layout_height="@dimen/list_item_detailed_height"
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentLeft="true"
+ android:scaleType="centerCrop" />
+
+ <RelativeLayout
+ android:id="@+id/image_background"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/list_item_detailed_height"
+ android:layout_toRightOf="@+id/image"
+ android:background="@color/list_item_background"
+ android:padding="@dimen/list_preferred_item_padding" >
+
+ <com.andrew.apollo.widgets.theme.ThemeableTextView
+ android:id="@+id/line_one"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentTop="true"
+ android:maxLines="2"
+ android:textColor="@color/white"
+ android:textSize="@dimen/text_size_medium"
+ android:textStyle="bold"
+ app:themeResource="line_one" />
+
+ <com.andrew.apollo.widgets.theme.ThemeableTextView
+ android:id="@+id/line_two"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/line_one"
+ android:layout_marginTop="@dimen/list_item_line_two_margin_top"
+ android:maxLines="2"
+ android:textColor="@color/transparent_white"
+ android:textSize="@dimen/text_size_small"
+ app:themeResource="line_two" />
+
+ <com.andrew.apollo.widgets.theme.ThemeableTextView
+ android:id="@+id/line_three"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentBottom="true"
+ android:singleLine="true"
+ android:textColor="@color/transparent_white"
+ android:textSize="@dimen/text_size_small"
+ app:themeResource="line_three" />
+ </RelativeLayout>
+
+</RelativeLayout>
\ No newline at end of file diff --git a/res/layout/list_item_normal.xml b/res/layout/list_item_normal.xml new file mode 100644 index 0000000..615ab5d --- /dev/null +++ b/res/layout/list_item_normal.xml @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ xmlns:app="http://schemas.android.com/apk/res/com.andrew.apollo"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:gravity="center_vertical"
+ tools:ignore="ContentDescription" >
+
+ <com.andrew.apollo.widgets.SquareImageView
+ android:id="@+id/image"
+ android:layout_width="@dimen/item_normal_height"
+ android:layout_height="@dimen/item_normal_height"
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentTop="true"
+ android:scaleType="fitXY" />
+
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/item_normal_height"
+ android:layout_toRightOf="@+id/image"
+ android:gravity="center_vertical"
+ android:minHeight="@dimen/item_normal_height"
+ android:paddingLeft="@dimen/list_preferred_item_padding"
+ android:paddingRight="@dimen/list_preferred_item_padding" >
+
+ <com.andrew.apollo.widgets.theme.ThemeableTextView
+ android:id="@+id/line_one"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentTop="true"
+ android:singleLine="true"
+ android:textSize="@dimen/text_size_medium"
+ android:textStyle="bold"
+ app:themeResource="line_one" />
+
+ <com.andrew.apollo.widgets.theme.ThemeableTextView
+ android:id="@+id/line_two"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/line_one"
+ android:layout_marginTop="@dimen/list_item_line_two_margin_top"
+ android:singleLine="true"
+ android:textSize="@dimen/text_size_small"
+ app:themeResource="line_two" />
+ </RelativeLayout>
+
+</RelativeLayout>
\ No newline at end of file diff --git a/res/layout/list_item_simple.xml b/res/layout/list_item_simple.xml new file mode 100644 index 0000000..3cbc3ed --- /dev/null +++ b/res/layout/list_item_simple.xml @@ -0,0 +1,55 @@ +<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res/com.andrew.apollo"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/item_normal_height"
+ android:gravity="center_vertical"
+ android:minHeight="@dimen/item_normal_height"
+ android:paddingLeft="@dimen/list_preferred_item_padding"
+ android:paddingRight="@dimen/list_preferred_item_padding" >
+
+ <com.andrew.apollo.widgets.theme.ThemeableTextView
+ android:id="@+id/line_one"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentTop="true"
+ android:singleLine="true"
+ android:textSize="@dimen/text_size_medium"
+ android:textStyle="bold"
+ app:themeResource="line_one" />
+
+ <com.andrew.apollo.widgets.theme.ThemeableTextView
+ android:id="@+id/line_two"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/line_one"
+ android:layout_marginTop="@dimen/list_item_line_two_margin_top"
+ android:singleLine="true"
+ android:textSize="@dimen/text_size_small"
+ app:themeResource="line_two" />
+
+ <com.andrew.apollo.widgets.theme.ThemeableTextView
+ android:id="@+id/line_three"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentBottom="true"
+ android:singleLine="true"
+ android:textSize="@dimen/text_size_small"
+ app:themeResource="line_three" />
+
+</RelativeLayout>
\ No newline at end of file diff --git a/res/layout/list_separator.xml b/res/layout/list_separator.xml deleted file mode 100644 index b8717df..0000000 --- a/res/layout/list_separator.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:focusable="false"
- android:paddingLeft="@dimen/list_separator_container_padding_left"
- android:paddingRight="@dimen/fast_scroll_padding_right" >
-
- <TextView
- android:id="@+id/title"
- style="@style/SeparatorTextViewStyle" />
-
-</FrameLayout>
\ No newline at end of file diff --git a/res/layout/listview.xml b/res/layout/listview.xml deleted file mode 100644 index 7e4283a..0000000 --- a/res/layout/listview.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:gravity="center_vertical"
- android:orientation="vertical" >
-
- <include layout="@layout/shadow" />
-
- <include layout="@layout/list_separator" />
-
- <ListView
- android:id="@android:id/list"
- android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_weight="1"
- android:cacheColorHint="@color/transparent"
- android:drawSelectorOnTop="false"
- android:fastScrollAlwaysVisible="true"
- android:fastScrollEnabled="true"
- android:listSelector="@drawable/holo_selector"
- android:paddingRight="@dimen/fast_scroll_padding_right" />
-
- <include
- android:id="@+id/empty_view"
- layout="@layout/empty_view" />
-
-</LinearLayout>
\ No newline at end of file diff --git a/res/layout/listview_items.xml b/res/layout/listview_items.xml deleted file mode 100644 index d589ae2..0000000 --- a/res/layout/listview_items.xml +++ /dev/null @@ -1,64 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="@dimen/listview_item_height"
- android:layout_gravity="center_vertical" >
-
- <ImageView
- android:id="@+id/listview_item_image"
- android:layout_width="@dimen/listview_album_art"
- android:layout_height="@dimen/listview_album_art"
- android:layout_alignParentBottom="true"
- android:layout_alignParentLeft="true"
- android:layout_alignParentTop="true"
- android:scaleType="centerCrop" />
-
- <!-- Padding may be set on via code for some tabs -->
-
- <TextView
- android:id="@+id/listview_item_line_one"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_toRightOf="@+id/listview_item_image"
- android:ellipsize="end"
- android:maxLength="29"
- android:paddingLeft="@dimen/listview_items_padding_left_top"
- android:paddingRight="@dimen/listview_items_padding_right"
- android:paddingTop="@dimen/listview_items_padding_left_top"
- android:shadowColor="@color/black"
- android:shadowRadius="0.5"
- android:singleLine="true"
- android:textSize="@dimen/text_size_medium" />
-
- <TextView
- android:id="@+id/listview_item_line_two"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_below="@+id/listview_item_line_one"
- android:layout_toRightOf="@+id/listview_item_image"
- android:ellipsize="end"
- android:paddingLeft="@dimen/listview_items_padding_left_top"
- android:paddingRight="@dimen/listview_items_padding_right"
- android:paddingTop="@dimen/listview_items_padding_left_top"
- android:shadowColor="@color/black"
- android:shadowRadius="0.2"
- android:singleLine="true"
- android:textSize="@dimen/text_size_small" />
-
- <include layout="@layout/context_menu" />
-
- <ImageView
- android:id="@+id/peak_two"
- style="@style/PeakMeter"
- android:layout_centerVertical="true"
- android:paddingRight="@dimen/listview_peak_meter_two_padding_right"
- android:paddingTop="@dimen/peak_meter_padding_top" />
-
- <ImageView
- android:id="@+id/peak_one"
- style="@style/PeakMeter"
- android:layout_centerVertical="true"
- android:paddingRight="@dimen/listview_peak_meter_one_padding_right"
- android:paddingTop="@dimen/peak_meter_padding_top" />
-
-</RelativeLayout>
\ No newline at end of file diff --git a/res/layout/lyrics_base.xml b/res/layout/lyrics_base.xml new file mode 100644 index 0000000..821a8f2 --- /dev/null +++ b/res/layout/lyrics_base.xml @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res/com.andrew.apollo"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
+
+ <ScrollView
+ android:id="@+id/audio_player_lyrics_frame"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:fillViewport="true" >
+
+ <com.andrew.apollo.widgets.theme.ThemeableTextView
+ android:id="@+id/audio_player_lyrics"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center_horizontal"
+ android:padding="@dimen/list_preferred_item_padding"
+ android:textStyle="bold"
+ app:themeResource="lyrics" />
+ </ScrollView>
+
+ <ProgressBar
+ android:id="@+id/audio_player_lyrics_progess"
+ style="?android:attr/progressBarStyleLarge"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical|center"
+ android:visibility="gone" />
+
+</FrameLayout>
\ No newline at end of file diff --git a/res/layout/notification_template_base.xml b/res/layout/notification_template_base.xml new file mode 100644 index 0000000..87c0990 --- /dev/null +++ b/res/layout/notification_template_base.xml @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:id="@+id/notification_base"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:gravity="center_vertical"
+ android:orientation="horizontal"
+ tools:ignore="ContentDescription" >
+
+ <ImageView
+ android:id="@+id/notification_base_image"
+ android:layout_width="@dimen/notification_big_icon_width"
+ android:layout_height="@dimen/notification_big_icon_height"
+ android:background="@drawable/default_artwork"
+ android:gravity="center"
+ android:scaleType="fitXY" />
+
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:layout_weight="1"
+ android:orientation="vertical"
+ android:paddingBottom="@dimen/notification_info_container_padding_bottom"
+ android:paddingLeft="@dimen/notification_info_container_padding_left" >
+
+ <TextView
+ android:id="@+id/notification_base_line_one"
+ style="@style/NotificationText"
+ android:textAppearance="@android:style/TextAppearance.StatusBar.EventContent.Title" />
+
+ <TextView
+ android:id="@+id/notification_base_line_two"
+ style="@style/NotificationText"
+ android:textAppearance="@android:style/TextAppearance.StatusBar.EventContent" />
+ </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file diff --git a/res/layout/onebyone_app_widget.xml b/res/layout/onebyone_app_widget.xml deleted file mode 100644 index b770eec..0000000 --- a/res/layout/onebyone_app_widget.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="@dimen/one_by_one_width"
- android:layout_height="@dimen/one_by_one_height" >
-
- <ImageView
- android:id="@+id/one_by_one_albumart"
- android:layout_width="match_parent"
- android:layout_height="match_parent" />
-
-</FrameLayout>
\ No newline at end of file diff --git a/res/layout/profile_tab.xml b/res/layout/profile_tab.xml new file mode 100644 index 0000000..27693ba --- /dev/null +++ b/res/layout/profile_tab.xml @@ -0,0 +1,90 @@ +<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<view xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="0dip"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ class="com.andrew.apollo.widgets.CarouselTab" >
+
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
+
+ <com.andrew.apollo.widgets.LayoutSuppressingImageView
+ android:id="@+id/profile_tab_photo"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentTop="true"
+ android:contentDescription="@null"
+ android:scaleType="centerCrop" />
+
+ <com.andrew.apollo.widgets.SquareImageView
+ android:id="@+id/profile_tab_album_art"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentTop="true"
+ android:contentDescription="@null"
+ android:scaleType="fitXY"
+ android:visibility="gone" />
+
+ <View
+ android:id="@+id/profile_tab_photo_overlay"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentTop="true" />
+
+ <View
+ android:id="@+id/profile_tab_label_background"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/profile_carousel_label_height"
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentLeft="true"
+ android:background="@color/transparent_black" />
+
+ <com.andrew.apollo.widgets.theme.Colorstrip
+ android:id="@+id/profile_tab_colorstrip"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/profile_indicator_height"
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentLeft="true" />
+
+ <View
+ android:id="@+id/profile_tab_alpha_overlay"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentTop="true"
+ android:layout_marginBottom="@dimen/profile_carousel_label_height" />
+
+ <TextView
+ android:id="@+id/profile_tab_label"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/profile_carousel_label_height"
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentLeft="true"
+ android:gravity="left|center_vertical"
+ android:paddingLeft="@dimen/profile_label_padding"
+ android:paddingRight="@dimen/profile_label_padding"
+ android:singleLine="true"
+ android:textColor="@color/white"
+ android:textSize="@dimen/text_size_large" />
+ </RelativeLayout>
+
+</view>
\ No newline at end of file diff --git a/res/layout/profile_tab_carousel.xml b/res/layout/profile_tab_carousel.xml new file mode 100644 index 0000000..18c5580 --- /dev/null +++ b/res/layout/profile_tab_carousel.xml @@ -0,0 +1,55 @@ +<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<view xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/profile_tab_carousel"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ class="com.andrew.apollo.widgets.ProfileTabCarousel"
+ android:fadingEdge="none"
+ android:scrollbars="none" >
+
+ <LinearLayout
+ android:id="@+id/profile_tab_carousel_tab_and_shadow_container"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical" >
+
+ <LinearLayout
+ android:id="@+id/profile_tab_carousel_tab_container"
+ android:layout_width="match_parent"
+ android:layout_height="0dip"
+ android:layout_weight="1"
+ android:baselineAligned="false"
+ android:orientation="horizontal" >
+
+ <include
+ android:id="@+id/profile_tab_carousel_tab_one"
+ layout="@layout/profile_tab" />
+
+ <include
+ android:id="@+id/profile_tab_carousel_tab_two"
+ layout="@layout/profile_tab" />
+ </LinearLayout>
+
+ <View
+ android:id="@+id/profile_tab_carousel_shadow"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/profile_photo_shadow_height"
+ android:background="?android:attr/windowContentOverlay" />
+ </LinearLayout>
+
+</view>
\ No newline at end of file diff --git a/res/layout/quick_queue.xml b/res/layout/quick_queue.xml deleted file mode 100644 index 4ee60f5..0000000 --- a/res/layout/quick_queue.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/quick_queue_holder"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:gravity="center_vertical"
- android:orientation="vertical" >
-
- <GridView
- android:id="@+id/gridview"
- android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_weight="1"
- android:cacheColorHint="@color/transparent"
- android:drawSelectorOnTop="false"
- android:listSelector="@color/transparent"
- android:scrollbars="none" />
-
-</LinearLayout>
\ No newline at end of file diff --git a/res/layout/quick_queue_items.xml b/res/layout/quick_queue_items.xml deleted file mode 100644 index afcb7ee..0000000 --- a/res/layout/quick_queue_items.xml +++ /dev/null @@ -1,87 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingBottom="@dimen/status_bar_recents_item_padding"
- android:paddingTop="@dimen/status_bar_recents_item_padding" >
-
- <RelativeLayout
- android:id="@+id/recent_item"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal" >
-
- <TextView
- android:id="@+id/queue_track_name"
- android:layout_width="@dimen/status_bar_recents_app_label_width"
- android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
- android:layout_alignTop="@+id/queue_album_art"
- android:layout_marginLeft="@dimen/status_bar_recents_app_label_left_margin"
- android:ellipsize="marquee"
- android:fadingEdge="horizontal"
- android:fadingEdgeLength="@dimen/status_bar_recents_fading_edge_length"
- android:paddingTop="2dp"
- android:scrollHorizontally="true"
- android:singleLine="true"
- android:textColor="@color/white"
- android:textSize="@dimen/status_bar_recents_app_label_text_size" />
-
- <FrameLayout
- android:id="@+id/app_thumbnail"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentTop="true"
- android:layout_marginLeft="@dimen/status_bar_recents_thumbnail_left_margin"
- android:layout_toRightOf="@+id/queue_track_name"
- android:background="@drawable/queue_thumbnail_bg"
- android:foreground="@drawable/queue_thumbnail_fg" >
-
- <ImageView
- android:id="@+id/queue_artist_image"
- android:layout_width="@dimen/status_bar_recents_thumbnail_width"
- android:layout_height="@dimen/status_bar_recents_thumbnail_height"
- android:scaleType="fitXY" />
- </FrameLayout>
-
- <View
- android:id="@+id/recents_callout_line"
- android:layout_width="@dimen/status_bar_recents_app_label_width"
- android:layout_height="1dip"
- android:layout_alignParentLeft="true"
- android:layout_below="@+id/queue_track_name"
- android:layout_marginLeft="@dimen/status_bar_recents_app_label_left_margin"
- android:layout_marginRight="3dip"
- android:layout_marginTop="3dip"
- android:layout_toLeftOf="@id/app_thumbnail"
- android:background="@color/queue_callout_line" />
-
- <ImageView
- android:id="@+id/queue_album_art"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginLeft="@dimen/status_bar_recents_app_icon_left_margin"
- android:layout_marginTop="@dimen/status_bar_recents_app_icon_top_margin"
- android:layout_toRightOf="@+id/queue_track_name"
- android:adjustViewBounds="true"
- android:maxHeight="@dimen/status_bar_recents_app_icon_max_height"
- android:maxWidth="@dimen/status_bar_recents_app_icon_max_width"
- android:scaleType="centerInside" />
-
- <TextView
- android:id="@+id/app_description"
- android:layout_width="@dimen/status_bar_recents_app_label_width"
- android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
- android:layout_below="@id/recents_callout_line"
- android:layout_marginLeft="@dimen/status_bar_recents_app_label_left_margin"
- android:layout_marginTop="3dip"
- android:ellipsize="marquee"
- android:fadingEdge="horizontal"
- android:fadingEdgeLength="@dimen/status_bar_recents_fading_edge_length"
- android:scrollHorizontally="true"
- android:singleLine="true"
- android:textSize="@dimen/status_bar_recents_app_description_text_size" />
- </RelativeLayout>
-
-</FrameLayout>
\ No newline at end of file diff --git a/res/layout/shadow.xml b/res/layout/shadow.xml deleted file mode 100644 index 37f28bb..0000000 --- a/res/layout/shadow.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/shadow"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:foreground="@drawable/title_bar_shadow"
- android:foregroundGravity="fill_horizontal|top|center" />
diff --git a/res/layout/square_image_view.xml b/res/layout/square_image_view.xml new file mode 100644 index 0000000..ea958b5 --- /dev/null +++ b/res/layout/square_image_view.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License. +-->
+<com.andrew.apollo.widgets.SquareView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/square_view"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
+
+ <com.andrew.apollo.widgets.SquareImageView
+ android:id="@+id/image"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:scaleType="centerCrop" />
+
+</com.andrew.apollo.widgets.SquareView>
\ No newline at end of file diff --git a/res/layout/status_bar.xml b/res/layout/status_bar.xml deleted file mode 100644 index 34385e7..0000000 --- a/res/layout/status_bar.xml +++ /dev/null @@ -1,56 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="horizontal" >
-
- <ImageView
- android:id="@+id/status_bar_album_art"
- android:layout_width="@dimen/status_bar_album_art"
- android:layout_height="@dimen/status_bar_album_art"
- android:gravity="center" />
-
- <ImageView
- android:id="@+id/status_bar_icon"
- android:layout_width="@dimen/status_bar_album_art"
- android:layout_height="@dimen/status_bar_album_art"
- android:background="@drawable/status_bg"
- android:scaleType="center"
- android:src="@drawable/stat_notify_music"
- android:visibility="gone" />
-
- <LinearLayout
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:layout_weight="1"
- android:orientation="vertical"
- android:paddingLeft="@dimen/status_bar_button_info_container_padding_left" >
-
- <TextView
- android:id="@+id/status_bar_track_name"
- style="@style/StatusBarText"
- android:textColor="@color/white"
- android:textSize="@dimen/text_size_medium"
- android:textStyle="bold" />
-
- <TextView
- android:id="@+id/status_bar_artist_name"
- style="@style/StatusBarText" />
- </LinearLayout>
-
- <ImageButton
- android:id="@+id/status_bar_play"
- style="@style/StatusBarButton" />
-
- <ImageButton
- android:id="@+id/status_bar_next"
- style="@style/StatusBarButton"
- android:src="@drawable/apollo_holo_dark_next" />
-
- <ImageButton
- android:id="@+id/status_bar_collapse"
- style="@style/StatusBarButton"
- android:src="@drawable/apollo_holo_dark_notifiation_bar_collapse" />
-
-</LinearLayout>
\ No newline at end of file diff --git a/res/layout/tabs.xml b/res/layout/tabs.xml deleted file mode 100644 index 0bfd77b..0000000 --- a/res/layout/tabs.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Button xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/tabs"
- style="@style/Tabs" />
diff --git a/res/layout/theme_preview.xml b/res/layout/theme_preview.xml deleted file mode 100644 index 0563b44..0000000 --- a/res/layout/theme_preview.xml +++ /dev/null @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" > - - <TextView - android:id="@+id/themeTitle" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> - - <TextView - android:id="@+id/themeDescription" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> - - <ImageView - android:id="@+id/themeIcon" - android:layout_width="wrap_content" - android:layout_height="wrap_content" /> - - <Button - android:id="@+id/themeApply" - android:onClick="applyTheme" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/apply_theme" /> - - <Button - android:id="@+id/themeSearch" - android:onClick="getThemes" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/get_more_themes" /> - -</LinearLayout>
\ No newline at end of file diff --git a/res/layout/top_shadow.xml b/res/layout/top_shadow.xml new file mode 100644 index 0000000..f37f41b --- /dev/null +++ b/res/layout/top_shadow.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
-->
+<View xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/shadow_height"
+ android:background="@drawable/top_shadow" />
diff --git a/res/layout/track_browser.xml b/res/layout/track_browser.xml deleted file mode 100644 index 4559091..0000000 --- a/res/layout/track_browser.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content" >
-
- <include
- android:id="@+id/half"
- layout="@layout/half_and_half" />
-
- <android.support.v4.view.ViewPager
- android:id="@+id/viewPager"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_below="@+id/half" />
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="@dimen/bottom_action_bar_height"
- android:layout_alignParentBottom="true" >
-
- <android.support.v4.view.ViewPager
- android:id="@+id/bottomActionBarPager"
- android:layout_width="match_parent"
- android:layout_height="match_parent"/>
- </LinearLayout>
-
-</RelativeLayout>
\ No newline at end of file |