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

Merge remote-tracking branch 'origin/master'

Browse source 
# Conflicts:
#	app/build.gradle
#	app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivityfragments/AbsMainActivityRecyclerViewFragment.java
This commit is contained in:
Karim Abou Zeid 2016-01-29 10:35:50 +01:00
commit 1b3d98e098
70 changed files with 1201 additions and 1946 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -50,10 +50,7 @@
android:layout_width="match_parent"
android:layout_height="@dimen/tab_height"
app:tabContentStart="72dp"
app:tabIndicatorColor="@color/primary_text_default_material_dark"
app:tabMode="scrollable"
app:tabSelectedTextColor="@color/primary_text_default_material_dark"
app:tabTextColor="@color/secondary_text_default_material_dark" />
app:tabMode="scrollable" />
</android.support.design.widget.AppBarLayout>

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

@ -1,7 +1,9 @@
<FrameLayout 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_height="match_parent"
android:transitionGroup="true"
tools:ignore="UnusedAttribute">
<LinearLayout
android:layout_width="match_parent"

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

@ -1,10 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="@dimen/mini_player_height"
android:clickable="true"
android:focusable="false">
android:focusable="false"
android:transitionName="@string/transition_mini_player"
tools:ignore="UnusedAttribute">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"

24
app/src/main/res/layout/preference_category_custom.xml
View file

@ -1,24 +0,0 @@
<FrameLayout 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:paddingLeft="16dip"
android:paddingRight="16dip"
android:paddingTop="16dp"
android:gravity="start|center_vertical"
android:layout_gravity="start|center_vertical"
tools:ignore="UnusedAttribute">
<TextView
android:id="@android:id/title"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:textColor="?colorAccent"
android:fontFamily="@string/font_fontFamily_medium"
android:textStyle="@integer/font_textStyle_medium"
android:textSize="14sp"
android:gravity="start|center_vertical"
android:layout_gravity="start|center_vertical"
android:textAlignment="viewStart" />
</FrameLayout>

7
app/src/main/res/layout/preference_color_widget.xml
View file

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<com.kabouzeid.gramophone.views.ColorView
android:id="@+id/circle"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_gravity="center_vertical|end"
xmlns:android="http://schemas.android.com/apk/res/android" />

70
app/src/main/res/layout/preference_custom.xml
View file

@ -1,70 +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="wrap_content"
android:gravity="center_vertical"
android:minHeight="?android:attr/listPreferredItemHeight"
android:paddingEnd="?android:attr/scrollbarSize"
android:paddingRight="?android:attr/scrollbarSize"
tools:ignore="RtlSymmetry,UnusedAttribute"
android:baselineAligned="false">
<RelativeLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginBottom="12dip"
android:layout_marginEnd="6dip"
android:layout_marginLeft="16dip"
android:layout_marginRight="6dip"
android:layout_marginStart="16dip"
android:layout_marginTop="12dip"
android:layout_weight="1">
<TextView
android:id="@android:id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:ellipsize="marquee"
android:fadingEdge="horizontal"
android:fontFamily="sans-serif"
android:gravity="start"
android:singleLine="true"
android:textAlignment="viewStart"
android:textColor="?android:textColorPrimary"
android:textSize="16sp"
tools:text="Title" />
<TextView
android:id="@android:id/summary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignLeft="@android:id/title"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_alignStart="@android:id/title"
android:layout_below="@android:id/title"
android:layout_marginTop="2dp"
android:fontFamily="sans-serif"
android:gravity="start"
android:maxLines="6"
android:textAlignment="viewStart"
android:textColor="?android:textColorSecondary"
android:textSize="14sp"
tools:text="Summary" />
</RelativeLayout>
<!-- Preference should place its actual preference widget here. -->
<LinearLayout
android:id="@android:id/widget_frame"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:layout_marginStart="10dp"
android:gravity="center_vertical"
android:orientation="vertical" />
</LinearLayout>

8
app/src/main/res/layout/preference_dynamic_checkbox.xml
View file

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<com.kabouzeid.gramophone.views.DynamicCheckBox xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+android:id/checkbox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:focusable="false"
android:focusableInTouchMode="false"
android:clickable="false" />

21
app/src/main/res/layout/vertical_recycler_fast_scroller_layout.xml
View file

@ -1,21 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="@dimen/scrollbar_width_plus_inset"
android:layout_height="match_parent"
tools:layout_gravity="end">
<View
android:id="@+id/scroll_bar"
android:layout_width="@dimen/scrollbar_width_plus_inset"
android:layout_height="match_parent"
android:layout_gravity="end"
android:alpha="0.3" />
<View
android:id="@+id/scroll_handle"
android:layout_width="@dimen/scrollbar_width_plus_inset"
android:layout_height="48dp"
android:layout_gravity="end" />
</FrameLayout>