- Removed notification vibration

- Minor text fixes - Removed "fast" from pokemon first move
igoticecream · Sep 27, 2016 · f33e724 · f33e724
1 parent ca6aa02
commit f33e724
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/app/src/main/java/com/icecream/snorlax/module/feature/encounter/Encounter.java b/app/src/main/java/com/icecream/snorlax/module/feature/encounter/Encounter.java
@@ -64,10 +64,12 @@ public final class Encounter implements Feature {
 	private String formatMove(String move) {
 		StringBuilder builder = new StringBuilder();
 		for (String part : move.split("_")) {
-			builder
-				.append(part.charAt(0))
-				.append(part.substring(1).toLowerCase(Locale.US))
-				.append(" ");
+			if (!part.equalsIgnoreCase("fast")) {
+				builder
+					.append(part.charAt(0))
+					.append(part.substring(1).toLowerCase(Locale.US))
+					.append(" ");
+			}
 		}
 		return builder.toString().trim();
 	}

diff --git a/app/src/main/java/com/icecream/snorlax/module/feature/encounter/EncounterNotification.java b/app/src/main/java/com/icecream/snorlax/module/feature/encounter/EncounterNotification.java
@@ -83,7 +83,7 @@ void show(int pokemonNumber, String pokemonName, double iv, int attack, int defe
 				)
 				.setColor(ContextCompat.getColor(mContext, R.color.red_700))
 				.setAutoCancel(true)
-				.setVibrate(new long[]{0, 60, 300, 60})
+				//.setVibrate(new long[]{0, 60, 300, 60})
 				.setPriority(Notification.PRIORITY_MAX)
 				.setCategory(NotificationCompat.CATEGORY_ALARM)
 				.build();

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -37,7 +37,7 @@
 	<string name="preference_encounter_notification">Encounter Notifications</string>
 	<string name="preference_encounter_notification_enable_key">encounter_notification_key</string>
 	<string name="preference_encounter_notification_enable_title">Enable encounter notifications</string>
-	<string name="preference_encounter_notification_enable_summary">Show encountered encounterPokemon stats via system notification</string>
+	<string name="preference_encounter_notification_enable_summary">Show encounter pokemons stats via system notification</string>
 
 	<string name="preference_catch_notification">Catch Notifications</string>
 	<string name="preference_catch_notification_enable_key">catch_notification_key</string>