Reform UI in 2.0.

Norbara · Jan 18, 2016 · 3a6965f · 3a6965f
1 parent d63b3fa
commit 3a6965f
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 50 deletions.
diff --git a/LuckyMoneyTool.iml b/LuckyMoneyTool.iml
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "com.miui.hongbao"
         minSdkVersion 15
         targetSdkVersion 22
-        versionCode 1
-        versionName "1.0"
+        versionCode 2
+        versionName "v2.0"
     }
     buildTypes {
         release {

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.miui.hongbao" >
+          package="com.miui.hongbao">
     <uses-sdk android:minSdkVersion="18"
               android:targetSdkVersion="22"/>
     <application
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name">
+            android:allowBackup="true"
+            android:icon="@mipmap/ic_launcher"
+            android:label="@string/app_name">
         <activity
-            android:name=".MainActivity"
-            android:label="@string/app_name"
-            android:theme="@style/Base.Theme.AppCompat.Light">
+                android:name=".MainActivity"
+                android:label="@string/app_name"
+                android:theme="@style/Base.Theme.AppCompat.Light">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
         <service
-            android:name=".HongbaoService"
-            android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE">
+                android:name=".HongbaoService"
+                android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE">
             <intent-filter>
                 <action android:name="android.accessibilityservice.AccessibilityService"/>
             </intent-filter>

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -1,53 +1,56 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
                 xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
-                android:layout_height="match_parent" tools:context=".MainActivity">
+                android:layout_height="match_parent" tools:context=".MainActivity"
+                android:background="#faf6f1">
     <TextView
             android:layout_width="fill_parent"
-            android:layout_height="68dp"
+            android:layout_height="150dp"
             android:textAppearance="?android:attr/textAppearanceLarge"
-            android:id="@+id/textView" android:background="#e53935" android:text="微信红包" android:textColor="#fff"
-            android:gravity="bottom|center_horizontal" android:paddingBottom="12dp"
-            android:elevation="8dp"/>
+            android:id="@+id/textView" android:background="@mipmap/action_bar" android:text="微信红包" android:textColor="#fee1b4"
+            android:gravity="center_vertical|center_horizontal"
+            android:textSize="26dp" android:paddingBottom="20dp"/>
     <ImageView
-            android:layout_width="100dp"
-            android:layout_height="100dp"
-            android:id="@+id/imageView" android:src="@mipmap/github"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/imageView" android:src="@mipmap/open"
             android:scaleType="centerInside"
             android:layout_above="@+id/textView3"
-            android:layout_centerHorizontal="true" android:onClick="openGithub" android:clickable="true"/>
+            android:layout_centerHorizontal="true" android:onClick="openGithub" android:clickable="true"
+    />
     <TextView
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium"
-            android:text="stable - 稳定版"
+            android:text="稳定版 v2.0"
             android:id="@+id/textView3"
-            android:layout_centerVertical="true" android:gravity="center" android:onClick="openGithub"
-            android:clickable="true"/>
+            android:gravity="center" android:onClick="openGithub"
+            android:clickable="true" android:layout_centerInParent="true" android:textColor="#c5a45e"
+            android:paddingTop="6dp" android:paddingBottom="1dp"/>
     <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:text="去Github关注项目进展"
             android:id="@+id/textView2" android:layout_below="@+id/textView3"
             android:layout_centerHorizontal="true" android:clickable="true" android:onClick="openGithub"
-            android:layout_marginTop="3dp"/>
+            android:layout_marginTop="3dp" android:textColor="#999999"/>
     <TextView
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:text="https://github.com/geeeeeeeeek/WeChatLuckyMoney"
             android:id="@+id/github" android:gravity="center_horizontal"
             android:layout_centerHorizontal="true"
-            android:layout_alignParentBottom="true" android:layout_marginBottom="20dp" android:layout_marginTop="15dp"
-            android:textColor="#2196f3" android:clickable="true" android:onClick="openGithub"/>
+            android:layout_alignParentBottom="true" android:layout_marginBottom="20dp" android:layout_marginTop="20dp"
+            android:textColor="#5272ae" android:clickable="true" android:onClick="openGithub"/>
     <Button
             android:id="@+id/button_accessible"
             android:text="@string/service_name"
             android:layout_width="match_parent"
             android:layout_height="60dp"
             android:onClick="onButtonClicked" android:layout_alignParentBottom="false"
-            android:background="#fdfdfd" android:textColor="#ff666666"
+            android:background="#24e2b379" android:textColor="#c5a45e"
             style="?android:attr/borderlessButtonStyle"
             android:layout_marginRight="16dp" android:layout_marginLeft="16dp" android:layout_above="@+id/github"
-            />
+            android:textSize="20dp"/>
 </RelativeLayout>
diff --git a/app/src/main/res/mipmap-xxhdpi/action_bar.png b/app/src/main/res/mipmap-xxhdpi/action_bar.png
diff --git a/app/src/main/res/mipmap-xxhdpi/github.png b/app/src/main/res/mipmap-xxhdpi/github.png
diff --git a/app/src/main/res/mipmap-xxhdpi/open.png b/app/src/main/res/mipmap-xxhdpi/open.png
diff --git a/build.gradle b/build.gradle
@@ -16,4 +16,4 @@ allprojects {
     repositories {
         jcenter()
     }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,4 +16,4 @@ allprojects { @@
         repositories {
             jcenter()
         }
-    }
+    }