From d422a05e8da4b1acadae6db41e6e6faf0f0a21a6 Mon Sep 17 00:00:00 2001
From: Xorok <TIE16390@spengergasse.at>
Date: Thu, 9 Mar 2017 23:29:00 +0100
Subject: [PATCH] Adapt names to naming convention

---
 .../shortcuttype/LastAddedShortcutType.java          |  4 ++--
 .../shortcuttype/ShuffleAllShortcutType.java         |  4 ++--
 .../shortcuttype/TopTracksShortcutType.java          |  4 ++--
 app/src/main/res/values/strings.xml                  | 12 ++++++------
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/kabouzeid/gramophone/appshortcuts/shortcuttype/LastAddedShortcutType.java b/app/src/main/java/com/kabouzeid/gramophone/appshortcuts/shortcuttype/LastAddedShortcutType.java
index 05de9ede..af638e68 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/appshortcuts/shortcuttype/LastAddedShortcutType.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/appshortcuts/shortcuttype/LastAddedShortcutType.java
@@ -20,8 +20,8 @@ public final class LastAddedShortcutType extends BaseShortcutType {
 
     public ShortcutInfo getShortcutInfo() {
         return new ShortcutInfo.Builder(mContext, ID_PREFIX + "last_added")
-                .setShortLabel(mContext.getString(R.string.appshortcut_lastadded_short))
-                .setLongLabel(mContext.getString(R.string.appshortcut_lastadded_long))
+                .setShortLabel(mContext.getString(R.string.app_shortcut_last_added_short))
+                .setLongLabel(mContext.getString(R.string.app_shortcut_last_added_long))
                 .setIcon(Icon.createWithResource(mContext, R.drawable.ic_app_shortcut_last_added))
                 .setIntent(getPlaySongsIntent(AppShortcutLauncherActivity.ShortcutType.LAST_ADDED))
                 .build();
diff --git a/app/src/main/java/com/kabouzeid/gramophone/appshortcuts/shortcuttype/ShuffleAllShortcutType.java b/app/src/main/java/com/kabouzeid/gramophone/appshortcuts/shortcuttype/ShuffleAllShortcutType.java
index fac2c656..4b36de6b 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/appshortcuts/shortcuttype/ShuffleAllShortcutType.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/appshortcuts/shortcuttype/ShuffleAllShortcutType.java
@@ -20,8 +20,8 @@ public final class ShuffleAllShortcutType extends BaseShortcutType {
 
     public ShortcutInfo getShortcutInfo() {
         return new ShortcutInfo.Builder(mContext, ID_PREFIX + "shuffle_all")
-                .setShortLabel(mContext.getString(R.string.appshortcut_shuffleall_short))
-                .setLongLabel(mContext.getString(R.string.appshortcut_shuffleall_long))
+                .setShortLabel(mContext.getString(R.string.app_shortcut_shuffle_all_short))
+                .setLongLabel(mContext.getString(R.string.app_shortcut_shuffle_all_long))
                 .setIcon(Icon.createWithResource(mContext, R.drawable.ic_app_shortcut_shuffle_all))
                 .setIntent(getPlaySongsIntent(AppShortcutLauncherActivity.ShortcutType.SHUFFLE_ALL))
                 .build();
diff --git a/app/src/main/java/com/kabouzeid/gramophone/appshortcuts/shortcuttype/TopTracksShortcutType.java b/app/src/main/java/com/kabouzeid/gramophone/appshortcuts/shortcuttype/TopTracksShortcutType.java
index 5bd55f05..5a77768e 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/appshortcuts/shortcuttype/TopTracksShortcutType.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/appshortcuts/shortcuttype/TopTracksShortcutType.java
@@ -20,8 +20,8 @@ public final class TopTracksShortcutType extends BaseShortcutType {
 
     public ShortcutInfo getShortcutInfo() {
         return new ShortcutInfo.Builder(mContext, ID_PREFIX + "top_tracks")
-                .setShortLabel(mContext.getString(R.string.appshortcut_toptracks_short))
-                .setLongLabel(mContext.getString(R.string.appshortcut_toptracks_long))
+                .setShortLabel(mContext.getString(R.string.app_shortcut_top_tracks_short))
+                .setLongLabel(mContext.getString(R.string.app_shortcut_top_tracks_long))
                 .setIcon(Icon.createWithResource(mContext, R.drawable.ic_app_shortcut_top_tracks))
                 .setIntent(getPlaySongsIntent(AppShortcutLauncherActivity.ShortcutType.TOP_TRACKS))
                 .build();
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b550ce35..e0d40984 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -277,14 +277,14 @@
     <string name="you_will_be_forwarded_to_the_issue_tracker_website">You will be forwarded to the issue tracker website.</string>
     
     <!-- App Shortcuts -->
-    <string name="appshortcut_shuffleall_long">@string/action_shuffle_all</string>
-    <string name="appshortcut_shuffleall_short">Shuffle</string>
+    <string name="app_shortcut_shuffle_all_long">@string/action_shuffle_all</string>
+    <string name="app_shortcut_shuffle_all_short">Shuffle</string>
 
-    <string name="appshortcut_toptracks_long">@string/my_top_tracks</string>
-    <string name="appshortcut_toptracks_short">Top Tracks</string> 
+    <string name="app_shortcut_top_tracks_long">@string/my_top_tracks</string>
+    <string name="app_shortcut_top_tracks_short">Top Tracks</string>
     
-    <string name="appshortcut_lastadded_long">@string/last_added</string>
-    <string name="appshortcut_lastadded_short">@string/last_added</string>
+    <string name="app_shortcut_last_added_long">@string/last_added</string>
+    <string name="app_shortcut_last_added_short">@string/last_added</string>
 
     <string name="error_launching_shortcut">Error launching shortcut.</string>
 </resources>