doc

app/src/main/java/net/DeltaWings/Android/Hangman/GameActivity.java

@@ -4,7 +4,9 @@ import android.animation.ObjectAnimator;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
@@ -55,8 +57,16 @@ public class GameActivity extends AppCompatActivity {
 
 		log("Logs");
 
-		gameUtil = new GameUtil();
+		SharedPreferences sharedPref=getPreferences(Context.MODE_PRIVATE);
+		String userName= sharedPref.getString("settting_difficulty", "0");
+
+		gameUtil = new GameUtil( Integer.parseInt(userName));
 		word.setText(TextUtils.join("", gameUtil.getUndescores()));
+		new Command().execute("LEADING|A");
+		new Command().execute("LAGGING|A");
+		new Command().execute("COULEUR|J");
+		new Command().execute("AFFICHER|"+TextUtils.join("", gameUtil.getUndescores()));
+
 
 		ActionBar actionBar = getSupportActionBar();
 		if (actionBar != null) {

app/src/main/java/net/DeltaWings/Android/Hangman/MainActivity.java

@@ -47,7 +47,7 @@ public class MainActivity extends AppCompatActivity {
 
 	    super.onCreate(savedInstanceState);
 
-	    if(getPref("setting_theme", this.getApplicationContext()) != "Color") {
+	    if(getPref("setting_theme", MainActivity.getInstance()) != "Color") {
 	    	setPref("setting_theme", "Color", this.getApplicationContext());
 	    }
 
@@ -68,7 +68,7 @@ public class MainActivity extends AppCompatActivity {
 		    @Override
 		    public void onClick(View v) {
 			    new Command().execute("AFFICHER|test");
-			    Toast.makeText(instance, getPref("setting_theme", getApplicationContext()), Toast.LENGTH_LONG).show();
+			    Toast.makeText(instance, getPref("setting_theme", MainActivity.getInstance()), Toast.LENGTH_LONG).show();
 		    }
 	    });
 
@@ -107,12 +107,12 @@ public class MainActivity extends AppCompatActivity {
 		editor.apply();
 	}
 
-	public static String getPref(String key, Context context) {
-		SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
-		return preferences.getString(key, null);
+	public static String getPref(String key, Activity context) {
+		SharedPreferences sharedPref=context.getPreferences(Context.MODE_PRIVATE);
+		return sharedPref.getString(key, "pokemon");
 	}
 
 	public static void setTheme(Activity activity) {
-		activity.setTheme(activity.getResources().getIdentifier("DeltaWings."+getPref("setting_theme", activity.getApplicationContext()), "style", activity.getPackageName()));
+		activity.setTheme(activity.getResources().getIdentifier("DeltaWings."+getPref("setting_theme", MainActivity.getInstance()), "style", activity.getPackageName()));
 	}
 }

app/src/main/java/net/DeltaWings/Android/Hangman/Util/GameUtil.java

@@ -10,6 +10,7 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Objects;
 import java.util.Random;
@@ -20,9 +21,22 @@ public class GameUtil {
 	private ArrayList<String> res = new ArrayList<>();
 	private ArrayList<String> letters = new ArrayList<>();
 	private HashMap<String, String> returning = new HashMap<>();
+	private Integer difficulty;
 	private String tag = "GameUtil";
+	private String[][] replacements = {
+			{"é", "e"},
+			{"è", "e"},
+			{"ê", "e"},
+			{"î", "i"},
+			{"ï", "i"},
+			{"à", "a"},
+			{"ç", "c"}
+	};
+	private String excluded = "aeyuio";
+	private String accentexcluded = "âäàéèïî";
 
-	public GameUtil() {
+	public GameUtil(Integer difficulty) {
+		this.difficulty = difficulty;
 		//Generate Word
 
 		ArrayList<String> list = new ArrayList<>();
@@ -61,21 +75,38 @@ public class GameUtil {
 
 
 
+		for (String lett: word.split("")) {
+			Log.v(tag, lett);
+			if(difficulty == 0 && (excluded.contains(lett) || accentexcluded.contains(lett))) {
+				res.add(lett);
+				Log.v(tag, "excluded || accentexcluded");
 
+			}
+			else {
+				Log.v(tag, "other");
 
-		for (int i = 0; i < word.length(); i++) {
-			res.add("_");
+				res.add("_");
+			}
 		}
 
 		Log.v(tag, res.toString());
 	}
 
 	public boolean checkLetter(String letter) {
+		/*if(difficulty == 1) {
+			for(String[] replacement: replacements) {
+				Log.v(tag, Arrays.toString(replacement));
+				letter = letter.replace(replacement[0], replacement[1]);
+			}
+		}*/
 		if(this.word.contains(letter)) {
 			Log.v(tag, "Letter Found !");
 			for (int i = 0; i < this.word.length(); i++) {
 				if(String.valueOf(this.word.charAt(i)).equals(letter)) {
-					res.set(i, letter);
+					Log.v(tag, i +"");
+					Log.v(tag, letter);
+					Log.v(tag, String.valueOf(this.word.charAt(i)));
+					res.set(i+1, letter);
 				}
 			}
 			return true;

app/src/main/res/values/arrays.xml

@@ -5,9 +5,9 @@
         Settings
     -->
     <string-array name="setting_difficulty">
-        <item name="easy">easy</item>
-        <item name="normal">normal</item>
-        <item name="hard">hard</item>
+        <item name="0">easy</item>
+        <item name="1">normal</item>
+        <item name="2">hard</item>
     </string-array>
     <string-array name="theme">
         <item name="color">Color</item>

app/src/main/res/values/strings.xml

@@ -23,11 +23,11 @@
     <string name="setting_general_ip">Select the server IP</string>
     <string name="setting_general_port">Select the server port</string>
 
+    <string name="setting_general_difficulty">Difficulty</string>
+
     <string name="setting_single_title">Singleplayer</string>
     <string name="setting_single_desc">Singleplayer Configuration</string>
 
-    <string name="setting_single_difficulty">Difficulty</string>
-
     <string name="setting_multi_title">Multiplayer</string>
     <string name="setting_multi_desc">Multiplayer Configuration</string>
 

app/src/main/res/xml/settings_general.xml

@@ -18,4 +18,10 @@
         android:selectAllOnFocus="true"
         android:singleLine="true"
         android:title="@string/setting_general_port"/>
+    <ListPreference
+        android:defaultValue="0"
+        android:entries="@array/setting_difficulty"
+        android:entryValues="@array/setting_difficulty"
+        android:key="setting_difficulty"
+        android:title="@string/setting_general_difficulty"/>
 </PreferenceScreen>

app/src/main/res/xml/settings_singleplayer.xml

@@ -5,5 +5,5 @@
         android:entries="@array/setting_difficulty"
         android:entryValues="@array/setting_difficulty"
         android:key="setting_difficulty"
-        android:title="@string/setting_single_difficulty"/>
+        android:title="@string/setting_general_difficulty"/>
 </PreferenceScreen>