Merge pull request #2 from SumiMakito/develop

Sample app was updated to version 1.2;
sumimakito · Apr 28, 2017 · 88db77b · 88db77b
2 parents 163bb39 + 3b86f74
commit 88db77b
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -1,28 +1,32 @@
 # AwesomeQRCode
 
-An awesome<del>(simple)</del> QR code generator.
+An awesome<del>(simple)</del> QR code generator for Android.
 
 一个优雅的<del>(不起眼的)</del> QR 二维码生成器
 
-### Get sample APK 下载演示 APK
+### Awesome-qr.js written in JavaScript, 支持 JavaScript 的 Awesome-qr.js
+
+Redirect to [Awesome-qr.js](https://github.com/SumiMakito/Awesome-qr.js)
+
+### Get sample APK, 下载演示 APK
 
 <a href="https://play.google.com/store/apps/details?id=com.github.sumimakito.awesomeqrsample" target="_blank"><img src="art/play_store_badge.png" alt="Google Play Store" width="200"></a>
 
-### Examples 样例
+### Examples, 样例
 
 > Try to scan these QR codes below with your smart phone.
 
 Example 1|Example 2|Example 3
 ------------ | ------------- | -------------
 <img src="art/awesome-qr-1.png" width="400"> | <img src="art/awesome-qr-2.png" width="400"> | <img src="art/awesome-qr-3.png" width="400">
 
-### Quick start 快速上手
+### Quick start, 快速上手
 
 ```java
 Bitmap qrCode = AwesomeQRCode.create("Makito loves Kafuu Chino.", 800, 20, 0.3f, Color.BLACK, Color.WHITE, backgroundBitmap, true, true);
 ```
 
-### Parameters 参数
+### Parameters, 参数
 
 ```java
 public static Bitmap create(
@@ -44,7 +48,7 @@ PayPal | Alipay
 [PayPal](https://www.paypal.me/makito) | [Alipay](https://qr.alipay.com/a6x02021re1jk4ftcymlw79)
 
 
-### Copyright &amp; License 版权信息与授权协议
+### Copyright &amp; License, 版权信息与授权协议
 
 Copyright &copy; 2017 Sumi Makito
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "com.github.sumimakito.awesomeqrsample"
         minSdkVersion 19
         targetSdkVersion 25
-        versionCode 1
-        versionName "1.0"
+        versionCode 3
+        versionName "1.2"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

diff --git a/app/src/main/res/drawable-nodpi/b.png b/app/src/main/res/drawable-nodpi/b.png
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -29,6 +29,18 @@
                 android:focusableInTouchMode="true"
                 android:orientation="horizontal" />
 
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="5dp"
+                android:background="#75f"
+                android:gravity="center"
+                android:padding="10dp"
+                android:text="About the launcher icon, special thanks to\nFont Awesome by Dave Gandy - http://fontawesome.io"
+                android:textColor="#fff"
+                android:textSize="12sp"
+                android:textStyle="bold" />
+
             <TextView
                 android:id="@+id/permissionHint"
                 android:layout_width="match_parent"
@@ -50,7 +62,7 @@
                 android:background="#8963a0"
                 android:gravity="center"
                 android:padding="10dp"
-                android:text="AwesomeQRCode, 2017 Copyright © Makito\nGet source code at GitHub: SumiMakito\nUnder Apache License, Version 2.0\n[ CLICK HERE ]"
+                android:text="AwesomeQRCode, 2017 Copyright © Makito\nGet source code at GitHub: SumiMakito\nClick here to view on GitHub"
                 android:textColor="#fff"
                 android:textSize="12sp"
                 android:textStyle="bold" />
@@ -63,7 +75,7 @@
                 android:background="#448800"
                 android:gravity="center"
                 android:padding="10dp"
-                android:text="Awesome-qr.js is also available!\n[ CLICK HERE ]"
+                android:text="Awesome-qr.js is also available!\nClick here to view on GitHub"
                 android:textColor="#fff"
                 android:textSize="12sp"
                 android:textStyle="bold" />