Merge pull request NetEase#28 from NetEase/develop

Emmagee 2.0

AndroidManifest.xml

@@ -1,45 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.netease.qa.emmagee"
-    android:versionCode="1"
-    android:versionName="1.0" >
+    android:versionCode="30"
+    android:versionName="2.0" >
 
-    <uses-sdk android:minSdkVersion="7" />
+    <uses-sdk android:minSdkVersion="8" />
+
     <application android:name=".utils.MyApplication"
-        android:icon="@drawable/icon"
-        android:label="@string/app_name" >
+                 android:icon="@drawable/icon"
+                 android:label="@string/app_name"
+                 android:theme="@android:style/Theme.NoTitleBar">
         <activity
-            android:name=".activity.MainPageActivity"
-            android:label="@string/app_name"
-            android:configChanges="orientation|keyboardHidden" 
-            android:launchMode="singleInstance" >   <!-- 防止程序横屏以后重新启动 -->
+                android:name=".activity.MainPageActivity"
+                android:configChanges="orientation|keyboardHidden"
+                android:launchMode="singleInstance"
+                android:screenOrientation="portrait">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <!-- <category android:name="android.intent.category.DEFAULT" /> -->
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity
-            android:name=".activity.SystemActivity"
-            android:label="@string/app_name2" >
-        </activity>
-
-        <activity
-            android:name=".activity.SettingsActivity"
-            android:label="@string/app_name4" >
-        </activity>
 
-         <service 
-            android:name="com.netease.qa.emmagee.service.EmmageeService">
-        </service>
+        <activity android:name=".activity.SettingsActivity"
+            	  android:theme="@style/customTheme"
+                  android:screenOrientation="portrait"/>
+
+        <activity android:name=".activity.AboutActivity"
+                  android:screenOrientation="portrait"/>
+
+        <activity android:name=".activity.MailSettingsActivity"
+                  android:screenOrientation="portrait"/>
+
+        <service android:name="com.netease.qa.emmagee.service.EmmageeService"/>
     </application>
-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
+
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
     <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> 
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_LOGS"/>
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
     <uses-permission android:name="android.permission.WAKE_LOCK"/>
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
 </manifest>

project.properties

@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-10
+target=android-8

res/drawable/custom_checkbox.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>  
+<selector  xmlns:android="http://schemas.android.com/apk/res/android">  
+    <item android:drawable="@drawable/checked_icon" android:state_checked="true"></item>  
+    <item android:drawable="@drawable/checked_icon" android:state_selected="true"></item>  
+    <item android:drawable="@drawable/checked_icon" android:state_pressed="true"></item>  
+    <item android:drawable="@drawable/unchecked_icon"></item>  
+</selector>  

res/drawable/custom_seekbar.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item>
+        <shape>
+            <solid android:color="@color/light_gray" />
+        </shape>
+    </item>
+    <item>
+        <clip>
+            <shape>
+                <solid android:color="@color/red" />
+            </shape>
+        </clip>
+    </item>
+
+</layer-list>

res/drawable/float_button.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <!-- border settings -->
+    <item>
+        <shape>
+            <solid android:color="@color/red" />
+            <corners android:radius="3dp" />  
+        </shape>
+    </item>
+
+    <item
+        android:bottom="1dp"
+        android:right="1dp"
+        android:left="1dp"
+        android:top="1dp">
+        <shape>
+            <solid android:color="@color/mix_gray" />
+            <corners android:radius="3dp" />    
+        </shape>
+    </item>
+
+</layer-list>

res/drawable/seekbar_thumb.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_focused="true" android:state_pressed="false" android:drawable="@drawable/seekbar_thumb_normal" />
+    <item android:state_focused="true" android:state_pressed="true" android:drawable="@drawable/seekbar_thumb_pressed" />
+    <item android:state_focused="false" android:state_pressed="true" android:drawable="@drawable/seekbar_thumb_pressed" />
+    <item android:drawable="@drawable/seekbar_thumb_normal" />
+</selector>

res/drawable/settings_button.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/settings_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/settings_pressed" android:state_focused="true"/>
+    <item android:drawable="@drawable/settings"></item>
+</selector>

res/drawable/test_button.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_focused="false" android:state_pressed="false" android:drawable="@drawable/btn_test" />
+    <item android:state_focused="false" android:state_pressed="true" android:drawable="@drawable/btn_test_press" />
+    <item android:state_focused="true" android:state_pressed="false" android:drawable="@drawable/btn_test_press" />
+    <item android:state_focused="true" android:state_pressed="true" android:drawable="@drawable/btn_test_press" />
+</selector>

res/layout/about.xml

@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:background="@color/light_purple"
+    android:orientation="vertical" >
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal" >
+
+        <include
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            layout="@layout/navigation_bar" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        android:orientation="vertical"
+        android:paddingBottom="@dimen/activity_vertical_margin"
+        android:paddingLeft="@dimen/activity_horizontal_margin"
+        android:paddingRight="@dimen/activity_horizontal_margin"
+        android:paddingTop="@dimen/activity_vertical_margin" >
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:orientation="vertical"
+            android:padding="@dimen/layout_vertical_margin_small" >
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_horizontal|center_vertical"
+                android:orientation="horizontal" >
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/icon" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/layout_vertical_margin_small"
+                    android:gravity="center_vertical"
+                    android:text="@string/app_name"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/text_size_bigest" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_horizontal"
+                android:orientation="horizontal"
+                android:padding="@dimen/layout_vertical_margin_small" >
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/version_title"
+                    android:textSize="@dimen/text_size" />
+
+                <TextView
+                    android:id="@+id/app_version"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textSize="@dimen/text_size" />
+            </LinearLayout>
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/white"
+            android:orientation="vertical" >
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:orientation="vertical"
+                android:padding="@dimen/layout_horizontal_margin" >
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/about_emmagee_intro"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/text_size" />
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/line_height"
+                    android:background="@color/light_gray"
+                    android:layout_marginLeft="@dimen/layout_vertical_margin_small"
+                    android:layout_marginRight="@dimen/layout_vertical_margin_small"
+                    android:layout_marginTop="@dimen/layout_vertical_margin"
+                    android:layout_marginBottom="@dimen/layout_vertical_margin"/>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/about_team"
+                    android:textColor="@color/mix_gray"
+                    android:textSize="@dimen/text_size" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/about_project_address"
+                    android:textColor="@color/mix_gray"
+                    android:textSize="@dimen/text_size" />
+            </LinearLayout>
+        </LinearLayout>
+    </LinearLayout>
+
+</LinearLayout>