Move app namespace back to com.kevintcoughlin to unblock release

cascadiacollections · May 24, 2020 · 69d60c0 · 69d60c0
1 parent a0c94bf
commit 69d60c0
Show file tree

Hide file tree

Showing 21 changed files with 47 additions and 47 deletions.
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 
 SModcast Podcast Player for Android
 
-Get it now on [Google Play](https://play.google.com/store/apps/details?id=com.com.cascadiacollections.smodr)
+Get it now on [Google Play](https://play.google.com/store/apps/details?id=com.com.kevintcoughlin.smodr)
 
 ![Channels View](https://lh3.googleusercontent.com/CCmHBWtfnwu9aI6GieX0txC45PPONOmnN64iJ0lipLNqm0WRc7hLTj5Oem2Egh3BU3-b=h900)
 

diff --git a/Smodr/debug/Smodr-debug.aab b/Smodr/debug/Smodr-debug.aab
diff --git a/Smodr/release/Smodr-release.aab b/Smodr/release/Smodr-release.aab
diff --git a/Smodr/src/main/AndroidManifest.xml b/Smodr/src/main/AndroidManifest.xml
@@ -11,7 +11,7 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
     <application
-        android:name="com.cascadiacollections.smodr.SmodrApplication"
+        android:name="com.kevintcoughlin.smodr.SmodrApplication"
         android:label="@string/app_name"
         android:icon="@drawable/icon"
         android:allowBackup="false"
@@ -28,7 +28,7 @@
             android:value="@integer/google_play_services_version" />
 
         <activity
-            android:name="com.cascadiacollections.smodr.views.activities.MainActivity"
+            android:name="com.kevintcoughlin.smodr.views.activities.MainActivity"
             android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -39,7 +39,7 @@
         <service
             android:enabled="true"
             android:label="Playback Service"
-            android:name="com.cascadiacollections.smodr.services.MediaService" />
+            android:name="com.kevintcoughlin.smodr.services.MediaService" />
 
         <activity
             android:name="com.google.android.gms.ads.AdActivity"

diff --git a/...adiacollections/smodr/SmodrApplication.kt → .../kevintcoughlin/smodr/SmodrApplication.kt b/...adiacollections/smodr/SmodrApplication.kt → .../kevintcoughlin/smodr/SmodrApplication.kt
@@ -1,7 +1,7 @@
-package com.cascadiacollections.smodr
+package com.kevintcoughlin.smodr
 
 import android.app.Application
-import com.cascadiacollections.smodr.database.AppDatabase
+import com.kevintcoughlin.smodr.database.AppDatabase
 
 /**
  * The Smodr [Application].

diff --git a/...llections/smodr/database/AppDatabase.java → ...tcoughlin/smodr/database/AppDatabase.java b/...llections/smodr/database/AppDatabase.java → ...tcoughlin/smodr/database/AppDatabase.java
@@ -1,13 +1,13 @@
-package com.cascadiacollections.smodr.database;
+package com.kevintcoughlin.smodr.database;
 
 import android.content.Context;
 
 import androidx.room.Database;
 import androidx.room.Room;
 import androidx.room.RoomDatabase;
 
-import com.cascadiacollections.smodr.models.Item;
-import com.cascadiacollections.smodr.models.ItemDao;
+import com.kevintcoughlin.smodr.models.Item;
+import com.kevintcoughlin.smodr.models.ItemDao;
 
 import java.util.List;
 

diff --git a/...scadiacollections/smodr/models/Channel.kt → ...om/kevintcoughlin/smodr/models/Channel.kt b/...scadiacollections/smodr/models/Channel.kt → ...om/kevintcoughlin/smodr/models/Channel.kt
@@ -1,4 +1,4 @@
-package com.cascadiacollections.smodr.models
+package com.kevintcoughlin.smodr.models
 
 import org.simpleframework.xml.Element
 import org.simpleframework.xml.ElementList

diff --git a/.../cascadiacollections/smodr/models/Feed.kt → ...a/com/kevintcoughlin/smodr/models/Feed.kt b/.../cascadiacollections/smodr/models/Feed.kt → ...a/com/kevintcoughlin/smodr/models/Feed.kt
@@ -1,4 +1,4 @@
-package com.cascadiacollections.smodr.models
+package com.kevintcoughlin.smodr.models
 
 import org.simpleframework.xml.Element
 import org.simpleframework.xml.Root

diff --git a/...ollections/smodr/models/IMediaPlayback.kt → ...ntcoughlin/smodr/models/IMediaPlayback.kt b/...ollections/smodr/models/IMediaPlayback.kt → ...ntcoughlin/smodr/models/IMediaPlayback.kt
@@ -1,4 +1,4 @@
-package com.cascadiacollections.smodr.models
+package com.kevintcoughlin.smodr.models
 
 import android.net.Uri
 

diff --git a/.../cascadiacollections/smodr/models/Item.kt → ...a/com/kevintcoughlin/smodr/models/Item.kt b/.../cascadiacollections/smodr/models/Item.kt → ...a/com/kevintcoughlin/smodr/models/Item.kt
@@ -1,4 +1,4 @@
-package com.cascadiacollections.smodr.models
+package com.kevintcoughlin.smodr.models
 
 import android.net.Uri
 import android.os.Bundle

diff --git a/...adiacollections/smodr/models/ItemDao.java → .../kevintcoughlin/smodr/models/ItemDao.java b/...adiacollections/smodr/models/ItemDao.java → .../kevintcoughlin/smodr/models/ItemDao.java
@@ -1,4 +1,4 @@
-package com.cascadiacollections.smodr.models;
+package com.kevintcoughlin.smodr.models;
 
 import androidx.room.Dao;
 import androidx.room.Delete;

diff --git a/...collections/smodr/services/FeedService.kt → ...intcoughlin/smodr/services/FeedService.kt b/...collections/smodr/services/FeedService.kt → ...intcoughlin/smodr/services/FeedService.kt
@@ -1,6 +1,6 @@
-package com.cascadiacollections.smodr.services
+package com.kevintcoughlin.smodr.services
 
-import com.cascadiacollections.smodr.models.Feed
+import com.kevintcoughlin.smodr.models.Feed
 import retrofit2.Call
 import retrofit2.http.GET
 import retrofit2.http.Url

diff --git a/...ollections/smodr/services/MediaService.kt → ...ntcoughlin/smodr/services/MediaService.kt b/...ollections/smodr/services/MediaService.kt → ...ntcoughlin/smodr/services/MediaService.kt
@@ -1,4 +1,4 @@
-package com.cascadiacollections.smodr.services
+package com.kevintcoughlin.smodr.services
 
 import android.app.Service
 import android.content.Intent
@@ -9,7 +9,7 @@ import android.net.Uri
 import android.os.Binder
 import android.os.IBinder
 import android.widget.Toast
-import com.cascadiacollections.smodr.services.MediaService.IPlaybackListener
+import com.kevintcoughlin.smodr.services.MediaService.IPlaybackListener
 import org.jetbrains.annotations.Contract
 import kotlin.math.min
 
@@ -165,11 +165,11 @@ class MediaService : Service(), MediaPlayer.OnErrorListener, OnPreparedListener,
     companion object {
         const val THIRTY_SECONDS_IN_MILLISECONDS = 30000
         const val INTENT_EPISODE_URL = "intent_episode_url"
-        const val ACTION_PLAY = "com.com.cascadiacollections.smodr.app.PLAY"
-        const val ACTION_PAUSE = "com.com.cascadiacollections.smodr.app.PAUSE"
-        const val ACTION_RESUME = "com.com.cascadiacollections.smodr.app.RESUME"
-        const val ACTION_STOP = "com.com.cascadiacollections.smodr.app.STOP"
-        const val ACTION_FORWARD = "com.com.cascadiacollections.smodr.app.FORWARD"
-        const val ACTION_REWIND = "com.com.cascadiacollections.smodr.app.REWIND"
+        const val ACTION_PLAY = "com.com.kevintcoughlin.smodr.app.PLAY"
+        const val ACTION_PAUSE = "com.com.kevintcoughlin.smodr.app.PAUSE"
+        const val ACTION_RESUME = "com.com.kevintcoughlin.smodr.app.RESUME"
+        const val ACTION_STOP = "com.com.kevintcoughlin.smodr.app.STOP"
+        const val ACTION_FORWARD = "com.com.kevintcoughlin.smodr.app.FORWARD"
+        const val ACTION_REWIND = "com.com.kevintcoughlin.smodr.app.REWIND"
     }
 }
diff --git a/...ns/smodr/utils/StringResourceUtilities.kt → ...in/smodr/utils/StringResourceUtilities.kt b/...ns/smodr/utils/StringResourceUtilities.kt → ...in/smodr/utils/StringResourceUtilities.kt
@@ -1,4 +1,4 @@
-package com.cascadiacollections.smodr.utils
+package com.kevintcoughlin.smodr.utils
 
 import android.content.Context
 import androidx.annotation.StringRes

diff --git a/...ctions/smodr/viewholders/EpisodeView.java → ...ughlin/smodr/viewholders/EpisodeView.java b/...ctions/smodr/viewholders/EpisodeView.java → ...ughlin/smodr/viewholders/EpisodeView.java
@@ -1,4 +1,4 @@
-package com.cascadiacollections.smodr.viewholders;
+package com.kevintcoughlin.smodr.viewholders;
 
 import android.annotation.SuppressLint;
 import android.graphics.Color;
@@ -11,8 +11,8 @@
 import androidx.annotation.NonNull;
 
 import com.cascadiacollections.jamoka.adapter.BinderRecyclerAdapter;
-import com.cascadiacollections.smodr.models.Item;
-import com.cascadiacollections.smodr.utils.StringResourceUtilities;
+import com.kevintcoughlin.smodr.models.Item;
+import com.kevintcoughlin.smodr.utils.StringResourceUtilities;
 import com.kevintcoughlin.smodr.R;
 
 import java.text.ParseException;

diff --git a/.../smodr/viewholders/EpisodeViewHolder.java → .../smodr/viewholders/EpisodeViewHolder.java b/.../smodr/viewholders/EpisodeViewHolder.java → .../smodr/viewholders/EpisodeViewHolder.java
@@ -1,4 +1,4 @@
-package com.cascadiacollections.smodr.viewholders;
+package com.kevintcoughlin.smodr.viewholders;
 
 import android.view.View;
 import android.widget.TextView;

diff --git a/...scadiacollections/smodr/views/TextView.kt → ...om/kevintcoughlin/smodr/views/TextView.kt b/...scadiacollections/smodr/views/TextView.kt → ...om/kevintcoughlin/smodr/views/TextView.kt
@@ -1,4 +1,4 @@
-package com.cascadiacollections.smodr.views
+package com.kevintcoughlin.smodr.views
 
 import android.text.format.DateUtils
 import android.widget.TextView

diff --git a/.../smodr/views/activities/MainActivity.java → .../smodr/views/activities/MainActivity.java b/.../smodr/views/activities/MainActivity.java → .../smodr/views/activities/MainActivity.java
@@ -1,4 +1,4 @@
-package com.cascadiacollections.smodr.views.activities;
+package com.kevintcoughlin.smodr.views.activities;
 
 import android.content.ComponentName;
 import android.content.Context;
@@ -21,12 +21,12 @@
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 
-import com.cascadiacollections.smodr.database.AppDatabase;
-import com.cascadiacollections.smodr.models.Channel;
-import com.cascadiacollections.smodr.models.Item;
-import com.cascadiacollections.smodr.services.MediaService;
-import com.cascadiacollections.smodr.views.TextViewKt;
-import com.cascadiacollections.smodr.views.fragments.EpisodesFragment;
+import com.kevintcoughlin.smodr.database.AppDatabase;
+import com.kevintcoughlin.smodr.models.Channel;
+import com.kevintcoughlin.smodr.models.Item;
+import com.kevintcoughlin.smodr.services.MediaService;
+import com.kevintcoughlin.smodr.views.TextViewKt;
+import com.kevintcoughlin.smodr.views.fragments.EpisodesFragment;
 import com.google.android.gms.ads.AdListener;
 import com.google.android.gms.ads.AdRequest;
 import com.google.android.gms.ads.InterstitialAd;

diff --git a/...odr/views/fragments/EpisodesFragment.java → ...odr/views/fragments/EpisodesFragment.java b/...odr/views/fragments/EpisodesFragment.java → ...odr/views/fragments/EpisodesFragment.java
@@ -1,4 +1,4 @@
-package com.cascadiacollections.smodr.views.fragments;
+package com.kevintcoughlin.smodr.views.fragments;
 
 import android.os.Bundle;
 import android.view.View;
@@ -12,13 +12,13 @@
 
 import com.cascadiacollections.jamoka.adapter.BinderRecyclerAdapter;
 import com.cascadiacollections.jamoka.fragment.BinderRecyclerFragment;
-import com.cascadiacollections.smodr.database.AppDatabase;
-import com.cascadiacollections.smodr.models.Channel;
-import com.cascadiacollections.smodr.models.Feed;
-import com.cascadiacollections.smodr.models.Item;
-import com.cascadiacollections.smodr.services.FeedService;
-import com.cascadiacollections.smodr.viewholders.EpisodeView;
-import com.cascadiacollections.smodr.viewholders.EpisodeViewHolder;
+import com.kevintcoughlin.smodr.database.AppDatabase;
+import com.kevintcoughlin.smodr.models.Channel;
+import com.kevintcoughlin.smodr.models.Feed;
+import com.kevintcoughlin.smodr.models.Item;
+import com.kevintcoughlin.smodr.services.FeedService;
+import com.kevintcoughlin.smodr.viewholders.EpisodeView;
+import com.kevintcoughlin.smodr.viewholders.EpisodeViewHolder;
 
 import org.jetbrains.annotations.Contract;
 
@@ -33,7 +33,7 @@
 import retrofit2.converter.simplexml.SimpleXmlConverterFactory;
 
 public final class EpisodesFragment extends BinderRecyclerFragment<Item, EpisodeViewHolder> implements Callback<Feed> {
-    private static final String EPISODE_FEED_URL = "com.com.cascadiacollections.smodr.views.fragments.EpisodesFragment.feedUrl";
+    private static final String EPISODE_FEED_URL = "com.com.kevintcoughlin.smodr.views.fragments.EpisodesFragment.feedUrl";
     private static final String BASE_URL = "https://www.smodcast.com/";
     private FeedService mFeedService;
 

diff --git a/...smodr/views/fragments/SettingsFragment.kt → ...smodr/views/fragments/SettingsFragment.kt b/...smodr/views/fragments/SettingsFragment.kt → ...smodr/views/fragments/SettingsFragment.kt
@@ -1,4 +1,4 @@
-package com.cascadiacollections.smodr.views.fragments
+package com.kevintcoughlin.smodr.views.fragments
 
 import android.os.Bundle
 import androidx.preference.PreferenceFragmentCompat