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/06/14 04:03:29 UTC
[1/2] incubator-taverna-mobile git commit: Bug Fixes in Dashboard and
FlashScreen Activities
Repository: incubator-taverna-mobile
Updated Branches:
refs/heads/master 2e18498bb -> 05ec2999f
Bug Fixes in Dashboard and FlashScreen Activities
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/6ddf757a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/6ddf757a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/6ddf757a
Branch: refs/heads/master
Commit: 6ddf757a59552a154a0c4181a3b6926e5967e488
Parents: 8789873
Author: Hitesh Gautam <ga...@gmail.com>
Authored: Wed Jun 13 20:20:21 2018 +0530
Committer: Hitesh Gautam <ga...@gmail.com>
Committed: Wed Jun 13 20:26:46 2018 +0530
----------------------------------------------------------------------
.../mobile/injection/ActivityContext.java | 18 +++++++++++++++++
.../mobile/injection/ApplicationContext.java | 18 +++++++++++++++++
.../taverna/mobile/injection/PerActivity.java | 18 +++++++++++++++++
.../injection/component/ActivityComponent.java | 21 ++++++++++++++++++++
.../component/ApplicationComponent.java | 18 +++++++++++++++++
.../mobile/injection/module/ActivityModule.java | 18 +++++++++++++++++
.../injection/module/ApplicationModule.java | 18 +++++++++++++++++
.../taverna/mobile/ui/DashboardActivity.java | 12 +++--------
.../taverna/mobile/ui/FlashScreenActivity.java | 9 ++++-----
9 files changed, 136 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/6ddf757a/app/src/main/java/org/apache/taverna/mobile/injection/ActivityContext.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/injection/ActivityContext.java b/app/src/main/java/org/apache/taverna/mobile/injection/ActivityContext.java
index 1476b50..d61259b 100644
--- a/app/src/main/java/org/apache/taverna/mobile/injection/ActivityContext.java
+++ b/app/src/main/java/org/apache/taverna/mobile/injection/ActivityContext.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ */
package org.apache.taverna.mobile.injection;
import java.lang.annotation.Retention;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/6ddf757a/app/src/main/java/org/apache/taverna/mobile/injection/ApplicationContext.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/injection/ApplicationContext.java b/app/src/main/java/org/apache/taverna/mobile/injection/ApplicationContext.java
index e71f26a..8366eaf 100644
--- a/app/src/main/java/org/apache/taverna/mobile/injection/ApplicationContext.java
+++ b/app/src/main/java/org/apache/taverna/mobile/injection/ApplicationContext.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ */
package org.apache.taverna.mobile.injection;
import java.lang.annotation.Retention;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/6ddf757a/app/src/main/java/org/apache/taverna/mobile/injection/PerActivity.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/injection/PerActivity.java b/app/src/main/java/org/apache/taverna/mobile/injection/PerActivity.java
index e32dd59..e8ee51a 100755
--- a/app/src/main/java/org/apache/taverna/mobile/injection/PerActivity.java
+++ b/app/src/main/java/org/apache/taverna/mobile/injection/PerActivity.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ */
package org.apache.taverna.mobile.injection;
import java.lang.annotation.Retention;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/6ddf757a/app/src/main/java/org/apache/taverna/mobile/injection/component/ActivityComponent.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/injection/component/ActivityComponent.java b/app/src/main/java/org/apache/taverna/mobile/injection/component/ActivityComponent.java
index c6705f6..c3b09a2 100644
--- a/app/src/main/java/org/apache/taverna/mobile/injection/component/ActivityComponent.java
+++ b/app/src/main/java/org/apache/taverna/mobile/injection/component/ActivityComponent.java
@@ -1,8 +1,27 @@
+/*
+ * 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.
+ */
package org.apache.taverna.mobile.injection.component;
import org.apache.taverna.mobile.injection.PerActivity;
import org.apache.taverna.mobile.injection.module.ActivityModule;
import org.apache.taverna.mobile.ui.DashboardActivity;
+import org.apache.taverna.mobile.ui.FlashScreenActivity;
import org.apache.taverna.mobile.ui.anouncements.AnnouncementFragment;
import org.apache.taverna.mobile.ui.favouriteworkflow.FavouriteWorkflowsActivity;
import org.apache.taverna.mobile.ui.favouriteworkflow.FavouriteWorkflowsFragment;
@@ -75,4 +94,6 @@ public interface ActivityComponent {
void inject(WorkflowDetailFragment workflowDetailFragment);
void inject(WorkflowRunActivity workflowRunActivity);
+
+ void inject(FlashScreenActivity flashScreenActivity);
}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/6ddf757a/app/src/main/java/org/apache/taverna/mobile/injection/component/ApplicationComponent.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/injection/component/ApplicationComponent.java b/app/src/main/java/org/apache/taverna/mobile/injection/component/ApplicationComponent.java
index f084431..22fd38c 100644
--- a/app/src/main/java/org/apache/taverna/mobile/injection/component/ApplicationComponent.java
+++ b/app/src/main/java/org/apache/taverna/mobile/injection/component/ApplicationComponent.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ */
package org.apache.taverna.mobile.injection.component;
import org.apache.taverna.mobile.data.DataManager;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/6ddf757a/app/src/main/java/org/apache/taverna/mobile/injection/module/ActivityModule.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/injection/module/ActivityModule.java b/app/src/main/java/org/apache/taverna/mobile/injection/module/ActivityModule.java
index d54752a..8a2738f 100644
--- a/app/src/main/java/org/apache/taverna/mobile/injection/module/ActivityModule.java
+++ b/app/src/main/java/org/apache/taverna/mobile/injection/module/ActivityModule.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ */
package org.apache.taverna.mobile.injection.module;
import android.app.Activity;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/6ddf757a/app/src/main/java/org/apache/taverna/mobile/injection/module/ApplicationModule.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/injection/module/ApplicationModule.java b/app/src/main/java/org/apache/taverna/mobile/injection/module/ApplicationModule.java
index 7af14f9..7ac727e 100644
--- a/app/src/main/java/org/apache/taverna/mobile/injection/module/ApplicationModule.java
+++ b/app/src/main/java/org/apache/taverna/mobile/injection/module/ApplicationModule.java
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ */
package org.apache.taverna.mobile.injection.module;
import org.apache.taverna.mobile.injection.ApplicationContext;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/6ddf757a/app/src/main/java/org/apache/taverna/mobile/ui/DashboardActivity.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/taverna/mobile/ui/DashboardActivity.java b/app/src/main/java/org/apache/taverna/mobile/ui/DashboardActivity.java
index 2019625..f9a4ae2 100644
--- a/app/src/main/java/org/apache/taverna/mobile/ui/DashboardActivity.java
+++ b/app/src/main/java/org/apache/taverna/mobile/ui/DashboardActivity.java
@@ -27,6 +27,7 @@ import com.bumptech.glide.request.target.SimpleTarget;
import org.apache.taverna.mobile.R;
import org.apache.taverna.mobile.data.DataManager;
import org.apache.taverna.mobile.ui.anouncements.AnnouncementFragment;
+import org.apache.taverna.mobile.ui.base.BaseActivity;
import org.apache.taverna.mobile.ui.favouriteworkflow.FavouriteWorkflowsFragment;
import org.apache.taverna.mobile.ui.login.LoginActivity;
import org.apache.taverna.mobile.ui.myworkflows.MyWorkflowFragment;
@@ -45,7 +46,6 @@ import android.support.v4.view.GravityCompat;
import android.support.v4.widget.DrawerLayout;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.view.Menu;
import android.view.MenuItem;
@@ -63,7 +63,7 @@ import de.hdodenhof.circleimageview.CircleImageView;
import static com.raizlabs.android.dbflow.config.FlowManager.getContext;
-public class DashboardActivity extends AppCompatActivity {
+public class DashboardActivity extends BaseActivity {
@Inject DataManager dataManager;
@@ -83,13 +83,10 @@ public class DashboardActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
-
setContentView(R.layout.activity_dashboard_main);
-
ButterKnife.bind(this);
-
+ getActivityComponent().inject(this);
setupDrawerContent(navigationView);
-
dialog = new Dialog(this);
setSupportActionBar(toolbar);
@@ -99,7 +96,6 @@ public class DashboardActivity extends AppCompatActivity {
ab.setDisplayHomeAsUpEnabled(true);
}
-
/**
* Setting the Fragment in FrameLayout
*/
@@ -115,7 +111,6 @@ public class DashboardActivity extends AppCompatActivity {
setNavHeader();
}
-
/**
* @param navigationView Design Support NavigationView OnClick Listener Event
*/
@@ -254,7 +249,6 @@ public class DashboardActivity extends AppCompatActivity {
});
}
-
@Override
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.dashboard_main, menu);
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/6ddf757a/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 d293223..2e24682 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
@@ -20,14 +20,13 @@ package org.apache.taverna.mobile.ui;
import org.apache.taverna.mobile.R;
import org.apache.taverna.mobile.data.DataManager;
+import org.apache.taverna.mobile.ui.base.BaseActivity;
import org.apache.taverna.mobile.ui.login.LoginActivity;
import org.apache.taverna.mobile.ui.tutorial.TutorialActivity;
-
import android.content.Intent;
import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import android.support.annotation.Nullable;
import java.util.concurrent.TimeUnit;
import javax.inject.Inject;
@@ -37,7 +36,7 @@ import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.functions.Consumer;
import io.reactivex.schedulers.Schedulers;
-public class FlashScreenActivity extends AppCompatActivity {
+public class FlashScreenActivity extends BaseActivity {
@Inject
DataManager dataManager;
@@ -46,6 +45,7 @@ public class FlashScreenActivity extends AppCompatActivity {
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_flash_screen);
+ getActivityComponent().inject(this);
Observable.timer(2, TimeUnit.SECONDS)
.subscribeOn(Schedulers.io())
@@ -72,6 +72,5 @@ public class FlashScreenActivity extends AppCompatActivity {
}
}
});
-
}
}
[2/2] incubator-taverna-mobile git commit: This Close #84
Posted by sa...@apache.org.
This Close #84
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/05ec2999
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/05ec2999
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/05ec2999
Branch: refs/heads/master
Commit: 05ec2999f6ac24a54c3c5ddd6822e720885894f2
Parents: 2e18498 6ddf757
Author: Sagar <ku...@gmail.com>
Authored: Thu Jun 14 09:33:10 2018 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Thu Jun 14 09:33:10 2018 +0530
----------------------------------------------------------------------
.../mobile/injection/ActivityContext.java | 18 +++++++++++++++++
.../mobile/injection/ApplicationContext.java | 18 +++++++++++++++++
.../taverna/mobile/injection/PerActivity.java | 18 +++++++++++++++++
.../injection/component/ActivityComponent.java | 21 ++++++++++++++++++++
.../component/ApplicationComponent.java | 18 +++++++++++++++++
.../mobile/injection/module/ActivityModule.java | 18 +++++++++++++++++
.../injection/module/ApplicationModule.java | 18 +++++++++++++++++
.../taverna/mobile/ui/DashboardActivity.java | 12 +++--------
.../taverna/mobile/ui/FlashScreenActivity.java | 9 ++++-----
9 files changed, 136 insertions(+), 14 deletions(-)
----------------------------------------------------------------------