From 4511b6cf49426d22e283761e751c1583c7aec4ec Mon Sep 17 00:00:00 2001 From: Murad Najafli Date: Tue, 30 Apr 2024 15:42:41 +0400 Subject: [PATCH] - ComponentActivity changed to AppCompatActivity - Changed util name to utils --- .../main/java/com/muradnajafli/newscatcher/MainActivity.kt | 2 +- .../java/com/muradnajafli/newscatcher/di/DataStoreModule.kt | 2 +- .../java/com/muradnajafli/newscatcher/di/NetworkModule.kt | 2 +- .../java/com/muradnajafli/newscatcher/domain/model/Article.kt | 2 +- .../newscatcher/presentation/bookmark/BookmarkScreen.kt | 2 +- .../muradnajafli/newscatcher/presentation/home/HomeScreen.kt | 2 +- .../newscatcher/presentation/home/HomeViewModel.kt | 4 ++-- .../presentation/home/components/SettingsColumn.kt | 2 +- .../com/muradnajafli/newscatcher/{util => utils}/Constants.kt | 2 +- .../newscatcher/{util => utils}/DataStoreExtension.kt | 2 +- .../com/muradnajafli/newscatcher/{util => utils}/DateUtils.kt | 2 +- .../newscatcher/{util => utils}/InternetChecker.kt | 2 +- .../muradnajafli/newscatcher/{util => utils}/LanguageUtils.kt | 2 +- .../com/muradnajafli/newscatcher/{util => utils}/UiText.kt | 2 +- 14 files changed, 15 insertions(+), 15 deletions(-) rename app/src/main/java/com/muradnajafli/newscatcher/{util => utils}/Constants.kt (80%) rename app/src/main/java/com/muradnajafli/newscatcher/{util => utils}/DataStoreExtension.kt (88%) rename app/src/main/java/com/muradnajafli/newscatcher/{util => utils}/DateUtils.kt (97%) rename app/src/main/java/com/muradnajafli/newscatcher/{util => utils}/InternetChecker.kt (94%) rename app/src/main/java/com/muradnajafli/newscatcher/{util => utils}/LanguageUtils.kt (95%) rename app/src/main/java/com/muradnajafli/newscatcher/{util => utils}/UiText.kt (92%) diff --git a/app/src/main/java/com/muradnajafli/newscatcher/MainActivity.kt b/app/src/main/java/com/muradnajafli/newscatcher/MainActivity.kt index 862b775..b64241f 100644 --- a/app/src/main/java/com/muradnajafli/newscatcher/MainActivity.kt +++ b/app/src/main/java/com/muradnajafli/newscatcher/MainActivity.kt @@ -5,7 +5,7 @@ import androidx.activity.compose.setContent import androidx.appcompat.app.AppCompatActivity import com.muradnajafli.newscatcher.navigation.NewsNavigator import com.muradnajafli.newscatcher.ui.theme.NewsCatcherTheme -import com.muradnajafli.newscatcher.util.LanguageUtils +import com.muradnajafli.newscatcher.utils.LanguageUtils import dagger.hilt.android.AndroidEntryPoint @AndroidEntryPoint diff --git a/app/src/main/java/com/muradnajafli/newscatcher/di/DataStoreModule.kt b/app/src/main/java/com/muradnajafli/newscatcher/di/DataStoreModule.kt index d70bfdf..a77c5f0 100644 --- a/app/src/main/java/com/muradnajafli/newscatcher/di/DataStoreModule.kt +++ b/app/src/main/java/com/muradnajafli/newscatcher/di/DataStoreModule.kt @@ -4,7 +4,7 @@ import android.content.Context import androidx.datastore.core.DataStore import androidx.datastore.preferences.core.Preferences import com.muradnajafli.newscatcher.data.repository.local.DataStoreRepositoryImpl -import com.muradnajafli.newscatcher.util.dataStore +import com.muradnajafli.newscatcher.utils.dataStore import dagger.Module import dagger.Provides import dagger.hilt.InstallIn diff --git a/app/src/main/java/com/muradnajafli/newscatcher/di/NetworkModule.kt b/app/src/main/java/com/muradnajafli/newscatcher/di/NetworkModule.kt index 545752a..6a96fc1 100644 --- a/app/src/main/java/com/muradnajafli/newscatcher/di/NetworkModule.kt +++ b/app/src/main/java/com/muradnajafli/newscatcher/di/NetworkModule.kt @@ -1,7 +1,7 @@ package com.muradnajafli.newscatcher.di import com.muradnajafli.newscatcher.data.retrofit.NewsApi -import com.muradnajafli.newscatcher.util.Constants +import com.muradnajafli.newscatcher.utils.Constants import dagger.Module import dagger.Provides import dagger.hilt.InstallIn diff --git a/app/src/main/java/com/muradnajafli/newscatcher/domain/model/Article.kt b/app/src/main/java/com/muradnajafli/newscatcher/domain/model/Article.kt index bd625cc..db73e57 100644 --- a/app/src/main/java/com/muradnajafli/newscatcher/domain/model/Article.kt +++ b/app/src/main/java/com/muradnajafli/newscatcher/domain/model/Article.kt @@ -5,7 +5,7 @@ import android.os.Parcelable import androidx.room.Entity import androidx.room.PrimaryKey import com.google.gson.annotations.SerializedName -import com.muradnajafli.newscatcher.util.DateUtils +import com.muradnajafli.newscatcher.utils.DateUtils import kotlinx.parcelize.Parcelize @Parcelize diff --git a/app/src/main/java/com/muradnajafli/newscatcher/presentation/bookmark/BookmarkScreen.kt b/app/src/main/java/com/muradnajafli/newscatcher/presentation/bookmark/BookmarkScreen.kt index 0213c1f..0fc249e 100644 --- a/app/src/main/java/com/muradnajafli/newscatcher/presentation/bookmark/BookmarkScreen.kt +++ b/app/src/main/java/com/muradnajafli/newscatcher/presentation/bookmark/BookmarkScreen.kt @@ -14,7 +14,7 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp import com.muradnajafli.newscatcher.domain.model.Article import com.muradnajafli.newscatcher.presentation.common.ArticleItem -import com.muradnajafli.newscatcher.util.DateUtils +import com.muradnajafli.newscatcher.utils.DateUtils @Composable fun BookMarkScreen( diff --git a/app/src/main/java/com/muradnajafli/newscatcher/presentation/home/HomeScreen.kt b/app/src/main/java/com/muradnajafli/newscatcher/presentation/home/HomeScreen.kt index e8c6022..03b9f2d 100644 --- a/app/src/main/java/com/muradnajafli/newscatcher/presentation/home/HomeScreen.kt +++ b/app/src/main/java/com/muradnajafli/newscatcher/presentation/home/HomeScreen.kt @@ -18,7 +18,7 @@ import com.muradnajafli.newscatcher.domain.model.Article import com.muradnajafli.newscatcher.presentation.home.components.ImageSlider import com.muradnajafli.newscatcher.presentation.home.components.SearchPanel import com.muradnajafli.newscatcher.presentation.home.components.SettingsColumn -import com.muradnajafli.newscatcher.util.UiText +import com.muradnajafli.newscatcher.utils.UiText @Composable fun HomeScreen( diff --git a/app/src/main/java/com/muradnajafli/newscatcher/presentation/home/HomeViewModel.kt b/app/src/main/java/com/muradnajafli/newscatcher/presentation/home/HomeViewModel.kt index 7c0983d..27631e4 100644 --- a/app/src/main/java/com/muradnajafli/newscatcher/presentation/home/HomeViewModel.kt +++ b/app/src/main/java/com/muradnajafli/newscatcher/presentation/home/HomeViewModel.kt @@ -7,8 +7,8 @@ import com.muradnajafli.newscatcher.domain.model.Article import com.muradnajafli.newscatcher.domain.usecase.dropdown.ReadLanguageUseCase import com.muradnajafli.newscatcher.domain.usecase.home.GetLatestHeadlinesUseCase import com.muradnajafli.newscatcher.domain.usecase.home.GetNewsFromSearchUseCase -import com.muradnajafli.newscatcher.util.InternetChecker -import com.muradnajafli.newscatcher.util.UiText +import com.muradnajafli.newscatcher.utils.InternetChecker +import com.muradnajafli.newscatcher.utils.UiText import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow diff --git a/app/src/main/java/com/muradnajafli/newscatcher/presentation/home/components/SettingsColumn.kt b/app/src/main/java/com/muradnajafli/newscatcher/presentation/home/components/SettingsColumn.kt index d948237..c5d1bbe 100644 --- a/app/src/main/java/com/muradnajafli/newscatcher/presentation/home/components/SettingsColumn.kt +++ b/app/src/main/java/com/muradnajafli/newscatcher/presentation/home/components/SettingsColumn.kt @@ -21,7 +21,7 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.muradnajafli.newscatcher.util.DateUtils +import com.muradnajafli.newscatcher.utils.DateUtils @Composable fun SettingsColumn( diff --git a/app/src/main/java/com/muradnajafli/newscatcher/util/Constants.kt b/app/src/main/java/com/muradnajafli/newscatcher/utils/Constants.kt similarity index 80% rename from app/src/main/java/com/muradnajafli/newscatcher/util/Constants.kt rename to app/src/main/java/com/muradnajafli/newscatcher/utils/Constants.kt index 55a80a8..f102789 100644 --- a/app/src/main/java/com/muradnajafli/newscatcher/util/Constants.kt +++ b/app/src/main/java/com/muradnajafli/newscatcher/utils/Constants.kt @@ -1,4 +1,4 @@ -package com.muradnajafli.newscatcher.util +package com.muradnajafli.newscatcher.utils import com.muradnajafli.newscatcher.BuildConfig diff --git a/app/src/main/java/com/muradnajafli/newscatcher/util/DataStoreExtension.kt b/app/src/main/java/com/muradnajafli/newscatcher/utils/DataStoreExtension.kt similarity index 88% rename from app/src/main/java/com/muradnajafli/newscatcher/util/DataStoreExtension.kt rename to app/src/main/java/com/muradnajafli/newscatcher/utils/DataStoreExtension.kt index 9969b19..00eb31d 100644 --- a/app/src/main/java/com/muradnajafli/newscatcher/util/DataStoreExtension.kt +++ b/app/src/main/java/com/muradnajafli/newscatcher/utils/DataStoreExtension.kt @@ -1,4 +1,4 @@ -package com.muradnajafli.newscatcher.util +package com.muradnajafli.newscatcher.utils import android.content.Context import androidx.datastore.core.DataStore diff --git a/app/src/main/java/com/muradnajafli/newscatcher/util/DateUtils.kt b/app/src/main/java/com/muradnajafli/newscatcher/utils/DateUtils.kt similarity index 97% rename from app/src/main/java/com/muradnajafli/newscatcher/util/DateUtils.kt rename to app/src/main/java/com/muradnajafli/newscatcher/utils/DateUtils.kt index 2a2e313..2aed794 100644 --- a/app/src/main/java/com/muradnajafli/newscatcher/util/DateUtils.kt +++ b/app/src/main/java/com/muradnajafli/newscatcher/utils/DateUtils.kt @@ -1,4 +1,4 @@ -package com.muradnajafli.newscatcher.util +package com.muradnajafli.newscatcher.utils import java.text.SimpleDateFormat import java.util.Date diff --git a/app/src/main/java/com/muradnajafli/newscatcher/util/InternetChecker.kt b/app/src/main/java/com/muradnajafli/newscatcher/utils/InternetChecker.kt similarity index 94% rename from app/src/main/java/com/muradnajafli/newscatcher/util/InternetChecker.kt rename to app/src/main/java/com/muradnajafli/newscatcher/utils/InternetChecker.kt index bc4d9f1..eed4712 100644 --- a/app/src/main/java/com/muradnajafli/newscatcher/util/InternetChecker.kt +++ b/app/src/main/java/com/muradnajafli/newscatcher/utils/InternetChecker.kt @@ -1,4 +1,4 @@ -package com.muradnajafli.newscatcher.util +package com.muradnajafli.newscatcher.utils import android.content.Context import android.net.ConnectivityManager diff --git a/app/src/main/java/com/muradnajafli/newscatcher/util/LanguageUtils.kt b/app/src/main/java/com/muradnajafli/newscatcher/utils/LanguageUtils.kt similarity index 95% rename from app/src/main/java/com/muradnajafli/newscatcher/util/LanguageUtils.kt rename to app/src/main/java/com/muradnajafli/newscatcher/utils/LanguageUtils.kt index a6d72b5..9b92129 100644 --- a/app/src/main/java/com/muradnajafli/newscatcher/util/LanguageUtils.kt +++ b/app/src/main/java/com/muradnajafli/newscatcher/utils/LanguageUtils.kt @@ -1,4 +1,4 @@ -package com.muradnajafli.newscatcher.util +package com.muradnajafli.newscatcher.utils import android.os.LocaleList diff --git a/app/src/main/java/com/muradnajafli/newscatcher/util/UiText.kt b/app/src/main/java/com/muradnajafli/newscatcher/utils/UiText.kt similarity index 92% rename from app/src/main/java/com/muradnajafli/newscatcher/util/UiText.kt rename to app/src/main/java/com/muradnajafli/newscatcher/utils/UiText.kt index d57e172..28d4138 100644 --- a/app/src/main/java/com/muradnajafli/newscatcher/util/UiText.kt +++ b/app/src/main/java/com/muradnajafli/newscatcher/utils/UiText.kt @@ -1,4 +1,4 @@ -package com.muradnajafli.newscatcher.util +package com.muradnajafli.newscatcher.utils import androidx.annotation.StringRes import androidx.compose.runtime.Composable