From 592a56972eeb35b348e1df2ce26a63f826176374 Mon Sep 17 00:00:00 2001
From: Pedro Diaz <pdiazper@ucab.edu.ve>
Date: Tue, 27 Sep 2016 09:10:45 -0400
Subject: [PATCH] Now vibration is removed without losing the head up

---
 .../feature/encounter/EncounterNotification.java       |  6 +++---
 .../module/feature/encounter/EncounterPokemon.java     | 10 ++++++----
 app/src/main/res/values/strings.xml                    |  6 +++---
 3 files changed, 12 insertions(+), 10 deletions(-)

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
index c51fc80..01ec47e 100644
--- 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
@@ -70,10 +70,10 @@ void show(int pokemonNumber, String pokemonName, double iv, int attack, int defe
 					getLargeIconHeight(),
 					false
 				))
-				.setContentTitle(mContext.getString(R.string.notification_title, pokemonName))
-				.setContentText(mContext.getString(R.string.notification_content, iv, attack, defense, stamina, cp, level, hp))
+				.setContentTitle(mContext.getString(R.string.notification_title, pokemonName, cp, hp, level))
+				.setContentText(mContext.getString(R.string.notification_content, iv, attack, defense, stamina))
 				.setStyle(new NotificationCompat.InboxStyle()
-					.addLine(mContext.getString(R.string.notification_categoty_stats_content, iv, attack, defense, stamina, cp, level, hp))
+					.addLine(mContext.getString(R.string.notification_categoty_stats_content, iv, attack, defense, stamina))
 					.addLine(getBoldSpannable(mContext.getString(R.string.notification_categoty_moves_title)))
 					.addLine(mContext.getString(R.string.notification_categoty_moves_content, move1, move2))
 					.addLine(getBoldSpannable(mContext.getString(R.string.notification_categoty_catch_title)))
diff --git a/app/src/main/java/com/icecream/snorlax/module/feature/encounter/EncounterPokemon.java b/app/src/main/java/com/icecream/snorlax/module/feature/encounter/EncounterPokemon.java
index 5a707b2..3d37d07 100644
--- a/app/src/main/java/com/icecream/snorlax/module/feature/encounter/EncounterPokemon.java
+++ b/app/src/main/java/com/icecream/snorlax/module/feature/encounter/EncounterPokemon.java
@@ -37,10 +37,12 @@ int getNumber() {
 	String getName() {
 		StringBuilder builder = new StringBuilder();
 		for (String part : mPokemon.getPokemonId().name().split("_")) {
-			builder
-				.append(part.charAt(0))
-				.append(part.substring(1).toLowerCase(Locale.US))
-				.append(" ");
+			if (!part.equalsIgnoreCase("male") && !part.equalsIgnoreCase("female")) {
+				builder
+					.append(part.charAt(0))
+					.append(part.substring(1).toLowerCase(Locale.US))
+					.append(" ");
+			}
 		}
 		return builder.toString().trim();
 	}
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 940c918..8575c84 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -15,11 +15,11 @@
 	<string name="error_xposed_missing">Install xposed to use Snorlax</string>
 	<string name="error_pokemon_missing">Install Pokemon Go to launch it</string>
 
-	<string name="notification_title">%1$s has appeared!</string>
-	<string name="notification_content">IV %1$4.1f%% %2$d/%3$d/%4$d - CP %5$d - LV %6$3.1f - HP %7$d</string>
+	<string name="notification_title">%1$s (CP %2$d HP %3$d) LV %4$3.1f</string>
+	<string name="notification_content">%1$4.1f%% [A/D/S %2$d/%3$d/%4$d]</string>
 
 	<string name="notification_categoty_stats_title">Stats</string>
-	<string name="notification_categoty_stats_content">IV %1$4.1f%% %2$d/%3$d/%4$d - CP %5$d - LV %6$3.1f - HP %7$d</string>
+	<string name="notification_categoty_stats_content">%1$4.1f%% [A/D/S %2$d/%3$d/%4$d]</string>
 
 	<string name="notification_categoty_moves_title">Moves</string>
 	<string name="notification_categoty_moves_content">%1$s - %2$s</string>