Skip to content

Commit

Permalink
Consistent package name (kasem-sm#138)
Browse files Browse the repository at this point in the history
Co-authored-by: kasem-sm <kasem-sm@github.com>
  • Loading branch information
kasem-sm and kasem-sm authored May 25, 2022
1 parent 17a82a7 commit fee1ed9
Show file tree
Hide file tree
Showing 48 changed files with 86 additions and 133 deletions.
14 changes: 2 additions & 12 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,10 @@ android {
apply plugin: 'kotlin-kapt'
apply plugin: 'dagger.hilt.android.plugin'

def versionProperties = new Properties()
versionProperties.load(new FileInputStream(rootProject.file("version.properties")))

def _versionCode = "${versionProperties['VERSION_CODE']}".toInteger()
def _versionName =
"${versionProperties['MAJOR']}" +
".${versionProperties['VERSION_CODE']}" +
".${versionProperties['MINOR']}" +
".${versionProperties['PATCH']}"

android {
defaultConfig {
versionCode = _versionCode
versionName = _versionName
versionCode = 1
versionName = "1.0"
applicationId "kasem.sm.slime"
}
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/kasem/sm/slime/SlimeApp.kt
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ package kasem.sm.slime
import android.app.Application
import androidx.hilt.work.HiltWorkerFactory
import androidx.work.Configuration
import com.slime.task_api.Tasks
import dagger.hilt.android.HiltAndroidApp
import javax.inject.Inject
import kasem.sm.task_api.Tasks
import timber.log.Timber.DebugTree
import timber.log.Timber.Forest.plant

Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/kasem/sm/slime/di/AppModule.kt
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ import androidx.work.NetworkType
import androidx.work.WorkManager
import coil.ImageLoader
import coil.memory.MemoryCache
import com.slime.auth_api.AuthManager
import com.slime.auth_api.Token
import dagger.Module
import dagger.Provides
import dagger.hilt.InstallIn
Expand All @@ -27,6 +25,8 @@ import io.ktor.client.request.header
import io.ktor.http.URLProtocol
import io.ktor.serialization.kotlinx.json.json
import javax.inject.Singleton
import kasem.sm.auth_api.AuthManager
import kasem.sm.auth_api.Token
import kasem.sm.core.domain.SlimeDispatchers
import kotlinx.coroutines.Dispatchers
import kotlinx.serialization.json.Json
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/java/kasem/sm/slime/ui/navigation/Screens.kt
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ import coil.ImageLoader
import com.google.accompanist.navigation.animation.composable
import com.google.accompanist.navigation.material.ExperimentalMaterialNavigationApi
import com.google.accompanist.navigation.material.bottomSheet
import com.slime.ui_home.HomeScreen
import kasem.sm.common_ui.util.Destination
import kasem.sm.ui_article_list.ListScreen
import kasem.sm.ui_auth.login.LoginScreen
import kasem.sm.ui_auth.register.RegisterScreen
import kasem.sm.ui_bookmarks.BookmarksScreen
import kasem.sm.ui_detail.DetailScreen
import kasem.sm.ui_explore.ExploreScreen
import kasem.sm.ui_home.HomeScreen
import kasem.sm.ui_profile.ProfileScreen
import kasem.sm.ui_subscribe_topic.SubscribeTopicScreen

Expand All @@ -44,6 +44,7 @@ fun NavGraphBuilder.attachRegistrationScreen(
}
}

@ExperimentalMaterialNavigationApi
internal fun NavGraphBuilder.attachLoginScreen(
navController: NavController,
snackbarHostState: SnackbarHostState,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright (C) 2022, Kasem S.M
* All rights reserved.
*/
package com.slime.auth_api
package kasem.sm.auth_api

import kotlinx.coroutines.flow.StateFlow

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright (C) 2022, Kasem S.M
* All rights reserved.
*/
package com.slime.auth_api
package kasem.sm.auth_api

enum class AuthState {
LOGGED_IN, LOGGED_OUT
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright (C) 2022, Kasem S.M
* All rights reserved.
*/
package com.slime.auth_api
package kasem.sm.auth_api

import javax.inject.Inject
import kasem.sm.core.domain.ObserverInteractor
Expand Down
2 changes: 1 addition & 1 deletion auth-impl/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest package="com.slime.auth_impl"/>
<manifest package="kasem.sm.auth_impl"/>
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@
* Copyright (C) 2022, Kasem S.M
* All rights reserved.
*/
package com.slime.auth_impl
package kasem.sm.auth_impl

import android.content.SharedPreferences
import androidx.core.content.edit
import com.slime.auth_api.AuthManager
import com.slime.auth_api.AuthState
import com.slime.auth_api.ID
import com.slime.auth_api.Token
import com.slime.auth_api.UserData
import com.slime.task_api.Tasks
import javax.inject.Inject
import kasem.sm.auth_api.AuthManager
import kasem.sm.auth_api.AuthState
import kasem.sm.auth_api.ID
import kasem.sm.auth_api.Token
import kasem.sm.auth_api.UserData
import kasem.sm.core.domain.SlimeDispatchers
import kasem.sm.task_api.Tasks
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.SupervisorJob
import kotlinx.coroutines.flow.MutableStateFlow
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright (C) 2022, Kasem S.M
* All rights reserved.
*/
package com.slime.auth_impl
package kasem.sm.auth_impl

import android.content.SharedPreferences
import kotlinx.coroutines.flow.Flow
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
* Copyright (C) 2022, Kasem S.M
* All rights reserved.
*/
package com.slime.auth_impl.di
package kasem.sm.auth_impl.di

import com.slime.auth_api.AuthManager
import com.slime.auth_impl.AuthManagerImpl
import dagger.Binds
import dagger.Module
import dagger.hilt.InstallIn
import dagger.hilt.components.SingletonComponent
import kasem.sm.auth_api.AuthManager
import kasem.sm.auth_impl.AuthManagerImpl

@Module
@InstallIn(SingletonComponent::class)
Expand Down
33 changes: 0 additions & 33 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,38 +1,5 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext {
def versionPropsFile = file("version.properties")

Properties versionProps = new Properties()
if (versionPropsFile.exists())
versionProps.load(new FileInputStream(versionPropsFile))

def _patch = (versionProps["PATCH"] ?: "0").toInteger() + 1
def _major = (versionProps["MAJOR"] ?: "0").toInteger()
def _minor = (versionProps["MINOR"] ?: "0").toInteger()

List<String> runTasks = gradle.startParameter.getTaskNames()
def value = 0
for (String item : runTasks)
if (item.contains("assembleRelease")) {
value = 1
}
_versionCode = (versionProps["VERSION_CODE"] ?: "1").toInteger() + value
if (_patch == 99999) {
_patch = 0
_minor = _minor + 1
}
if (_major == 99) {
_major = 0
_major = _major + 1
}

versionProps["MAJOR"] = _major.toString()
versionProps["MINOR"] = _minor.toString()
versionProps["PATCH"] = _patch.toString()
versionProps["VERSION_CODE"] = _versionCode.toString()
versionProps.store(versionPropsFile.newWriter(), null)
}
repositories {
google()
mavenCentral()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest package="kasem.sm.article.worker"/>
<manifest package="kasem.sm.article.daily_read_worker"/>
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright (C) 2022, Kasem S.M
* All rights reserved.
*/
package kasem.sm.article.worker
package kasem.sm.article.daily_read_worker

import androidx.work.Constraints
import androidx.work.ExistingPeriodicWorkPolicy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright (C) 2022, Kasem S.M
* All rights reserved.
*/
package kasem.sm.article.worker
package kasem.sm.article.daily_read_worker

import android.content.Context
import android.graphics.Bitmap
Expand All @@ -16,10 +16,10 @@ import coil.request.ImageRequest
import coil.request.SuccessResult
import dagger.assisted.Assisted
import dagger.assisted.AssistedInject
import kasem.sm.article.daily_read_worker.utils.NotificationManager
import kasem.sm.article.datasource.cache.ArticleDatabaseService
import kasem.sm.article.datasource.network.ArticleApiService
import kasem.sm.article.widget.DailyReadWidgetReceiver
import kasem.sm.article.worker.utils.NotificationManager
import kasem.sm.core.domain.SlimeDispatchers
import kotlinx.coroutines.withContext
import timber.log.Timber
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright (C) 2022, Kasem S.M
* All rights reserved.
*/
package kasem.sm.article.worker.utils
package kasem.sm.article.daily_read_worker.utils

import android.app.Notification
import android.app.Notification.VISIBILITY_PUBLIC
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
*/
package kasem.sm.article.datasource_impl.network

import com.slime.auth_api.AuthManager
import com.slime.auth_api.ID
import io.ktor.client.HttpClient
import io.ktor.client.call.body
import io.ktor.client.request.get
Expand All @@ -15,6 +13,8 @@ import kasem.sm.article.datasource.network.ArticleApiService
import kasem.sm.article.datasource.network.response.ArticleDto
import kasem.sm.article.datasource.network.response.ArticleResponse
import kasem.sm.article.datasource.network.response.SlimeResponse
import kasem.sm.auth_api.AuthManager
import kasem.sm.auth_api.ID
import kasem.sm.core.utils.userIdParam
import kasem.sm.core.utils.withResult

Expand Down
2 changes: 1 addition & 1 deletion features/article/markdown/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest package="slime.markdown"/>
<manifest package="kasem.sm.article.markdown"/>
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest package="kasem.sm.authentication.worker"/>
<manifest package="kasem.sm.authentication.auth_verify_worker"/>
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright (C) 2022, Kasem S.M
* All rights reserved.
*/
package kasem.sm.authentication.worker
package kasem.sm.authentication.auth_verify_worker

import androidx.work.Constraints
import androidx.work.ExistingPeriodicWorkPolicy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
* Copyright (C) 2022, Kasem S.M
* All rights reserved.
*/
package kasem.sm.authentication.worker
package kasem.sm.authentication.auth_verify_worker

import android.content.Context
import androidx.hilt.work.HiltWorker
import androidx.work.CoroutineWorker
import androidx.work.WorkerParameters
import com.slime.auth_api.AuthManager
import com.slime.auth_api.AuthState
import dagger.assisted.Assisted
import dagger.assisted.AssistedInject
import kasem.sm.auth_api.AuthManager
import kasem.sm.auth_api.AuthState
import kasem.sm.authentication.datasource.network.AuthApiService

@HiltWorker
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
*/
package kasem.sm.authentication.datasource_impl.network

import com.slime.auth_api.AuthManager
import com.slime.auth_api.ID
import io.ktor.client.HttpClient
import io.ktor.client.call.body
import io.ktor.client.request.get
import io.ktor.client.request.parameter
import io.ktor.client.request.post
import javax.inject.Inject
import kasem.sm.auth_api.AuthManager
import kasem.sm.auth_api.ID
import kasem.sm.authentication.datasource.network.AuthApiService
import kasem.sm.authentication.datasource.network.response.AuthResponse
import kasem.sm.authentication.datasource.network.response.SlimeResponse
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
*/
package kasem.sm.authentication.domain.interactors

import com.slime.auth_api.AuthManager
import javax.inject.Inject
import kasem.sm.auth_api.AuthManager
import kasem.sm.authentication.datasource.network.AuthApiService
import kasem.sm.authentication.domain.model.AuthResult
import kasem.sm.authentication.domain.model.AuthResult.Companion.toInvalidCredentialsException
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
*/
package kasem.sm.authentication.domain.interactors

import com.slime.auth_api.AuthManager
import javax.inject.Inject
import kasem.sm.auth_api.AuthManager
import kasem.sm.authentication.datasource.network.AuthApiService
import kasem.sm.authentication.domain.model.AuthResult
import kasem.sm.authentication.domain.model.AuthResult.Companion.toInvalidCredentialsException
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
*/
package kasem.sm.topic.datasource_impl.network

import com.slime.auth_api.AuthManager
import com.slime.auth_api.ID
import io.ktor.client.HttpClient
import io.ktor.client.call.body
import io.ktor.client.request.get
Expand All @@ -14,6 +12,8 @@ import io.ktor.client.request.post
import io.ktor.http.ContentType
import io.ktor.http.contentType
import javax.inject.Inject
import kasem.sm.auth_api.AuthManager
import kasem.sm.auth_api.ID
import kasem.sm.core.utils.userIdParam
import kasem.sm.core.utils.withResult
import kasem.sm.topic.datasource.network.TopicApiService
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest package="kasem.sm.topic.worker"/>
<manifest package="kasem.sm.topic.subscription_manager_worker"/>
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright (C) 2022, Kasem S.M
* All rights reserved.
*/
package kasem.sm.topic.worker
package kasem.sm.topic.subscription_manager_worker

import android.content.Context
import androidx.hilt.work.HiltWorker
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright (C) 2022, Kasem S.M
* All rights reserved.
*/
package kasem.sm.topic.worker
package kasem.sm.topic.subscription_manager_worker

import androidx.work.Constraints
import androidx.work.ExistingWorkPolicy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Copyright (C) 2022, Kasem S.M
* All rights reserved.
*/
package kasem.sm.topic.worker
package kasem.sm.topic.subscription_manager_worker

import androidx.work.Constraints
import androidx.work.ExistingWorkPolicy
Expand All @@ -11,7 +11,7 @@ import androidx.work.OneTimeWorkRequestBuilder
import androidx.work.WorkInfo
import androidx.work.WorkManager
import javax.inject.Inject
import kasem.sm.topic.worker.utils.asFlow
import kasem.sm.topic.subscription_manager_worker.utils.asFlow
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.channelFlow
import kotlinx.coroutines.flow.collectLatest
Expand Down
Loading

0 comments on commit fee1ed9

Please sign in to comment.