Changeset c912129 in orbit for android/src

Timestamp:

12/27/13 06:31:45 (8 years ago)

Author:

Steve Castellotti <sc@…>

Branches:

master, Servo

Children:

a9fa399

Parents:

00d1787

Message:

• Score layout improved for small screens

File:

• android/src/info/puzzlebox/orbit/FragmentTabFlightThinkGear.java (modified) (3 diffs)

android/src/info/puzzlebox/orbit/FragmentTabFlightThinkGear.java

@@ -92 +92 @@
         Button testFlightButton;
         Button stopTestButton;
+
+        TextView textViewLabelScores;
+        TextView textViewLabelScore;
+        TextView textViewLabelLastScore;
+        TextView textViewLabelHighScore;
+        View viewSpaceScore;
+        View viewSpaceScoreLast;
+        View viewSpaceScoreHigh;        
         TextView textViewScore;
         TextView textViewLastScore;
         TextView textViewHighScore;
-        View viewSpaceLastScore;
 
         ImageView imageViewStatus;
@@ -269 +276 @@
                 connectButton.setOnClickListener(this);
 
+                textViewLabelScores = (TextView) v.findViewById(R.id.textViewLabelScores);
+                textViewLabelScore = (TextView) v.findViewById(R.id.textViewLabelScore);
+                textViewLabelLastScore = (TextView) v.findViewById(R.id.textViewLabelLastScore);
+                textViewLabelHighScore = (TextView) v.findViewById(R.id.textViewLabelHighScore);
+
+                viewSpaceScore = (View) v.findViewById(R.id.viewSpaceScore);
+                viewSpaceScoreLast = (View) v.findViewById(R.id.viewSpaceScoreLast);
+                viewSpaceScoreHigh = (View) v.findViewById(R.id.viewSpaceScoreHigh);
+
                 textViewScore = (TextView) v.findViewById(R.id.textViewScore);
                 textViewLastScore = (TextView) v.findViewById(R.id.textViewLastScore);
                 textViewHighScore = (TextView) v.findViewById(R.id.textViewHighScore);
-                viewSpaceLastScore = (View) v.findViewById(R.id.viewSpaceScoreLast);
+
+
+                // Hide the "Scores" label by default
+                textViewLabelScores.setVisibility(View.GONE);
+                viewSpaceScore.setVisibility(View.GONE);
 
 
@@ -462 +482 @@
                 setButtonText(R.id.buttonTestFly, button_test_fly_small);
 
-                textViewLastScore.setVisibility(View.GONE);
-                viewSpaceLastScore.setVisibility(View.GONE);
-
-                //              viewSpaceGenerateAudioWidth = LayoutParams.MATCH_PARENT;
-
-                //              @SuppressWarnings("deprecation")
-                //              int width = getWindowManager().getDefaultDisplay().getWidth();
-                //              int height = getWindowManager().getDefaultDisplay().getHeight();
-
-                //              viewSpaceGenerateAudioWidth = width / 4; // approximate center of screen
+                textViewLabelScores.setVisibility(View.VISIBLE);
+                viewSpaceScore.setVisibility(View.VISIBLE);
+
+                
+                android.view.ViewGroup.LayoutParams layoutParams;
+
+                layoutParams = (android.view.ViewGroup.LayoutParams) viewSpaceScoreLast.getLayoutParams();
+                layoutParams.width = 10;
+                viewSpaceScoreLast.setLayoutParams(layoutParams);
+
+                layoutParams = (android.view.ViewGroup.LayoutParams) viewSpaceScoreHigh.getLayoutParams();
+                layoutParams.width = 10;
+                viewSpaceScoreHigh.setLayoutParams(layoutParams);
+
+
+                String labelScore = getResources().getString(R.string.textview_label_score_small);
+                textViewLabelScore.setText(labelScore);
+
+                String labelLastScore = getResources().getString(R.string.textview_label_last_score_small);
+                textViewLabelLastScore.setText(labelLastScore);
+
+                String labelHighScore = getResources().getString(R.string.textview_label_high_score_small);
+                textViewLabelHighScore.setText(labelHighScore);
+
 
                 //              hideEEGRawHistory();