Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor: Rename package name from space.taran to dev.arkbuilders #28

Merged
merged 1 commit into from
Nov 7, 2023
Merged

Refactor: Rename package name from space.taran to dev.arkbuilders #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ android {
compileSdk 33

defaultConfig {
applicationId "space.taran.arkmemo"
applicationId "dev.arkbuilders.arkmemo"
minSdk 26
targetSdk 33
versionCode 1
Expand Down
4 changes: 2 additions & 2 deletions .../taran/arkmemo/ExampleInstrumentedTest.kt → ...ilders/arkmemo/ExampleInstrumentedTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package space.taran.arkmemo
package dev.arkbuilders.arkmemo

import androidx.test.platform.app.InstrumentationRegistry
import androidx.test.ext.junit.runners.AndroidJUnit4
Expand All @@ -19,6 +19,6 @@ class ExampleInstrumentedTest {
fun useAppContext() {
// Context of the app under test.
val appContext = InstrumentationRegistry.getInstrumentation().targetContext
assertEquals("space.taran.arkmemo", appContext.packageName)
assertEquals("dev.arkbuilders.arkmemo", appContext.packageName)
}
}
2 changes: 1 addition & 1 deletion app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="space.taran.arkmemo">
package="dev.arkbuilders.arkmemo">

<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
Expand Down
5 changes: 2 additions & 3 deletions app/src/main/java/space/taran/arkmemo/App.kt → .../main/java/dev/arkbuilders/arkmemo/App.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package space.taran.arkmemo
package dev.arkbuilders.arkmemo

import android.app.Application
import android.content.Context
import dagger.hilt.android.HiltAndroidApp
import dev.arkbuilders.arklib.initArkLib
import kotlinx.coroutines.CoroutineScope
Expand All @@ -13,7 +12,7 @@ import org.acra.data.StringFormat
import org.acra.ktx.initAcra
import org.acra.sender.HttpSender
import dev.arkbuilders.arkfilepicker.folders.FoldersRepo
import space.taran.arkmemo.space.taran.arkmemo.utils.Config
import dev.arkbuilders.arkmemo.utils.Config

@HiltAndroidApp
class App: Application() {
Expand Down
4 changes: 1 addition & 3 deletions ...n/arkmemo/contracts/PermissionContract.kt → ...s/arkmemo/contracts/PermissionContract.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package space.taran.arkmemo.contracts
package dev.arkbuilders.arkmemo.contracts

import android.app.Activity
import android.content.Context
import android.content.Intent
import android.net.Uri
Expand All @@ -9,7 +8,6 @@ import android.os.Environment
import android.provider.Settings
import androidx.activity.result.contract.ActivityResultContract
import androidx.annotation.RequiresApi
import space.taran.arkmemo.files.FilePicker

class PermissionContract: ActivityResultContract<String, Boolean>() {

Expand Down
2 changes: 1 addition & 1 deletion .../space/taran/arkmemo/data/ResourceMeta.kt → .../arkbuilders/arkmemo/data/ResourceMeta.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package space.taran.arkmemo.data
package dev.arkbuilders.arkmemo.data

import dev.arkbuilders.arklib.ResourceId
import java.nio.file.attribute.FileTime
Expand Down
4 changes: 2 additions & 2 deletions ...rkmemo/data/repositories/TextNotesRepo.kt → ...rkmemo/data/repositories/TextNotesRepo.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package space.taran.arkmemo.data.repositories
package dev.arkbuilders.arkmemo.data.repositories

import kotlinx.coroutines.CoroutineScope
import space.taran.arkmemo.models.TextNote
import dev.arkbuilders.arkmemo.models.TextNote
import java.nio.file.Path

interface TextNotesRepo {
Expand Down
8 changes: 4 additions & 4 deletions ...mo/data/repositories/TextNotesRepoImpl.kt → ...mo/data/repositories/TextNotesRepoImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package space.taran.arkmemo.data.repositories
package dev.arkbuilders.arkmemo.data.repositories

import android.util.Log
import dev.arkbuilders.arklib.ResourceId
Expand All @@ -10,8 +10,8 @@ import dev.arkbuilders.arklib.user.properties.PropertiesStorageRepo
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import space.taran.arkmemo.data.ResourceMeta
import space.taran.arkmemo.models.TextNote
import dev.arkbuilders.arkmemo.data.ResourceMeta
import dev.arkbuilders.arkmemo.models.TextNote
import java.nio.file.Files
import java.nio.file.Path
import javax.inject.Inject
Expand Down Expand Up @@ -69,7 +69,7 @@ class TextNotesRepoImpl @Inject constructor(): TextNotesRepo {
size
)
val titles = propertiesStorage.getProperties(id).titles
val content = TextNote.Content(titles.elementAt(0), data.toString())
val content = TextNote.Content(titles.elementAtOrNull(0) ?: "", data.toString())
val note = TextNote(content, meta)
notes.add(note)
}
Expand Down
6 changes: 3 additions & 3 deletions ...ace/taran/arkmemo/di/PreferencesModule.kt → ...kbuilders/arkmemo/di/PreferencesModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package space.taran.arkmemo.di
package dev.arkbuilders.arkmemo.di

import dagger.Binds
import dagger.Module
import dagger.hilt.InstallIn
import dagger.hilt.components.SingletonComponent
import space.taran.arkmemo.preferences.MemoPreferences
import space.taran.arkmemo.preferences.MemoPreferencesImpl
import dev.arkbuilders.arkmemo.preferences.MemoPreferences
import dev.arkbuilders.arkmemo.preferences.MemoPreferencesImpl

@InstallIn(SingletonComponent::class)
@Module
Expand Down
6 changes: 3 additions & 3 deletions ...pace/taran/arkmemo/di/RepositoryModule.kt → ...rkbuilders/arkmemo/di/RepositoryModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package space.taran.arkmemo.di
package dev.arkbuilders.arkmemo.di

import dagger.Binds
import dagger.Module
import dagger.hilt.InstallIn
import dagger.hilt.components.SingletonComponent
import space.taran.arkmemo.data.repositories.TextNotesRepo
import space.taran.arkmemo.data.repositories.TextNotesRepoImpl
import dev.arkbuilders.arkmemo.data.repositories.TextNotesRepo
import dev.arkbuilders.arkmemo.data.repositories.TextNotesRepoImpl


@InstallIn(SingletonComponent::class)
Expand Down
6 changes: 3 additions & 3 deletions ...a/space/taran/arkmemo/files/FilePicker.kt → ...v/arkbuilders/arkmemo/files/FilePicker.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package space.taran.arkmemo.files
package dev.arkbuilders.arkmemo.files

import android.Manifest
import android.content.Context
Expand All @@ -13,8 +13,8 @@ import androidx.fragment.app.FragmentManager
import dev.arkbuilders.arkfilepicker.ArkFilePickerConfig
import dev.arkbuilders.arkfilepicker.presentation.filepicker.ArkFilePickerFragment
import dev.arkbuilders.arkfilepicker.presentation.filepicker.ArkFilePickerMode
import space.taran.arkmemo.BuildConfig
import space.taran.arkmemo.R
import dev.arkbuilders.arkmemo.BuildConfig
import dev.arkbuilders.arkmemo.R

class FilePicker private constructor(){
companion object{
Expand Down
5 changes: 2 additions & 3 deletions ...taran/arkmemo/files/parsers/JsonParser.kt → ...lders/arkmemo/files/parsers/JsonParser.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
package space.taran.arkmemo.files.parsers
package dev.arkbuilders.arkmemo.files.parsers

import android.graphics.Path
import com.google.gson.Gson
import space.taran.arkmemo.models.TextNote
import dev.arkbuilders.arkmemo.models.TextNote

class JsonParser {
companion object{
Expand Down
4 changes: 2 additions & 2 deletions ...va/space/taran/arkmemo/models/TextNote.kt → ...ev/arkbuilders/arkmemo/models/TextNote.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package space.taran.arkmemo.models
package dev.arkbuilders.arkmemo.models

import android.os.Parcelable
import kotlinx.parcelize.IgnoredOnParcel
import space.taran.arkmemo.data.ResourceMeta
import dev.arkbuilders.arkmemo.data.ResourceMeta
import kotlinx.parcelize.Parcelize

@Parcelize
Expand Down
2 changes: 1 addition & 1 deletion ...an/arkmemo/preferences/MemoPreferences.kt → ...rs/arkmemo/preferences/MemoPreferences.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package space.taran.arkmemo.preferences
package dev.arkbuilders.arkmemo.preferences

import java.nio.file.Path

Expand Down
2 changes: 1 addition & 1 deletion ...rkmemo/preferences/MemoPreferencesImpl.kt → ...rkmemo/preferences/MemoPreferencesImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package space.taran.arkmemo.preferences
package dev.arkbuilders.arkmemo.preferences

import android.content.Context
import android.content.Context.MODE_PRIVATE
Expand Down
18 changes: 9 additions & 9 deletions ...ran/arkmemo/ui/activities/MainActivity.kt → ...ers/arkmemo/ui/activities/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package space.taran.arkmemo.ui.activities
package dev.arkbuilders.arkmemo.ui.activities

import android.content.ClipboardManager
import android.content.Context
Expand All @@ -15,14 +15,14 @@ import androidx.fragment.app.Fragment
import by.kirich1409.viewbindingdelegate.viewBinding
import dagger.hilt.android.AndroidEntryPoint
import dev.arkbuilders.arkfilepicker.presentation.onArkPathPicked
import space.taran.arkmemo.R
import space.taran.arkmemo.contracts.PermissionContract
import space.taran.arkmemo.databinding.ActivityMainBinding
import space.taran.arkmemo.files.FilePicker
import space.taran.arkmemo.preferences.MemoPreferences
import space.taran.arkmemo.ui.fragments.EditTextNotesFragment
import space.taran.arkmemo.ui.fragments.SettingsFragment
import space.taran.arkmemo.ui.fragments.TextNotesFragment
import dev.arkbuilders.arkmemo.R
import dev.arkbuilders.arkmemo.contracts.PermissionContract
import dev.arkbuilders.arkmemo.databinding.ActivityMainBinding
import dev.arkbuilders.arkmemo.files.FilePicker
import dev.arkbuilders.arkmemo.preferences.MemoPreferences
import dev.arkbuilders.arkmemo.ui.fragments.EditTextNotesFragment
import dev.arkbuilders.arkmemo.ui.fragments.SettingsFragment
import dev.arkbuilders.arkmemo.ui.fragments.TextNotesFragment
import javax.inject.Inject

@AndroidEntryPoint
Expand Down
16 changes: 8 additions & 8 deletions ...kmemo/ui/adapters/TextNotesListAdapter.kt → ...kmemo/ui/adapters/TextNotesListAdapter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package space.taran.arkmemo.ui.adapters
package dev.arkbuilders.arkmemo.ui.adapters

import android.view.LayoutInflater
import android.view.View
Expand All @@ -7,13 +7,13 @@ import androidx.appcompat.app.AppCompatActivity
import androidx.fragment.app.FragmentManager
import androidx.recyclerview.widget.RecyclerView
import by.kirich1409.viewbindingdelegate.viewBinding
import space.taran.arkmemo.R
import space.taran.arkmemo.databinding.TextNoteBinding
import space.taran.arkmemo.models.TextNote
import space.taran.arkmemo.ui.activities.MainActivity
import space.taran.arkmemo.ui.activities.replaceFragment
import space.taran.arkmemo.ui.dialogs.NoteDeleteDialogFragment
import space.taran.arkmemo.ui.fragments.EditTextNotesFragment
import dev.arkbuilders.arkmemo.R
import dev.arkbuilders.arkmemo.databinding.TextNoteBinding
import dev.arkbuilders.arkmemo.models.TextNote
import dev.arkbuilders.arkmemo.ui.activities.MainActivity
import dev.arkbuilders.arkmemo.ui.activities.replaceFragment
import dev.arkbuilders.arkmemo.ui.dialogs.NoteDeleteDialogFragment
import dev.arkbuilders.arkmemo.ui.fragments.EditTextNotesFragment

class TextNotesListAdapter(private val notes: List<TextNote>): RecyclerView.Adapter<TextNotesListAdapter.NoteViewHolder>() {

Expand Down
8 changes: 4 additions & 4 deletions ...mo/ui/dialogs/NoteDeleteDialogFragment.kt → ...mo/ui/dialogs/NoteDeleteDialogFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package space.taran.arkmemo.ui.dialogs
package dev.arkbuilders.arkmemo.ui.dialogs

import android.app.Dialog
import android.os.Bundle
import android.widget.Toast
import androidx.appcompat.app.AlertDialog
import androidx.fragment.app.DialogFragment
import space.taran.arkmemo.R
import space.taran.arkmemo.models.TextNote
import space.taran.arkmemo.ui.fragments.deleteNote
import dev.arkbuilders.arkmemo.R
import dev.arkbuilders.arkmemo.models.TextNote
import dev.arkbuilders.arkmemo.ui.fragments.deleteNote

class NoteDeleteDialogFragment: DialogFragment() {

Expand Down
12 changes: 6 additions & 6 deletions ...emo/ui/fragments/EditTextNotesFragment.kt → ...emo/ui/fragments/EditTextNotesFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package space.taran.arkmemo.ui.fragments
package dev.arkbuilders.arkmemo.ui.fragments

import android.os.Bundle
import android.text.Editable
Expand All @@ -9,11 +9,11 @@ import androidx.fragment.app.Fragment
import androidx.fragment.app.activityViewModels
import by.kirich1409.viewbindingdelegate.viewBinding
import dagger.hilt.android.AndroidEntryPoint
import space.taran.arkmemo.R
import space.taran.arkmemo.ui.viewmodels.NotesViewModel
import space.taran.arkmemo.databinding.FragmentEditTextNotesBinding
import space.taran.arkmemo.models.TextNote
import space.taran.arkmemo.ui.activities.MainActivity
import dev.arkbuilders.arkmemo.R
import dev.arkbuilders.arkmemo.ui.viewmodels.NotesViewModel
import dev.arkbuilders.arkmemo.databinding.FragmentEditTextNotesBinding
import dev.arkbuilders.arkmemo.models.TextNote
import dev.arkbuilders.arkmemo.ui.activities.MainActivity

@AndroidEntryPoint
class EditTextNotesFragment: Fragment(R.layout.fragment_edit_text_notes) {
Expand Down
18 changes: 9 additions & 9 deletions ...ran/arkmemo/ui/fragments/NotesFragment.kt → ...ers/arkmemo/ui/fragments/NotesFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package space.taran.arkmemo.ui.fragments
package dev.arkbuilders.arkmemo.ui.fragments

import android.os.Bundle
import android.view.View
Expand All @@ -15,14 +15,14 @@ import by.kirich1409.viewbindingdelegate.viewBinding
import com.google.android.material.floatingactionbutton.FloatingActionButton
import dagger.hilt.android.AndroidEntryPoint
import kotlinx.coroutines.launch
import space.taran.arkmemo.R
import space.taran.arkmemo.ui.viewmodels.NotesViewModel
import space.taran.arkmemo.databinding.FragmentTextNotesBinding
import space.taran.arkmemo.models.TextNote
import space.taran.arkmemo.ui.activities.MainActivity
import space.taran.arkmemo.ui.activities.getTextFromClipBoard
import space.taran.arkmemo.ui.activities.replaceFragment
import space.taran.arkmemo.ui.adapters.TextNotesListAdapter
import dev.arkbuilders.arkmemo.R
import dev.arkbuilders.arkmemo.ui.viewmodels.NotesViewModel
import dev.arkbuilders.arkmemo.databinding.FragmentTextNotesBinding
import dev.arkbuilders.arkmemo.models.TextNote
import dev.arkbuilders.arkmemo.ui.activities.MainActivity
import dev.arkbuilders.arkmemo.ui.activities.getTextFromClipBoard
import dev.arkbuilders.arkmemo.ui.activities.replaceFragment
import dev.arkbuilders.arkmemo.ui.adapters.TextNotesListAdapter

@AndroidEntryPoint
class TextNotesFragment: Fragment(R.layout.fragment_text_notes) {
Expand Down
12 changes: 6 additions & 6 deletions .../arkmemo/ui/fragments/SettingsFragment.kt → .../arkmemo/ui/fragments/SettingsFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package space.taran.arkmemo.ui.fragments
package dev.arkbuilders.arkmemo.ui.fragments

import android.os.Bundle
import android.view.View
import androidx.preference.PreferenceFragmentCompat
import dagger.hilt.android.AndroidEntryPoint
import dev.arkbuilders.arkfilepicker.presentation.onArkPathPicked
import space.taran.arkmemo.R
import space.taran.arkmemo.files.FilePicker
import space.taran.arkmemo.preferences.MemoPreferences
import space.taran.arkmemo.ui.activities.MainActivity
import space.taran.arkmemo.ui.views.PathPreference
import dev.arkbuilders.arkmemo.R
import dev.arkbuilders.arkmemo.files.FilePicker
import dev.arkbuilders.arkmemo.preferences.MemoPreferences
import dev.arkbuilders.arkmemo.ui.activities.MainActivity
import dev.arkbuilders.arkmemo.ui.views.PathPreference
import javax.inject.Inject


Expand Down
8 changes: 4 additions & 4 deletions ...n/arkmemo/ui/viewmodels/NotesViewModel.kt → ...s/arkmemo/ui/viewmodels/NotesViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package space.taran.arkmemo.ui.viewmodels
package dev.arkbuilders.arkmemo.ui.viewmodels

import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
Expand All @@ -7,9 +7,9 @@ import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import space.taran.arkmemo.data.repositories.TextNotesRepo
import space.taran.arkmemo.models.TextNote
import space.taran.arkmemo.preferences.MemoPreferences
import dev.arkbuilders.arkmemo.data.repositories.TextNotesRepo
import dev.arkbuilders.arkmemo.models.TextNote
import dev.arkbuilders.arkmemo.preferences.MemoPreferences
import javax.inject.Inject

@HiltViewModel
Expand Down
4 changes: 2 additions & 2 deletions .../taran/arkmemo/ui/views/PathPreference.kt → ...ilders/arkmemo/ui/views/PathPreference.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package space.taran.arkmemo.ui.views
package dev.arkbuilders.arkmemo.ui.views

import android.content.Context
import android.util.AttributeSet
import android.widget.TextView
import androidx.preference.Preference
import androidx.preference.PreferenceViewHolder
import space.taran.arkmemo.R
import dev.arkbuilders.arkmemo.R

class PathPreference(context: Context, attrs: AttributeSet): Preference(context, attrs) {
private var title: TextView? = null
Expand Down
2 changes: 1 addition & 1 deletion .../java/space/taran/arkmemo/utils/Config.kt → ...a/dev/arkbuilders/arkmemo/utils/Config.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package space.taran.arkmemo.space.taran.arkmemo.utils
package dev.arkbuilders.arkmemo.utils

import android.content.Context
import com.simplemobiletools.commons.helpers.BaseConfig
Expand Down
2 changes: 1 addition & 1 deletion ...va/space/taran/arkmemo/utils/Constants.kt → ...ev/arkbuilders/arkmemo/utils/Constants.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package space.taran.arkmemo.space.taran.arkmemo.utils
package dev.arkbuilders.arkmemo.utils

// shared preferences
const val CRASH_REPORT_ENABLE = "crash_report_enable"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/xml/root_preferences.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
<PreferenceCategory app:title="@string/your_notes">
<space.taran.arkmemo.ui.views.PathPreference
<dev.arkbuilders.arkmemo.ui.views.PathPreference
app:key="@string/path_pref_key"
app:layout="@layout/path_pref" />
</PreferenceCategory>
Expand Down
2 changes: 1 addition & 1 deletion ...va/space/taran/arkmemo/ExampleUnitTest.kt → ...ev/arkbuilders/arkmemo/ExampleUnitTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package space.taran.arkmemo
package dev.arkbuilders.arkmemo

import org.junit.Test

Expand Down