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

Lots of progress with dynamic theming, the nav drawer now uses a RecyclerView, AboutDeveloperDialogHelper is now a DialogFragment, RTL support (to suppress Lint warnings), other various small fixes, cleaned up and formatted lot of code (and removed un-used resources), R.string.ok > android.R.string.ok, R.string.cancel > android.R.string.cancel, switched dialog helpers to DialogFragments.

Browse source
This commit is contained in:
Aidan Follestad 2015-04-16 16:47:02 -05:00
commit 7ce86afd74
265 changed files with 2853 additions and 2292 deletions
Download patch file Download diff file Expand all files Collapse all files

52
app/src/main/res/values/arrays.xml Normal file
View file

@ -0,0 +1,52 @@
<resources>
<array name="colors_primary">
<item>#3F51B5</item>
<item>#9E9E9E</item>
<item>#424242</item>
<item>#1C1C1C</item>
<item>#000000</item>
<item>#607D8B</item>
<item>#37474F</item>
<item>#795548</item>
<item>#D32F2F</item>
<item>#E91E63</item>
<item>#9C27B0</item>
<item>#5E35B1</item>
<item>#1976D2</item>
<item>#03A9F4</item>
<item>#00BCD4</item>
<item>#009688</item>
<item>#43A047</item>
<item>#7CB342</item>
<item>#C0CA33</item>
<item>#FBC02D</item>
<item>#FFB300</item>
<item>#FB8C00</item>
<item>#F4511E</item>
</array>
<array name="colors_accent">
<item>#3F51B5</item>
<item>#9E9E9E</item>
<item>#607D8B</item>
<item>#795548</item>
<item>#D32F2F</item>
<item>#E91E63</item>
<item>#9C27B0</item>
<item>#5E35B1</item>
<item>#1976D2</item>
<item>#03A9F4</item>
<item>#00BCD4</item>
<item>#009688</item>
<item>#43A047</item>
<item>#7CB342</item>
<item>#C0CA33</item>
<item>#FBC02D</item>
<item>#FFB300</item>
<item>#FB8C00</item>
<item>#F4511E</item>
<item>#FFFFFF</item>
</array>
</resources>

31
app/src/main/res/values/attrs.xml
View file

@ -1,26 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<attr name="title_text_color" format="color"/>
<attr name="caption_text_color" format="color"/>
<attr name="title_text_color" format="color" />
<attr name="caption_text_color" format="color" />
<attr name="nav_drawer_icon_color" format="color" />
<attr name="music_controller_container_color" format="color"/>
<attr name="navigation_drawer_background_color" format="color"/>
<attr name="music_controller_container_color" format="color" />
<attr name="navigation_drawer_background_color" format="color" />
<attr name="inset_divider" format="color" />
<attr name="list_selector" format="reference"/>
<attr name="round_selector" format="reference"/>
<attr name="rect_selector" format="reference"/>
<attr name="list_selector" format="reference" />
<attr name="round_selector" format="reference" />
<attr name="rect_selector" format="reference" />
<attr name="separator_color" format="color"/>
<attr name="separator_color" format="color" />
<attr name="drawable_color" format="color"/>
<attr name="drawable_color_enabled" format="color"/>
<attr name="drawable_color" format="color" />
<attr name="drawable_color_enabled" format="color" />
<attr name="themed_drawable_color" format="color"/>
<attr name="themed_drawable_activated_color" format="color"/>
<attr name="themed_drawable_color" format="color" />
<attr name="default_bar_color" format="color"/>
<attr name="card_color" format="color"/>
<attr name="default_bar_color" format="color" />
<attr name="card_color" format="color" />
<attr name="toolbarPopupTheme" format="reference"/>
<attr name="toolbarPopupTheme" format="reference" />
</resources>

18
app/src/main/res/values/colors.xml
View file

@ -1,40 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!--general-->
<color name="ripple_material_dark" type="color">#4dffffff</color>
<color name="ripple_material_light" type="color">#1f000000</color>
<color name="activated_selected_dark" type="color">#9affffff</color>
<color name="activated_selected_light" type="color">#3e000000</color>
<!--light theme-->
<color name="materialmusic_color">@color/indigo_500</color>
<color name="materialmusic_color_darker">@color/indigo_600</color>
<color name="materialmusic_accent_color">@color/pink_500</color>
<color name="materialmusic_accent_color_darker">@color/pink_600</color>
<color name="materialmusic_accent_color_lighter">@color/pink_300</color>
<color name="materialmusic_music_controller_container_color">@color/grey_300</color>
<color name="materialmusic_navigation_drawer_background_color">@color/grey_300</color>
<!--<color name="materialmusic_navigation_drawer_background_color">@color/grey_300</color>-->
<color name="materialmusic_navigation_drawer_background_color">#fff</color>
<color name="materialmusic_separator_color">#0C000000</color>
<color name="materialmusic_default_bar_color">@color/grey_300</color>
<color name="materialmusic_themed_drawable_color">#8A000000</color>
<color name="materialmusic_themed_drawable_activated_color">@color/materialmusic_accent_color</color>
<color name="list_item_selector_activated">#D0D0D0</color>
<!--dark theme-->
<color name="materialmusic_dark_color">@color/indigo_500</color>
<color name="materialmusic_dark_color_darker">@color/indigo_600</color>
<color name="materialmusic_dark_accent_color">@color/pink_500</color>
<color name="materialmusic_dark_accent_color_darker">@color/pink_600</color>
<color name="materialmusic_dark_accent_color_lighter">@color/pink_300</color>
<color name="materialmusic_dark_music_controller_container_color">@color/grey_800</color>
<color name="materialmusic_dark_navigation_drawer_background_color">@color/grey_900</color>
<color name="materialmusic_dark_separator_color">#0CFFFFFF</color>
<color name="materialmusic_dark_default_bar_color">@color/grey_900</color>
<color name="materialmusic_dark_themed_drawable_color">@color/white</color>
<color name="materialmusic_dark_themed_drawable_activated_color">@color/materialmusic_dark_accent_color</color>
<color name="list_item_selector_activated_dark">#55000000</color>
<!--round and rect selector-->
<color name="button_selected">#D0D0D0</color>
<color name="button_selected_dark">#30FFFFFF</color>
<color name="sliding_tabs_activated">#FFFFFF</color>
<color name="sliding_tabs_deactivated">#99FFFFFF</color>

22
app/src/main/res/values/dimens.xml
View file

@ -1,14 +1,9 @@
<resources>
<!-- Default screen margins, per the Android Design guidelines. -->
<dimen name="activity_horizontal_margin">16dp</dimen>
<dimen name="activity_vertical_margin">16dp</dimen>
<dimen name="default_item_margin">16dp</dimen>
<dimen name="list_top_margin">8dp</dimen>
<!-- Per the design guidelines, navigation drawers should be between 240dp and 320dp:
https://developer.android.com/design/patterns/navigation-drawer.html -->
<dimen name="navigation_drawer_textsize">14sp</dimen>
<dimen name="navigation_drawer_image_height">140dp</dimen>
<dimen name="navigation_drawer_width">260dp</dimen>
@ -24,17 +19,6 @@
<dimen name="notification_big_icon_width">64.0dip</dimen>
<dimen name="notification_info_container_padding_left">8.0dip</dimen>
<dimen name="notification_info_container_padding_bottom">4.0dip</dimen>
<dimen name="notification_action_padding">8.0dip</dimen>
<dimen name="notification_action_height">48.0dip</dimen>
<dimen name="notification_action_width">48.0dip</dimen>
<!-- Notification template expanded -->
<dimen name="notification_expanded_height">128.0dip</dimen>
<dimen name="notification_expanded_buttons_divider_padding">12.0dip</dimen>
<dimen name="notification_expanded_button_height">48.0dip</dimen>
<dimen name="notification_expanded_button_padding">10.0dip</dimen>
<dimen name="notification_expanded_content_padding_top">8.0dip</dimen>
<dimen name="notification_expanded_collapse_padding">8.0dip</dimen>
<dimen name="tab_height">48dp</dimen>
@ -44,7 +28,6 @@
Refer to App Widget Documentation for margin information
http://developer.android.com/guide/topics/appwidgets/index.html#CreatingLayout
-->
<dimen name="widget_margin">8dp</dimen>
<dimen name="app_widget_small_artwork_height">64dp</dimen>
<dimen name="pause_bar_width">5dp</dimen>
@ -53,4 +36,9 @@ http://developer.android.com/guide/topics/appwidgets/index.html#CreatingLayout
<dimen name="fab_icon_bound_width">32dp</dimen>
<dimen name="fab_icon_bound_height">36dp</dimen>
<!-- Color Chooser Dialog -->
<dimen name="circle_view_border">1dp</dimen>
<dimen name="circle_view_check">24dp</dimen>
</resources>

7
app/src/main/res/values/fonts.xml Normal file
View file

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- bold -->
<string name="font_fontFamily_medium" translatable="false">sans-serif</string>
</resources>

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

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

278
app/src/main/res/values/materialcolors.xml
View file

@ -1,290 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- https://gist.github.com/kalehv/bae765c756e94455ed88 -->
<?xml version="1.0" encoding="utf-8"?><!-- https://gist.github.com/kalehv/bae765c756e94455ed88 -->
<resources>
<color name="red_50">#ffebee</color>
<color name="red_100">#ffcdd2</color>
<color name="red_200">#ef9a9a</color>
<color name="red_300">#e57373</color>
<color name="red_400">#ef5350</color>
<color name="red_500">#f44336</color>
<color name="red_600">#e53935</color>
<color name="red_700">#d32f2f</color>
<color name="red_800">#c62828</color>
<color name="red_900">#b71c1c</color>
<color name="red_A100">#ff8a80</color>
<color name="red_A200">#ff5252</color>
<color name="red_A400">#ff1744</color>
<color name="red_A700">#d50000</color>
<color name="pink_50">#fce4ec</color>
<color name="pink_100">#f8bbd0</color>
<color name="pink_200">#f48fb1</color>
<color name="pink_300">#f06292</color>
<color name="pink_400">#ec407a</color>
<color name="pink_500">#e91e63</color>
<color name="pink_600">#d81b60</color>
<color name="pink_700">#c2185b</color>
<color name="pink_800">#ad1457</color>
<color name="pink_900">#880e4f</color>
<color name="pink_A100">#ff80ab</color>
<color name="pink_A200">#ff4081</color>
<color name="pink_A400">#f50057</color>
<color name="pink_A700">#c51162</color>
<color name="purple_50">#f3e5f5</color>
<color name="purple_100">#e1bee7</color>
<color name="purple_200">#ce93d8</color>
<color name="purple_300">#ba68c8</color>
<color name="purple_400">#ab47bc</color>
<color name="purple_500">#9c27b0</color>
<color name="purple_600">#8e24aa</color>
<color name="purple_700">#7b1fa2</color>
<color name="purple_800">#6a1b9a</color>
<color name="purple_900">#4a148c</color>
<color name="purple_A100">#ea80fc</color>
<color name="purple_A200">#e040fb</color>
<color name="purple_A400">#d500f9</color>
<color name="purple_A700">#aa00ff</color>
<color name="dark_purple_50">#ede7f6</color>
<color name="dark_purple_100">#d1c4e9</color>
<color name="dark_purple_200">#b39ddb</color>
<color name="dark_purple_300">#9575cd</color>
<color name="dark_purple_400">#7e57c2</color>
<color name="dark_purple_500">#673ab7</color>
<color name="dark_purple_600">#5e35b1</color>
<color name="dark_purple_700">#512da8</color>
<color name="dark_purple_800">#4527a0</color>
<color name="dark_purple_900">#311b92</color>
<color name="dark_purple_A100">#b388ff</color>
<color name="dark_purple_A200">#7c4dff</color>
<color name="dark_purple_A400">#651fff</color>
<color name="dark_purple_A700">#6200ea</color>
<color name="indigo_50">#e8eaf6</color>
<color name="indigo_100">#c5cae9</color>
<color name="indigo_200">#9fa8da</color>
<color name="indigo_300">#7986cb</color>
<color name="indigo_400">#5c6bc0</color>
<color name="indigo_500">#3f51b5</color>
<color name="indigo_600">#3949ab</color>
<color name="indigo_700">#303f9f</color>
<color name="indigo_800">#283593</color>
<color name="indigo_900">#1a237e</color>
<color name="indigo_A100">#8c9eff</color>
<color name="indigo_A200">#536dfe</color>
<color name="indigo_A400">#3d5afe</color>
<color name="indigo_A700">#304ffe</color>
<color name="blue_50">#e3f2fd</color>
<color name="blue_100">#bbdefb</color>
<color name="blue_200">#90caf9</color>
<color name="blue_300">#64b5f6</color>
<color name="blue_400">#42a5f5</color>
<color name="blue_500">#2196f3</color>
<color name="blue_600">#1e88e5</color>
<color name="blue_700">#1976d2</color>
<color name="blue_800">#1565c0</color>
<color name="blue_900">#0d47a1</color>
<color name="blue_A100">#82b1ff</color>
<color name="blue_A200">#448aff</color>
<color name="blue_A400">#2979ff</color>
<color name="blue_A700">#2962ff</color>
<color name="black">#000000</color>
<color name="white">#ffffff</color>
<color name="light_blue_50">#e1f5fe</color>
<color name="light_blue_100">#b3e5fc</color>
<color name="light_blue_200">#81d4fa</color>
<color name="light_blue_300">#4fc3f7</color>
<color name="light_blue_400">#29b6f6</color>
<color name="light_blue_500">#03a9f4</color>
<color name="light_blue_600">#039be5</color>
<color name="light_blue_700">#0288d1</color>
<color name="light_blue_800">#0277bd</color>
<color name="light_blue_900">#01579b</color>
<color name="light_blue_A100">#80d8ff</color>
<color name="light_blue_A200">#40c4ff</color>
<color name="light_blue_A400">#00b0ff</color>
<color name="light_blue_A700">#0091ea</color>
<color name="cyan_50">#e0f7fa</color>
<color name="cyan_100">#b2ebf2</color>
<color name="cyan_200">#80deea</color>
<color name="cyan_300">#4dd0e1</color>
<color name="cyan_400">#26c6da</color>
<color name="cyan_500">#00bcd4</color>
<color name="cyan_600">#00acc1</color>
<color name="cyan_700">#0097a7</color>
<color name="cyan_800">#00838f</color>
<color name="cyan_900">#006064</color>
<color name="cyan_A100">#84ffff</color>
<color name="cyan_A200">#18ffff</color>
<color name="cyan_A400">#00e5ff</color>
<color name="cyan_A700">#00b8d4</color>
<color name="teal_50">#e0f2f1</color>
<color name="teal_100">#b2dfdb</color>
<color name="teal_200">#80cbc4</color>
<color name="teal_300">#4db6ac</color>
<color name="teal_400">#26a69a</color>
<color name="teal_500">#009688</color>
<color name="teal_600">#00897b</color>
<color name="teal_700">#00796b</color>
<color name="teal_800">#00695c</color>
<color name="teal_900">#004d40</color>
<color name="teal_A100">#a7ffeb</color>
<color name="teal_A200">#64ffda</color>
<color name="teal_A400">#1de9b6</color>
<color name="teal_A700">#00bfa5</color>
<color name="green_50">#e8f5e9</color>
<color name="green_100">#c8e6c9</color>
<color name="green_200">#a5d6a7</color>
<color name="green_300">#81c784</color>
<color name="green_400">#66bb6a</color>
<color name="green_500">#4caf50</color>
<color name="green_600">#43a047</color>
<color name="green_700">#388e3c</color>
<color name="green_800">#2e7d32</color>
<color name="green_900">#1b5e20</color>
<color name="green_A100">#b9f6ca</color>
<color name="green_A200">#69f0ae</color>
<color name="green_A400">#00e676</color>
<color name="green_A700">#00c853</color>
<color name="light_green_50">#f1f8e9</color>
<color name="light_green_100">#dcedc8</color>
<color name="light_green_200">#c5e1a5</color>
<color name="light_green_300">#aed581</color>
<color name="light_green_400">#9ccc65</color>
<color name="light_green_500">#8bc34a</color>
<color name="light_green_600">#7cb342</color>
<color name="light_green_700">#689f38</color>
<color name="light_green_800">#558b2f</color>
<color name="light_green_900">#33691e</color>
<color name="light_green_A100">#ccff90</color>
<color name="light_green_A200">#b2ff59</color>
<color name="light_green_A400">#76ff03</color>
<color name="light_green_A700">#64dd17</color>
<color name="lime_50">#f9fbe7</color>
<color name="lime_100">#f0f4c3</color>
<color name="lime_200">#e6ee9c</color>
<color name="lime_300">#dce775</color>
<color name="lime_400">#d4e157</color>
<color name="lime_500">#cddc39</color>
<color name="lime_600">#c0ca33</color>
<color name="lime_700">#afb42b</color>
<color name="lime_800">#9e9d24</color>
<color name="lime_900">#827717</color>
<color name="lime_A100">#f4ff81</color>
<color name="lime_A200">#eeff41</color>
<color name="lime_A400">#c6ff00</color>
<color name="lime_A700">#aeea00</color>
<color name="yellow_50">#fffde7</color>
<color name="yellow_100">#fff9c4</color>
<color name="yellow_200">#fff59d</color>
<color name="yellow_300">#fff176</color>
<color name="yellow_400">#ffee58</color>
<color name="yellow_500">#ffeb3b</color>
<color name="yellow_600">#fdd835</color>
<color name="yellow_700">#fbc02d</color>
<color name="yellow_800">#f9a825</color>
<color name="yellow_900">#f57f17</color>
<color name="yellow_A100">#ffff8d</color>
<color name="yellow_A200">#ffff00</color>
<color name="yellow_A400">#ffea00</color>
<color name="yellow_A700">#ffd600</color>
<color name="amber_50">#fff8e1</color>
<color name="amber_100">#ffecb3</color>
<color name="amber_200">#ffe082</color>
<color name="amber_300">#ffd54f</color>
<color name="amber_400">#ffca28</color>
<color name="amber_500">#ffc107</color>
<color name="amber_600">#ffb300</color>
<color name="amber_700">#ffa000</color>
<color name="amber_800">#ff8f00</color>
<color name="amber_900">#ff6f00</color>
<color name="amber_A100">#ffe57f</color>
<color name="amber_A200">#ffd740</color>
<color name="amber_A400">#ffc400</color>
<color name="amber_A700">#ffab00</color>
<color name="orange_50">#fff3e0</color>
<color name="orange_100">#ffe0b2</color>
<color name="orange_200">#ffcc80</color>
<color name="orange_300">#ffb74d</color>
<color name="orange_400">#ffa726</color>
<color name="orange_500">#ff9800</color>
<color name="orange_600">#fb8c00</color>
<color name="orange_700">#f57c00</color>
<color name="orange_800">#ef6c00</color>
<color name="orange_900">#e65100</color>
<color name="orange_A100">#ffd180</color>
<color name="orange_A200">#ffab40</color>
<color name="orange_A400">#ff9100</color>
<color name="orange_A700">#ff6d00</color>
<color name="deep_orange_50">#fbe9e7</color>
<color name="deep_orange_100">#ffccbc</color>
<color name="deep_orange_200">#ffab91</color>
<color name="deep_orange_300">#ff8a65</color>
<color name="deep_orange_400">#ff7043</color>
<color name="deep_orange_500">#ff5722</color>
<color name="deep_orange_600">#f4511e</color>
<color name="deep_orange_700">#e64a19</color>
<color name="deep_orange_800">#d84315</color>
<color name="deep_orange_900">#bf360c</color>
<color name="deep_orange_A100">#ff9e80</color>
<color name="deep_orange_A200">#ff6e40</color>
<color name="deep_orange_A400">#ff3d00</color>
<color name="deep_orange_A700">#dd2c00</color>
<color name="brown_50">#efebe9</color>
<color name="brown_100">#d7ccc8</color>
<color name="brown_200">#bcaaa4</color>
<color name="brown_300">#a1887f</color>
<color name="brown_400">#8d6e63</color>
<color name="brown_500">#795548</color>
<color name="brown_600">#6d4c41</color>
<color name="brown_700">#5d4037</color>
<color name="brown_800">#4e342e</color>
<color name="brown_900">#3e2723</color>
<color name="grey_50">#fafafa</color>
<color name="grey_100">#f5f5f5</color>
<color name="grey_200">#eeeeee</color>
<color name="grey_300">#e0e0e0</color>
<color name="grey_400">#bdbdbd</color>
<color name="grey_500">#9e9e9e</color>
<color name="grey_600">#757575</color>
<color name="grey_700">#616161</color>
<color name="grey_800">#424242</color>
<color name="grey_900">#212121</color>
<color name="blue_grey_50">#eceff1</color>
<color name="blue_grey_100">#cfd8dc</color>
<color name="blue_grey_200">#b0bec5</color>
<color name="blue_grey_300">#90a4ae</color>
<color name="blue_grey_400">#78909c</color>
<color name="blue_grey_500">#607d8b</color>
<color name="blue_grey_600">#546e7a</color>
<color name="blue_grey_700">#455a64</color>
<color name="blue_grey_800">#37474f</color>
<color name="blue_grey_900">#263238</color>
<color name="black">#000000</color>
<color name="black_dividers">#1f000000</color>
<color name="black_text_disabled">#42000000</color>
<color name="black_text_secondary">#8a000000</color>
<color name="black_text">#de000000</color>
<color name="white">#ffffff</color>
<color name="white_dividers">#1fffffff</color>
<color name="white_text_disabled">#4dffffff</color>
<color name="white_text_secondary">#b3ffffff</color>
<color name="white_text">#ffffff</color>
</resources>

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

@ -13,15 +13,10 @@
<string name="action_tag_editor">Tag Editor</string>
<string name="action_delete_from_disk">Delete from disk</string>
<string name="action_details">Details</string>
<string name="action_go_to">Go to…</string>
<string name="albums">Albums</string>
<string name="artists">Artists</string>
<string name="genres">Genres</string>
<string name="songs">Songs</string>
<string name="playlists">Playlists</string>
<string name="unknown_artist">Unknown Artist</string>
<string name="unknown_album">Unknown Album</string>
<string name="untitled_song">Untitled Song</string>
<string name="nothing_playing">Nothing is playing</string>
<string name="unplayable_file">Sorry - an error occurred while attempting to play this song</string>
<string name="biography_unavailable">Sorry, we were not able to find a matching biography for this artist.</string>
@ -29,7 +24,6 @@
<string name="audio_focus_denied">We were not able to gain audio focus.</string>
<string name="title_activity_tag_editor">Tag editor</string>
<string name="tag_editor">Tag editor</string>
<string name="song">Song</string>
<string name="album">Album</string>
<string name="artist">Artist</string>
<string name="genre">Genre</string>
@ -49,24 +43,17 @@
<string name="label_track_length">Length</string>
<string name="label_bit_rate">Bitrate</string>
<string name="label_sampling_rate">Sampling rate</string>
<string name="ok">OK</string>
<string name="action_go_to_artist">Go to artist</string>
<string name="action_go_to_album">Go to album</string>
<string name="label_current_playing_queue">Playing queue</string>
<string name="close">Close</string>
<string name="save_as_playlist">Save as playlist</string>
<string name="credits_3">Icon by</string>
<string name="credits_1">Gramophone is a completely free material designed music player by</string>
<string name="title_activity_search">Search</string>
<string name="more">more</string>
<string name="no_results">No results</string>
<string name="action_re_download_artist_image">Update artist image</string>
<string name="updated_artist_image_for">Updated artist image for</string>
<string name="updating">Updating…</string>
<string name="loading">Loading…</string>
<string name="added_title_to_playing_queue">Added 1 title to the playing queue.</string>
<string name="added_titles_to_playing_queue_1">Added\u0020</string>
<string name="added_titles_to_playing_queue_2">\u0020titles to the playing queue.</string>
<string name="title_activity_playlist_detail">Playlist Activity</string>
<string name="action_delete_from_playlist">Delete from playlist</string>
<string name="inserted_titles_to_playlist_1">Added\u0020</string>
@ -74,7 +61,6 @@
<string name="action_new_playlist">New playlist</string>
<string name="action_grid_columns">Grid columns</string>
<string name="action_grid_columns_land">Grid columns (Land)</string>
<string name="cancel">Cancel</string>
<string name="created_playlist">Created playlist\u0020</string>
<string name="deleted_playlist">Deleted playlist\u0020</string>
<string name="create_playlist_failed">Could not create playlist\u0020</string>
@ -85,7 +71,6 @@
<string name="delete_warning">"Warning: This operation can not be undone."</string>
<string name="shuffle_all">Shuffle all</string>
<string name="last_opened">Last opened</string>
<string name="title_setting_start_page">Start page</string>
<string name="light_theme_name">Light</string>
<string name="dark_theme_name">Dark</string>
<string name="equalizer">Equalizer</string>
@ -106,4 +91,11 @@
<string name="navigation_drawer_close">Close navigation drawer</string>
<string name="delete">delete</string>
<string name="select">Select</string>
<string name="default_str">Default</string>
<string name="primary_color">Primary Color</string>
<string name="accent_color">Accent Color</string>
<string name="primary_color_desc">The primary theme color, defaults to indigo.</string>
<string name="accent_color_desc">The accent theme color, defaults to pink.</string>
</resources>

14
app/src/main/res/values/styles.xml
View file

@ -1,16 +1,12 @@
<resources>
<style name="Theme.MaterialMusic" parent="Theme.MaterialMusic.Base">
<style name="Theme.MaterialMusic" parent="Theme.MaterialMusic.Base" />
</style>
<style name="Theme.MaterialMusic.Light" parent="Theme.MaterialMusic.Base.Light" />
<style name="Theme.MaterialMusic.Light" parent="Theme.MaterialMusic.Base.Light">
<style name="Theme.MaterialMusic.Notification" parent="@android:style/TextAppearance.StatusBar.EventContent" />
</style>
<style name="Theme.MaterialMusic.Notification" parent="@android:style/TextAppearance.StatusBar.EventContent"/>
<style name="Theme.MaterialMusic.Notification.Title" parent="@android:style/TextAppearance.StatusBar.EventContent.Title"/>
<style name="Theme.MaterialMusic.Notification.Title" parent="@android:style/TextAppearance.StatusBar.EventContent.Title" />
<style name="OverFlowButton">
<item name="android:tint">?themed_drawable_color</item>
@ -33,7 +29,7 @@
</style>
<style name="PlayPauseFab" parent="PlayPauseFabParent"/>
<style name="PlayPauseFab" parent="PlayPauseFabParent" />
<style name="NotificationButton" parent="NotificationButtonParent">
<item name="android:background">?android:attr/selectableItemBackground</item>

30
app/src/main/res/values/styles_parents.xml
View file

@ -2,6 +2,8 @@
<resources>
<style name="Theme.MaterialMusic.Base" parent="Theme.AppCompat.NoActionBar">
<item name="md_dark_theme">true</item>
<item name="android:windowActionBarOverlay">true</item>
<item name="windowActionBarOverlay">true</item>
@ -15,29 +17,34 @@
<item name="title_text_color">?android:attr/textColorPrimary</item>
<item name="caption_text_color">?android:attr/textColorSecondary</item>
<item name="music_controller_container_color">@color/materialmusic_dark_music_controller_container_color</item>
<item name="navigation_drawer_background_color">@color/materialmusic_dark_navigation_drawer_background_color</item>
<item name="music_controller_container_color">
@color/materialmusic_dark_music_controller_container_color
</item>
<item name="navigation_drawer_background_color">
@color/materialmusic_dark_navigation_drawer_background_color
</item>
<item name="list_selector">@drawable/list_selector_dark</item>
<item name="round_selector">@drawable/round_selector_dark</item>
<item name="rect_selector">@drawable/rect_selector_dark</item>
<item name="separator_color">@color/materialmusic_dark_separator_color</item>
<item name="inset_divider">@color/md_divider_white</item>
<item name="nav_drawer_icon_color">#fff</item>
<item name="themed_drawable_color">@color/materialmusic_dark_themed_drawable_color</item>
<item name="themed_drawable_activated_color">@color/materialmusic_dark_themed_drawable_activated_color</item>
<item name="default_bar_color">@color/materialmusic_dark_default_bar_color</item>
<item name="card_color">@color/materialmusic_dark_default_bar_color</item>
<item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat</item>
<item name="md_dark_theme">true</item>
</style>
<style name="Theme.MaterialMusic.Base.Light" parent="Theme.AppCompat.Light.NoActionBar">
<item name="android:windowActionBarOverlay">true</item>
<item name="windowActionBarOverlay">true</item>
<item name="md_dark_theme">false</item>
<item name="colorPrimary">@color/materialmusic_color</item>
<item name="colorPrimaryDark">@color/materialmusic_color_darker</item>
@ -49,23 +56,28 @@
<item name="title_text_color">?android:attr/textColorPrimary</item>
<item name="caption_text_color">?android:attr/textColorSecondary</item>
<item name="music_controller_container_color">@color/materialmusic_music_controller_container_color</item>
<item name="navigation_drawer_background_color">@color/materialmusic_navigation_drawer_background_color</item>
<item name="music_controller_container_color">
@color/materialmusic_music_controller_container_color
</item>
<item name="navigation_drawer_background_color">
@color/materialmusic_navigation_drawer_background_color
</item>
<item name="list_selector">@drawable/list_selector</item>
<item name="round_selector">@drawable/round_selector</item>
<item name="rect_selector">@drawable/rect_selector</item>
<item name="separator_color">@color/materialmusic_separator_color</item>
<item name="inset_divider">@color/md_divider_black</item>
<item name="nav_drawer_icon_color">#000</item>
<item name="themed_drawable_color">@color/materialmusic_themed_drawable_color</item>
<item name="themed_drawable_activated_color">@color/materialmusic_themed_drawable_activated_color</item>
<item name="default_bar_color">@color/materialmusic_default_bar_color</item>
<item name="card_color">@color/white</item>
<item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Light</item>
<item name="md_dark_theme">false</item>
</style>
<style name="PlayPauseFabParent">

2
app/src/main/res/values/values.xml
View file

@ -4,6 +4,4 @@
<string name="transition_fab">fab_transition</string>
<string name="transition_album_text">album_text_transition</string>
<string name="transition_artist_image">artist_image_transition</string>
<string name="transition_artist_text">artist_text_transition</string>
<string name="DEV_TAG">kabouzeid</string>
</resources>