Skip to content

Commit

Permalink
Merge pull request #118 from kitakkun/feature/change_package_from_com…
Browse files Browse the repository at this point in the history
…_to_io

Change package from com.github.kitakkun to io.github.kitakkun
  • Loading branch information
kitakkun authored Jul 9, 2024
2 parents 999b407 + fa98be0 commit 6a91830
Show file tree
Hide file tree
Showing 164 changed files with 515 additions and 515 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ pluginManagement {
// ...
}
plugins {
id("com.github.kitakkun.backintime") version "1.0.0" apply false
id("io.github.kitakkun.backintime") version "1.0.0" apply false
kotlin("plugin.serialization") version "2.0.0" apply false // required by the plugin
}
}
Expand All @@ -59,7 +59,7 @@ dependencyResolutionManagement {
```kotlin
plugins {
id("com.github.kitakkun.backintime") version "1.0.0"
id("io.github.kitakkun.backintime") version "1.0.0"
kotlin("plugin.serialization")
...
}
Expand Down
2 changes: 1 addition & 1 deletion backintime-annotations/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ kotlin {

android {
compileSdk = 34
namespace = "com.github.kitakkun.backintime.annotations"
namespace = "io.github.kitakkun.backintime.annotations"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@file:Suppress("unused")

package com.github.kitakkun.backintime.annotations
package io.github.kitakkun.backintime.annotations

/**
* compiler plugin will inject code for debugging if the class is marked with this annotation.
Expand Down
6 changes: 3 additions & 3 deletions backintime-demo/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ plugins {
alias(libs.plugins.kotlinSerialization)
alias(libs.plugins.backintimeLint)
alias(libs.plugins.compose.compiler)
id("com.github.kitakkun.backintime") version "1.0.0"
id("io.github.kitakkun.backintime") version "1.0.0"
}

android {
namespace = "com.github.kitakkun.backintime.evaluation"
namespace = "io.github.kitakkun.backintime.evaluation"
compileSdk = 34

defaultConfig {
applicationId = "com.github.kitakkun.backintime.evaluation"
applicationId = "io.github.kitakkun.backintime.evaluation"
minSdk = 24
targetSdk = 34
versionCode = 1
Expand Down
4 changes: 2 additions & 2 deletions backintime-demo/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools">

<application
android:name="com.github.kitakkun.backintime.evaluation.MyApplication"
android:name="io.github.kitakkun.backintime.evaluation.MyApplication"
android:allowBackup="true"
android:dataExtractionRules="@xml/data_extraction_rules"
android:fullBackupContent="@xml/backup_rules"
Expand All @@ -14,7 +14,7 @@
android:theme="@style/Theme.BackintimeEvaluation"
tools:targetApi="31">
<activity
android:name="com.github.kitakkun.backintime.evaluation.MainActivity"
android:name="io.github.kitakkun.backintime.evaluation.MainActivity"
android:exported="true"
android:theme="@style/Theme.BackintimeEvaluation">
<intent-filter>
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.kitakkun.backintime.evaluation
package io.github.kitakkun.backintime.evaluation

import android.os.Bundle
import androidx.activity.ComponentActivity
Expand All @@ -15,10 +15,10 @@ import androidx.compose.runtime.mutableIntStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import com.github.kitakkun.backintime.evaluation.flux.FluxTodoListPage
import com.github.kitakkun.backintime.evaluation.mvi.MVITodoListPage
import com.github.kitakkun.backintime.evaluation.mvvm.MVVMTodoListPage
import com.github.kitakkun.backintime.evaluation.ui.theme.BackintimefluxTheme
import io.github.kitakkun.backintime.evaluation.flux.FluxTodoListPage
import io.github.kitakkun.backintime.evaluation.mvi.MVITodoListPage
import io.github.kitakkun.backintime.evaluation.mvvm.MVVMTodoListPage
import io.github.kitakkun.backintime.evaluation.ui.theme.BackintimefluxTheme

class MainActivity : ComponentActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package com.github.kitakkun.backintime.evaluation
package io.github.kitakkun.backintime.evaluation

import android.app.Application
import com.facebook.flipper.android.AndroidFlipperClient
import com.facebook.flipper.android.utils.FlipperUtils
import com.facebook.soloader.SoLoader
import com.github.kitakkun.backintime.evaluation.di.appModule
import com.github.kitakkun.backintime.runtime.flipper.BackInTimeFlipperPlugin
import io.github.kitakkun.backintime.evaluation.di.appModule
import io.github.kitakkun.backintime.runtime.flipper.BackInTimeFlipperPlugin
import org.koin.android.ext.koin.androidContext
import org.koin.android.ext.koin.androidLogger
import org.koin.core.context.startKoin
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.kitakkun.backintime.evaluation.data
package io.github.kitakkun.backintime.evaluation.data

import androidx.room.Entity
import androidx.room.PrimaryKey
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.kitakkun.backintime.evaluation.data
package io.github.kitakkun.backintime.evaluation.data

import androidx.room.Dao
import androidx.room.Delete
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.kitakkun.backintime.evaluation.data
package io.github.kitakkun.backintime.evaluation.data

import androidx.room.Database
import androidx.room.RoomDatabase
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package com.github.kitakkun.backintime.evaluation.di
package io.github.kitakkun.backintime.evaluation.di

import androidx.room.Room
import com.github.kitakkun.backintime.evaluation.data.TodoDao
import com.github.kitakkun.backintime.evaluation.data.TodoDatabase
import com.github.kitakkun.backintime.evaluation.flux.FluxTodoListStore
import com.github.kitakkun.backintime.evaluation.flux.TodoListActionCreator
import com.github.kitakkun.backintime.evaluation.flux.architecture.Dispatcher
import com.github.kitakkun.backintime.evaluation.mvi.MVITodoListStore
import com.github.kitakkun.backintime.evaluation.mvvm.MVVMTodoListViewModel
import io.github.kitakkun.backintime.evaluation.data.TodoDao
import io.github.kitakkun.backintime.evaluation.data.TodoDatabase
import io.github.kitakkun.backintime.evaluation.flux.FluxTodoListStore
import io.github.kitakkun.backintime.evaluation.flux.TodoListActionCreator
import io.github.kitakkun.backintime.evaluation.flux.architecture.Dispatcher
import io.github.kitakkun.backintime.evaluation.mvi.MVITodoListStore
import io.github.kitakkun.backintime.evaluation.mvvm.MVVMTodoListViewModel
import org.koin.androidx.viewmodel.dsl.viewModelOf
import org.koin.core.module.dsl.factoryOf
import org.koin.core.module.dsl.singleOf
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.kitakkun.backintime.evaluation.flux
package io.github.kitakkun.backintime.evaluation.flux

import androidx.compose.foundation.layout.padding
import androidx.compose.material.icons.Icons
Expand All @@ -9,9 +9,9 @@ import androidx.compose.material3.Scaffold
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.ui.Modifier
import com.github.kitakkun.backintime.evaluation.ui.AddTodoDialog
import com.github.kitakkun.backintime.evaluation.ui.EditTodoDialog
import com.github.kitakkun.backintime.evaluation.ui.TodoList
import io.github.kitakkun.backintime.evaluation.ui.AddTodoDialog
import io.github.kitakkun.backintime.evaluation.ui.EditTodoDialog
import io.github.kitakkun.backintime.evaluation.ui.TodoList
import org.koin.androidx.compose.koinViewModel
import org.koin.compose.koinInject

Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package com.github.kitakkun.backintime.evaluation.flux
package io.github.kitakkun.backintime.evaluation.flux

import androidx.compose.runtime.State
import androidx.compose.runtime.mutableStateListOf
import androidx.compose.runtime.mutableStateOf
import androidx.lifecycle.ViewModel
import com.github.kitakkun.backintime.annotations.BackInTime
import com.github.kitakkun.backintime.evaluation.data.Todo
import com.github.kitakkun.backintime.evaluation.flux.architecture.ActionEvent
import com.github.kitakkun.backintime.evaluation.flux.architecture.Dispatcher
import com.github.kitakkun.backintime.evaluation.flux.architecture.Store
import io.github.kitakkun.backintime.annotations.BackInTime
import io.github.kitakkun.backintime.evaluation.data.Todo
import io.github.kitakkun.backintime.evaluation.flux.architecture.ActionEvent
import io.github.kitakkun.backintime.evaluation.flux.architecture.Dispatcher
import io.github.kitakkun.backintime.evaluation.flux.architecture.Store

@BackInTime
class FluxTodoListStore(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.kitakkun.backintime.evaluation.flux
package io.github.kitakkun.backintime.evaluation.flux

import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package com.github.kitakkun.backintime.evaluation.flux
package io.github.kitakkun.backintime.evaluation.flux

import com.github.kitakkun.backintime.evaluation.data.Todo
import com.github.kitakkun.backintime.evaluation.data.TodoDao
import com.github.kitakkun.backintime.evaluation.flux.architecture.ActionCreator
import com.github.kitakkun.backintime.evaluation.flux.architecture.Dispatcher
import io.github.kitakkun.backintime.evaluation.data.Todo
import io.github.kitakkun.backintime.evaluation.data.TodoDao
import io.github.kitakkun.backintime.evaluation.flux.architecture.ActionCreator
import io.github.kitakkun.backintime.evaluation.flux.architecture.Dispatcher
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.launch

class TodoListActionCreator(
private val dispatcher: Dispatcher,
private val todoDao: TodoDao,
private val todoDao: io.github.kitakkun.backintime.evaluation.data.TodoDao,
) : ActionCreator, CoroutineScope by IOScope() {
fun reloadToDos() {
launch {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.github.kitakkun.backintime.evaluation.flux
package io.github.kitakkun.backintime.evaluation.flux

import com.github.kitakkun.backintime.evaluation.data.Todo
import com.github.kitakkun.backintime.evaluation.flux.architecture.ActionEvent
import io.github.kitakkun.backintime.evaluation.data.Todo
import io.github.kitakkun.backintime.evaluation.flux.architecture.ActionEvent

sealed interface TodoListActionEvent : ActionEvent {
data class ReloadToDoSucceeded(val todos: List<Todo>) : TodoListActionEvent
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
package io.github.kitakkun.backintime.evaluation.flux.architecture

interface ActionCreator
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
package io.github.kitakkun.backintime.evaluation.flux.architecture

interface ActionEvent
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.kitakkun.backintime.evaluation.flux.architecture
package io.github.kitakkun.backintime.evaluation.flux.architecture

class Dispatcher {
private val listeners = mutableListOf<Store>()
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package io.github.kitakkun.backintime.evaluation.flux.architecture

interface Store {
fun reduce(event: ActionEvent)
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.kitakkun.backintime.evaluation.mvi
package io.github.kitakkun.backintime.evaluation.mvi

import androidx.compose.foundation.layout.padding
import androidx.compose.material.icons.Icons
Expand All @@ -9,9 +9,9 @@ import androidx.compose.material3.Scaffold
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.ui.Modifier
import com.github.kitakkun.backintime.evaluation.ui.AddTodoDialog
import com.github.kitakkun.backintime.evaluation.ui.EditTodoDialog
import com.github.kitakkun.backintime.evaluation.ui.TodoList
import io.github.kitakkun.backintime.evaluation.ui.AddTodoDialog
import io.github.kitakkun.backintime.evaluation.ui.EditTodoDialog
import io.github.kitakkun.backintime.evaluation.ui.TodoList
import org.koin.androidx.compose.koinViewModel

@Composable
Expand Down
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
package com.github.kitakkun.backintime.evaluation.mvi
package io.github.kitakkun.backintime.evaluation.mvi

import androidx.compose.runtime.State
import androidx.compose.runtime.mutableStateListOf
import androidx.compose.runtime.mutableStateOf
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.github.kitakkun.backintime.annotations.BackInTime
import com.github.kitakkun.backintime.evaluation.data.Todo
import com.github.kitakkun.backintime.evaluation.data.TodoDao
import com.github.kitakkun.backintime.evaluation.mvi.architecture.Store
import io.github.kitakkun.backintime.annotations.BackInTime
import io.github.kitakkun.backintime.evaluation.data.Todo
import io.github.kitakkun.backintime.evaluation.data.TodoDao
import io.github.kitakkun.backintime.evaluation.mvi.architecture.Store
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch

@BackInTime
class MVITodoListStore(
private val todoDao: TodoDao,
private val todoDao: io.github.kitakkun.backintime.evaluation.data.TodoDao,
) : Store, ViewModel() {
private val mutableTodos = mutableStateListOf<Todo>()
val todos: List<Todo> = mutableTodos
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.kitakkun.backintime.evaluation.mvi
package io.github.kitakkun.backintime.evaluation.mvi

sealed interface TodoListIntent {
data object ReloadTodoList : TodoListIntent
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
package io.github.kitakkun.backintime.evaluation.mvi.architecture

interface Store
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.kitakkun.backintime.evaluation.mvvm
package io.github.kitakkun.backintime.evaluation.mvvm

import androidx.compose.foundation.layout.padding
import androidx.compose.material.icons.Icons
Expand All @@ -9,9 +9,9 @@ import androidx.compose.material3.Scaffold
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.ui.Modifier
import com.github.kitakkun.backintime.evaluation.ui.AddTodoDialog
import com.github.kitakkun.backintime.evaluation.ui.EditTodoDialog
import com.github.kitakkun.backintime.evaluation.ui.TodoList
import io.github.kitakkun.backintime.evaluation.ui.AddTodoDialog
import io.github.kitakkun.backintime.evaluation.ui.EditTodoDialog
import io.github.kitakkun.backintime.evaluation.ui.TodoList
import org.koin.androidx.compose.koinViewModel

@Composable
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
package com.github.kitakkun.backintime.evaluation.mvvm
package io.github.kitakkun.backintime.evaluation.mvvm

import androidx.compose.runtime.State
import androidx.compose.runtime.mutableStateListOf
import androidx.compose.runtime.mutableStateOf
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.github.kitakkun.backintime.annotations.BackInTime
import com.github.kitakkun.backintime.evaluation.data.Todo
import com.github.kitakkun.backintime.evaluation.data.TodoDao
import io.github.kitakkun.backintime.annotations.BackInTime
import io.github.kitakkun.backintime.evaluation.data.Todo
import io.github.kitakkun.backintime.evaluation.data.TodoDao
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch

@BackInTime
class MVVMTodoListViewModel(
private val todoDao: TodoDao,
private val todoDao: io.github.kitakkun.backintime.evaluation.data.TodoDao,
) : ViewModel() {
private val mutableTodos = mutableStateListOf<Todo>()
val todos: List<Todo> = mutableTodos
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.kitakkun.backintime.evaluation.ui
package io.github.kitakkun.backintime.evaluation.ui

import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.kitakkun.backintime.evaluation.ui
package io.github.kitakkun.backintime.evaluation.ui

import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
Expand Down Expand Up @@ -27,7 +27,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.text.input.ImeAction
import androidx.compose.ui.unit.dp
import androidx.compose.ui.window.Dialog
import com.github.kitakkun.backintime.evaluation.data.Todo
import io.github.kitakkun.backintime.evaluation.data.Todo

@Composable
fun EditTodoDialog(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.kitakkun.backintime.evaluation.ui
package io.github.kitakkun.backintime.evaluation.ui

import androidx.compose.foundation.layout.Row
import androidx.compose.material3.Checkbox
Expand All @@ -8,7 +8,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.text.style.TextDecoration
import com.github.kitakkun.backintime.evaluation.data.Todo
import io.github.kitakkun.backintime.evaluation.data.Todo

@Composable
fun TodoItemView(
Expand Down
Loading

0 comments on commit 6a91830

Please sign in to comment.