redesign flash screen according to mvp structure
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/bd09d435 Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/bd09d435 Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/bd09d435 Branch: refs/heads/master Commit: bd09d435921a069a560ecd19867da7350fa5be0e Parents: dd91a92 Author: Sagar <[email protected]> Authored: Tue Aug 2 22:44:07 2016 +0530 Committer: Sagar <[email protected]> Committed: Tue Aug 2 22:44:07 2016 +0530 ---------------------------------------------------------------------- app/src/main/AndroidManifest.xml | 2 +- .../mobile/activities/FlashScreenActivity.java | 93 -------------------- .../taverna/mobile/ui/FlashScreenActivity.java | 38 ++++++++ 3 files changed, 39 insertions(+), 94 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/bd09d435/app/src/main/AndroidManifest.xml ---------------------------------------------------------------------- diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4b2c3bb..ad0b96e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -36,7 +36,7 @@ limitations under the License. android:label="@string/app_name"> </activity> <activity - android:name=".activities.FlashScreenActivity" + android:name=".ui.FlashScreenActivity" android:label="@string/title_activity_flash_screen"> <intent-filter> <action android:name="android.intent.action.MAIN"/> http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/bd09d435/app/src/main/java/org/apache/taverna/mobile/activities/FlashScreenActivity.java ---------------------------------------------------------------------- diff --git a/app/src/main/java/org/apache/taverna/mobile/activities/FlashScreenActivity.java b/app/src/main/java/org/apache/taverna/mobile/activities/FlashScreenActivity.java deleted file mode 100644 index b24e9a2..0000000 --- a/app/src/main/java/org/apache/taverna/mobile/activities/FlashScreenActivity.java +++ /dev/null @@ -1,93 +0,0 @@ -package org.apache.taverna.mobile.activities; - -/* -* Apache Taverna Mobile -* Copyright 2015 The Apache Software Foundation - -* This product includes software developed at -* The Apache Software Foundation (http://www.apache.org/). - -* Licensed to the Apache Software Foundation (ASF) under one -* or more contributor license agreements. See the NOTICE file -* distributed with this work for additional information -* regarding copyright ownership. The ASF licenses this file -* to you under the Apache License, Version 2.0 (the -* "License"); you may not use this file except in compliance -* with the License. You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, -* software distributed under the License is distributed on an -* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -* KIND, either express or implied. See the License for the -* specific language governing permissions and limitations -* under the License. -*/ - -import android.content.Context; -import android.content.Intent; -import android.os.Bundle; -import android.os.Handler; -import android.preference.PreferenceManager; -import android.support.v7.app.AppCompatActivity; -import android.view.Menu; -import android.view.MenuItem; - -import org.apache.taverna.mobile.R; -import org.apache.taverna.mobile.data.DataManager; -import org.apache.taverna.mobile.data.local.PreferencesHelper; -import org.apache.taverna.mobile.ui.login.LoginActivity; - -public class FlashScreenActivity extends AppCompatActivity { - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_flash_screen); - //getSupportActionBar().hide(); - } - - @Override - public boolean onCreateOptionsMenu(Menu menu) { - return false; - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - - return super.onOptionsItemSelected(item); - } - - @Override - public void onResume() { - super.onResume(); - final Context context = this; - //setup initial app settings - if (!PreferenceManager.getDefaultSharedPreferences(context).getBoolean("pref_set", false)) { - PreferenceManager.getDefaultSharedPreferences(context).edit().putString - ("pref_server_url", "http://heater.cs.man.ac.uk:8090/taverna-2.5.4/";).apply(); - PreferenceManager.getDefaultSharedPreferences(context).edit().putString - ("pref_player_url", "http://heater.cs.man.ac.uk:3000/";).apply(); - } else { - PreferenceManager.getDefaultSharedPreferences(context).edit().putBoolean("pref_set", - true).apply(); - } - Handler mhandler = new Handler(); - mhandler.postDelayed(new Runnable() { - @Override - public void run() { - if (!(new DataManager(new PreferencesHelper(context)).getPreferencesHelper() - .getLoggedInFlag())) { - startActivity(new Intent(FlashScreenActivity.this, LoginActivity.class)); - (FlashScreenActivity.this).finish(); - } else { - startActivity(new Intent(FlashScreenActivity.this, DashboardMainActivity - .class)); - (FlashScreenActivity.this).finish(); - } - } - }, 2500); - - } -} http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/bd09d435/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 new file mode 100644 index 0000000..5bad64c --- /dev/null +++ b/app/src/main/java/org/apache/taverna/mobile/ui/FlashScreenActivity.java @@ -0,0 +1,38 @@ +package org.apache.taverna.mobile.ui; + + +import android.content.Intent; +import android.os.Bundle; +import android.support.annotation.Nullable; +import android.support.v7.app.AppCompatActivity; + +import org.apache.taverna.mobile.R; +import org.apache.taverna.mobile.activities.DashboardMainActivity; +import org.apache.taverna.mobile.data.DataManager; +import org.apache.taverna.mobile.data.local.PreferencesHelper; +import org.apache.taverna.mobile.ui.login.LoginActivity; + +public class FlashScreenActivity extends AppCompatActivity { + + private DataManager dataManager; + + + @Override + protected void onCreate(@Nullable Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_flash_screen); + + dataManager = new DataManager(new PreferencesHelper(this)); + + if (!dataManager.getPreferencesHelper().getLoggedInFlag()) { + startActivity(new Intent(FlashScreenActivity.this, LoginActivity.class)); + (FlashScreenActivity.this).finish(); + } else { + startActivity(new Intent(FlashScreenActivity.this, DashboardMainActivity.class)); + (FlashScreenActivity.this).finish(); + } + } + + + +}
