Update version to 2.2.5, Fix some users can't type id

NKUST-ITC · Feb 26, 2017 · 338e50c · 338e50c
1 parent bd77b3c
commit 338e50c
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 28 deletions.
diff --git a/Android/app/build.gradle b/Android/app/build.gradle
@@ -15,15 +15,15 @@ repositories {
 }
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion "24.0.0"
+    compileSdkVersion 25
+    buildToolsVersion "25.0.2"
 
     defaultConfig {
         applicationId "tw.edu.kuas.wifiautologin"
-        minSdkVersion 9
-        targetSdkVersion 24
-        versionCode 224
-        versionName "2.2.4"
+        minSdkVersion 14
+        targetSdkVersion 25
+        versionCode 225
+        versionName "2.2.5"
     }
     buildTypes {
         debug {
@@ -49,16 +49,18 @@ android {
                     'proguard-crashlytics.pro'
         }
     }
+    return void
 }
 
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.android.support:appcompat-v7:24.0.0'
-    compile 'com.android.support:design:24.0.0'
-    compile 'com.google.android.gms:play-services-analytics:9.2.0'
-    compile 'com.jakewharton:butterknife:7.0.1'
-    compile 'com.squareup.okhttp3:okhttp:3.2.0'
-    compile('com.crashlytics.sdk.android:crashlytics:2.5.7@aar') {
+    compile 'com.android.support:appcompat-v7:25.2.0'
+    compile 'com.android.support:design:25.2.0'
+    compile 'com.google.android.gms:play-services-analytics:10.2.0'
+    compile 'com.jakewharton:butterknife:8.5.1'
+    annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1'
+    compile 'com.squareup.okhttp3:okhttp:3.6.0'
+    compile('com.crashlytics.sdk.android:crashlytics:2.6.6@aar') {
         transitive = true;
     }
 }

diff --git a/Android/app/src/main/java/tw/edu/kuas/wifiautologin/MainActivity.java b/Android/app/src/main/java/tw/edu/kuas/wifiautologin/MainActivity.java
@@ -23,7 +23,7 @@
 import com.google.android.gms.analytics.HitBuilders;
 import com.google.android.gms.analytics.Tracker;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import tw.edu.kuas.wifiautologin.base.SilentApplication;
@@ -36,14 +36,14 @@
 
 @SuppressWarnings("unused") public class MainActivity extends AppCompatActivity {
 
-	@Bind(R.id.button_login) Button mLoginButton;
-	@Bind(R.id.button_logout) Button mLogoutButton;
-	@Bind(R.id.editText_user) EditText mUsernameEditText;
-	@Bind(R.id.editText_password) EditText mPasswordEditText;
-	@Bind(R.id.textView_debug) TextView mDebugTextView;
-	@Bind(R.id.progressBar) ProgressBar mProgressBar;
-	@Bind(R.id.textInputLayout_user) TextInputLayout mUserNameTextInputLayout;
-	@Bind(R.id.textInputLayout_password) TextInputLayout mPasswordTextInputLayout;
+	@BindView(R.id.button_login) Button mLoginButton;
+	@BindView(R.id.button_logout) Button mLogoutButton;
+	@BindView(R.id.editText_user) EditText mUsernameEditText;
+	@BindView(R.id.editText_password) EditText mPasswordEditText;
+	@BindView(R.id.textView_debug) TextView mDebugTextView;
+	@BindView(R.id.progressBar) ProgressBar mProgressBar;
+	@BindView(R.id.textInputLayout_user) TextInputLayout mUserNameTextInputLayout;
+	@BindView(R.id.textInputLayout_password) TextInputLayout mPasswordTextInputLayout;
 
 	private static Tracker mTracker;
 

diff --git a/Android/app/src/main/res/layout-land/activity_main.xml b/Android/app/src/main/res/layout-land/activity_main.xml
@@ -42,9 +42,9 @@
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
 					android:imeOptions="actionGo"
-					android:inputType="number"
+					android:inputType="textEmailAddress"
 					android:maxLength="10"
-					android:singleLine="true"
+					android:maxLines="1"
 					android:textSize="@dimen/text_title"/>
 			</android.support.design.widget.TextInputLayout>
 
@@ -59,6 +59,7 @@
 					android:layout_height="wrap_content"
 					android:imeOptions="actionGo"
 					android:inputType="textPassword"
+					android:maxLines="1"
 					android:textSize="@dimen/text_title"/>
 			</android.support.design.widget.TextInputLayout>
 

diff --git a/Android/app/src/main/res/layout/activity_main.xml b/Android/app/src/main/res/layout/activity_main.xml
@@ -39,9 +39,9 @@
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:imeOptions="actionGo"
-				android:inputType="number"
+				android:inputType="textEmailAddress"
 				android:maxLength="10"
-				android:singleLine="true"
+				android:maxLines="1"
 				android:textSize="@dimen/text_title"/>
 		</android.support.design.widget.TextInputLayout>
 
@@ -56,6 +56,7 @@
 				android:layout_height="wrap_content"
 				android:imeOptions="actionGo"
 				android:inputType="textPassword"
+				android:maxLines="1"
 				android:textSize="@dimen/text_title"/>
 		</android.support.design.widget.TextInputLayout>
 

diff --git a/Android/build.gradle b/Android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.2'
+        classpath 'com.android.tools.build:gradle:2.2.3'
         classpath 'com.google.gms:google-services:3.0.0'
 
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/Android/gradle/wrapper/gradle-wrapper.properties b/Android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Apr 20 18:14:09 GMT+08:00 2016
+#Mon Feb 27 00:19:18 GMT+08:00 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip