tenkuma/jamfish
tenkuma/jamfish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Just code rearrangement

Browse source
This commit is contained in:
Karim Abou Zeid 2015-01-27 14:42:12 +01:00
commit 60a3070dfe
58 changed files with 1468 additions and 1500 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/res/layout/activity_album_tag_editor.xml
View file

@ -158,9 +158,9 @@
<com.melnykov.fab.FloatingActionButton
android:id="@+id/fab"
style="@style/PlayPauseFab"
android:src="@drawable/ic_done_white_48dp"
android:layout_gravity="bottom|right"
android:layout_margin="16dp"
android:layout_gravity="bottom|right"/>
android:src="@drawable/ic_done_white_48dp"/>
</FrameLayout>

4
app/src/main/res/layout/activity_artist_detail.xml
View file

@ -88,11 +88,11 @@
android:background="@android:color/transparent"/>
<android.support.v7.widget.Toolbar
android:elevation="@dimen/toolbar_elevation"
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@android:color/transparent"/>
android:background="@android:color/transparent"
android:elevation="@dimen/toolbar_elevation"/>
</LinearLayout>
<com.melnykov.fab.FloatingActionButton

34
app/src/main/res/layout/activity_music_controller.xml
View file

@ -6,21 +6,21 @@
tools:context="com.kabouzeid.materialmusic.ui.activities.AlbumDetailActivity$PlaceholderFragment">
<com.kabouzeid.materialmusic.view.SquareImageView
android:scaleType="centerCrop"
android:background="@color/black"
android:id="@+id/album_art"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/black"
android:scaleType="centerCrop"
android:src="@drawable/default_album_art"
android:transitionName="@string/transition_album_cover"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/navigation_drawer_gradient"
android:orientation="vertical"
android:layout_above="@+id/footer"
android:layout_alignTop="@+id/progress_container"/>
android:layout_alignTop="@+id/progress_container"
android:background="@drawable/navigation_drawer_gradient"
android:orientation="vertical"/>
<LinearLayout
android:id="@+id/progress_container"
@ -60,13 +60,13 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/album_art"
android:background="?attr/colorPrimary"
android:elevation="1dp"
android:orientation="vertical"
android:paddingBottom="16dp"
android:paddingLeft="72dp"
android:paddingRight="72dp"
android:paddingTop="16dp"
android:background="?attr/colorPrimary"
android:elevation="1dp"
android:orientation="vertical"
android:transitionName="@string/transition_album_text"
>
@ -74,8 +74,8 @@
android:id="@+id/song_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:singleLine="true"
android:fontFamily="sans-serif-medium"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="?attr/title_text_color"/>
@ -83,8 +83,8 @@
android:id="@+id/song_artist"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:singleLine="true"
android:fontFamily="sans-serif"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Caption"
android:textColor="?attr/caption_text_color"/>
@ -103,12 +103,11 @@
<com.melnykov.fab.FloatingActionButton
android:id="@+id/fab"
android:layout_centerInParent="true"
style="@style/PlayPauseFab"
android:layout_centerInParent="true"
/>
<ImageButton
android:scaleType="fitCenter"
android:id="@+id/prev_button"
android:layout_width="56dp"
android:layout_height="56dp"
@ -117,10 +116,10 @@
android:layout_toLeftOf="@+id/fab"
android:background="?android:attr/selectableItemBackground"
android:padding="14dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_skip_previous_white_48dp"/>
<ImageButton
android:scaleType="fitCenter"
android:id="@+id/next_button"
android:layout_width="56dp"
android:layout_height="56dp"
@ -129,30 +128,31 @@
android:layout_toRightOf="@+id/fab"
android:background="?android:attr/selectableItemBackground"
android:padding="14dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_skip_next_white_48dp"/>
<ImageButton
android:scaleType="fitCenter"
android:id="@+id/repeat_button"
android:layout_width="56dp"
android:layout_height="56dp"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:layout_margin="8dp"
android:layout_alignParentLeft="true"
android:background="?android:attr/selectableItemBackground"
android:padding="14dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_repeat_grey600_48dp"/>
<ImageButton
android:scaleType="fitCenter"
android:id="@+id/shuffle_button"
android:layout_width="56dp"
android:layout_height="56dp"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_margin="8dp"
android:layout_alignParentRight="true"
android:background="?android:attr/selectableItemBackground"
android:padding="14dp"
android:scaleType="fitCenter"
android:src="@drawable/ic_shuffle_grey600_48dp"/>
</RelativeLayout>

5
app/src/main/res/layout/activity_song_tag_editor.xml
View file

@ -1,6 +1,5 @@
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:fab="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:focusable="true"
@ -198,9 +197,9 @@
<com.melnykov.fab.FloatingActionButton
android:id="@+id/fab"
style="@style/PlayPauseFab"
android:src="@drawable/ic_done_white_48dp"
android:layout_gravity="bottom|right"
android:layout_margin="16dp"
android:layout_gravity="bottom|right"/>
android:src="@drawable/ic_done_white_48dp"/>
</FrameLayout>

30
app/src/main/res/layout/album_tile.xml
View file

@ -1,49 +1,49 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
android:padding="4dp"
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:descendantFocusability="blocksDescendants"
android:gravity="center"
android:orientation="vertical">
android:orientation="vertical"
android:padding="4dp">
<com.kabouzeid.materialmusic.view.SquareImageView
android:transitionName="@string/transition_album_cover"
android:id="@+id/album_art"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"/>
android:scaleType="centerCrop"
android:transitionName="@string/transition_album_cover"/>
<LinearLayout
android:transitionName="@string/transition_album_text"
android:padding="16dp"
android:orientation="vertical"
android:background="?attr/colorPrimary"
android:id="@+id/footer"
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:background="?attr/colorPrimary"
android:orientation="vertical"
android:padding="16dp"
android:transitionName="@string/transition_album_text">
<TextView
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:fontFamily="sans-serif-medium"
android:textColor="?attr/title_text_color"
android:id="@+id/album_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="sans-serif-medium"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="?attr/title_text_color"
android:textSize="16sp"
tools:text="Album Title"/>
<TextView
android:textAppearance="@style/TextAppearance.AppCompat.Caption"
android:fontFamily="sans-serif"
android:textColor="?attr/caption_text_color"
android:id="@+id/album_interpret"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="sans-serif"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Caption"
android:textColor="?attr/caption_text_color"
android:textSize="12sp"
tools:text="Interpret"/>
</LinearLayout>

12
app/src/main/res/layout/dialog_playlist.xml
View file

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<com.mobeta.android.dslv.DragSortListView
app:max_drag_scroll_speed="2"
app:float_alpha="0.5"
app:drag_start_mode="onLongPress"
app:use_default_controller="true"
android:id="@+id/dragSortListView"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"/>
app:drag_start_mode="onLongPress"
app:float_alpha="0.5"
app:max_drag_scroll_speed="2"
app:use_default_controller="true"/>

2
app/src/main/res/layout/fragment_drawer.xml
View file

@ -2,10 +2,10 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:paddingBottom="@dimen/activity_vertical_margin"
tools:context=".DrawerActivity$PlaceholderFragment">
<TextView

2
app/src/main/res/layout/fragment_navigation_drawer.xml
View file

@ -1,10 +1,10 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:clickable="true"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?colorPrimary"
android:clickable="true"
android:orientation="vertical">
<RelativeLayout

6
app/src/main/res/layout/fragment_place_holder.xml
View file

@ -5,8 +5,8 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:fontFamily="sans-serif-medium"
android:gravity="center"
android:text="Comming soon!"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="?title_text_color"
android:text="Comming soon!"/>
android:textColor="?title_text_color"/>

16
app/src/main/res/layout/item_artist_view.xml
View file

@ -10,23 +10,23 @@
<com.kabouzeid.materialmusic.view.SquareImageView
android:id="@+id/artist_image"
android:scaleType="centerCrop"
android:layout_width="60dp"
android:layout_height="60dp"
android:gravity="center"
android:layout_gravity="center"
android:gravity="center"
android:scaleType="centerCrop"
/>
<TextView
android:id="@+id/artist_name"
android:layout_height="wrap_content"
android:layout_width="0dp"
android:singleLine="true"
android:fontFamily="sans-serif"
android:textAppearance="@style/TextAppearance.AppCompat.Body2"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"/>
android:layout_marginRight="16dp"
android:layout_weight="1"
android:fontFamily="sans-serif"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Body2"/>
</LinearLayout>

2
app/src/main/res/layout/item_navigation_drawer.xml
View file

@ -4,9 +4,9 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/list_selector"
android:minHeight="48dp"
android:orientation="horizontal"
android:background="?attr/list_selector"
android:padding="16dp">
<ImageView

1
app/src/main/res/layout/item_playlist.xml
View file

@ -7,6 +7,7 @@
android:descendantFocusability="blocksDescendants"
android:orientation="horizontal"
>
<TextView
android:id="@+id/song_title"
android:layout_width="0dp"

2
app/src/main/res/layout/item_song.xml
View file

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
android:descendantFocusability="blocksDescendants"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="64dp"
android:background="?android:attr/selectableItemBackground"
android:descendantFocusability="blocksDescendants"
android:orientation="horizontal"
android:paddingLeft="16dp"
>

14
app/src/main/res/layout/item_song_view.xml
View file

@ -11,21 +11,21 @@
android:id="@+id/album_art"
android:layout_width="60dp"
android:layout_height="60dp"
android:gravity="center"
android:layout_gravity="center"
android:gravity="center"
/>
<TextView
android:id="@+id/song_title"
android:layout_height="wrap_content"
android:layout_width="0dp"
android:singleLine="true"
android:fontFamily="sans-serif"
android:textAppearance="@style/TextAppearance.AppCompat.Body2"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"/>
android:layout_marginRight="16dp"
android:layout_weight="1"
android:fontFamily="sans-serif"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Body2"/>
<ImageView
android:id="@+id/menu"

4
app/src/main/res/layout/notification_playing.xml
View file

@ -75,16 +75,16 @@
<ImageButton
android:id="@+id/button_toggle_play_pause"
style="@style/NotificationButton"
android:paddingTop="16dp"
android:paddingBottom="16dp"
android:paddingTop="16dp"
android:src="@drawable/ic_play_arrow_white_48dp"
/>
<ImageButton
android:id="@+id/button_next"
style="@style/NotificationButton"
android:paddingTop="16dp"
android:paddingBottom="16dp"
android:paddingTop="16dp"
android:src="@drawable/ic_skip_next_white_48dp"
/>

4
app/src/main/res/layout/tab_indicator.xml
View file

@ -13,9 +13,9 @@
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:id="@android:id/text1"
<TextView android:id="@android:id/text1"
style="@style/ThemeOverlay.AppCompat.Light"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="48dp"
android:gravity="center"