remove "sample" files, fix classpath.

[FreeShisen] / src / de / cwde / shisensho / ShisenShoActivity.java

diff --git a/src/de/cwde/shisensho/ShisenShoActivity.java b/src/de/cwde/shisensho/ShisenShoActivity.java
index b87979f755a3e74c4640b72b44cf8948f65db61a..43753652ac467cce68bedcb815a1fa35aa218908 100644 (file)
--- a/src/de/cwde/shisensho/ShisenShoActivity.java
+++ b/src/de/cwde/shisensho/ShisenShoActivity.java
@@ -1,7 +1,5 @@
 package de.cwde.shisensho;
 
 package de.cwde.shisensho;
 

-import de.cwde.shisensho.R;
-

 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.Intent;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.Intent;


@@ -9,6 +7,7 @@ import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.os.Bundle;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.os.Bundle;

+import android.preference.PreferenceManager;

 import android.text.SpannableString;
 import android.text.util.Linkify;
 import android.view.Menu;
 import android.text.SpannableString;
 import android.text.util.Linkify;
 import android.view.Menu;


@@ -22,24 +21,26 @@ public class ShisenShoActivity extends Activity {
        private ShisenShoView view;
 
        /** Called when the activity is first created. */
        private ShisenShoView view;
 
        /** Called when the activity is first created. */

-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
+       @Override
+       public void onCreate(Bundle savedInstanceState) {
+               super.onCreate(savedInstanceState);

 
 

-        requestWindowFeature(Window.FEATURE_NO_TITLE);
-        //getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
-        //             WindowManager.LayoutParams.FLAG_FULLSCREEN);
+               PreferenceManager.setDefaultValues(this, R.xml.preferences, false);

 
 

-        view = ShisenSho.app().getView();
-        ShisenSho.app().activity = this;
-        setContentView(view);
-    }
+               requestWindowFeature(Window.FEATURE_NO_TITLE);
+               //getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
+               //              WindowManager.LayoutParams.FLAG_FULLSCREEN);
+
+               view = ShisenSho.app().getView();
+               ShisenSho.app().activity = this;
+               setContentView(view);
+       }

 
        @Override
        protected void onDestroy() {
                ViewGroup vg = (ViewGroup)(view.getParent());
                vg.removeView(view);
 
        @Override
        protected void onDestroy() {
                ViewGroup vg = (ViewGroup)(view.getParent());
                vg.removeView(view);

-        ShisenSho.app().activity = null;
+               ShisenSho.app().activity = null;

                super.onDestroy();
        }
 
                super.onDestroy();
        }
 


@@ -61,58 +62,58 @@ public class ShisenShoActivity extends Activity {
 
        @Override
        public boolean onCreateOptionsMenu(Menu menu) {
 
        @Override
        public boolean onCreateOptionsMenu(Menu menu) {

-           MenuInflater inflater = getMenuInflater();
-           inflater.inflate(R.menu.menu, menu);
-           return true;
+               MenuInflater inflater = getMenuInflater();
+               inflater.inflate(R.menu.menu, menu);
+               return true;

        }
 
        @Override
        public boolean onOptionsItemSelected(MenuItem item) {
        }
 
        @Override
        public boolean onOptionsItemSelected(MenuItem item) {

-           // Handle item selection
-           switch (item.getItemId()) {
-           case R.id.hint:
-           case R.id.undo:
-           case R.id.clean:
-               return view.onOptionsItemSelected(item);
-           case R.id.options:
-               startActivityForResult(new Intent("de.cwde.shisensho.SETTINGS", null), 0);
-               return true;
-           case R.id.about:
-               onAboutActivate();
-               return true;
-           default:
-               return super.onOptionsItemSelected(item);
-           }
+               // Handle item selection
+               switch (item.getItemId()) {
+               case R.id.hint:
+               case R.id.undo:
+               case R.id.clean:
+                       return view.onOptionsItemSelected(item);
+               case R.id.options:
+                       startActivityForResult(new Intent("de.cwde.shisensho.SETTINGS", null), 0);
+                       return true;
+               case R.id.about:
+                       onAboutActivate();
+                       return true;
+               default:
+                       return super.onOptionsItemSelected(item);
+               }

        }
 
        private void onAboutActivate() {
        }
 
        private void onAboutActivate() {

-        // Try to load the a package matching the name of our own package
-        PackageInfo pInfo;
+               // Try to load the a package matching the name of our own package
+               PackageInfo pInfo;

                try {
                        pInfo = getPackageManager().getPackageInfo(getPackageName(), PackageManager.GET_META_DATA);
                try {
                        pInfo = getPackageManager().getPackageInfo(getPackageName(), PackageManager.GET_META_DATA);

-               String aboutTitle = String.format("About %s", getString(R.string.app_name));
-               String versionString = String.format("Version: %s", pInfo.versionName);
-               String aboutText = getString(R.string.aboutText);
+                       String aboutTitle = String.format("About %s", getString(R.string.app_name));
+                       String versionString = String.format("Version: %s", pInfo.versionName);
+                       String aboutText = getString(R.string.aboutText);

 
 

-               // Set up the TextView
-               final TextView message = new TextView(this);
-               // We'll use a spannablestring to be able to make links clickable
-               final SpannableString s = new SpannableString(aboutText);
+                       // Set up the TextView
+                       final TextView message = new TextView(this);
+                       // We'll use a spannablestring to be able to make links clickable
+                       final SpannableString s = new SpannableString(aboutText);

 
 

-               // Set some padding
-               message.setPadding(5, 5, 5, 5);
-               // Set up the final string
-               message.setText(versionString + "\n" + s);
-               // Now linkify the text
-               Linkify.addLinks(message, Linkify.ALL);
+                       // Set some padding
+                       message.setPadding(5, 5, 5, 5);
+                       // Set up the final string
+                       message.setText(versionString + "\n" + s);
+                       // Now linkify the text
+                       Linkify.addLinks(message, Linkify.ALL);

 
 

-               new AlertDialog.Builder(this)
-                       .setTitle(aboutTitle)
-                       .setCancelable(true)
-                       .setIcon(R.drawable.icon)
-                       .setPositiveButton(getString(android.R.string.ok), null)
-                       .setView(message).create()
-                       .show();
+                       new AlertDialog.Builder(this)
+                       .setTitle(aboutTitle)
+                       .setCancelable(true)
+                       .setIcon(R.drawable.icon)
+                       .setPositiveButton(getString(android.R.string.ok), null)
+                       .setView(message).create()
+                       .show();

                } catch (NameNotFoundException e) {
                        e.printStackTrace();
                }
                } catch (NameNotFoundException e) {
                        e.printStackTrace();
                }