switch users

res/layout/main.xml

@@ -444,7 +444,7 @@
         android:id="@+id/choose_category_round"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
-        android:visibility="visible" >
+        android:visibility="gone" >
 
        <RelativeLayout
             android:id="@+id/header_container"
@@ -480,7 +480,7 @@
                 android:layout_width="fill_parent"
                 android:layout_height="20dp"
                 android:layout_centerVertical="true"
-                android:layout_toLeftOf="@+id/timer"
+                android:layout_toLeftOf="@+id/category_timer"
                 android:layout_toRightOf="@id/info"
                 android:indeterminate="false"
                 android:max="60000"

res/raw/rounds.txt

@@ -8,4 +8,4 @@ Presidential
 STDs
 Games
 Playstation
-Food
+Food

res/values/settings.xml

@@ -5,6 +5,7 @@
 	<item name="secondsPerRound" type="integer">5</item>
 	<item name="secondsPerVotingRound" type="integer">10</item>
 	<item name="secondsPerResultsRound" type="integer">10</item>
+	<item name="secondsPerChooseCategoryRound" type="integer">10</item>
 	<string name="serverUrl">ws://192.168.43.200:8080/websocket</string>
 	<string name="facebookAppId">135742016560988</string>
 	<string name="facebookAppSecret">ee70cce63d156cbf177721b1412e5a31</string>

src/com/happytap/acro/AcroActivity.java

@@ -24,6 +24,7 @@
 import android.view.inputmethod.InputMethodManager;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
+import android.widget.ArrayAdapter;
 import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.ListView;
@@ -126,7 +127,14 @@ public void run() {
 	ProgressBar _progress;
 
 	View _chooseCategoryRound;
-
+
+	ProgressBar _chooseCategoryProgress;
+
+	Future<?> _chooseCategoryFuture;
+
+	TextView _chooseCategoryTimer;
+
+
 	Runnable _requestRoomList = new Runnable() {
 		public void run() {
 			try {
@@ -141,6 +149,10 @@ public void run() {
 
 	ListView _rooms;
 
+	ListView _categories;
+
+	ArrayAdapter<String> _categoryAdapter;
+
 	Runnable _roundUiRunnable = new Runnable() {
 		public void run() {
 			int k = (int) Math.ceil(_config.getSecondsPerRound()
@@ -242,6 +254,22 @@ public void run() {
 		}
 
 	};
+
+	Runnable _chooseCategoryRoundRunnable = new Runnable() {
+
+		@Override
+		public void run() {
+			int newProgress = _chooseCategoryProgress.getProgress() + 100;
+			_chooseCategoryProgress.setProgress(newProgress);
+			int k = (int) Math.ceil(_config.getSecondsPerChooseCategory()
+					- newProgress / 1000d);
+			if (k == 0) {
+				_chooseCategoryFuture.cancel(true);
+			}
+			runOnUiThread(_chooseCategoryUiRunnable);
+		}
+
+	};
 
 	Future<?> _resultsRoundRunnableFuture;
 
@@ -277,7 +305,25 @@ private void onResultsRoundOver() {
 
 		};
 	};
+
+	Runnable _chooseCategoryUiRunnable = new Runnable() {
+		public void run() {
 
+			int k = (int) Math.ceil(_config.getSecondsPerChooseCategory()
+					- _chooseCategoryProgress.getProgress() / 1000d);
+			_chooseCategoryTimer.setText(String.valueOf(k));
+			if (k == 0) {
+				onChooseCategoryRoundOver();
+			}
+		}
+
+
+	};
+
+	private void onChooseCategoryRoundOver() {
+		// TODO Auto-generated method stub
+
+	}
 	InputMethodManager imm;
 
 	@SuppressWarnings("unchecked")
@@ -328,6 +374,13 @@ public void onClick(View v) {
 				t.setGravity(Gravity.CENTER);
 				_chat.addView(t, lp);
 			}
+			if(showUsers) {
+				//switch to chat
+				_chatList.setAdapter(null);
+			} else {
+				//switch to users
+				_chatList.setAdapter(null);
+			}
 			_chat.invalidate();
 		} else {
 			startConnectionToServer();
@@ -336,6 +389,7 @@ public void onClick(View v) {
 
 	@Override
 	public void onConnected() {
+		//runOnUiThread(_onChatRoundRunnable);
 		runOnUiThread(_onUiJoinRoomRunnable);
 		//runOnUiThread(_joinRoomRound);
 		//startJoinRoomRound();
@@ -380,7 +434,10 @@ public void onCreate(Bundle savedInstanceState) {
 		_resultsProgress = findView(R.id.results_progress_bar);
 		_resultsText = findView(R.id.results_timer);
 		_chooseCategoryRound = findView(R.id.choose_category_round);
-
+		_chooseCategoryProgress = findView(R.id.category_progress_bar);
+		_chooseCategoryProgress.setMax(_config.getSecondsPerChooseCategory() * 1000);
+		_chooseCategoryTimer = findView(R.id.category_timer);
+		_categories = findView(R.id.categories);
 		// two = findView(R.id.two);
 
 		// three = findView(R.id.three);
@@ -397,9 +454,10 @@ public void onCreate(Bundle savedInstanceState) {
 		//startSentenceRound();
 		// startConnectionToServer();
 		// startJoinRoomRound();
-		startSentenceRound();
+		//startSentenceRound();
 		// startJoinRoomRound();
 		// startLoginRound();
+		//startChooseCategoryRound();
 
 	}
 
@@ -532,12 +590,9 @@ private void requestRoomList() {
 	}
 
 	private void startChatRound() {
+		hideAllViews();
 		_chatRound.setVisibility(View.VISIBLE);
-		_joinRoomRound.setVisibility(View.GONE);
-		_rooms.setVisibility(View.GONE);
-		_votingRound.setVisibility(View.GONE);
-		_socketDroppedRound.setVisibility(View.GONE);
-		_sentenceRound.setVisibility(View.GONE);
+		_root.invalidate();
 	}
 
 	private void startConnectionToServer() {
@@ -556,6 +611,19 @@ private void startJoinRoomRound() {
 		_rooms.setOnItemClickListener(this);
 	}
 
+	private void startChooseCategoryRound() {
+		hideAllViews();
+		String[] cats = getResources().getStringArray(R.array.rounds);
+
+		_chooseCategoryRound.setVisibility(View.VISIBLE);
+		_root.invalidate();
+		_chooseCategoryProgress.setProgress(0);
+		_chooseCategoryTimer.setText(String.valueOf(_config.getSecondsPerRound()));
+		_chooseCategoryFuture = ThreadHelper.getScheduler()
+				.scheduleAtFixedRate(_chooseCategoryRoundRunnable, 0, 100,
+						TimeUnit.MILLISECONDS);
+	}
+
 	private void startSentenceRound() {
 		hideAllViews();
 		_sentenceRound.setVisibility(View.VISIBLE);
@@ -602,6 +670,9 @@ private void killAllTasks() {
 		if (_votingRoundRunnableFuture != null) {
 			_votingRoundRunnableFuture.cancel(true);
 		}
+		if(_chooseCategoryFuture!=null) {
+			_chooseCategoryFuture.cancel(true);
+		}
 	}
 
 	private void startVotingRound() {

src/com/happytap/acro/Configuration.java

@@ -24,6 +24,10 @@ public boolean isTest() {
   public int getSecondsPerRound() {
     return ctx.getResources().getInteger(R.integer.secondsPerRound);
   }
+
+  public int getSecondsPerChooseCategory() {
+	  return ctx.getResources().getInteger(R.integer.secondsPerChooseCategoryRound);
+  }
 
   public int getSecondsPerVotingRound() {
     return ctx.getResources().getInteger(R.integer.secondsPerVotingRound);