Renamed package to com.sirekanyan

app/build.gradle

@@ -6,7 +6,7 @@ android {
     compileSdkVersion 27
     buildToolsVersion '27.0.3'
     defaultConfig {
-        applicationId 'me.vadik.knigopis'
+        applicationId 'me.vadik.knigopis' // todo: remove in beta release
         minSdkVersion 16
         targetSdkVersion 27
         versionCode 17

app/src/main/AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="me.vadik.knigopis">
+    package="com.sirekanyan.knigopis">
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
@@ -38,14 +38,14 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="me.vadik.knigopis.feature.book.BookActivity"/>
+        <activity android:name=".feature.book.BookActivity"/>
 
         <activity
-            android:name="me.vadik.knigopis.feature.user.UserActivity"
+            android:name=".feature.user.UserActivity"
             android:parentActivityName=".feature.MainActivity"/>
 
         <activity
-            android:name="me.vadik.knigopis.feature.profile.ProfileActivity"
+            android:name=".feature.profile.ProfileActivity"
             android:screenOrientation="portrait"
             android:theme="@style/ProfileAppTheme" />
 

app/src/main/java/me/vadik/knigopis/App.kt → app/src/main/java/com/sirekanyan/knigopis/App.kt

@@ -1,4 +1,4 @@
-package me.vadik.knigopis
+package com.sirekanyan.knigopis
 
 import android.app.Application
 import org.koin.android.ext.android.startKoin

app/src/main/java/me/vadik/knigopis/Router.kt → app/src/main/java/com/sirekanyan/knigopis/Router.kt

@@ -1,7 +1,7 @@
-package me.vadik.knigopis
+package com.sirekanyan.knigopis
 
 import android.net.Uri
-import me.vadik.knigopis.repository.model.Book
+import com.sirekanyan.knigopis.repository.model.Book
 
 interface Router {
     fun openBookScreen(book: Book)

app/src/main/java/me/vadik/knigopis/common/Adapter.kt → app/src/main/java/com/sirekanyan/knigopis/common/Adapter.kt

@@ -1,10 +1,10 @@
-package me.vadik.knigopis.common
+package com.sirekanyan.knigopis.common
 
 import android.support.annotation.IdRes
 import android.support.v7.widget.RecyclerView
 import android.view.View
 import android.view.ViewGroup
-import me.vadik.knigopis.common.extensions.inflate
+import com.sirekanyan.knigopis.common.extensions.inflate
 
 class Adapter<T>(
     private val items: List<T>,

app/src/main/java/me/vadik/knigopis/common/Collection.kt → app/src/main/java/com/sirekanyan/knigopis/common/Collection.kt

@@ -1,4 +1,4 @@
-package me.vadik.knigopis.common
+package com.sirekanyan.knigopis.common
 
 import java.util.*
 

app/src/main/java/me/vadik/knigopis/common/CommonResource.kt → app/src/main/java/com/sirekanyan/knigopis/common/CommonResource.kt

@@ -1,4 +1,4 @@
-package me.vadik.knigopis.common
+package com.sirekanyan.knigopis.common
 
 import android.view.View
 

app/src/main/java/me/vadik/knigopis/common/Context.kt → app/src/main/java/com/sirekanyan/knigopis/common/Context.kt

@@ -1,4 +1,4 @@
-package me.vadik.knigopis.common
+package com.sirekanyan.knigopis.common
 
 import android.content.Intent
 

app/src/main/java/me/vadik/knigopis/common/DrawableResource.kt → app/src/main/java/com/sirekanyan/knigopis/common/DrawableResource.kt

@@ -1,4 +1,4 @@
-package me.vadik.knigopis.common
+package com.sirekanyan.knigopis.common
 
 import android.graphics.drawable.Drawable
 import android.support.annotation.DrawableRes

app/src/main/java/me/vadik/knigopis/common/NetworkChecker.kt → app/src/main/java/com/sirekanyan/knigopis/common/NetworkChecker.kt

@@ -1,7 +1,7 @@
-package me.vadik.knigopis.common
+package com.sirekanyan.knigopis.common
 
 import android.app.Application
-import me.vadik.knigopis.common.extensions.systemConnectivityManager
+import com.sirekanyan.knigopis.common.extensions.systemConnectivityManager
 
 interface NetworkChecker {
 

app/src/main/java/me/vadik/knigopis/common/ResourceProvider.kt → app/src/main/java/com/sirekanyan/knigopis/common/ResourceProvider.kt

@@ -1,4 +1,4 @@
-package me.vadik.knigopis.common
+package com.sirekanyan.knigopis.common
 
 import android.app.Application
 

app/src/main/java/me/vadik/knigopis/common/StringResource.kt → app/src/main/java/com/sirekanyan/knigopis/common/StringResource.kt

@@ -1,4 +1,4 @@
-package me.vadik.knigopis.common
+package com.sirekanyan.knigopis.common
 
 import android.support.annotation.StringRes
 import android.widget.TextView

app/src/main/java/me/vadik/knigopis/common/adapter/AbstractBooksAdapter.kt → app/src/main/java/com/sirekanyan/knigopis/common/adapter/AbstractBooksAdapter.kt

@@ -1,12 +1,12 @@
-package me.vadik.knigopis.common.adapter
+package com.sirekanyan.knigopis.common.adapter
 
 import android.support.annotation.LayoutRes
 import android.support.v7.widget.RecyclerView
 import android.view.ViewGroup
-import me.vadik.knigopis.common.extensions.inflate
-import me.vadik.knigopis.repository.model.Book
-import me.vadik.knigopis.repository.model.BookHeader
-import me.vadik.knigopis.repository.model.FinishedBook
+import com.sirekanyan.knigopis.common.extensions.inflate
+import com.sirekanyan.knigopis.repository.model.Book
+import com.sirekanyan.knigopis.repository.model.BookHeader
+import com.sirekanyan.knigopis.repository.model.FinishedBook
 
 private const val HEADER_TYPE = 0
 private const val ITEM_TYPE = 1

app/src/main/java/me/vadik/knigopis/common/adapter/BookViewHolder.kt → app/src/main/java/com/sirekanyan/knigopis/common/adapter/BookViewHolder.kt

@@ -1,13 +1,13 @@
-package me.vadik.knigopis.common.adapter
+package com.sirekanyan.knigopis.common.adapter
 
 import android.support.annotation.StringRes
 import android.support.v7.widget.RecyclerView
 import android.view.View
 import kotlinx.android.synthetic.main.header.view.*
 import kotlinx.android.synthetic.main.user_book.view.*
-import me.vadik.knigopis.R
-import me.vadik.knigopis.common.extensions.setSquareImage
-import me.vadik.knigopis.common.extensions.showNow
+import com.sirekanyan.knigopis.R
+import com.sirekanyan.knigopis.common.extensions.setSquareImage
+import com.sirekanyan.knigopis.common.extensions.showNow
 
 sealed class BookViewHolder(view: View) : RecyclerView.ViewHolder(view)
 

app/src/main/java/me/vadik/knigopis/common/extensions/activity.kt → app/src/main/java/com/sirekanyan/knigopis/common/extensions/activity.kt

@@ -1,4 +1,4 @@
-package me.vadik.knigopis.common.extensions
+package com.sirekanyan.knigopis.common.extensions
 
 import android.app.Activity
 

app/src/main/java/me/vadik/knigopis/common/extensions/context.kt → app/src/main/java/com/sirekanyan/knigopis/common/extensions/context.kt

@@ -1,4 +1,4 @@
-package me.vadik.knigopis.common.extensions
+package com.sirekanyan.knigopis.common.extensions
 
 import android.content.ClipboardManager
 import android.content.Context

app/src/main/java/me/vadik/knigopis/common/extensions/image_view.kt → app/src/main/java/com/sirekanyan/knigopis/common/extensions/image_view.kt

@@ -1,4 +1,4 @@
-package me.vadik.knigopis.common.extensions
+package com.sirekanyan.knigopis.common.extensions
 
 import android.content.Context
 import android.graphics.drawable.Drawable
@@ -10,7 +10,7 @@ import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
 import com.bumptech.glide.request.RequestListener
 import com.bumptech.glide.request.RequestOptions
 import com.bumptech.glide.request.target.Target
-import me.vadik.knigopis.R
+import com.sirekanyan.knigopis.R
 
 fun ImageView.setCircleImage(url: String?, isDark: Boolean = false) {
     Glide.with(context)

app/src/main/java/me/vadik/knigopis/common/extensions/view.kt → app/src/main/java/com/sirekanyan/knigopis/common/extensions/view.kt

@@ -1,4 +1,4 @@
-package me.vadik.knigopis.common.extensions
+package com.sirekanyan.knigopis.common.extensions
 
 import android.support.annotation.StringRes
 import android.support.design.widget.Snackbar

app/src/main/java/me/vadik/knigopis/common/extensions/view_group.kt → app/src/main/java/com/sirekanyan/knigopis/common/extensions/view_group.kt

@@ -1,4 +1,4 @@
-package me.vadik.knigopis.common.extensions
+package com.sirekanyan.knigopis.common.extensions
 
 import android.support.annotation.LayoutRes
 import android.view.LayoutInflater

app/src/main/java/me/vadik/knigopis/common/utils.kt → app/src/main/java/com/sirekanyan/knigopis/common/utils.kt

@@ -1,4 +1,4 @@
-package me.vadik.knigopis.common
+package com.sirekanyan.knigopis.common
 
 import android.animation.ObjectAnimator
 import android.app.Activity
@@ -14,15 +14,18 @@ import android.text.Spanned
 import android.util.Log
 import android.view.View
 import android.widget.ProgressBar
+import com.sirekanyan.knigopis.App
+import com.sirekanyan.knigopis.BuildConfig.APPLICATION_ID
 import io.reactivex.Completable
 import io.reactivex.Single
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
-import me.vadik.knigopis.App
 
 private const val TAG = "Knigopis"
 private val HTTP_SCHEMES = setOf("http", "https")
 
+fun extra(name: String) = "$APPLICATION_ID.extra_$name"
+
 fun Activity.app() = application as App
 
 @Suppress("unused")

app/src/main/java/me/vadik/knigopis/common/view/dialog/DialogFactory.kt → app/src/main/java/com/sirekanyan/knigopis/common/view/dialog/DialogFactory.kt

@@ -1,11 +1,11 @@
-package me.vadik.knigopis.common.view.dialog
+package com.sirekanyan.knigopis.common.view.dialog
 
 import android.content.Context
 import android.support.design.widget.BottomSheetDialog
 import kotlinx.android.synthetic.main.bottom_sheet_dialog_item.view.*
 import kotlinx.android.synthetic.main.bottom_sheet_dialog_view.*
-import me.vadik.knigopis.R
-import me.vadik.knigopis.common.extensions.inflate
+import com.sirekanyan.knigopis.R
+import com.sirekanyan.knigopis.common.extensions.inflate
 
 interface DialogFactory {
 

app/src/main/java/me/vadik/knigopis/common/view/dialog/DialogItem.kt → app/src/main/java/com/sirekanyan/knigopis/common/view/dialog/DialogItem.kt

@@ -1,9 +1,9 @@
-package me.vadik.knigopis.common.view.dialog
+package com.sirekanyan.knigopis.common.view.dialog
 
 import android.support.annotation.DrawableRes
-import me.vadik.knigopis.common.IntegerStringResource
-import me.vadik.knigopis.common.PlainStringResource
-import me.vadik.knigopis.common.StringResource
+import com.sirekanyan.knigopis.common.IntegerStringResource
+import com.sirekanyan.knigopis.common.PlainStringResource
+import com.sirekanyan.knigopis.common.StringResource
 
 fun createDialogItem(titleRes: Int, iconRes: Int, onClick: () -> Unit) =
     DialogItem(IntegerStringResource(titleRes), iconRes, onClick)

app/src/main/java/me/vadik/knigopis/common/view/header/HeaderItemDecoration.java → app/src/main/java/com/sirekanyan/knigopis/common/view/header/HeaderItemDecoration.java

@@ -1,4 +1,4 @@
-package me.vadik.knigopis.common.view.header;
+package com.sirekanyan.knigopis.common.view.header;
 
 import android.graphics.Canvas;
 import android.support.annotation.NonNull;

app/src/main/java/me/vadik/knigopis/common/view/header/StickyHeaderInterface.java → app/src/main/java/com/sirekanyan/knigopis/common/view/header/StickyHeaderInterface.java

@@ -1,4 +1,4 @@
-package me.vadik.knigopis.common.view.header;
+package com.sirekanyan.knigopis.common.view.header;
 
 import android.view.View;
 

app/src/main/java/me/vadik/knigopis/dependency.kt → app/src/main/java/com/sirekanyan/knigopis/dependency.kt

@@ -1,22 +1,22 @@
-package me.vadik.knigopis
+package com.sirekanyan.knigopis
 
 import com.google.gson.Gson
 import com.google.gson.GsonBuilder
-import me.vadik.knigopis.common.NetworkChecker
-import me.vadik.knigopis.common.NetworkCheckerImpl
-import me.vadik.knigopis.common.ResourceProvider
-import me.vadik.knigopis.common.ResourceProviderImpl
-import me.vadik.knigopis.common.view.dialog.BottomSheetDialogFactory
-import me.vadik.knigopis.common.view.dialog.DialogFactory
-import me.vadik.knigopis.feature.user.UserInteractor
-import me.vadik.knigopis.feature.user.UserInteractorImpl
-import me.vadik.knigopis.repository.*
-import me.vadik.knigopis.repository.api.Endpoint
-import me.vadik.knigopis.repository.cache.*
-import me.vadik.knigopis.repository.cache.common.CommonCache
-import me.vadik.knigopis.repository.cache.common.CommonCacheImpl
-import me.vadik.knigopis.repository.model.FinishedBook
-import me.vadik.knigopis.repository.model.PlannedBook
+import com.sirekanyan.knigopis.common.NetworkChecker
+import com.sirekanyan.knigopis.common.NetworkCheckerImpl
+import com.sirekanyan.knigopis.common.ResourceProvider
+import com.sirekanyan.knigopis.common.ResourceProviderImpl
+import com.sirekanyan.knigopis.common.view.dialog.BottomSheetDialogFactory
+import com.sirekanyan.knigopis.common.view.dialog.DialogFactory
+import com.sirekanyan.knigopis.feature.user.UserInteractor
+import com.sirekanyan.knigopis.feature.user.UserInteractorImpl
+import com.sirekanyan.knigopis.repository.*
+import com.sirekanyan.knigopis.repository.api.Endpoint
+import com.sirekanyan.knigopis.repository.cache.*
+import com.sirekanyan.knigopis.repository.cache.common.CommonCache
+import com.sirekanyan.knigopis.repository.cache.common.CommonCacheImpl
+import com.sirekanyan.knigopis.repository.model.FinishedBook
+import com.sirekanyan.knigopis.repository.model.PlannedBook
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
 import org.koin.dsl.context.Context

app/src/main/java/me/vadik/knigopis/feature/MainActivity.kt → app/src/main/java/com/sirekanyan/knigopis/feature/MainActivity.kt

@@ -1,4 +1,4 @@
-package me.vadik.knigopis.feature
+package com.sirekanyan.knigopis.feature
 
 import android.Manifest.permission.READ_PHONE_STATE
 import android.content.Intent
@@ -21,29 +21,29 @@ import kotlinx.android.synthetic.main.activity_main.*
 import kotlinx.android.synthetic.main.books_page.*
 import kotlinx.android.synthetic.main.notes_page.*
 import kotlinx.android.synthetic.main.users_page.*
-import me.vadik.knigopis.BuildConfig
-import me.vadik.knigopis.R
-import me.vadik.knigopis.Router
-import me.vadik.knigopis.common.*
-import me.vadik.knigopis.common.extensions.showNow
-import me.vadik.knigopis.common.extensions.startActivityOrNull
-import me.vadik.knigopis.common.extensions.toast
-import me.vadik.knigopis.common.view.dialog.DialogFactory
-import me.vadik.knigopis.common.view.header.HeaderItemDecoration
-import me.vadik.knigopis.common.view.header.StickyHeaderInterface
-import me.vadik.knigopis.feature.book.createEditBookIntent
-import me.vadik.knigopis.feature.book.createNewBookIntent
-import me.vadik.knigopis.feature.books.BooksAdapter
-import me.vadik.knigopis.feature.notes.NotesAdapter
-import me.vadik.knigopis.feature.profile.createProfileIntent
-import me.vadik.knigopis.feature.user.createUserIntent
-import me.vadik.knigopis.feature.users.UsersAdapter
-import me.vadik.knigopis.repository.*
-import me.vadik.knigopis.repository.api.Endpoint
-import me.vadik.knigopis.repository.model.*
-import me.vadik.knigopis.repository.model.CurrentTab.*
-import me.vadik.knigopis.repository.model.note.Note
-import me.vadik.knigopis.repository.model.subscription.Subscription
+import com.sirekanyan.knigopis.BuildConfig
+import com.sirekanyan.knigopis.R
+import com.sirekanyan.knigopis.Router
+import com.sirekanyan.knigopis.common.*
+import com.sirekanyan.knigopis.common.extensions.showNow
+import com.sirekanyan.knigopis.common.extensions.startActivityOrNull
+import com.sirekanyan.knigopis.common.extensions.toast
+import com.sirekanyan.knigopis.common.view.dialog.DialogFactory
+import com.sirekanyan.knigopis.common.view.header.HeaderItemDecoration
+import com.sirekanyan.knigopis.common.view.header.StickyHeaderInterface
+import com.sirekanyan.knigopis.feature.book.createEditBookIntent
+import com.sirekanyan.knigopis.feature.book.createNewBookIntent
+import com.sirekanyan.knigopis.feature.books.BooksAdapter
+import com.sirekanyan.knigopis.feature.notes.NotesAdapter
+import com.sirekanyan.knigopis.feature.profile.createProfileIntent
+import com.sirekanyan.knigopis.feature.user.createUserIntent
+import com.sirekanyan.knigopis.feature.users.UsersAdapter
+import com.sirekanyan.knigopis.repository.*
+import com.sirekanyan.knigopis.repository.api.Endpoint
+import com.sirekanyan.knigopis.repository.model.*
+import com.sirekanyan.knigopis.repository.model.CurrentTab.*
+import com.sirekanyan.knigopis.repository.model.note.Note
+import com.sirekanyan.knigopis.repository.model.subscription.Subscription
 import org.koin.android.ext.android.inject
 import retrofit2.HttpException
 
@@ -51,7 +51,7 @@ private const val ULOGIN_REQUEST_CODE = 0
 private const val BOOK_REQUEST_CODE = 1
 private const val VERSION_CLICK_COUNT_OFF = 1
 private const val VERSION_CLICK_COUNT_ON = 12
-private const val CURRENT_TAB_KEY = "me.vadik.knigopis.current_tab"
+private const val CURRENT_TAB_KEY = "current_tab"
 
 class MainActivity : AppCompatActivity(), Router {
 

app/src/main/java/me/vadik/knigopis/feature/book/BookActivity.kt → app/src/main/java/com/sirekanyan/knigopis/feature/book/BookActivity.kt

@@ -1,4 +1,4 @@
-package me.vadik.knigopis.feature.book
+package com.sirekanyan.knigopis.feature.book
 
 import android.content.Context
 import android.content.Intent
@@ -6,29 +6,29 @@ import android.os.Bundle
 import android.support.v7.app.AppCompatActivity
 import android.widget.SeekBar
 import android.widget.SeekBar.OnSeekBarChangeListener
+import com.sirekanyan.knigopis.R
+import com.sirekanyan.knigopis.common.*
+import com.sirekanyan.knigopis.common.extensions.*
+import com.sirekanyan.knigopis.repository.BookRepository
+import com.sirekanyan.knigopis.repository.Configuration
+import com.sirekanyan.knigopis.repository.api.createBookImageUrl
+import com.sirekanyan.knigopis.repository.model.FinishedBook
+import com.sirekanyan.knigopis.repository.model.FinishedBookToSend
+import com.sirekanyan.knigopis.repository.model.PlannedBook
+import com.sirekanyan.knigopis.repository.model.PlannedBookToSend
 import kotlinx.android.synthetic.main.book_edit.*
-import me.vadik.knigopis.R
-import me.vadik.knigopis.common.*
-import me.vadik.knigopis.common.extensions.*
-import me.vadik.knigopis.repository.BookRepository
-import me.vadik.knigopis.repository.Configuration
-import me.vadik.knigopis.repository.api.createBookImageUrl
-import me.vadik.knigopis.repository.model.FinishedBook
-import me.vadik.knigopis.repository.model.FinishedBookToSend
-import me.vadik.knigopis.repository.model.PlannedBook
-import me.vadik.knigopis.repository.model.PlannedBookToSend
 import org.koin.android.ext.android.inject
 import java.util.*
 
-private const val EXTRA_BOOK_ID = "me.vadik.knigopis.extra_book_id"
-private const val EXTRA_BOOK_TITLE = "me.vadik.knigopis.extra_book_title"
-private const val EXTRA_BOOK_AUTHOR = "me.vadik.knigopis.extra_book_author"
-private const val EXTRA_BOOK_YEAR = "me.vadik.knigopis.extra_book_year"
-private const val EXTRA_BOOK_MONTH = "me.vadik.knigopis.extra_book_month"
-private const val EXTRA_BOOK_DAY = "me.vadik.knigopis.extra_book_day"
-private const val EXTRA_BOOK_NOTES = "me.vadik.knigopis.extra_book_notes"
-private const val EXTRA_BOOK_PROGRESS = "me.vadik.knigopis.extra_book_progress"
-private const val EXTRA_BOOK_FINISHED = "me.vadik.knigopis.extra_book_finished"
+private val EXTRA_BOOK_ID = extra("book_id")
+private val EXTRA_BOOK_TITLE = extra("book_title")
+private val EXTRA_BOOK_AUTHOR = extra("book_author")
+private val EXTRA_BOOK_YEAR = extra("book_year")
+private val EXTRA_BOOK_MONTH = extra("book_month")
+private val EXTRA_BOOK_DAY = extra("book_day")
+private val EXTRA_BOOK_NOTES = extra("book_notes")
+private val EXTRA_BOOK_PROGRESS = extra("book_progress")
+private val EXTRA_BOOK_FINISHED = extra("book_finished")
 
 fun Context.createNewBookIntent() = Intent(this, BookActivity::class.java)
 

app/src/main/java/me/vadik/knigopis/feature/books/BooksAdapter.kt → app/src/main/java/com/sirekanyan/knigopis/feature/books/BooksAdapter.kt

@@ -1,28 +1,28 @@
-package me.vadik.knigopis.feature.books
+package com.sirekanyan.knigopis.feature.books
 
 import android.app.AlertDialog
 import android.view.View
 import android.widget.ImageView
 import android.widget.ProgressBar
 import android.widget.TextView
-import me.vadik.knigopis.R
-import me.vadik.knigopis.Router
-import me.vadik.knigopis.common.Adapter
-import me.vadik.knigopis.common.extensions.hideNow
-import me.vadik.knigopis.common.extensions.setSquareImage
-import me.vadik.knigopis.common.extensions.showNow
-import me.vadik.knigopis.common.extensions.toast
-import me.vadik.knigopis.common.io2main
-import me.vadik.knigopis.common.logError
-import me.vadik.knigopis.common.setProgressSmoothly
-import me.vadik.knigopis.common.view.dialog.DialogFactory
-import me.vadik.knigopis.common.view.dialog.createDialogItem
-import me.vadik.knigopis.repository.KAuth
-import me.vadik.knigopis.repository.api.Endpoint
-import me.vadik.knigopis.repository.model.Book
-import me.vadik.knigopis.repository.model.BookHeader
-import me.vadik.knigopis.repository.model.FinishedBook
-import me.vadik.knigopis.repository.model.PlannedBook
+import com.sirekanyan.knigopis.R
+import com.sirekanyan.knigopis.Router
+import com.sirekanyan.knigopis.common.Adapter
+import com.sirekanyan.knigopis.common.extensions.hideNow
+import com.sirekanyan.knigopis.common.extensions.setSquareImage
+import com.sirekanyan.knigopis.common.extensions.showNow
+import com.sirekanyan.knigopis.common.extensions.toast
+import com.sirekanyan.knigopis.common.io2main
+import com.sirekanyan.knigopis.common.logError
+import com.sirekanyan.knigopis.common.setProgressSmoothly
+import com.sirekanyan.knigopis.common.view.dialog.DialogFactory
+import com.sirekanyan.knigopis.common.view.dialog.createDialogItem
+import com.sirekanyan.knigopis.repository.KAuth
+import com.sirekanyan.knigopis.repository.api.Endpoint
+import com.sirekanyan.knigopis.repository.model.Book
+import com.sirekanyan.knigopis.repository.model.BookHeader
+import com.sirekanyan.knigopis.repository.model.FinishedBook
+import com.sirekanyan.knigopis.repository.model.PlannedBook
 
 class BooksAdapter(
     private val api: Endpoint,

app/src/main/java/me/vadik/knigopis/feature/notes/NoteViewHolder.kt → app/src/main/java/com/sirekanyan/knigopis/feature/notes/NoteViewHolder.kt

@@ -1,11 +1,11 @@
-package me.vadik.knigopis.feature.notes
+package com.sirekanyan.knigopis.feature.notes
 
 import android.support.v7.widget.RecyclerView
 import android.text.format.DateUtils
 import android.view.View
 import kotlinx.android.synthetic.main.note.view.*
-import me.vadik.knigopis.common.extensions.setCircleImage
-import me.vadik.knigopis.common.extensions.setSquareImage
+import com.sirekanyan.knigopis.common.extensions.setCircleImage
+import com.sirekanyan.knigopis.common.extensions.setSquareImage
 
 class NoteViewHolder(val view: View) : RecyclerView.ViewHolder(view) {
 

app/src/main/java/me/vadik/knigopis/feature/notes/NotesAdapter.kt → app/src/main/java/com/sirekanyan/knigopis/feature/notes/NotesAdapter.kt

@@ -1,11 +1,11 @@
-package me.vadik.knigopis.feature.notes
+package com.sirekanyan.knigopis.feature.notes
 
 import android.support.v7.widget.RecyclerView
 import android.view.ViewGroup
-import me.vadik.knigopis.R
-import me.vadik.knigopis.Router
-import me.vadik.knigopis.common.extensions.inflate
-import me.vadik.knigopis.repository.model.note.Note
+import com.sirekanyan.knigopis.R
+import com.sirekanyan.knigopis.Router
+import com.sirekanyan.knigopis.common.extensions.inflate
+import com.sirekanyan.knigopis.repository.model.note.Note
 
 class NotesAdapter(
     private val notes: List<Note>,

app/src/main/java/me/vadik/knigopis/feature/profile/ProfileActivity.kt → app/src/main/java/com/sirekanyan/knigopis/feature/profile/ProfileActivity.kt

@@ -1,4 +1,4 @@
-package me.vadik.knigopis.feature.profile
+package com.sirekanyan.knigopis.feature.profile
 
 import android.content.Context
 import android.content.Intent
@@ -9,12 +9,12 @@ import android.view.MenuItem
 import android.view.animation.AccelerateInterpolator
 import android.view.inputmethod.EditorInfo
 import kotlinx.android.synthetic.main.profile_activity.*
-import me.vadik.knigopis.R
-import me.vadik.knigopis.common.*
-import me.vadik.knigopis.common.extensions.*
-import me.vadik.knigopis.repository.KAuth
-import me.vadik.knigopis.repository.api.Endpoint
-import me.vadik.knigopis.repository.model.*
+import com.sirekanyan.knigopis.R
+import com.sirekanyan.knigopis.common.*
+import com.sirekanyan.knigopis.common.extensions.*
+import com.sirekanyan.knigopis.repository.KAuth
+import com.sirekanyan.knigopis.repository.api.Endpoint
+import com.sirekanyan.knigopis.repository.model.*
 import org.koin.android.ext.android.inject
 
 fun Context.createProfileIntent() = Intent(this, ProfileActivity::class.java)

app/src/main/java/me/vadik/knigopis/feature/user/BooksAdapter.kt → app/src/main/java/com/sirekanyan/knigopis/feature/user/BooksAdapter.kt

@@ -1,15 +1,15 @@
-package me.vadik.knigopis.feature.user
+package com.sirekanyan.knigopis.feature.user
 
-import me.vadik.knigopis.R
-import me.vadik.knigopis.common.adapter.AbstractBooksAdapter
-import me.vadik.knigopis.common.adapter.BookHeaderViewHolder
-import me.vadik.knigopis.common.adapter.BookItemViewHolder
-import me.vadik.knigopis.common.view.dialog.DialogFactory
-import me.vadik.knigopis.common.view.dialog.createDialogItem
-import me.vadik.knigopis.feature.book.createNewBookIntent
-import me.vadik.knigopis.repository.model.Book
-import me.vadik.knigopis.repository.model.BookHeader
-import me.vadik.knigopis.repository.model.FinishedBook
+import com.sirekanyan.knigopis.R
+import com.sirekanyan.knigopis.common.adapter.AbstractBooksAdapter
+import com.sirekanyan.knigopis.common.adapter.BookHeaderViewHolder
+import com.sirekanyan.knigopis.common.adapter.BookItemViewHolder
+import com.sirekanyan.knigopis.common.view.dialog.DialogFactory
+import com.sirekanyan.knigopis.common.view.dialog.createDialogItem
+import com.sirekanyan.knigopis.feature.book.createNewBookIntent
+import com.sirekanyan.knigopis.repository.model.Book
+import com.sirekanyan.knigopis.repository.model.BookHeader
+import com.sirekanyan.knigopis.repository.model.FinishedBook
 
 class BooksAdapter(
     books: List<Book>,

app/src/main/java/me/vadik/knigopis/feature/user/UserActivity.kt → app/src/main/java/com/sirekanyan/knigopis/feature/user/UserActivity.kt

@@ -1,4 +1,4 @@
-package me.vadik.knigopis.feature.user
+package com.sirekanyan.knigopis.feature.user
 
 import android.content.ClipData
 import android.content.Context
@@ -10,21 +10,21 @@ import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import android.widget.TextView
+import com.sirekanyan.knigopis.R
+import com.sirekanyan.knigopis.common.*
+import com.sirekanyan.knigopis.common.extensions.*
+import com.sirekanyan.knigopis.common.view.dialog.DialogFactory
+import com.sirekanyan.knigopis.common.view.header.HeaderItemDecoration
+import com.sirekanyan.knigopis.common.view.header.StickyHeaderInterface
+import com.sirekanyan.knigopis.repository.Configuration
+import com.sirekanyan.knigopis.repository.model.Book
+import com.sirekanyan.knigopis.repository.model.BookHeader
 import kotlinx.android.synthetic.main.user_activity.*
-import me.vadik.knigopis.R
-import me.vadik.knigopis.common.*
-import me.vadik.knigopis.common.extensions.*
-import me.vadik.knigopis.common.view.dialog.DialogFactory
-import me.vadik.knigopis.common.view.header.HeaderItemDecoration
-import me.vadik.knigopis.common.view.header.StickyHeaderInterface
-import me.vadik.knigopis.repository.Configuration
-import me.vadik.knigopis.repository.model.Book
-import me.vadik.knigopis.repository.model.BookHeader
 import org.koin.android.ext.android.inject
 
-private const val EXTRA_USER_ID = "me.vadik.knigopis.extra_user_id"
-private const val EXTRA_USER_NAME = "me.vadik.knigopis.extra_user_name"
-private const val EXTRA_USER_PHOTO = "me.vadik.knigopis.extra_user_photo"
+private val EXTRA_USER_ID = extra("user_id")
+private val EXTRA_USER_NAME = extra("user_name")
+private val EXTRA_USER_PHOTO = extra("user_photo")
 
 fun Context.createUserIntent(id: String, name: String, avatar: String?): Intent =
     Intent(this, UserActivity::class.java)

app/src/main/java/me/vadik/knigopis/feature/user/UserInteractor.kt → app/src/main/java/com/sirekanyan/knigopis/feature/user/UserInteractor.kt

@@ -1,12 +1,12 @@
-package me.vadik.knigopis.feature.user
+package com.sirekanyan.knigopis.feature.user
 
 import io.reactivex.Completable
 import io.reactivex.Single
-import me.vadik.knigopis.common.io2main
-import me.vadik.knigopis.repository.KAuth
-import me.vadik.knigopis.repository.api.Endpoint
-import me.vadik.knigopis.repository.model.Book
-import me.vadik.knigopis.repository.model.BookHeader
+import com.sirekanyan.knigopis.common.io2main
+import com.sirekanyan.knigopis.repository.KAuth
+import com.sirekanyan.knigopis.repository.api.Endpoint
+import com.sirekanyan.knigopis.repository.model.Book
+import com.sirekanyan.knigopis.repository.model.BookHeader
 
 interface UserInteractor {
 

app/src/main/java/me/vadik/knigopis/feature/user/behavior/BehaviorHelper.kt → app/src/main/java/com/sirekanyan/knigopis/feature/user/behavior/BehaviorHelper.kt

@@ -1,4 +1,4 @@
-package me.vadik.knigopis.feature.user.behavior
+package com.sirekanyan.knigopis.feature.user.behavior
 
 import android.view.View
 

app/src/main/java/me/vadik/knigopis/feature/user/behavior/SimpleBehavior.kt → app/src/main/java/com/sirekanyan/knigopis/feature/user/behavior/SimpleBehavior.kt

@@ -1,11 +1,12 @@
-package me.vadik.knigopis.feature.user.behavior
+package com.sirekanyan.knigopis.feature.user.behavior
 
 import android.content.Context
 import android.support.design.widget.CoordinatorLayout
 import android.util.AttributeSet
 import android.view.View
-import me.vadik.knigopis.R.styleable.*
+import com.sirekanyan.knigopis.R.styleable.*
 
+@Suppress("unused")
 class SimpleBehavior(
     context: Context,
     attrs: AttributeSet

app/src/main/java/me/vadik/knigopis/feature/user/behavior/SimpleViewState.kt → app/src/main/java/com/sirekanyan/knigopis/feature/user/behavior/SimpleViewState.kt

@@ -1,4 +1,4 @@
-package me.vadik.knigopis.feature.user.behavior
+package com.sirekanyan.knigopis.feature.user.behavior
 
 class SimpleViewState(
     val x: Int,

app/src/main/java/me/vadik/knigopis/feature/users/SocialNetwork.kt → app/src/main/java/com/sirekanyan/knigopis/feature/users/SocialNetwork.kt

@@ -1,9 +1,9 @@
-package me.vadik.knigopis.feature.users
+package com.sirekanyan.knigopis.feature.users
 
 import android.net.Uri
 import android.support.annotation.DrawableRes
 import android.support.annotation.StringRes
-import me.vadik.knigopis.R
+import com.sirekanyan.knigopis.R
 
 fun Uri.toSocialNetwork() = SocialNetwork.values().find { it.host == host }
 

app/src/main/java/me/vadik/knigopis/feature/users/UriItem.kt → app/src/main/java/com/sirekanyan/knigopis/feature/users/UriItem.kt

@@ -1,8 +1,8 @@
-package me.vadik.knigopis.feature.users
+package com.sirekanyan.knigopis.feature.users
 
 import android.net.Uri
-import me.vadik.knigopis.R
-import me.vadik.knigopis.common.ResourceProvider
+import com.sirekanyan.knigopis.R
+import com.sirekanyan.knigopis.common.ResourceProvider
 
 class UriItem(val uri: Uri, resource: ResourceProvider) {
     private val social = uri.toSocialNetwork()

app/src/main/java/me/vadik/knigopis/feature/users/UserViewHolder.kt → app/src/main/java/com/sirekanyan/knigopis/feature/users/UserViewHolder.kt

@@ -1,12 +1,12 @@
-package me.vadik.knigopis.feature.users
+package com.sirekanyan.knigopis.feature.users
 
 import android.support.v7.widget.RecyclerView
 import android.view.View
 import kotlinx.android.synthetic.main.user.view.*
-import me.vadik.knigopis.R
-import me.vadik.knigopis.common.extensions.setCircleImage
-import me.vadik.knigopis.common.extensions.showNow
-import me.vadik.knigopis.common.getHtmlString
+import com.sirekanyan.knigopis.R
+import com.sirekanyan.knigopis.common.extensions.setCircleImage
+import com.sirekanyan.knigopis.common.extensions.showNow
+import com.sirekanyan.knigopis.common.getHtmlString
 
 class UserViewHolder(val view: View) : RecyclerView.ViewHolder(view) {
 

app/src/main/java/me/vadik/knigopis/feature/users/UsersAdapter.kt → app/src/main/java/com/sirekanyan/knigopis/feature/users/UsersAdapter.kt

@@ -1,14 +1,14 @@
-package me.vadik.knigopis.feature.users
+package com.sirekanyan.knigopis.feature.users
 
 import android.support.v7.widget.RecyclerView
 import android.view.ViewGroup
-import me.vadik.knigopis.R
-import me.vadik.knigopis.Router
-import me.vadik.knigopis.common.ResourceProvider
-import me.vadik.knigopis.common.extensions.inflate
-import me.vadik.knigopis.common.view.dialog.DialogFactory
-import me.vadik.knigopis.common.view.dialog.createDialogItem
-import me.vadik.knigopis.repository.model.subscription.Subscription
+import com.sirekanyan.knigopis.R
+import com.sirekanyan.knigopis.Router
+import com.sirekanyan.knigopis.common.ResourceProvider
+import com.sirekanyan.knigopis.common.extensions.inflate
+import com.sirekanyan.knigopis.common.view.dialog.DialogFactory
+import com.sirekanyan.knigopis.common.view.dialog.createDialogItem
+import com.sirekanyan.knigopis.repository.model.subscription.Subscription
 
 class UsersAdapter(
     private val users: List<Subscription>,

app/src/main/java/me/vadik/knigopis/repository/BookOrganizer.kt → app/src/main/java/com/sirekanyan/knigopis/repository/BookOrganizer.kt

@@ -1,11 +1,11 @@
-package me.vadik.knigopis.repository
+package com.sirekanyan.knigopis.repository
 
-import me.vadik.knigopis.R
-import me.vadik.knigopis.common.ResourceProvider
-import me.vadik.knigopis.repository.model.Book
-import me.vadik.knigopis.repository.model.BookHeader
-import me.vadik.knigopis.repository.model.FinishedBook
-import me.vadik.knigopis.repository.model.PlannedBook
+import com.sirekanyan.knigopis.R
+import com.sirekanyan.knigopis.common.ResourceProvider
+import com.sirekanyan.knigopis.repository.model.Book
+import com.sirekanyan.knigopis.repository.model.BookHeader
+import com.sirekanyan.knigopis.repository.model.FinishedBook
+import com.sirekanyan.knigopis.repository.model.PlannedBook
 
 interface BookOrganizer<T : Book> {
 

app/src/main/java/me/vadik/knigopis/repository/BookRepository.kt → app/src/main/java/com/sirekanyan/knigopis/repository/BookRepository.kt

@@ -1,14 +1,14 @@
-package me.vadik.knigopis.repository
+package com.sirekanyan.knigopis.repository
 
 import io.reactivex.Completable
 import io.reactivex.Single
 import io.reactivex.rxkotlin.Singles
-import me.vadik.knigopis.common.NetworkChecker
-import me.vadik.knigopis.common.logError
-import me.vadik.knigopis.common.logWarn
-import me.vadik.knigopis.repository.api.Endpoint
-import me.vadik.knigopis.repository.cache.BookCache
-import me.vadik.knigopis.repository.model.*
+import com.sirekanyan.knigopis.common.NetworkChecker
+import com.sirekanyan.knigopis.common.logError
+import com.sirekanyan.knigopis.common.logWarn
+import com.sirekanyan.knigopis.repository.api.Endpoint
+import com.sirekanyan.knigopis.repository.cache.BookCache
+import com.sirekanyan.knigopis.repository.model.*
 
 interface BookRepository {
 

app/src/main/java/me/vadik/knigopis/repository/Configuration.kt → app/src/main/java/com/sirekanyan/knigopis/repository/Configuration.kt

@@ -1,4 +1,4 @@
-package me.vadik.knigopis.repository
+package com.sirekanyan.knigopis.repository
 
 import android.content.Context
 

app/src/main/java/me/vadik/knigopis/repository/KAuth.kt → app/src/main/java/com/sirekanyan/knigopis/repository/KAuth.kt

@@ -1,10 +1,10 @@
-package me.vadik.knigopis.repository
+package com.sirekanyan.knigopis.repository
 
 import android.content.Context
 import android.content.Intent
-import me.vadik.knigopis.common.io2main
-import me.vadik.knigopis.common.logError
-import me.vadik.knigopis.repository.api.Endpoint
+import com.sirekanyan.knigopis.common.io2main
+import com.sirekanyan.knigopis.common.logError
+import com.sirekanyan.knigopis.repository.api.Endpoint
 import ru.ulogin.sdk.UloginAuthActivity
 import java.util.*
 

app/src/main/java/me/vadik/knigopis/repository/NoteRepository.kt → app/src/main/java/com/sirekanyan/knigopis/repository/NoteRepository.kt

@@ -1,13 +1,13 @@
-package me.vadik.knigopis.repository
+package com.sirekanyan.knigopis.repository
 
 import io.reactivex.Completable
 import io.reactivex.Single
-import me.vadik.knigopis.common.NetworkChecker
-import me.vadik.knigopis.common.logError
-import me.vadik.knigopis.common.logWarn
-import me.vadik.knigopis.repository.api.Endpoint
-import me.vadik.knigopis.repository.cache.NoteCache
-import me.vadik.knigopis.repository.model.note.Note
+import com.sirekanyan.knigopis.common.NetworkChecker
+import com.sirekanyan.knigopis.common.logError
+import com.sirekanyan.knigopis.common.logWarn
+import com.sirekanyan.knigopis.repository.api.Endpoint
+import com.sirekanyan.knigopis.repository.cache.NoteCache
+import com.sirekanyan.knigopis.repository.model.note.Note
 
 interface NoteRepository {
 

app/src/main/java/me/vadik/knigopis/repository/SubscriptionRepository.kt → app/src/main/java/com/sirekanyan/knigopis/repository/SubscriptionRepository.kt

@@ -1,13 +1,13 @@
-package me.vadik.knigopis.repository
+package com.sirekanyan.knigopis.repository
 
 import io.reactivex.Completable
 import io.reactivex.Single
-import me.vadik.knigopis.common.NetworkChecker
-import me.vadik.knigopis.common.logError
-import me.vadik.knigopis.common.logWarn
-import me.vadik.knigopis.repository.api.Endpoint
-import me.vadik.knigopis.repository.cache.SubscriptionCache
-import me.vadik.knigopis.repository.model.subscription.Subscription
+import com.sirekanyan.knigopis.common.NetworkChecker
+import com.sirekanyan.knigopis.common.logError
+import com.sirekanyan.knigopis.common.logWarn
+import com.sirekanyan.knigopis.repository.api.Endpoint
+import com.sirekanyan.knigopis.repository.cache.SubscriptionCache
+import com.sirekanyan.knigopis.repository.model.subscription.Subscription
 
 interface SubscriptionRepository {
 

app/src/main/java/me/vadik/knigopis/repository/api/Endpoint.kt → app/src/main/java/com/sirekanyan/knigopis/repository/api/Endpoint.kt

@@ -1,10 +1,10 @@
-package me.vadik.knigopis.repository.api
+package com.sirekanyan.knigopis.repository.api
 
 import io.reactivex.Completable
 import io.reactivex.Single
-import me.vadik.knigopis.repository.model.*
-import me.vadik.knigopis.repository.model.note.Note
-import me.vadik.knigopis.repository.model.subscription.Subscription
+import com.sirekanyan.knigopis.repository.model.*
+import com.sirekanyan.knigopis.repository.model.note.Note
+import com.sirekanyan.knigopis.repository.model.subscription.Subscription
 import retrofit2.http.*
 
 interface Endpoint {

app/src/main/java/me/vadik/knigopis/repository/api/static.kt → app/src/main/java/com/sirekanyan/knigopis/repository/api/static.kt

@@ -1,6 +1,6 @@
-package me.vadik.knigopis.repository.api
+package com.sirekanyan.knigopis.repository.api
 
-import me.vadik.knigopis.BuildConfig.STATIC_SERVER
+import com.sirekanyan.knigopis.BuildConfig.STATIC_SERVER
 
 fun createUserImageUrl(userId: String): String {
     return "$STATIC_SERVER/user/$userId"

app/src/main/java/me/vadik/knigopis/repository/cache/BookCache.kt → app/src/main/java/com/sirekanyan/knigopis/repository/cache/BookCache.kt

@@ -1,12 +1,12 @@
-package me.vadik.knigopis.repository.cache
+package com.sirekanyan.knigopis.repository.cache
 
 import io.reactivex.Completable
 import io.reactivex.Maybe
-import me.vadik.knigopis.repository.cache.common.CacheKey
-import me.vadik.knigopis.repository.cache.common.CommonCache
-import me.vadik.knigopis.repository.cache.common.genericType
-import me.vadik.knigopis.repository.model.FinishedBook
-import me.vadik.knigopis.repository.model.PlannedBook
+import com.sirekanyan.knigopis.repository.cache.common.CacheKey
+import com.sirekanyan.knigopis.repository.cache.common.CommonCache
+import com.sirekanyan.knigopis.repository.cache.common.genericType
+import com.sirekanyan.knigopis.repository.model.FinishedBook
+import com.sirekanyan.knigopis.repository.model.PlannedBook
 
 interface BookCache {
 

app/src/main/java/me/vadik/knigopis/repository/cache/NoteCache.kt → app/src/main/java/com/sirekanyan/knigopis/repository/cache/NoteCache.kt

@@ -1,11 +1,11 @@
-package me.vadik.knigopis.repository.cache
+package com.sirekanyan.knigopis.repository.cache
 
 import io.reactivex.Completable
 import io.reactivex.Maybe
-import me.vadik.knigopis.repository.cache.common.CacheKey
-import me.vadik.knigopis.repository.cache.common.CommonCache
-import me.vadik.knigopis.repository.cache.common.genericType
-import me.vadik.knigopis.repository.model.note.Note
+import com.sirekanyan.knigopis.repository.cache.common.CacheKey
+import com.sirekanyan.knigopis.repository.cache.common.CommonCache
+import com.sirekanyan.knigopis.repository.cache.common.genericType
+import com.sirekanyan.knigopis.repository.model.note.Note
 
 interface NoteCache {
 

app/src/main/java/me/vadik/knigopis/repository/cache/SubscriptionCache.kt → app/src/main/java/com/sirekanyan/knigopis/repository/cache/SubscriptionCache.kt

@@ -1,11 +1,11 @@
-package me.vadik.knigopis.repository.cache
+package com.sirekanyan.knigopis.repository.cache
 
 import io.reactivex.Completable
 import io.reactivex.Maybe
-import me.vadik.knigopis.repository.cache.common.CacheKey
-import me.vadik.knigopis.repository.cache.common.CommonCache
-import me.vadik.knigopis.repository.cache.common.genericType
-import me.vadik.knigopis.repository.model.subscription.Subscription
+import com.sirekanyan.knigopis.repository.cache.common.CacheKey
+import com.sirekanyan.knigopis.repository.cache.common.CommonCache
+import com.sirekanyan.knigopis.repository.cache.common.genericType
+import com.sirekanyan.knigopis.repository.model.subscription.Subscription
 
 interface SubscriptionCache {
 

app/src/main/java/me/vadik/knigopis/repository/cache/common/CacheKey.kt → app/src/main/java/com/sirekanyan/knigopis/repository/cache/common/CacheKey.kt

@@ -1,4 +1,4 @@
-package me.vadik.knigopis.repository.cache.common
+package com.sirekanyan.knigopis.repository.cache.common
 
 enum class CacheKey {
 

app/src/main/java/me/vadik/knigopis/repository/cache/common/CommonCache.kt → app/src/main/java/com/sirekanyan/knigopis/repository/cache/common/CommonCache.kt

@@ -1,4 +1,4 @@
-package me.vadik.knigopis.repository.cache.common
+package com.sirekanyan.knigopis.repository.cache.common
 
 import android.content.Context
 import com.google.gson.Gson

app/src/main/java/me/vadik/knigopis/repository/model/Book.kt → app/src/main/java/com/sirekanyan/knigopis/repository/model/Book.kt

@@ -1,7 +1,7 @@
-package me.vadik.knigopis.repository.model
+package com.sirekanyan.knigopis.repository.model
 
-import me.vadik.knigopis.common.orDefault
-import me.vadik.knigopis.repository.api.createBookImageUrl
+import com.sirekanyan.knigopis.common.orDefault
+import com.sirekanyan.knigopis.repository.api.createBookImageUrl
 
 interface Book {
     val id: String

app/src/main/java/me/vadik/knigopis/repository/model/BookHeader.kt → app/src/main/java/com/sirekanyan/knigopis/repository/model/BookHeader.kt

@@ -1,4 +1,4 @@
-package me.vadik.knigopis.repository.model
+package com.sirekanyan.knigopis.repository.model
 
 class BookHeader(
     override val title: String,

app/src/main/java/me/vadik/knigopis/repository/model/Credentials.kt → app/src/main/java/com/sirekanyan/knigopis/repository/model/Credentials.kt

@@ -1,4 +1,4 @@
-package me.vadik.knigopis.repository.model
+package com.sirekanyan.knigopis.repository.model
 
 import com.google.gson.annotations.SerializedName
 

app/src/main/java/me/vadik/knigopis/repository/model/CurrentTab.kt → app/src/main/java/com/sirekanyan/knigopis/repository/model/CurrentTab.kt

@@ -1,7 +1,7 @@
-package me.vadik.knigopis.repository.model
+package com.sirekanyan.knigopis.repository.model
 
 import android.support.annotation.IdRes
-import me.vadik.knigopis.R
+import com.sirekanyan.knigopis.R
 
 enum class CurrentTab(@IdRes val itemId: Int) {
 

app/src/main/java/me/vadik/knigopis/repository/model/FinishedBook.kt → app/src/main/java/com/sirekanyan/knigopis/repository/model/FinishedBook.kt

@@ -1,4 +1,4 @@
-package me.vadik.knigopis.repository.model
+package com.sirekanyan.knigopis.repository.model
 
 class FinishedBook(
     override val id: String,

app/src/main/java/me/vadik/knigopis/repository/model/FinishedBookToSend.kt → app/src/main/java/com/sirekanyan/knigopis/repository/model/FinishedBookToSend.kt

@@ -1,4 +1,4 @@
-package me.vadik.knigopis.repository.model
+package com.sirekanyan.knigopis.repository.model
 
 class FinishedBookToSend(
     val title: String,

app/src/main/java/me/vadik/knigopis/repository/model/PlannedBook.kt → app/src/main/java/com/sirekanyan/knigopis/repository/model/PlannedBook.kt

@@ -1,4 +1,4 @@
-package me.vadik.knigopis.repository.model
+package com.sirekanyan.knigopis.repository.model
 
 import java.util.*
 

app/src/main/java/me/vadik/knigopis/repository/model/PlannedBookToSend.kt → app/src/main/java/com/sirekanyan/knigopis/repository/model/PlannedBookToSend.kt

@@ -1,4 +1,4 @@
-package me.vadik.knigopis.repository.model
+package com.sirekanyan.knigopis.repository.model
 
 class PlannedBookToSend(
     val title: String,

app/src/main/java/com/sirekanyan/knigopis/repository/model/Profile.kt

@@ -0,0 +1,3 @@
+package com.sirekanyan.knigopis.repository.model
+
+class Profile(val nickname: String, val profile: String)

app/src/main/java/me/vadik/knigopis/repository/model/User.kt → app/src/main/java/com/sirekanyan/knigopis/repository/model/User.kt

@@ -1,7 +1,7 @@
-package me.vadik.knigopis.repository.model
+package com.sirekanyan.knigopis.repository.model
 
 import android.net.Uri
-import me.vadik.knigopis.common.toUriOrNull
+import com.sirekanyan.knigopis.common.toUriOrNull
 
 private val defaultAvatars = setOf(
     "https://lh3.googleusercontent.com/-XdUIqdMkCWA/AAAAAAAAAAI/AAAAAAAAAAA/4252rscbv5M/photo.jpg?sz=100",

app/src/main/java/me/vadik/knigopis/repository/model/note/Identity.kt → app/src/main/java/com/sirekanyan/knigopis/repository/model/note/Identity.kt

@@ -1,6 +1,6 @@
-package me.vadik.knigopis.repository.model.note
+package com.sirekanyan.knigopis.repository.model.note
 
-import me.vadik.knigopis.repository.api.createUserImageUrl
+import com.sirekanyan.knigopis.repository.api.createUserImageUrl
 
 class Identity(
     val id: String,

app/src/main/java/me/vadik/knigopis/repository/model/note/Note.kt → app/src/main/java/com/sirekanyan/knigopis/repository/model/note/Note.kt

@@ -1,6 +1,6 @@
-package me.vadik.knigopis.repository.model.note
+package com.sirekanyan.knigopis.repository.model.note
 
-import me.vadik.knigopis.repository.model.Book
+import com.sirekanyan.knigopis.repository.model.Book
 import java.util.*
 
 class Note(

app/src/main/java/me/vadik/knigopis/repository/model/subscription/Subscription.kt → app/src/main/java/com/sirekanyan/knigopis/repository/model/subscription/Subscription.kt

@@ -1,6 +1,6 @@
-package me.vadik.knigopis.repository.model.subscription
+package com.sirekanyan.knigopis.repository.model.subscription
 
-import me.vadik.knigopis.repository.model.User
+import com.sirekanyan.knigopis.repository.model.User
 
 class Subscription(
     val subUser: User,

app/src/main/java/me/vadik/knigopis/repository/api/gson/ImageThumbnailDeserializer.kt

@@ -1,22 +0,0 @@
-package me.vadik.knigopis.repository.api.gson
-
-import com.google.gson.JsonDeserializationContext
-import com.google.gson.JsonDeserializer
-import com.google.gson.JsonElement
-import me.vadik.knigopis.repository.model.ImageThumbnail
-import java.lang.reflect.Type
-
-class ImageThumbnailDeserializer : JsonDeserializer<ImageThumbnail> {
-    override fun deserialize(
-        json: JsonElement,
-        typeOfT: Type,
-        context: JsonDeserializationContext
-    ) =
-        json.asJsonObject
-            .getAsJsonObject("data")
-            .getAsJsonObject("result")
-            .getAsJsonArray("items")
-            .map { it.asJsonObject["thumbnail"].asString }
-            .map { "https:" + it }
-            .let(::ImageThumbnail)
-}

app/src/main/java/me/vadik/knigopis/repository/model/ImageThumbnail.kt

@@ -1,3 +0,0 @@
-package me.vadik.knigopis.repository.model
-
-class ImageThumbnail(val urls: List<String>)

app/src/main/java/me/vadik/knigopis/repository/model/Profile.kt

@@ -1,3 +0,0 @@
-package me.vadik.knigopis.repository.model
-
-class Profile(val nickname: String, val profile: String)

app/src/main/res/layout/activity_main.xml

@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context="me.vadik.knigopis.feature.MainActivity">
+    tools:context=".feature.MainActivity">
 
     <android.support.design.widget.AppBarLayout
         android:layout_width="match_parent"

app/src/main/res/layout/user_activity.xml

@@ -47,7 +47,7 @@
         app:appBarLayout="@+id/app_bar"
         app:appBarMaxHeight="@dimen/app_bar_height"
         app:appBarMinHeight="@dimen/toolbar_height"
-        app:layout_behavior="me.vadik.knigopis.feature.user.behavior.SimpleBehavior"
+        app:layout_behavior=".feature.user.behavior.SimpleBehavior"
         app:toHeight="40dp"
         app:toWidth="40dp"
         app:toX="64dp"