Change everything from nz.scuttlebutt.app to social.sunrise.app

sunrise-choir · Oct 25, 2019 · ae6c2fc · ae6c2fc
1 parent ef0457c
commit ae6c2fc
Show file tree

Hide file tree

Showing 62 changed files with 236 additions and 205 deletions.
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -27,7 +27,7 @@ android {
         enabled = true
     }
     defaultConfig {
-        applicationId "nz.scuttlebutt.android_go"
+        applicationId "social.sunrise.app"
         minSdkVersion 23
         targetSdkVersion 29
         versionCode 1

diff --git a/...utt/android_go/ExampleInstrumentedTest.kt → ...al/sunrise/app/ExampleInstrumentedTest.kt b/...utt/android_go/ExampleInstrumentedTest.kt → ...al/sunrise/app/ExampleInstrumentedTest.kt
@@ -1,4 +1,4 @@
-package nz.scuttlebutt.android_go
+package social.sunrise.app
 
 //import androidx.test.ext.junit.runners.AndroidJUnit4
 

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="nz.scuttlebutt.android_go">
+    package="social.sunrise.app">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.INTERNET" />

diff --git a/...z/scuttlebutt/android_go/ProfileHolder.kt → .../java/social/sunrise/app/ProfileHolder.kt b/...z/scuttlebutt/android_go/ProfileHolder.kt → .../java/social/sunrise/app/ProfileHolder.kt
@@ -1,4 +1,4 @@
-package nz.scuttlebutt.android_go
+package social.sunrise.app
 
 
 import android.os.Bundle

diff --git a/.../scuttlebutt/android_go/ScuttlebuttApp.kt → ...java/social/sunrise/app/ScuttlebuttApp.kt b/.../scuttlebutt/android_go/ScuttlebuttApp.kt → ...java/social/sunrise/app/ScuttlebuttApp.kt
@@ -1,9 +1,10 @@
-package nz.scuttlebutt.android_go
+package social.sunrise.app
 
 
 import android.Manifest
 import android.app.Activity
 import android.app.Application
+import android.content.Context
 import android.content.pm.PackageManager
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
@@ -20,25 +21,25 @@ import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.content
-import nz.scuttlebutt.android_go.database.Database
-import nz.scuttlebutt.android_go.models.PatchqlBackgroundMessage
-import nz.scuttlebutt.android_go.utils.SsbUri
 import org.kodein.di.Kodein
 import org.kodein.di.KodeinAware
 import org.kodein.di.generic.*
+import social.sunrise.app.database.Database
+import social.sunrise.app.models.PatchqlBackgroundMessage
+import social.sunrise.app.utils.SsbUri
 import java.io.File
 
 
 @Serializable
 data class Secret(val id: String, val private: String, val curve: String, val public: String)
 
 
-
 class ScuttlebuttApp : Application(), KodeinAware {
 
     override val kodein: Kodein by Kodein.lazy {
         checkPermissions()
-        val externalDir = "/sdcard"
+        //val externalDir = "/sdcard"
+        val externalDir = getDir("scuttlebutt", Context.MODE_PRIVATE).absolutePath
         val repoPath = externalDir + getString(R.string.ssb_go_folder_name)
         val dbPath =
             getDatabasePath(getString(R.string.patchql_sqlite_db_name))?.absolutePath!!

diff --git a/...va/nz/scuttlebutt/android_go/SsbServer.kt → ...main/java/social/sunrise/app/SsbServer.kt b/...va/nz/scuttlebutt/android_go/SsbServer.kt → ...main/java/social/sunrise/app/SsbServer.kt
@@ -1,4 +1,4 @@
-package nz.scuttlebutt.android_go
+package social.sunrise.app
 
 import android.util.Log
 import gobotexample.Gobotexample
@@ -9,11 +9,11 @@ import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonConfiguration
-import nz.scuttlebutt.android_go.lib.AuthorRelationship
+import social.sunrise.app.lib.AuthorRelationship
 
 
 @Serializable
-data class Post(val text: String){
+data class Post(val text: String) {
     val type = "post"
 }
 
@@ -35,7 +35,7 @@ data class Like(@Transient val link: String = "", @Transient val value: Int = 0)
 // Message types for counterActor
 sealed class SsbServerMsg
 
-object StartServer: SsbServerMsg()
+object StartServer : SsbServerMsg()
 object StopServer : SsbServerMsg()
 
 class PublishLikeMessage(

diff --git a/...utt/android_go/activities/MainActivity.kt → ...al/sunrise/app/activities/MainActivity.kt b/...utt/android_go/activities/MainActivity.kt → ...al/sunrise/app/activities/MainActivity.kt
@@ -1,4 +1,4 @@
-package nz.scuttlebutt.android_go.activities
+package social.sunrise.app.activities
 
 
 import android.Manifest
@@ -12,11 +12,11 @@ import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProviders
 import androidx.navigation.findNavController
 import androidx.navigation.ui.NavigationUI
-import nz.scuttlebutt.android_go.R
-import nz.scuttlebutt.android_go.databinding.ActivityMainBinding
-import nz.scuttlebutt.android_go.viewModels.MainActivityViewModel
 import org.kodein.di.KodeinAware
 import org.kodein.di.android.kodein
+import social.sunrise.app.R
+import social.sunrise.app.databinding.ActivityMainBinding
+import social.sunrise.app.viewModels.MainActivityViewModel
 
 class MainActivity : AppCompatActivity(), KodeinAware {
 

diff --git a/...ebutt/android_go/adapters/PostsAdapter.kt → ...cial/sunrise/app/adapters/PostsAdapter.kt b/...ebutt/android_go/adapters/PostsAdapter.kt → ...cial/sunrise/app/adapters/PostsAdapter.kt
@@ -1,4 +1,4 @@
-package nz.scuttlebutt.android_go.adapters
+package social.sunrise.app.adapters
 
 import android.graphics.BitmapFactory
 import android.view.LayoutInflater
@@ -11,11 +11,11 @@ import androidx.navigation.findNavController
 import androidx.paging.PagedListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import io.noties.markwon.Markwon
-import nz.scuttlebutt.android_go.NavigationDirections
-import nz.scuttlebutt.android_go.R
-import nz.scuttlebutt.android_go.databinding.FragmentThreadSummaryBinding
-import nz.scuttlebutt.android_go.models.LIVE_DIFF_CALLBACK
-import nz.scuttlebutt.android_go.models.Post
+import social.sunrise.app.NavigationDirections
+import social.sunrise.app.R
+import social.sunrise.app.databinding.FragmentThreadSummaryBinding
+import social.sunrise.app.models.LIVE_DIFF_CALLBACK
+import social.sunrise.app.models.Post
 import java.util.*
 
 

diff --git a/...utt/android_go/adapters/ThreadsAdapter.kt → ...al/sunrise/app/adapters/ThreadsAdapter.kt b/...utt/android_go/adapters/ThreadsAdapter.kt → ...al/sunrise/app/adapters/ThreadsAdapter.kt
@@ -1,4 +1,4 @@
-package nz.scuttlebutt.android_go.adapters
+package social.sunrise.app.adapters
 
 import android.graphics.BitmapFactory
 import android.view.LayoutInflater
@@ -11,12 +11,12 @@ import androidx.navigation.findNavController
 import androidx.paging.PagedListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import io.noties.markwon.Markwon
-import nz.scuttlebutt.android_go.NavigationDirections
-import nz.scuttlebutt.android_go.R
-import nz.scuttlebutt.android_go.databinding.FragmentThreadSummaryBinding
-import nz.scuttlebutt.android_go.fragments.ThreadFragmentDirections
-import nz.scuttlebutt.android_go.models.LIVE_THREAD_DIFF_CALLBACK
-import nz.scuttlebutt.android_go.models.Thread
+import social.sunrise.app.NavigationDirections
+import social.sunrise.app.R
+import social.sunrise.app.databinding.FragmentThreadSummaryBinding
+import social.sunrise.app.fragments.ThreadFragmentDirections
+import social.sunrise.app.models.LIVE_THREAD_DIFF_CALLBACK
+import social.sunrise.app.models.Thread
 import java.util.*
 
 

diff --git a/...a/nz/scuttlebutt/android_go/dao/Author.kt → ...ain/java/social/sunrise/app/dao/Author.kt b/...a/nz/scuttlebutt/android_go/dao/Author.kt → ...ain/java/social/sunrise/app/dao/Author.kt
@@ -1,8 +1,8 @@
-package nz.scuttlebutt.android_go.dao
+package social.sunrise.app.dao
 
 import com.sunrisechoir.graphql.AuthorProfileQuery
-import nz.scuttlebutt.android_go.lib.AuthorRelationship
-import nz.scuttlebutt.android_go.models.LiveAuthor
+import social.sunrise.app.lib.AuthorRelationship
+import social.sunrise.app.models.LiveAuthor
 
 interface Author {
     fun get(query: () -> AuthorProfileQuery.Builder): LiveAuthor

diff --git a/...ava/nz/scuttlebutt/android_go/dao/Blob.kt → .../main/java/social/sunrise/app/dao/Blob.kt b/...ava/nz/scuttlebutt/android_go/dao/Blob.kt → .../main/java/social/sunrise/app/dao/Blob.kt
@@ -1,4 +1,4 @@
-package nz.scuttlebutt.android_go.dao
+package social.sunrise.app.dao
 
 import androidx.lifecycle.LiveData
 

diff --git a/...uttlebutt/android_go/dao/Notifications.kt → ...a/social/sunrise/app/dao/Notifications.kt b/...uttlebutt/android_go/dao/Notifications.kt → ...a/social/sunrise/app/dao/Notifications.kt
@@ -1,4 +1,4 @@
-package nz.scuttlebutt.android_go.dao
+package social.sunrise.app.dao
 
 import androidx.lifecycle.LiveData
 import com.sunrisechoir.graphql.PostsQuery

diff --git a/...ava/nz/scuttlebutt/android_go/dao/Post.kt → .../main/java/social/sunrise/app/dao/Post.kt b/...ava/nz/scuttlebutt/android_go/dao/Post.kt → .../main/java/social/sunrise/app/dao/Post.kt
@@ -1,10 +1,10 @@
-package nz.scuttlebutt.android_go.dao
+package social.sunrise.app.dao
 
 import androidx.lifecycle.LiveData
 import androidx.paging.DataSource
 import com.sunrisechoir.graphql.PostsQuery
 
-import nz.scuttlebutt.android_go.models.Post as PostModel
+import social.sunrise.app.models.Post as PostModel
 
 interface Post {
     fun reload(postId: String)

diff --git a/...a/nz/scuttlebutt/android_go/dao/Thread.kt → ...ain/java/social/sunrise/app/dao/Thread.kt b/...a/nz/scuttlebutt/android_go/dao/Thread.kt → ...ain/java/social/sunrise/app/dao/Thread.kt
@@ -1,9 +1,9 @@
-package nz.scuttlebutt.android_go.dao
+package social.sunrise.app.dao
 
 import androidx.lifecycle.LiveData
 import androidx.paging.DataSource
 import com.sunrisechoir.graphql.ThreadForPostQuery
-import nz.scuttlebutt.android_go.models.Post
+import social.sunrise.app.models.Post
 
 //TODO this won't work yet.
 // It would be cool if thread had paginated replies but it doesn't. This means making live data here isn't quite right. tbd.

diff --git a/.../nz/scuttlebutt/android_go/dao/Threads.kt → ...in/java/social/sunrise/app/dao/Threads.kt b/.../nz/scuttlebutt/android_go/dao/Threads.kt → ...in/java/social/sunrise/app/dao/Threads.kt
@@ -1,9 +1,9 @@
-package nz.scuttlebutt.android_go.dao
+package social.sunrise.app.dao
 
 import androidx.lifecycle.LiveData
 import androidx.paging.DataSource
 import com.sunrisechoir.graphql.ThreadsSummaryQuery
-import nz.scuttlebutt.android_go.models.Thread
+import social.sunrise.app.models.Thread
 
 interface Threads {
     fun reload(rootId: String)

diff --git a/...uttlebutt/android_go/database/Database.kt → ...a/social/sunrise/app/database/Database.kt b/...uttlebutt/android_go/database/Database.kt → ...a/social/sunrise/app/database/Database.kt
@@ -1,22 +1,22 @@
-package nz.scuttlebutt.android_go.database
+package social.sunrise.app.database
 
 import com.sunrisechoir.patchql.PatchqlApollo
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.channels.SendChannel
-import nz.scuttlebutt.android_go.SsbServerMsg
-import nz.scuttlebutt.android_go.database.authorProfile.AuthorProfileDaoImpl
-import nz.scuttlebutt.android_go.database.blob.BlobDaoImpl
-import nz.scuttlebutt.android_go.database.notifications.NotificationsDaoImpl
-import nz.scuttlebutt.android_go.database.post.PostDaoImpl
-import nz.scuttlebutt.android_go.database.threads.ThreadDaoImpl
-import nz.scuttlebutt.android_go.database.threads.ThreadsDaoImpl
-import nz.scuttlebutt.android_go.models.PatchqlBackgroundMessage
-import nz.scuttlebutt.android_go.dao.Author as AuthorProfileDao
-import nz.scuttlebutt.android_go.dao.Blob as BlobDao
-import nz.scuttlebutt.android_go.dao.Notifications as NotificationsDao
-import nz.scuttlebutt.android_go.dao.Post as PostDao
-import nz.scuttlebutt.android_go.dao.Thread as ThreadDao
-import nz.scuttlebutt.android_go.dao.Threads as ThreadsDao
+import social.sunrise.app.SsbServerMsg
+import social.sunrise.app.database.authorProfile.AuthorProfileDaoImpl
+import social.sunrise.app.database.blob.BlobDaoImpl
+import social.sunrise.app.database.notifications.NotificationsDaoImpl
+import social.sunrise.app.database.post.PostDaoImpl
+import social.sunrise.app.database.threads.ThreadDaoImpl
+import social.sunrise.app.database.threads.ThreadsDaoImpl
+import social.sunrise.app.models.PatchqlBackgroundMessage
+import social.sunrise.app.dao.Author as AuthorProfileDao
+import social.sunrise.app.dao.Blob as BlobDao
+import social.sunrise.app.dao.Notifications as NotificationsDao
+import social.sunrise.app.dao.Post as PostDao
+import social.sunrise.app.dao.Thread as ThreadDao
+import social.sunrise.app.dao.Threads as ThreadsDao
 
 class Database(
     patchqlApollo: PatchqlApollo,

diff --git a/...ase/authorProfile/AuthorProfileDaoImpl.kt → ...ase/authorProfile/AuthorProfileDaoImpl.kt b/...ase/authorProfile/AuthorProfileDaoImpl.kt → ...ase/authorProfile/AuthorProfileDaoImpl.kt
@@ -1,18 +1,18 @@
-package nz.scuttlebutt.android_go.database.authorProfile
+package social.sunrise.app.database.authorProfile
 
 import androidx.lifecycle.MutableLiveData
 import com.sunrisechoir.graphql.AuthorProfileQuery
 import com.sunrisechoir.patchql.PatchqlApollo
 import kotlinx.coroutines.*
 import kotlinx.coroutines.channels.SendChannel
-import nz.scuttlebutt.android_go.PublishContactMessage
-import nz.scuttlebutt.android_go.SsbServerMsg
-import nz.scuttlebutt.android_go.lib.AuthorRelationship
-import nz.scuttlebutt.android_go.models.Author
-import nz.scuttlebutt.android_go.models.LiveAuthor
-import nz.scuttlebutt.android_go.models.PatchqlBackgroundMessage
-import nz.scuttlebutt.android_go.models.ProcessNextChunk
-import nz.scuttlebutt.android_go.dao.Author as AuthorDao
+import social.sunrise.app.PublishContactMessage
+import social.sunrise.app.SsbServerMsg
+import social.sunrise.app.lib.AuthorRelationship
+import social.sunrise.app.models.Author
+import social.sunrise.app.models.LiveAuthor
+import social.sunrise.app.models.PatchqlBackgroundMessage
+import social.sunrise.app.models.ProcessNextChunk
+import social.sunrise.app.dao.Author as AuthorDao
 
 class AuthorProfileDaoImpl(
     private val patchqlApollo: PatchqlApollo,

diff --git a/...t/android_go/database/blob/BlobDaoImpl.kt → .../sunrise/app/database/blob/BlobDaoImpl.kt b/...t/android_go/database/blob/BlobDaoImpl.kt → .../sunrise/app/database/blob/BlobDaoImpl.kt
@@ -1,14 +1,14 @@
-package nz.scuttlebutt.android_go.database.blob
+package social.sunrise.app.database.blob
 
 import androidx.collection.LruCache
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import com.sunrisechoir.patchql.PatchqlApollo
 import kotlinx.coroutines.*
 import kotlinx.coroutines.channels.SendChannel
-import nz.scuttlebutt.android_go.GetBlob
-import nz.scuttlebutt.android_go.SsbServerMsg
-import nz.scuttlebutt.android_go.dao.Blob as BlobDao
+import social.sunrise.app.GetBlob
+import social.sunrise.app.SsbServerMsg
+import social.sunrise.app.dao.Blob as BlobDao
 
 class BlobDaoImpl(
     private val patchqlApollo: PatchqlApollo,