Update preferences

Add config option for game referee
Change default value of channel
Move setting default prefs to main

diff --git a/res/xml/prefs.xml b/res/xml/prefs.xml
index e371c0ac2975dcc7fbce9a9808106796d58ef997..394fd8691ca9a3cecf97a69a6f1dcbe27219e55d 100644 (file)
--- a/res/xml/prefs.xml
+++ b/res/xml/prefs.xml
@@ -26,7 +26,12 @@
                        android:key="pref_channel"
                        android:summary="IRC Channel to Join"
                        android:title="Channel"
-                       android:defaultValue="#rhtest" />
+                       android:defaultValue="#rhspades" />
+               <EditTextPreference
+                       android:key="pref_referee"
+                       android:summary="Name of the bot hosting the game"
+                       android:title="Referee"
+                       android:defaultValue="rhawk" />
        </PreferenceCategory>
        <PreferenceCategory
                android:title="Authentication settings"

diff --git a/src/org/pileus/spades/Main.java b/src/org/pileus/spades/Main.java
index f85e06fccb3947c56345028187313ee81c84ddd1..07c4ace6cd3a6af9804103ca5e063b4be2d66fd2 100644 (file)
--- a/src/org/pileus/spades/Main.java
+++ b/src/org/pileus/spades/Main.java
@@ -5,6 +5,7 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Messenger;
+import android.preference.PreferenceManager;
 import android.text.Html;
 import android.text.method.ScrollingMovementMethod;
 import android.text.format.DateFormat;
@@ -217,6 +218,9 @@ public class Main extends Activity
                        super.onCreate(savedInstanceState);
                        Os.debug("Main: onCreate");
 
+                       // Setup preferences
+                       PreferenceManager.setDefaultValues(this, R.xml.prefs, false);
+
                        // Setup main layout
                        this.setContentView(R.layout.main);
 
@@ -257,7 +261,9 @@ public class Main extends Activity
                                        .setContent(R.id.debug));
 
                        // Setup Spades game and cards view
-                       this.game  = new Spades("rhawk");
+                       this.game  = new Spades(PreferenceManager
+                                       .getDefaultSharedPreferences(this)
+                                       .getString("pref_referee", "rhawk"));
                        this.cards = new Cards(this);
 
                        this.game.cards = this.cards;

diff --git a/src/org/pileus/spades/Task.java b/src/org/pileus/spades/Task.java
index 8d1c3b4f7fadd8a3099415f19b10507e4e3c7a73..a606d90c1add51b75f019bd77ae988a27dcc1bf3 100644 (file)
--- a/src/org/pileus/spades/Task.java
+++ b/src/org/pileus/spades/Task.java
@@ -195,7 +195,6 @@ public class Task extends Service implements Runnable
                this.lock   = new ReentrantLock();
                this.client = new Client();
                this.prefs  = PreferenceManager.getDefaultSharedPreferences(this);
-               PreferenceManager.setDefaultValues(this, R.xml.prefs, false);
        }
 
        @Override