From 174aad344be8523a26f60a11ba0ebfcbcfa13620 Mon Sep 17 00:00:00 2001
From: kazhik <kazhik@gmail.com>
Date: Tue, 20 Oct 2009 13:24:23 +0900
Subject: [PATCH] tab ui implemented

---
 res/layout/stopwatch.xml                           | 124 ++++++++++++---------
 res/values/strings.xml                             |   4 +
 src/net/kazhik/android/tokyorunners/MapMode.java   |  78 ++++++++++---
 .../kazhik/android/tokyorunners/TokyoRunners.java  | 121 +++++++-------------
 4 files changed, 174 insertions(+), 153 deletions(-)

diff --git a/res/layout/stopwatch.xml b/res/layout/stopwatch.xml
index e7c3a39..611a2a4 100755
--- a/res/layout/stopwatch.xml
+++ b/res/layout/stopwatch.xml
@@ -1,63 +1,81 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:background="#696969" android:layout_width="fill_parent"
+
+<TabHost xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@android:id/tabhost" android:layout_width="fill_parent"
 	android:layout_height="fill_parent">
+	<LinearLayout android:orientation="vertical"
+		android:layout_width="fill_parent" android:layout_height="fill_parent">
+		<TabWidget android:id="@android:id/tabs"
+			android:layout_width="fill_parent" android:layout_height="wrap_content" />
+		<FrameLayout android:id="@android:id/tabcontent"
+			android:layout_width="fill_parent" android:layout_height="fill_parent">
+			<RelativeLayout android:id="@+id/stopwatchmode"
+				android:background="#696969" android:layout_width="fill_parent"
+				android:layout_height="fill_parent">
 
-	<LinearLayout android:id="@+id/statistics"
-		android:orientation="vertical" android:layout_width="fill_parent"
-		android:layout_height="wrap_content" android:paddingLeft="5dp"
-		android:paddingRight="5dp" android:layout_alignParentTop="true">
-		<LinearLayout android:orientation="horizontal"
-			android:layout_width="fill_parent" android:layout_height="wrap_content">
-			<Chronometer android:id="@+id/elapsed_time"
-				android:layout_width="fill_parent" android:layout_height="wrap_content"
-				android:textSize="40dp" android:gravity="right" android:textColor="#7CFC00"
-				android:layout_weight="1" />
-			<TextView android:id="@+id/time_separator"
-				android:layout_width="wrap_content" android:layout_height="wrap_content"
-				android:textColor="#7CFC00" android:text="/" android:textSize="40dp" />
-			<Chronometer android:id="@+id/lap_time"
-				android:layout_width="fill_parent" android:layout_height="wrap_content"
-				android:textColor="#7CFC00" android:textSize="40dp" android:gravity="right"
-				android:layout_weight="1" />
-		</LinearLayout>
-
-
-		<RelativeLayout android:orientation="horizontal"
-			android:layout_width="fill_parent" android:layout_height="wrap_content">
-			<TextView android:id="@+id/distance" android:layout_width="wrap_content"
-				android:layout_height="wrap_content" android:textColor="#7CFC00"
-				android:text="0.0" android:textSize="40dp"
-				android:layout_marginLeft="5pt" android:layout_alignParentRight="true" />
-			<TextView android:text="@string/label_distance"
-				android:layout_width="wrap_content" android:layout_height="wrap_content"
-				android:textSize="30dp" android:textColor="#7CFC00"
-				android:layout_toLeftOf="@id/distance" />
-		</RelativeLayout>
+				<LinearLayout android:id="@+id/statistics"
+					android:orientation="vertical" android:layout_width="fill_parent"
+					android:layout_height="wrap_content" android:paddingLeft="5dp"
+					android:paddingRight="5dp" android:layout_alignParentTop="true">
+					<LinearLayout android:orientation="horizontal"
+						android:layout_width="fill_parent" android:layout_height="wrap_content">
+						<Chronometer android:id="@+id/elapsed_time"
+							android:layout_width="fill_parent" android:layout_height="wrap_content"
+							android:textSize="40dp" android:gravity="right"
+							android:textColor="#7CFC00" android:layout_weight="1" />
+						<TextView android:id="@+id/time_separator"
+							android:layout_width="wrap_content" android:layout_height="wrap_content"
+							android:textColor="#7CFC00" android:text="/" android:textSize="40dp" />
+						<Chronometer android:id="@+id/lap_time"
+							android:layout_width="fill_parent" android:layout_height="wrap_content"
+							android:textColor="#7CFC00" android:textSize="40dp"
+							android:gravity="right" android:layout_weight="1" />
+					</LinearLayout>
 
-	</LinearLayout>
 
-	<LinearLayout android:id="@+id/buttons"
-		android:orientation="horizontal" android:layout_width="fill_parent"
-		android:layout_height="wrap_content" android:layout_alignParentBottom="true">
-		<Button android:id="@+id/button_start_stop"
-			android:layout_width="fill_parent" android:layout_height="wrap_content"
-			android:layout_weight="1" android:textSize="24dp" android:textColor="#4B0082"
-			android:text="@string/button_start" />
-		<Button android:id="@+id/button_reset_lap"
-			android:layout_width="fill_parent" android:layout_height="wrap_content"
-			android:layout_weight="1" android:textColor="#4B0082"
-			android:textSize="24dp" android:text="@string/button_reset" />
-	</LinearLayout>
+					<RelativeLayout android:orientation="horizontal"
+						android:layout_width="fill_parent" android:layout_height="wrap_content">
+						<TextView android:id="@+id/distance"
+							android:layout_width="wrap_content" android:layout_height="wrap_content"
+							android:textColor="#7CFC00" android:text="0.0" android:textSize="40dp"
+							android:layout_marginLeft="5pt" android:layout_alignParentRight="true" />
+						<TextView android:text="@string/label_distance"
+							android:layout_width="wrap_content" android:layout_height="wrap_content"
+							android:textSize="30dp" android:textColor="#7CFC00"
+							android:layout_toLeftOf="@id/distance" />
+					</RelativeLayout>
+
+				</LinearLayout>
+
+				<LinearLayout android:id="@+id/buttons"
+					android:orientation="horizontal" android:layout_width="fill_parent"
+					android:layout_height="wrap_content"
+					android:layout_alignParentBottom="true">
+					<Button android:id="@+id/button_start_stop"
+						android:layout_width="fill_parent" android:layout_height="wrap_content"
+						android:layout_weight="1" android:textSize="24dp"
+						android:textColor="#4B0082" android:text="@string/button_start" />
+					<Button android:id="@+id/button_reset_lap"
+						android:layout_width="fill_parent" android:layout_height="wrap_content"
+						android:layout_weight="1" android:textColor="#4B0082"
+						android:textSize="24dp" android:text="@string/button_reset" />
+				</LinearLayout>
 
 
-	<ListView android:id="@+id/lap_history" android:layout_below="@id/statistics"
-		android:layout_above="@id/buttons" android:layout_alignParentRight="true"
-		android:layout_height="fill_parent" android:layout_width="fill_parent"
-		android:paddingLeft="5dp" android:paddingRight="5dp"
-		android:scrollbarSize="5dp" android:scrollbarStyle="outsideOverlay"
-		android:choiceMode="none" android:clickable="false" android:longClickable="true" />
+				<ListView android:id="@+id/lap_history"
+					android:layout_below="@id/statistics" android:layout_above="@id/buttons"
+					android:layout_alignParentRight="true" android:layout_height="fill_parent"
+					android:layout_width="fill_parent" android:paddingLeft="5dp"
+					android:paddingRight="5dp" android:scrollbarSize="5dp"
+					android:scrollbarStyle="outsideOverlay" android:choiceMode="none"
+					android:clickable="false" android:longClickable="true" />
+
+
+			</RelativeLayout>
+		</FrameLayout>
+	</LinearLayout>
+</TabHost>
+
 
 
-</RelativeLayout>
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 84781a0..a2d7150 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="title">Tokyo Runners</string>
+    
+    <string name="title_stopwatch">Stopwatch</string>
+    <string name="title_map">Map</string>
+    
     <string name="label_distance">Distance:</string>
     <string name="button_start">Start</string>
     <string name="button_stop">Stop</string>
diff --git a/src/net/kazhik/android/tokyorunners/MapMode.java b/src/net/kazhik/android/tokyorunners/MapMode.java
index f6b13f6..13e9c56 100755
--- a/src/net/kazhik/android/tokyorunners/MapMode.java
+++ b/src/net/kazhik/android/tokyorunners/MapMode.java
@@ -5,8 +5,11 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
+import android.app.AlertDialog;
+import android.app.Dialog;
 import android.content.BroadcastReceiver;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.SharedPreferences;
@@ -20,6 +23,7 @@ import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.util.Log;
 import android.view.GestureDetector;
+import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.MotionEvent;
@@ -160,14 +164,16 @@ public class MapMode extends MapActivity {
 		return false;
 	}
     @Override
-    public void onResume() {
-    	 super.onResume();
-         IntentFilter filter = new IntentFilter();
-         filter.addAction("RunningRecord");
-         
-         registerReceiver(m_runningRecordReceiver, filter);
-    	
-    }
+	public void onResume() {
+		Log.d(this.getClass().getName(), "onResume()");
+		super.onResume();
+		IntentFilter filter = new IntentFilter();
+		filter.addAction("RunningRecord");
+
+		registerReceiver(m_runningRecordReceiver, filter);
+
+	}
+
     @Override
     public void onPause() {
     	 super.onPause();
@@ -255,23 +261,59 @@ public class MapMode extends MapActivity {
         }
         return super.onTouchEvent(event);
     }
+	public boolean onKeyDown(int keyCode, KeyEvent event) {
+		Log.d(this.getClass().getName(), "onKeyDown():" + keyCode );
+		if (keyCode == KeyEvent.KEYCODE_BACK){
+			showDialog(Constants.DIALOG_EXIT_ID);
+			return true;
+		}
+		
+    	return super.onKeyDown(keyCode, event);
+		
+	}
     @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        menu.add(Menu.NONE, Constants.MENU_STOPWATCH, Menu.NONE,
-        		R.string.menu_stopwatch).setIcon(R.drawable.stopwatch);
-        menu.add(Menu.NONE, Constants.MENU_SETTING, Menu.NONE,
-        		R.string.menu_setting).setIcon(android.R.drawable.ic_menu_preferences);
-        
-        return super.onCreateOptionsMenu(menu);
+    public Dialog onCreateDialog (int id) {
+    	
+    	AlertDialog.Builder builder = new AlertDialog.Builder(this);
+    	switch (id) {
+    	case Constants.DIALOG_EXIT_ID:
+    		builder.setTitle(R.string.dialog_exit_title);
+    		builder.setMessage(R.string.dialog_exit_message);
+    		builder.setPositiveButton(R.string.dialog_yes, new DialogInterface.OnClickListener() {
+				@Override
+				public void onClick(DialogInterface dialog, int which) {
+					finish();
+
+				}
+			});
+    		builder.setNegativeButton(R.string.dialog_no, new DialogInterface.OnClickListener() {
+				@Override
+				public void onClick(DialogInterface dialog, int which) {
+					dialog.cancel();
+					
+				}
+			});
+
+    		break;
+		default:
+			break;
+    	}
+    	
+    	AlertDialog alertDialog = builder.create();
+    	return alertDialog;
     }
 
     @Override
+    public boolean onPrepareOptionsMenu(Menu menu) {
+    	menu.removeItem(Constants.MENU_SAVE);
+    	menu.removeItem(Constants.MENU_HISTORY);
+        
+        return super.onPrepareOptionsMenu(menu);
+    }
+    @Override
     public boolean onOptionsItemSelected(MenuItem item) {
     	Intent intent;
         switch (item.getItemId()) {
-        case Constants.MENU_STOPWATCH:
-    		finish();
-        	break;
         case Constants.MENU_SETTING:
         	intent = new Intent(this, Config.class);
         	intent.setAction(Intent.ACTION_VIEW);
diff --git a/src/net/kazhik/android/tokyorunners/TokyoRunners.java b/src/net/kazhik/android/tokyorunners/TokyoRunners.java
index df75e79..2793178 100755
--- a/src/net/kazhik/android/tokyorunners/TokyoRunners.java
+++ b/src/net/kazhik/android/tokyorunners/TokyoRunners.java
@@ -2,15 +2,15 @@ package net.kazhik.android.tokyorunners;
 
 import java.util.Date;
 
-import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
+import android.app.TabActivity;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.res.Resources;
 import android.database.Cursor;
-import android.location.GpsStatus;
 import android.location.Location;
 import android.location.LocationListener;
 import android.location.LocationManager;
@@ -21,23 +21,21 @@ import android.os.SystemClock;
 import android.preference.PreferenceManager;
 import android.text.format.DateUtils;
 import android.util.Log;
-import android.view.GestureDetector;
 import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.view.MotionEvent;
 import android.view.View;
 import android.view.WindowManager;
 import android.view.View.OnClickListener;
-import android.view.View.OnLongClickListener;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.Chronometer;
 import android.widget.ListView;
+import android.widget.TabHost;
 import android.widget.TextView;
 
 
-public class TokyoRunners extends Activity implements
+public class TokyoRunners extends TabActivity implements
 	LocationListener {
 	
 	private SharedPreferences m_prefs;
@@ -49,24 +47,8 @@ public class TokyoRunners extends Activity implements
 	private boolean m_useGPS = false;
 	private boolean m_autosplit = false;
 	
-	private GestureDetector m_gestureDetector;
-	
 	private static RunningRecord m_runningRecord;
 	
-	private class GestureListener extends GestureDetector.SimpleOnGestureListener {
-		public void onLongPress(MotionEvent arg0) {
-			Log.d(this.getClass().getName(), "onLongPress():" );
-			
-			showMap();
-		}
-
-		public boolean onDoubleTap(MotionEvent arg0) {
-			Log.d(this.getClass().getName(), "onDoubleTap():" );
-			return false;
-		}
-
-		
-	}
 	
     class StartStopButton implements OnClickListener {
 		public void onClick(View v) {
@@ -91,15 +73,41 @@ public class TokyoRunners extends Activity implements
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         
-        m_gestureDetector = new GestureDetector(new GestureListener());
+        Debug.startMethodTracing("tokyorunners");
         
         setContentView(R.layout.stopwatch);
         
-        Debug.startMethodTracing("tokyorunners");
+        // タブの設定
+        TabHost tabHost = getTabHost();
         
+        Resources res = getResources();
+        TabHost.TabSpec stopwatchTab = tabHost.newTabSpec("stopwatch");
+        stopwatchTab.setIndicator(res.getText(R.string.title_stopwatch));
+        stopwatchTab.setContent(R.id.stopwatchmode);
+        tabHost.addTab(stopwatchTab);
+
+        TabHost.TabSpec mapTab = tabHost.newTabSpec("map");
+        mapTab.setIndicator(res.getText(R.string.title_map));
+        mapTab.setContent(new Intent(this, MapMode.class));
+        tabHost.addTab(mapTab); 
+        
+        tabHost.setCurrentTab(0);
+        
+        tabHost.setOnTabChangedListener(new TabHost.OnTabChangeListener() {
+			@Override
+			public void onTabChanged(String tag) {
+				if (tag.equals("stopwatch")) {
+				} else if (tag.equals("map")) {
+				}
+				
+			}
+        });
+
         m_runningRecord = new RunningRecord(getContentResolver());
     	
         m_prefs = PreferenceManager.getDefaultSharedPreferences(this);
+ 
+        // GPS設定
         m_useGPS = m_prefs.getBoolean("use_gps", true);
         if (m_useGPS) {
         	m_locMgr = (LocationManager)getSystemService(Context.LOCATION_SERVICE);
@@ -114,51 +122,27 @@ public class TokyoRunners extends Activity implements
             	m_runningRecord.setSplitInterval(interval);
             }
             
-			m_locMgr.addGpsStatusListener(new GpsStatus.Listener() {
-				@Override
-				public void onGpsStatusChanged(int event) {
-					switch (event) {
-					case GpsStatus.GPS_EVENT_STARTED:
-						Log.d(this.getClass().getName(), "GPS_EVENT_STARTED" );
-						break;
-					case GpsStatus.GPS_EVENT_STOPPED:
-						Log.d(this.getClass().getName(), "GPS_EVENT_STOPPED" );
-						break;
-					case GpsStatus.GPS_EVENT_FIRST_FIX:
-						Log.d(this.getClass().getName(), "GPS_EVENT_FIRST_FIX" );
-						break;
-					default:
-						break;
-					}
-				}
-			});
 
         }
-        
+
+        // タイム表示
         m_elapsedTime = (Chronometer)findViewById(R.id.elapsed_time);
         m_lapTime = (Chronometer)findViewById(R.id.lap_time);
 
+        // ボタン
         Button btnStartStop = (Button)findViewById(R.id.button_start_stop);
 	    btnStartStop.setOnClickListener(new StartStopButton());
 	    
         Button btnResetLap = (Button)findViewById(R.id.button_reset_lap);
 	    btnResetLap.setOnClickListener(new ResetLapButton());
 	   
-	    
+
+	    // スプリットタイム／ラップタイム履歴
 		ListView lvLaptime = (ListView)findViewById(R.id.lap_history);
         ArrayAdapter<String> arrayAdapter
         	= new ArrayAdapter<String>(this, R.layout.laptime);
         lvLaptime.setAdapter(arrayAdapter);
         
-		lvLaptime.setOnLongClickListener(new OnLongClickListener() {
-			@Override
-			public boolean onLongClick(View v) {
-				Log.d(this.getClass().getName(), "onLongClick():" );
-				showMap();
-				return false;
-			}
-		});
-
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);        
         
         
@@ -181,14 +165,6 @@ public class TokyoRunners extends Activity implements
         }
     }
     
-    private void showMap() {
-    	Intent intent = new Intent(TokyoRunners.this, MapMode.class);
-    	intent.setAction(Intent.ACTION_VIEW);
-    	startActivity(intent);
-		
-    	
-    }
-
     private void readHistory(long startTime) {
 
         String[] columns = {
@@ -271,19 +247,11 @@ public class TokyoRunners extends Activity implements
     public boolean onCreateOptionsMenu(Menu menu) {
         menu.add(Menu.NONE, Constants.MENU_SAVE, Menu.NONE, R.string.menu_save).setIcon(android.R.drawable.ic_menu_save);
         menu.add(Menu.NONE, Constants.MENU_HISTORY, Menu.NONE, R.string.menu_history).setIcon(R.drawable.history2);
-        menu.add(Menu.NONE, Constants.MENU_MAP, Menu.NONE, R.string.menu_map).setIcon(android.R.drawable.ic_menu_mapmode);
         menu.add(Menu.NONE, Constants.MENU_SETTING, Menu.NONE, R.string.menu_setting).setIcon(android.R.drawable.ic_menu_preferences);
         
         return super.onCreateOptionsMenu(menu);
     }
     @Override
-    public boolean onPrepareOptionsMenu(Menu menu) {
-    	menu.findItem(Constants.MENU_MAP).setEnabled(m_useGPS);
-        
-        return super.onPrepareOptionsMenu(menu);
-    }
-    
-    @Override
     public Dialog onCreateDialog (int id) {
     	
     	AlertDialog.Builder builder = new AlertDialog.Builder(this);
@@ -346,11 +314,6 @@ public class TokyoRunners extends Activity implements
         	intent.setAction(Intent.ACTION_VIEW);
         	startActivityForResult(intent, Constants.REQUEST_CODE_HISTORY);
         	break;
-        case Constants.MENU_MAP:
-        	intent = new Intent(this, MapMode.class);
-        	intent.setAction(Intent.ACTION_VIEW);
-        	startActivity(intent);
-        	break;
         case Constants.MENU_SETTING:
         	intent = new Intent(this, Config.class);
         	intent.setAction(Intent.ACTION_VIEW);
@@ -525,6 +488,7 @@ public class TokyoRunners extends Activity implements
 	public boolean dispatchKeyEvent(KeyEvent event) {
 		Log.d(this.getClass().getName(), "dispatchKeyEvent():"
 				+ event.toString());
+		/*
 		if (event.getKeyCode() == KeyEvent.KEYCODE_DPAD_CENTER
 				&& event.getAction() == KeyEvent.ACTION_DOWN) {
 			if (m_running == true) {
@@ -533,6 +497,7 @@ public class TokyoRunners extends Activity implements
 				start();
 			}
 		}
+		*/
 		return super.dispatchKeyEvent(event);
 	}
     @Override
@@ -547,13 +512,5 @@ public class TokyoRunners extends Activity implements
 		
 	}
 
-    @Override
-    public boolean onTouchEvent(MotionEvent event) {
-		Log.d(this.getClass().getName(), "onTouchEvent():" + event.getAction() );
-        if (m_gestureDetector.onTouchEvent(event)) {
-        	return true;
-        }
-        return super.onTouchEvent(event);
-    }
     
 }
\ No newline at end of file
-- 
2.11.0