WebSVN - Projects - Path Comparison - /DUBwise/trunk/android Rev 212 and /DUBwise/trunk/android/ Rev 219

Ignore whitespace Rev 212 → Rev 219

 /DUBwise/trunk/android/AndroidManifest.xml
 ,7 → 48,17
             </intent-filter>
         </activity>
+        <activity android:name=".SettingsActivity"
+                  android:label="@string/app_name"
+                  >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+            </intent-filter>
+        </activity>
         <activity android:name=".RCDataActivity"
                   android:label="@string/app_name"
                   >

 /DUBwise/trunk/android/res/layout/settings.xml
 ,0 → 1,52
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent">
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="fill_parent"
+       android:layout_height="wrap_content">
+     <CheckBox android:id="@+id/check_fullscreen"
+            android:paddingBottom="24sp"
+            android:paddingTop="24sp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Fullscreen" />
+     <View
+                android:layout_height="2px"
+                   android:layout_width="fill_parent"
+                android:background="#DDFFDD"
+                android:layout_marginTop="5dip"
+                android:layout_marginBottom="5dip"/>
+    <TextView
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="5dip"
+            android:text="Front:"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:focusable="true"
+        />
+    </LinearLayout>
+</ScrollView>

 /DUBwise/trunk/android/src/org/ligi/android/DUBwise.java
 ,8 → 55,8
     boolean do_sound;
     boolean fullscreen;
     MKCommunicator mk;
-    String[] menu_items = new String[]{"Connection", "Old Interface" , "View On Maps", "Flight Settings","RCData","Motor Test", "About","Quit"};
-    int[] menu_actions= new int[]{ACTIONID_CONN , ACTIONID_OLDINTERFACE , ACTIONID_MAPS ,ACTIONID_FLIGHTSETTINGS,ACTIONID_RCDATA,ACTIONID_MOTORTEST, ACTIONID_ABOUT , ACTIONID_QUIT };
+    String[] menu_items = new String[]{"Settings","Connection", "Old Interface" , "View On Maps", "Flight Settings","RCData","Motor Test", "About","Quit"};
+    int[] menu_actions= new int[]{ACTIONID_SETTINGS,ACTIONID_CONN , ACTIONID_OLDINTERFACE , ACTIONID_MAPS ,ACTIONID_FLIGHTSETTINGS,ACTIONID_RCDATA,ACTIONID_MOTORTEST, ACTIONID_ABOUT , ACTIONID_QUIT };
     public final static int ACTIONID_CONN=0;
     public final static int ACTIONID_MAPS=1;
 ,6 → 65,7
     public final static int ACTIONID_FLIGHTSETTINGS=4;
     public final static int ACTIONID_MOTORTEST=5;
     public final static int ACTIONID_RCDATA=6;
+    public final static int ACTIONID_SETTINGS=7;
     public final static int ACTIONID_QUIT=100;
     SharedPreferences settings;
 ,6 → 113,12
          switch(menu_actions[position])
              {
+             case ACTIONID_SETTINGS:
+                 //              setContentView(new ConnectionView(this));
+                 startActivity(new Intent(this, SettingsActivity.class));
+                 break;
              case ACTIONID_CONN:
                  //              setContentView(new ConnectionView(this));

/DUBwise/trunk/android/src/org/ligi/android/R.java
20,6 → 20,7
public static final class id {
public static final int cancel_btn=0x7f060004;
public static final int check_autoconn=0x7f060002;
public static final int check_fullscreen=0x7f060015;
public static final int check_fullspeed=0x7f060005;
public static final int edit_host=0x7f060000;
public static final int edit_port=0x7f060001;
44,6 → 45,7
public static final int connection=0x7f030000;
public static final int motortest=0x7f030001;
public static final int rcdata=0x7f030002;
public static final int settings=0x7f030003;
}
public static final class raw {
public static final int voice_sample_01=0x7f040000;

 /DUBwise/trunk/android/src/org/ligi/android/SettingsActivity.java
 ,0 → 1,79
+package org.ligi.android;
+import android.app.ListActivity;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.ListView;
+import android.widget.SimpleAdapter;
+import android.util.Log;
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.ListView;
+import android.widget.SimpleAdapter;
+import java.text.Collator;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import android.net.Uri;
+import java.net.URISyntaxException;
+import android.widget.*;
+import android.content.DialogInterface;
+import android.content.Context.*;
+import android.widget.EditText;
+import android.text.method.NumberKeyListener;
+import com.google.android.maps.MapView;
+import          android.app.AlertDialog.*;
+import          android.app.AlertDialog;
+import android.content.SharedPreferences;
+import org.ligi.ufo.*;
+public class SettingsActivity extends Activity
+{
+    CheckBox fullscreen;
+    AndroidMKCommunicator mk;
+    @Override
+        public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.settings);
+        fullscreen=(CheckBox)findViewById( R.id.check_fullscreen);
+    }
+   @Override
+    protected void onDestroy()
+    {
+        super.onDestroy();
+    }
+}

 /DUBwise/trunk/android/src/org/ligi/android/SettingsActivity.xml
 ,0 → 1,138
+package org.ligi.android;
+import android.app.ListActivity;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.ListView;
+import android.widget.SimpleAdapter;
+import android.util.Log;
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.ListView;
+import android.widget.SimpleAdapter;
+import java.text.Collator;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import android.net.Uri;
+import java.net.URISyntaxException;
+import android.widget.*;
+import android.content.DialogInterface;
+import android.content.Context.*;
+import android.widget.EditText;
+import android.text.method.NumberKeyListener;
+import com.google.android.maps.MapView;
+import          android.app.AlertDialog.*;
+import          android.app.AlertDialog;
+import android.content.SharedPreferences;
+import org.ligi.ufo.*;
+public class MotorTestActivity extends Activity
+ implements SeekBar.OnSeekBarChangeListener
+{
+    SeekBar seek_right,seek_left,seek_front,seek_back,seek_all;
+    CheckBox full_speed;
+    boolean toasted=false;
+    AndroidMKCommunicator mk;
+    @Override
+        public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mk= new AndroidMKCommunicator(this);
+        setContentView(R.layout.motortest);
+        seek_right=(SeekBar)findViewById( R.id.seek_right);
+        seek_left=(SeekBar)findViewById( R.id.seek_left);
+        seek_front=(SeekBar)findViewById( R.id.seek_front);
+        seek_back=(SeekBar)findViewById( R.id.seek_back);
+        seek_all=(SeekBar)findViewById( R.id.seek_all);
+        full_speed=(CheckBox)findViewById( R.id.check_fullspeed);
+        seek_right.setOnSeekBarChangeListener(this);
+        seek_left.setOnSeekBarChangeListener(this);
+        seek_front.setOnSeekBarChangeListener(this);
+        seek_back.setOnSeekBarChangeListener(this);
+        seek_all.setOnSeekBarChangeListener(this);
+        //      toast=Toast;
+        toast=toast.makeText(this, "Value too Dangerous - Clipping! Activate 'Allow Full Speed' to Override" + mk.stats.debug_data_count,Toast.LENGTH_LONG );
+    }
+   @Override
+    protected void onDestroy()
+    {
+        mk.close_connections(true);
+        mk=null;
+        super.onDestroy();
+    }
+    Toast toast;
+    public void onProgressChanged(SeekBar seekBar, int progress, boolean fromTouch) {
+        //        mProgressText.setText(progress + " " +
+        //      getString(R.string.seekbar_from_touch) + "=" + fromTouch);
+        if (( progress>50)&&(!full_speed.isChecked()))
+            {
+                seekBar.setProgress(50);
+                progress=50;
+                toast.show ();
+            }
+        else
+            {
+                toast.cancel();
+            }
+        if (seekBar==seek_all)
+            {
+            seek_right.setProgress(progress);
+            seek_left.setProgress(progress);
+            seek_front.setProgress(progress);
+            seek_back.setProgress(progress);
+            }
+        int[] params=new int[4];
+        params[0] = seek_right.getProgress();
+        params[1] = seek_left.getProgress();
+        params[2] = seek_front.getProgress();
+        params[3] = seek_back.getProgress();
+        params[3] = seek_right.getProgress();
+        params[2] = seek_left.getProgress();
+        params[0] = seek_front.getProgress();
+        params[1] = seek_back.getProgress();
+        mk.motor_test(params);
+    }
+    public void onStartTrackingTouch(SeekBar seekBar) {
+        //mTrackingText.setText(getString(R.string.seekbar_tracking_on));
+    }
+    public void onStopTrackingTouch(SeekBar seekBar) {
+        //        mTrackingText.setText(getString(R.string.seekbar_tracking_off));
+    }
+}

Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 212 → Rev 219