From 2e12c3931a37c64d1e263c3aad01ef1165a75df4 Mon Sep 17 00:00:00 2001
From: Ben Weiss <benweiss@google.com>
Date: Fri, 20 Jul 2018 11:52:18 +0100
Subject: [PATCH] ActivityHelper package fixes

---
 .../java/io/plaidapp/about/ui/AboutActivity.kt   |  1 -
 .../about/ui/model/AboutViewModelTest.kt         | 16 ++++++++++++++++
 .../java/io/plaidapp/core/util/ActivityHelper.kt |  5 ++---
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/about/src/main/java/io/plaidapp/about/ui/AboutActivity.kt b/about/src/main/java/io/plaidapp/about/ui/AboutActivity.kt
index 5ce6a7038..b9120646c 100644
--- a/about/src/main/java/io/plaidapp/about/ui/AboutActivity.kt
+++ b/about/src/main/java/io/plaidapp/about/ui/AboutActivity.kt
@@ -17,7 +17,6 @@
 package io.plaidapp.about.ui
 
 import android.arch.lifecycle.ViewModelProviders
-import android.net.Uri
 import android.os.Bundle
 import android.support.customtabs.CustomTabsIntent
 import android.support.v4.content.ContextCompat
diff --git a/about/src/test/java/io/plaidapp/about/ui/model/AboutViewModelTest.kt b/about/src/test/java/io/plaidapp/about/ui/model/AboutViewModelTest.kt
index 426577016..8e2967524 100644
--- a/about/src/test/java/io/plaidapp/about/ui/model/AboutViewModelTest.kt
+++ b/about/src/test/java/io/plaidapp/about/ui/model/AboutViewModelTest.kt
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2018 Google, Inc.
+ *
+ * Licensed 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 io.plaidapp.about.ui.model
 
 import `in`.uncod.android.bypass.Markdown
diff --git a/core/src/main/java/io/plaidapp/core/util/ActivityHelper.kt b/core/src/main/java/io/plaidapp/core/util/ActivityHelper.kt
index 0c69ac8ef..28747e366 100644
--- a/core/src/main/java/io/plaidapp/core/util/ActivityHelper.kt
+++ b/core/src/main/java/io/plaidapp/core/util/ActivityHelper.kt
@@ -32,7 +32,6 @@ import io.plaidapp.core.designernews.data.votes.UpvoteStoryService
  * Helpers to start activities in a modularized world.
  */
 
-private const val PACKAGE_NAME_OLD = "io.plaidapp.ui"
 private const val PACKAGE_NAME = "io.plaidapp"
 
 /**
@@ -116,7 +115,7 @@ object Activities {
          * PostNewDesignerNewsStory Activity
          */
         object PostStory : AddressableActivity {
-            override val className = "$PACKAGE_NAME_OLD.designernews.PostNewDesignerNewsStory"
+            override val className = "$PACKAGE_NAME.designernews.PostNewDesignerNewsStory"
 
             const val RESULT_DRAG_DISMISSED = 3
             const val RESULT_POSTING = 4
@@ -142,7 +141,7 @@ object Activities {
      * SearchActivity
      */
     object Search : AddressableActivity {
-        override val className = "$PACKAGE_NAME_OLD.search.SearchActivity"
+        override val className = "$PACKAGE_NAME.ui.search.SearchActivity"
 
         const val EXTRA_QUERY = "EXTRA_QUERY"
         const val EXTRA_SAVE_DRIBBBLE = "EXTRA_SAVE_DRIBBBLE"