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

Re added the adjustable grid size feature. Transition between two grid sizes are not working yet. Fixes kabouzeid/phonograph-issue-tracker#43

Browse source
This commit is contained in:
Karim Abou Zeid 2015-09-30 20:53:09 +02:00
commit d1b06b79f8
17 changed files with 398 additions and 200 deletions
Download patch file Download diff file Expand all files Collapse all files

43
app/src/main/res/menu/menu_main.xml
View file

@ -15,30 +15,49 @@
app:showAsAction="never" />
<item
android:id="@+id/action_view_as"
android:title="@string/action_view_as">
android:id="@+id/action_grid_size"
android:title="@string/action_grid_size">
<menu>
<group
android:id="@+id/group_view_as"
android:id="@+id/group_grid_size"
android:checkableBehavior="single"
tools:ignore="HardcodedText">
<item
android:id="@+id/action_layout_mode_list"
android:title="@string/list" />
android:id="@+id/action_grid_size_1"
android:title="@string/grid_size_1" />
<item
android:id="@+id/action_layout_mode_grid"
android:title="@string/grid" />
android:id="@+id/action_grid_size_2"
android:title="@string/grid_size_2" />
<item
android:id="@+id/action_grid_size_3"
android:title="@string/grid_size_3" />
<item
android:id="@+id/action_grid_size_4"
android:title="@string/grid_size_4" />
<item
android:id="@+id/action_grid_size_5"
android:title="@string/grid_size_5" />
<item
android:id="@+id/action_grid_size_6"
android:title="@string/grid_size_6" />
<item
android:id="@+id/action_grid_size_7"
android:title="@string/grid_size_7" />
<item
android:id="@+id/action_grid_size_8"
android:title="@string/grid_size_8" />
</group>
<item
android:id="@+id/action_colored_footers"
android:checkable="true"
android:title="@string/colored_footers" />
</menu>
</item>
<item
android:orderInCategory="98"
android:id="@+id/action_colored_footers"
android:checkable="true"
android:title="@string/colored_footers" />
<item
android:id="@+id/action_sleep_timer"
android:orderInCategory="98"
android:title="@string/action_sleep_timer"
app:showAsAction="never" />

5
app/src/main/res/values-land/integers.xml
View file

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<integer name="grid_num_columns">4</integer>
<integer name="list_num_columns">2</integer>
</resources>

5
app/src/main/res/values-sw600dp-land/integers.xml
View file

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<integer name="grid_num_columns">6</integer>
<integer name="list_num_columns">3</integer>
</resources>

6
app/src/main/res/values-sw600dp/integers.xml
View file

@ -1,5 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<integer name="grid_num_columns">4</integer>
<integer name="list_num_columns">2</integer>
<integer name="default_grid_columns">4</integer>
<integer name="default_list_columns">2</integer>
<integer name="default_grid_columns_land">6</integer>
<integer name="default_list_columns_land">3</integer>
</resources>

7
app/src/main/res/values/integers.xml
View file

@ -1,7 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<integer name="grid_num_columns">2</integer>
<integer name="list_num_columns">1</integer>
<integer name="default_grid_columns">2</integer>
<integer name="default_grid_columns_land">4</integer>
<integer name="default_list_columns">1</integer>
<integer name="default_list_columns_land">2</integer>
<integer name="font_textStyle_medium">1</integer>
</resources>

13
app/src/main/res/values/strings.xml
View file

@ -60,7 +60,8 @@
<string name="added_title_to_playing_queue">"Added 1 title to the playing queue."</string>
<string name="added_x_titles_to_playing_queue">Added %1$d titles to the playing queue.</string>
<string name="action_remove_from_playlist">Remove from playlist</string>
<string name="action_view_as">View as</string>
<string name="action_grid_size">Grid size</string>
<string name="action_grid_size_land">Grid size (land)</string>
<string name="inserted_x_songs_into_playlist_x">Inserted %1$d songs into the playlist %2$s.</string>
<string name="created_playlist_x">Created playlist %1$s.</string>
<string name="deleted_playlist_x">Deleted playlist %1$s.</string>
@ -166,8 +167,14 @@
<string name="sleep_timer_set">Sleep timer set for %d minutes from now.</string>
<string name="action_new_playlist">New playlist…</string>
<string name="new_playlist_title">New playlist</string>
<string name="grid">Grid</string>
<string name="list">List</string>
<string name="grid_size_1">1</string>
<string name="grid_size_2">2</string>
<string name="grid_size_3">3</string>
<string name="grid_size_4">4</string>
<string name="grid_size_5">5</string>
<string name="grid_size_6">6</string>
<string name="grid_size_7">7</string>
<string name="grid_size_8">8</string>
<string name="colored_footers">Colored footers</string>
<string name="special_thanks_to">Special thanks to</string>
<string name="changelog">Changelog</string>