You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by sa...@apache.org on 2018/03/02 03:39:35 UTC
incubator-taverna-mobile git commit: Improved LoginScreen UI
Repository: incubator-taverna-mobile
Updated Branches:
refs/heads/master 14710b7c2 -> 7e2e6414a
Improved LoginScreen UI
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/commit/7e2e6414
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/7e2e6414
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/7e2e6414
Branch: refs/heads/master
Commit: 7e2e6414a6a001a6521b5addf64b44b1cdedf236
Parents: 14710b7
Author: saketkumar95 <sa...@gmail.com>
Authored: Wed Feb 28 19:55:56 2018 +0530
Committer: saketkumar95 <sa...@gmail.com>
Committed: Fri Mar 2 05:48:58 2018 +0530
----------------------------------------------------------------------
app/build.gradle | 1 +
.../taverna/mobile/ui/login/LoginFragment.java | 19 +++++++
.../main/res/drawable/ic_lock_black_24dp.xml | 9 ++++
.../main/res/drawable/ic_person_black_24dp.xml | 9 ++++
app/src/main/res/layout/fragment_login.xml | 54 +++++++++++++-------
app/src/main/res/values/colors.xml | 1 +
app/src/main/res/values/dimens.xml | 12 +++++
app/src/main/res/values/strings.xml | 1 +
8 files changed, 87 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/7e2e6414/app/build.gradle
----------------------------------------------------------------------
diff --git a/app/build.gradle b/app/build.gradle
index afd31c7..94a9839 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -97,6 +97,7 @@ dependencies {
exclude module: 'xpp3'
}
+ implementation "com.android.support:customtabs:$rootProject.supportLibraryVersion"
implementation 'com.github.bumptech.glide:glide:3.6.0'
implementation 'com.caverock:androidsvg:1.2.1'
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/7e2e6414/app/src/main/java/org/apache/taverna/mobile/ui/login/LoginFragment.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/login/LoginFragment.java b/app/src/main/java/org/apache/taverna/mobile/ui/login/LoginFragment.java
index f3019cc..23b97b8 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/login/LoginFragment.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/login/LoginFragment.java
@@ -27,8 +27,11 @@ import org.apache.taverna.mobile.utils.ConnectionInfo;
import android.app.ProgressDialog;
import android.content.Intent;
+import android.net.Uri;
+import android.os.Build;
import android.os.Bundle;
import android.support.annotation.Nullable;
+import android.support.customtabs.CustomTabsIntent;
import android.support.design.widget.Snackbar;
import android.support.design.widget.TextInputLayout;
import android.support.v4.app.Fragment;
@@ -68,6 +71,8 @@ public class LoginFragment extends Fragment implements LoginMvpView, View.OnFocu
private ProgressDialog progressDialog;
+ private final String myExperimentURL = "https://www.myexperiment.org/users/new";
+
public static LoginFragment newInstance() {
@@ -162,6 +167,20 @@ public class LoginFragment extends Fragment implements LoginMvpView, View.OnFocu
}
}
+ @OnClick(R.id.bRegister)
+ public void register(View v) {
+ if (Build.VERSION.SDK_INT < 15) {
+ Intent intent = new Intent(Intent.ACTION_VIEW);
+ intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ intent.setData(Uri.parse(myExperimentURL));
+ startActivity(intent);
+ } else {
+ CustomTabsIntent.Builder customTabsIntentBuilder = new CustomTabsIntent.Builder();
+ CustomTabsIntent customTabsIntent = customTabsIntentBuilder.build();
+ customTabsIntent.launchUrl(getActivity(), Uri.parse(myExperimentURL));
+ }
+ }
+
@Override
public void showError(String string) {
final Snackbar snackbar = Snackbar.make(mEditTextPassword, string, Snackbar
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/7e2e6414/app/src/main/res/drawable/ic_lock_black_24dp.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/drawable/ic_lock_black_24dp.xml b/app/src/main/res/drawable/ic_lock_black_24dp.xml
new file mode 100644
index 0000000..0ff8fd7
--- /dev/null
+++ b/app/src/main/res/drawable/ic_lock_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:fillColor="#000000"
+ android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8L8.9,8L8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z"/>
+</vector>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/7e2e6414/app/src/main/res/drawable/ic_person_black_24dp.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/drawable/ic_person_black_24dp.xml b/app/src/main/res/drawable/ic_person_black_24dp.xml
new file mode 100644
index 0000000..270fbae
--- /dev/null
+++ b/app/src/main/res/drawable/ic_person_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:fillColor="#000000"
+ android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/>
+</vector>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/7e2e6414/app/src/main/res/layout/fragment_login.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml
index 7edd2a8..c3bb1a0 100644
--- a/app/src/main/res/layout/fragment_login.xml
+++ b/app/src/main/res/layout/fragment_login.xml
@@ -18,6 +18,8 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:background="@color/white"
+ android:fitsSystemWindows="true"
xmlns:app="http://schemas.android.com/apk/res-auto">
<RelativeLayout
@@ -30,8 +32,8 @@
<ImageView
android:id="@+id/logo"
- android:layout_width="60dp"
- android:layout_height="60dp"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:contentDescription="@string/brand"
@@ -42,10 +44,11 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/logo"
+ android:typeface="serif"
android:layout_centerHorizontal="true"
- android:layout_marginTop="42dp"
+ android:layout_marginTop="@dimen/appName_text_margin"
android:text="@string/app_name"
- android:textSize="25sp"/>
+ android:textSize="@dimen/text_size" />
<LinearLayout
android:id="@+id/loginlayout"
@@ -53,31 +56,31 @@
android:layout_height="wrap_content"
android:layout_below="@+id/tvAppName"
android:layout_centerInParent="true"
- android:layout_marginTop="20dp"
- android:background="@android:color/white"
+ android:layout_marginTop="@dimen/login_layout_marginTop"
android:orientation="vertical"
- android:padding="20dp">
+ android:padding="@dimen/login_layout_padding">
<TextView
android:id="@+id/tvLoginInfo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
- android:background="#E1E1E1"
- android:padding="10dp"
+ android:background="@color/grey_background"
+ android:padding="@dimen/login_info_padding"
android:text="@string/logininfo"
- android:textSize="20sp"
- android:textStyle="normal|bold"
- />
+ android:textSize="@dimen/login_text_size"
+ android:textStyle="normal|bold" />
<android.support.design.widget.TextInputLayout
android:id="@+id/input_layout_email"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginTop="20dp">
+ android:layout_marginTop="@dimen/input_layout_email_margin">
<EditText
android:id="@+id/etEmail"
+ android:drawableStart="@drawable/ic_person_black_24dp"
+ android:drawablePadding="@dimen/layout_padding"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textEmailAddress"
@@ -90,11 +93,13 @@
android:id="@+id/input_layout_password"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginTop="20dp"
+ android:layout_marginTop="@dimen/login_layout_marginTop"
app:passwordToggleEnabled="true">
<EditText
android:id="@+id/etPassword"
+ android:drawableStart="@drawable/ic_lock_black_24dp"
+ android:drawablePadding="@dimen/layout_padding"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/hint_password"
@@ -110,17 +115,28 @@
android:checked="true"
android:text="@string/keeplogin"/>
- <Button
+ <android.support.v7.widget.AppCompatButton
android:id="@+id/bLogin"
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
+ android:textColor="@color/white"
android:background="@color/colorPrimary"
+ android:layout_marginBottom="@dimen/loginButton_marginBottom"
+ android:layout_marginTop="@dimen/loginButton_marginTop"
android:contentDescription="@string/login_button_description"
- android:text="@string/bLogin"
- android:textSize="18sp"/>
+ android:text="@string/bLogin" />
+ <android.support.v7.widget.AppCompatButton
+ style="@style/Widget.AppCompat.Button.Borderless"
+ android:id="@+id/bRegister"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:text="@string/create_an_account"
+ android:textAppearance="@style/Base.TextAppearance.AppCompat.Small"
+ android:textColor="@color/primary"/>
</LinearLayout>
+
+
</RelativeLayout>
</ScrollView>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/7e2e6414/app/src/main/res/values/colors.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 1225ace..bf0895c 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -23,6 +23,7 @@
<color name="button_click_background">#e0e0e0</color>
<color name="black_background">#EE2196F3</color>
<color name="grey_background">#e0e0e0</color>
+ <color name="white">#ffff</color>
<!-- A light Holo shade of blue -->
<color name="blue_light">#ff33b5e5</color>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/7e2e6414/app/src/main/res/values/dimens.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index e444114..5b22891 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -30,4 +30,16 @@ limitations under the License.
<dimen name="item_offset">3dp</dimen>
<dimen name="fab_margin">16dp</dimen>
<dimen name="text_margin">16dp</dimen>
+ <dimen name="layout_padding">8dp</dimen>
+ <dimen name="text_size">25sp</dimen>
+ <dimen name="login_layout_padding">20dp</dimen>
+ <dimen name="login_layout_marginTop">20dp</dimen>
+ <dimen name="login_info_padding">10dp</dimen>
+ <dimen name="login_text_size">20sp</dimen>
+ <dimen name="input_layout_email_margin">10dp</dimen>
+ <dimen name="loginButton_marginBottom">8dp</dimen>
+ <dimen name="loginButton_marginTop">30dp</dimen>
+ <dimen name="appName_text_margin">12dp</dimen>
+
+
</resources>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/7e2e6414/app/src/main/res/values/strings.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6d62393..0930804 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -98,6 +98,7 @@ limitations under the License.
<string name="loadworkflows">Loading Workflows</string>
<string name="fetchrun">Fetching run components</string>
<string name="keeplogin">Remain Logged-in</string>
+ <string name="create_an_account">Create a myExperiment account</string>
<string name="emailerr">Username must not be empty</string>
<string name="passworderr">Password must not be empty</string>