updated version code 58

fieldsight · Mar 14, 2019 · b023f3a · b023f3a
1 parent 867ce4a
commit b023f3a
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 18 deletions.
diff --git a/collect_app/build.gradle b/collect_app/build.gradle
@@ -69,7 +69,7 @@ if (secretsFile.exists()) {
 
 def versionMajor = 2
 def versionMinor = 6
-def versionPatch = 2
+def versionPatch = 3
 
 
 
@@ -82,8 +82,8 @@ android {
         targetSdkVersion(26)
         //versionCode LEGACY_BUILD_NUMBER_OFFSET + getMasterCommitCount()
         //versionName getVersionName()
-        versionCode 57
-        versionName "${versionMajor}.${versionMinor}.${versionPatch}"
+        versionCode 58
+        versionName "${versionMajor}.${versionMinor}.${versionPatch}-beta"
         System.out.println(versionName + " " + versionCode)
         testInstrumentationRunner('android.support.test.runner.AndroidJUnitRunner')
         multiDexEnabled true

diff --git a/collect_app/src/main/res/layouts/odk/layout/activity_login.xml b/collect_app/src/main/res/layouts/odk/layout/activity_login.xml
@@ -6,16 +6,17 @@
 
 
     <ImageButton
-       android:padding="@dimen/padding_extra_large"
-        android:src="@drawable/ic_settings_24dp_legacy"
         android:id="@+id/btn_change_server_url"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
-        android:layout_alignParentRight="true"
         android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
         android:layout_marginTop="8dp"
-        android:background="@null" />
+        android:background="@null"
+        android:padding="@dimen/padding_extra_large"
+        android:src="@drawable/ic_settings_24dp_legacy"
+        android:visibility="gone" />
 
     <ProgressBar
 
@@ -33,15 +34,15 @@
 
 
     <ImageView
-        android:focusableInTouchMode="true"
         android:id="@+id/logo"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
         android:layout_centerHorizontal="true"
         android:layout_marginLeft="@dimen/margin_large"
-        android:layout_marginRight="@dimen/margin_large"
         android:layout_marginTop="70dp"
+        android:layout_marginRight="@dimen/margin_large"
+        android:focusableInTouchMode="true"
         android:src="@drawable/fieldsight_logo_text"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -80,19 +81,18 @@
                     android:hint="@string/prompt_email"
                     android:inputType="textEmailAddress"
                     android:maxLines="1"
-                    android:singleLine="true"
-                     />
+                    android:singleLine="true" />
 
             </android.support.design.widget.TextInputLayout>
 
             <android.support.design.widget.TextInputLayout
-                app:passwordToggleEnabled="true"
                 android:id="@+id/textInputLayout4"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="@+id/email_sign_in_button"
-                app:layout_constraintTop_toBottomOf="@+id/textInputLayout3">
+                app:layout_constraintTop_toBottomOf="@+id/textInputLayout3"
+                app:passwordToggleEnabled="true">
 
                 <EditText
                     android:id="@+id/password"
@@ -103,8 +103,7 @@
                     android:imeOptions="actionUnspecified"
                     android:inputType="textPassword"
                     android:maxLines="1"
-                    android:singleLine="true"
-                     />
+                    android:singleLine="true" />
 
             </android.support.design.widget.TextInputLayout>
 
@@ -128,12 +127,12 @@
     <TextView
 
         android:id="@+id/tv_forgot_pwd"
-        android:layout_alignParentBottom="true"
-        android:gravity="center"
-        android:padding="@dimen/padding_large"
         style="@style/ColoredCaption"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:gravity="center"
+        android:padding="@dimen/padding_large"
         android:text="Forgot Password?" />
 
 </RelativeLayout>