Merge pull request Catrobat#143 from Catrobat/RefactorSoundRecorder

Refactor SoundRecorder
merged and accepted

Author: sjaindl

catroid/AndroidManifest.xml

@@ -114,6 +114,7 @@
         <activity
             android:name=".soundrecorder.SoundRecorderActivity"
             android:exported="false"
+            android:screenOrientation="portrait"
             android:label="@string/soundrecorder_name"
             android:theme="@style/Theme.Catroid" >
             <intent-filter>

catroid/res/layout/activity_soundrecorder.xml

@@ -19,10 +19,10 @@
  *  GNU Affero General Public License for more details.
  *  
  *  You should have received a copy of the GNU Affero General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
--->
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/SoundrecorderActivityRoot"
+    android:id="@+id/soundrecorder"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@android:color/white"
@@ -38,26 +38,26 @@
         android:textColor="@color/dark_gray" />
 
     <ImageView
-        android:id="@+id/recordButton"
+        android:id="@+id/soundrecorder_imageview_record"
         android:layout_width="wrap_content"
         android:layout_height="80dip"
         android:layout_gravity="center_horizontal"
         android:background="@android:color/transparent"
         android:src="@drawable/ic_record_inactive" />
 
     <TextView
-        android:id="@+id/recording"
+        android:id="@+id/soundrecorder_textview_recording_hint"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center"
         android:paddingTop="30dip"
         android:text="@string/soundrecorder_recording"
         android:textColor="#000000"
-        android:textSize="25dip"
+        android:textSize="25sp"
         android:visibility="invisible" />
 
     <LinearLayout
-        android:id="@+id/recordLayout"
+        android:id="@+id/soundrecorder_linearlayout_record"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
@@ -71,7 +71,7 @@
         android:shadowRadius="4" >
 
         <TextView
-            android:id="@+id/recordText"
+            android:id="@+id/soundrecorder_textview_record_start_stop"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
@@ -80,14 +80,4 @@
             android:textStyle="bold" />
     </LinearLayout>
 
-    <!--
-         <Button
-        android:id="@+id/buttonRecord"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:drawableLeft="@drawable/ic_record_inactive_button"
-        android:text="@string/soundrecorder_record_start" />
-    -->
-
 </LinearLayout>

catroid/src/org/catrobat/catroid/soundrecorder/SoundRecorderActivity.java

@@ -24,6 +24,7 @@
 
 import java.io.IOException;
 
+import org.catrobat.catroid.R;
 import org.catrobat.catroid.common.Constants;
 import org.catrobat.catroid.utils.Utils;
 
@@ -40,7 +41,6 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
-import org.catrobat.catroid.R;
 
 import com.actionbarsherlock.app.SherlockFragmentActivity;
 
@@ -59,18 +59,12 @@ public void onCreate(Bundle savedInstanceState) {
 
 		setContentView(R.layout.activity_soundrecorder);
 
-		recordLayout = (LinearLayout) findViewById(R.id.recordLayout);
-		recordButton = (ImageView) findViewById(R.id.recordButton);
-		recordText = (TextView) findViewById(R.id.recordText);
-		recordingIndicationText = (TextView) findViewById(R.id.recording);
+		recordLayout = (LinearLayout) findViewById(R.id.soundrecorder_linearlayout_record);
+		recordButton = (ImageView) findViewById(R.id.soundrecorder_imageview_record);
+		recordText = (TextView) findViewById(R.id.soundrecorder_textview_record_start_stop);
+		recordingIndicationText = (TextView) findViewById(R.id.soundrecorder_textview_recording_hint);
 
 		recordLayout.setOnClickListener(this);
-
-		soundRecorder = (SoundRecorder) getLastCustomNonConfigurationInstance();
-		if (soundRecorder != null && soundRecorder.isRecording()) {
-			setViewsToRecordingState();
-		}
-
 		Utils.checkForExternalStorageAvailableAndDisplayErrorIfNot(this);
 	}
 
@@ -81,7 +75,7 @@ public void onCreate(Bundle savedInstanceState) {
 	protected void onDestroy() {
 		super.onDestroy();
 
-		unbindDrawables(findViewById(R.id.SoundrecorderActivityRoot));
+		unbindDrawables(findViewById(R.id.soundrecorder));
 		System.gc();
 	}
 
@@ -99,7 +93,7 @@ private void unbindDrawables(View view) {
 
 	@Override
 	public void onClick(View v) {
-		if (v.getId() == R.id.recordLayout) {
+		if (v.getId() == R.id.soundrecorder_linearlayout_record) {
 			if (soundRecorder != null && soundRecorder.isRecording()) {
 				stopRecording();
 				finish();
@@ -115,11 +109,6 @@ public void onBackPressed() {
 		super.onBackPressed();
 	}
 
-	@Override
-	public Object onRetainCustomNonConfigurationInstance() {
-		return soundRecorder;
-	}
-
 	private synchronized void startRecording() {
 		if (soundRecorder != null && soundRecorder.isRecording()) {
 			return;

catroidUiTest/src/org/catrobat/catroid/uitest/ui/ProgramMenuActivityTest.java

@@ -84,6 +84,7 @@ public void testOrientation() throws NameNotFoundException {
 		createProject();
 		solo.clickOnButton(solo.getString(R.string.main_menu_continue));
 		solo.clickOnText("Background");
+		solo.waitForActivity(ProgramMenuActivity.class.getSimpleName());
 		assertEquals("ProgramMenuActivity not in Portrait mode!", Configuration.ORIENTATION_PORTRAIT, solo
 				.getCurrentActivity().getResources().getConfiguration().orientation);
 
@@ -96,6 +97,7 @@ public void testOrientation() throws NameNotFoundException {
 		// Note that the activity is _indeed_ rotated on your device/emulator!
 		// Robotium can _force_ the activity to be in landscape mode (and so could we, programmatically)
 		solo.setActivityOrientation(Solo.LANDSCAPE);
+		solo.sleep(200);
 
 		assertEquals(ProgramMenuActivity.class.getSimpleName()
 				+ " not set to be in portrait mode in AndroidManifest.xml!", ActivityInfo.SCREEN_ORIENTATION_PORTRAIT,

catroidUiTest/src/org/catrobat/catroid/uitest/ui/ProjectActivityTest.java

@@ -162,6 +162,7 @@ public void testAddedSpriteVisibleOnLongList() {
 	public void testOrientation() throws NameNotFoundException {
 		/// Method 1: Assert it is currently in portrait mode.
 		solo.clickOnButton(solo.getString(R.string.main_menu_continue));
+		solo.waitForActivity(ProjectActivity.class.getSimpleName());
 		assertEquals("ProjectActivity not in Portrait mode!", Configuration.ORIENTATION_PORTRAIT, solo
 				.getCurrentActivity().getResources().getConfiguration().orientation);
 
@@ -174,6 +175,7 @@ public void testOrientation() throws NameNotFoundException {
 		// Note that the activity is _indeed_ rotated on your device/emulator!
 		// Robotium can _force_ the activity to be in landscape mode (and so could we, programmatically)
 		solo.setActivityOrientation(Solo.LANDSCAPE);
+		solo.sleep(200);
 
 		assertEquals(ProjectActivity.class.getSimpleName() + " not set to be in portrait mode in AndroidManifest.xml!",
 				ActivityInfo.SCREEN_ORIENTATION_PORTRAIT, activityInfo.screenOrientation);

catroidUiTest/src/org/catrobat/catroid/uitest/ui/SoundRecorderTest.java

@@ -26,24 +26,29 @@
 import java.util.ArrayList;
 
 import org.catrobat.catroid.ProjectManager;
+import org.catrobat.catroid.R;
 import org.catrobat.catroid.common.Constants;
 import org.catrobat.catroid.common.SoundInfo;
 import org.catrobat.catroid.soundrecorder.SoundRecorderActivity;
+import org.catrobat.catroid.ui.MainMenuActivity;
 import org.catrobat.catroid.ui.ScriptTabActivity;
 import org.catrobat.catroid.uitest.util.UiTestUtils;
 import org.catrobat.catroid.utils.Utils;
 
+import android.content.pm.ActivityInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.res.Configuration;
 import android.test.ActivityInstrumentationTestCase2;
-import org.catrobat.catroid.R;
 
 import com.jayway.android.robotium.solo.Solo;
 
-public class SoundRecorderTest extends ActivityInstrumentationTestCase2<ScriptTabActivity> {
+public class SoundRecorderTest extends ActivityInstrumentationTestCase2<MainMenuActivity> {
 
 	private Solo solo;
 
 	public SoundRecorderTest() {
-		super(ScriptTabActivity.class);
+		super(MainMenuActivity.class);
 	}
 
 	@Override
@@ -53,6 +58,7 @@ public void setUp() throws Exception {
 		UiTestUtils.createTestProject();
 
 		solo = new Solo(getInstrumentation(), getActivity());
+		UiTestUtils.getIntoScriptTabActivityFromMainMenu(solo);
 	}
 
 	@Override
@@ -64,6 +70,29 @@ public void tearDown() throws Exception {
 		solo = null;
 	}
 
+	public void testOrientation() throws NameNotFoundException {
+		prepareRecording();
+		solo.waitForActivity(SoundRecorderActivity.class.getSimpleName());
+		/// Method 1: Assert it is currently in portrait mode.
+		assertEquals("SoundRecorderActivity not in Portrait mode!", Configuration.ORIENTATION_PORTRAIT, solo
+				.getCurrentActivity().getResources().getConfiguration().orientation);
+
+		/// Method 2: Retreive info about Activity as collected from AndroidManifest.xml
+		// https://developer.android.com/reference/android/content/pm/ActivityInfo.html
+		PackageManager packageManager = solo.getCurrentActivity().getPackageManager();
+		ActivityInfo activityInfo = packageManager.getActivityInfo(solo.getCurrentActivity().getComponentName(),
+				PackageManager.GET_ACTIVITIES);
+
+		// Note that the activity is _indeed_ rotated on your device/emulator!
+		// Robotium can _force_ the activity to be in landscape mode (and so could we, programmatically)
+		solo.setActivityOrientation(Solo.LANDSCAPE);
+		solo.sleep(200);
+
+		assertEquals(SoundRecorderActivity.class.getSimpleName()
+				+ " not set to be in portrait mode in AndroidManifest.xml!", ActivityInfo.SCREEN_ORIENTATION_PORTRAIT,
+				activityInfo.screenOrientation);
+	}
+
 	public void testRecordMultipleSounds() throws InterruptedException {
 		prepareRecording();
 		recordSoundWithChangingOrientation();
@@ -77,22 +106,18 @@ public void testRecordMultipleSounds() throws InterruptedException {
 	public void recordSoundWithChangingOrientation() throws InterruptedException {
 		solo.waitForActivity(SoundRecorderActivity.class.getSimpleName());
 		solo.clickOnText(solo.getString(R.string.soundrecorder_record_start));
-		solo.setActivityOrientation(Solo.LANDSCAPE);
-		solo.setActivityOrientation(Solo.PORTRAIT);
+		solo.sleep(500);
 		solo.clickOnText(solo.getString(R.string.soundrecorder_record_stop));
 	}
 
 	public void recordSoundGoBackWhileRecording() throws InterruptedException {
 		solo.waitForActivity(SoundRecorderActivity.class.getSimpleName());
 		solo.clickOnText(solo.getString(R.string.soundrecorder_record_start));
-		solo.setActivityOrientation(Solo.LANDSCAPE);
-
+		solo.sleep(500);
 		solo.goBack();
-		solo.setActivityOrientation(Solo.PORTRAIT);
 	}
 
 	private void prepareRecording() {
-		solo.setActivityOrientation(Solo.PORTRAIT);
 		solo.clickOnText(solo.getString(R.string.sounds));
 
 		UiTestUtils.clickOnActionBar(solo, R.id.menu_add);