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/03 16:23:42 UTC
incubator-taverna-mobile git commit: fix : flash screen delay
Repository: incubator-taverna-mobile
Updated Branches:
refs/heads/master f0a4e6843 -> b88b625bb
fix : flash screen delay
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/b88b625b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/b88b625b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/b88b625b
Branch: refs/heads/master
Commit: b88b625bbe128eb68a1c73b18d337e8413246481
Parents: f0a4e68
Author: Sagar <ku...@gmail.com>
Authored: Sat Mar 3 21:52:02 2018 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Sat Mar 3 21:52:02 2018 +0530
----------------------------------------------------------------------
.../taverna/mobile/ui/FlashScreenActivity.java | 35 +++++++++++++++-----
.../main/res/layout/activity_flash_screen.xml | 32 +++++++-----------
app/src/main/res/values/dimens.xml | 2 ++
3 files changed, 41 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b88b625b/app/src/main/java/org/apache/taverna/mobile/ui/FlashScreenActivity.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/FlashScreenActivity.java b/app/src/main/java/org/apache/taverna/mobile/ui/FlashScreenActivity.java
index 74bef25..2237f88 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/FlashScreenActivity.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/FlashScreenActivity.java
@@ -29,6 +29,13 @@ import org.apache.taverna.mobile.data.DataManager;
import org.apache.taverna.mobile.data.local.PreferencesHelper;
import org.apache.taverna.mobile.ui.login.LoginActivity;
+import java.util.concurrent.TimeUnit;
+
+import io.reactivex.Observable;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.functions.Consumer;
+import io.reactivex.schedulers.Schedulers;
+
public class FlashScreenActivity extends AppCompatActivity {
private DataManager dataManager;
@@ -40,15 +47,27 @@ public class FlashScreenActivity extends AppCompatActivity {
setContentView(R.layout.activity_flash_screen);
dataManager = new DataManager(new PreferencesHelper(this));
+ Observable.timer(2, TimeUnit.SECONDS)
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe(new Consumer<Long>() {
+ @Override
+ public void accept(Long aLong) throws Exception {
+ if (!dataManager.getPreferencesHelper().isLoggedInFlag()) {
+ dataManager.getPreferencesHelper().clear();
+ startActivity(new Intent(FlashScreenActivity.this,
+ LoginActivity.class));
+ (FlashScreenActivity.this).finish();
+ } else {
+ startActivity(new Intent(FlashScreenActivity.this,
+ DashboardActivity.class));
+ (FlashScreenActivity.this).finish();
+ }
+ }
+ });
+
+
- if (!dataManager.getPreferencesHelper().isLoggedInFlag()) {
- dataManager.getPreferencesHelper().clear();
- startActivity(new Intent(FlashScreenActivity.this, LoginActivity.class));
- (FlashScreenActivity.this).finish();
- } else {
- startActivity(new Intent(FlashScreenActivity.this, DashboardActivity.class));
- (FlashScreenActivity.this).finish();
- }
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b88b625b/app/src/main/res/layout/activity_flash_screen.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/layout/activity_flash_screen.xml b/app/src/main/res/layout/activity_flash_screen.xml
index 51594d1..b06ff27 100644
--- a/app/src/main/res/layout/activity_flash_screen.xml
+++ b/app/src/main/res/layout/activity_flash_screen.xml
@@ -18,52 +18,44 @@ limitations under the License.
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:paddingBottom="@dimen/activity_vertical_margin"
- tools:context="org.apache.taverna.mobile.activities.FlashScreenActivity">
+ tools:context=".ui.FlashScreenActivity">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/app_name"
- android:id="@+id/textView"
+ android:id="@+id/tvTitle"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
- android:textSize="40sp" />
+ android:textSize="@dimen/title_text_size" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:id="@+id/imageView2"
+ android:id="@+id/ivLogo"
android:src="@mipmap/ic_launcher"
- android:layout_below="@+id/textView"
- android:layout_marginTop="39dp"
- android:layout_alignRight="@+id/textView"
- android:layout_alignEnd="@+id/textView"
- android:layout_alignLeft="@+id/textView"
- android:layout_alignStart="@+id/textView"
+ android:layout_below="@+id/tvTitle"
+ android:layout_marginTop="@dimen/logo_margin_top"
+ android:layout_alignEnd="@+id/tvTitle"
+ android:layout_alignStart="@+id/tvTitle"
android:scaleType="fitStart"
- android:layout_above="@+id/textView2" />
+ android:layout_above="@+id/tvFooter" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="@string/completebrand"
- android:id="@+id/textView2"
- android:layout_alignParentLeft="true"
+ android:id="@+id/tvFooter"
android:layout_alignParentStart="true"
android:layout_alignParentBottom="true"
- android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:gravity="center" />
<ProgressBar
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:id="@+id/progressBar"
- android:indeterminate="true"
- android:indeterminateBehavior="repeat"
- android:indeterminateOnly="true"
- android:indeterminateTintMode="src_over"
- android:layout_alignBottom="@+id/imageView2"
+ android:id="@+id/pbLoading"
+ android:layout_alignBottom="@+id/ivLogo"
android:layout_centerHorizontal="true" />
</RelativeLayout>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/b88b625b/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 7d2f772..05a3adf 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -78,6 +78,8 @@ limitations under the License.
<dimen name="loginButton_marginBottom">8dp</dimen>
<dimen name="loginButton_marginTop">30dp</dimen>
<dimen name="appName_text_margin">12dp</dimen>
+ <dimen name="title_text_size">40sp</dimen>
+ <dimen name="logo_margin_top">40dp</dimen>
</resources>