voice message fix

kentingnguyen · Dec 12, 2013 · 589624c · 589624c
2 parents 5aa3cdf + 5181f46
commit 589624c
Show file tree

Hide file tree

Showing 10 changed files with 159 additions and 72 deletions.
diff --git a/PenPal/AndroidManifest.xml b/PenPal/AndroidManifest.xml
@@ -4,6 +4,7 @@
     android:versionCode="1"
     android:versionName="1.0" >
 	<uses-permission android:name="android.permission.INTERNET" /> 
+	<uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-sdk
         android:minSdkVersion="9"
         android:targetSdkVersion="17" />
@@ -13,12 +14,13 @@
         android:icon="@drawable/pen_pal_icon"
         android:label="@string/app_name"
         android:theme="@style/AppTheme"
-        android:screenOrientation="portrait" 
+
          >
         <activity
             android:name="edu.berkeley.cs160.off_by_1.Home"
-            android:theme="@style/PenPalTheme" >
-            android:label="@string/app_name" >
+            android:theme="@style/PenPalTheme" 
+            android:label="@string/app_name"
+            android:screenOrientation="portrait" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -29,47 +31,55 @@
             android:name="edu.berkeley.cs160.off_by_1.FriendList"
             android:label="@string/title_activity_friend_list"
             android:parentActivityName="edu.berkeley.cs160.off_by_1.Home"
-            android:theme="@style/PenPalTheme" >
+            android:theme="@style/PenPalTheme"
+            android:screenOrientation="portrait"
+             >
         </activity>
 
         <activity
             android:name="edu.berkeley.cs160.off_by_1.SendMessage"
             android:label="@string/title_activity_send_message"
             android:parentActivityName="edu.berkeley.cs160.off_by_1.Home"
-            android:theme="@style/PenPalTheme" >
+            android:theme="@style/PenPalTheme" 
+            android:screenOrientation="portrait">
         </activity>
         <activity
             android:name="edu.berkeley.cs160.off_by_1.Profile"
             android:label="@string/title_activity_profile"
             android:parentActivityName="edu.berkeley.cs160.off_by_1.FriendList"
-            android:theme="@style/PenPalTheme" >
+            android:theme="@style/PenPalTheme"
+            android:screenOrientation="portrait" >
         </activity>
         <activity
             android:name="edu.berkeley.cs160.off_by_1.MakeMessage"
             android:label="@string/title_activity_make_message"
             android:parentActivityName="edu.berkeley.cs160.off_by_1.SendMessage"
             android:windowSoftInputMode="adjustResize"
-            android:theme="@style/PenPalTheme" >
+            android:theme="@style/PenPalTheme"
+            android:screenOrientation="portrait" >
             >
         </activity>
         <activity
             android:name="edu.berkeley.cs160.off_by_1.ReceiveMessage"
             android:label="@string/title_activity_receive_message"
             android:parentActivityName="edu.berkeley.cs160.off_by_1.Home"
-            android:theme="@style/PenPalTheme" >
+            android:theme="@style/PenPalTheme"
+            android:screenOrientation="portrait" >
             >
         </activity>
         <activity
             android:name="edu.berkeley.cs160.off_by_1.MeetPenPal"
             android:label="@string/title_activity_meet_pen_pal"
             android:parentActivityName="edu.berkeley.cs160.off_by_1.FriendLit"
-            android:theme="@style/PenPalTheme" >
+            android:theme="@style/PenPalTheme"
+            android:screenOrientation="portrait" >
             >
         </activity>
         <activity
             android:name="edu.berkeley.cs160.off_by_1.MessageSent"
             android:label="@string/title_activity_message_sent"
-            android:theme="@style/PenPalTheme" >
+            android:theme="@style/PenPalTheme"
+            android:screenOrientation="portrait" >
 
         </activity>
     </application>

diff --git a/PenPal/gen/android/support/v7/appcompat/R.java b/PenPal/gen/android/support/v7/appcompat/R.java
@@ -554,7 +554,7 @@ public static final class styleable {
 		public static final int MenuItem_android_titleCondensed = 8;
 		public static final int MenuItem_android_visible = 4;
 		public static final int MenuItem_showAsAction = 13;
-		public static final int[] MenuView = { 0x010100ae, 0x0101012c, 0x0101012d, 0x0101012e, 0x0101012f, 0x01010130, 0x01010131, 0x01010435 };
+		public static final int[] MenuView = { 0x010100ae, 0x0101012c, 0x0101012d, 0x0101012e, 0x0101012f, 0x01010130, 0x01010131, 0x0101040c };
 		public static final int MenuView_android_headerBackground = 4;
 		public static final int MenuView_android_horizontalDivider = 2;
 		public static final int MenuView_android_itemBackground = 5;

diff --git a/PenPal/gen/edu/berkeley/cs160/off_by_1/R.java b/PenPal/gen/edu/berkeley/cs160/off_by_1/R.java
@@ -1072,16 +1072,16 @@ public static final class id {
         public static final int none=0x7f060010;
         public static final int normal=0x7f060000;
         public static final int penPalDetailsText=0x7f060054;
-        public static final int playButton=0x7f06006b;
+        public static final int playButton=0x7f06006a;
         public static final int profileName=0x7f060059;
         public static final int progress_circular=0x7f060018;
         public static final int progress_horizontal=0x7f060019;
         public static final int questionButton=0x7f06004d;
         public static final int radio=0x7f06002f;
         public static final int receivedMessage=0x7f06005f;
-        public static final int recordButton=0x7f060068;
-        public static final int recordTimer=0x7f06006a;
-        public static final int recordTimerBar=0x7f060069;
+        public static final int recordButton=0x7f060069;
+        public static final int recordProgressBar=0x7f060068;
+        public static final int recordTimer=0x7f06006b;
         public static final int reply=0x7f06005e;
         public static final int research=0x7f060055;
         public static final int search_badge=0x7f060032;
@@ -2542,7 +2542,7 @@ <p>Must be one or more (separated by '|') of the following constant values.</p>
          */
         public static final int[] MenuView = {
             0x010100ae, 0x0101012c, 0x0101012d, 0x0101012e,
-            0x0101012f, 0x01010130, 0x01010131, 0x01010435
+            0x0101012f, 0x01010130, 0x01010131, 0x0101040c
         };
         /**
           <p>

diff --git a/PenPal/project.properties b/PenPal/project.properties
@@ -11,6 +11,6 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-19
+target=android-17
 android.library.reference.1=../appcompat
 android.library=false
diff --git a/PenPal/res/layout/voice_message.xml b/PenPal/res/layout/voice_message.xml
@@ -4,41 +4,42 @@
     android:layout_height="match_parent"
     android:orientation="vertical" >
 
-    <Button
-        android:id="@+id/recordButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
-        android:layout_centerVertical="true"
-        android:text="Record Button"/>
-
     <ProgressBar
-        android:id="@+id/recordTimerBar"
+        android:id="@+id/recordProgressBar"
         style="?android:attr/progressBarStyleHorizontal"
         android:layout_width="200dp"
         android:layout_height="wrap_content"
         android:layout_below="@+id/recordButton"
         android:layout_centerHorizontal="true"
-        android:layout_marginTop="26dp" />
+        android:layout_marginTop="26dp" 
+        android:max="60"/>
 
-    <TextView
-        android:id="@+id/recordTimer"
+    <Button
+        android:id="@+id/recordButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignRight="@+id/recordTimerBar"
-        android:layout_below="@+id/recordTimerBar"
-        android:layout_marginTop="18dp"
-        android:text=":15"
-        android:textSize="30sp"
-        android:textAppearance="?android:attr/textAppearanceLarge" />
+        android:layout_alignParentTop="true"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="140dp"
+        android:text="Start Recording" />
 
     <Button
         android:id="@+id/playButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignLeft="@+id/recordButton"
-        android:layout_below="@+id/recordTimer"
+        android:layout_below="@+id/recordProgressBar"
+        android:layout_centerHorizontal="true"
         android:layout_marginTop="18dp"
         android:text="Play Button" />
 
+    <TextView
+        android:id="@+id/recordTimer"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignRight="@+id/recordProgressBar"
+        android:layout_below="@+id/recordProgressBar"
+        android:text=":15"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:textSize="30sp" />
+
 </RelativeLayout>