Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

refactored: files and packages naming #35

Merged
merged 1 commit into from
Jun 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@

<!-- notification receiver -->
<receiver
android:name=".services.notification_service.NotificationReceiver"
android:name=".services.notification.NotificationReceiver"
android:enabled="true"
android:exported="true">
<intent-filter>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/jobik/shkiper/NotepadApplication.kt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package com.jobik.shkiper

import android.app.Application
import android.content.Context
import com.jobik.shkiper.services.billing_service.BillingService
import com.jobik.shkiper.services.billing.BillingService
import com.jobik.shkiper.services.localization.LocaleHelper
import com.jobik.shkiper.services.localization.Localization

Expand Down
8 changes: 4 additions & 4 deletions app/src/main/java/com/jobik/shkiper/activity/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ import com.jobik.shkiper.SharedPreferencesKeys.OnboardingFinishedData
import com.jobik.shkiper.database.models.NotePosition
import com.jobik.shkiper.services.localization.LocaleHelper
import com.jobik.shkiper.navigation.Route
import com.jobik.shkiper.services.billing_service.BillingService
import com.jobik.shkiper.services.in_app_updates_service.InAppUpdatesService
import com.jobik.shkiper.services.review_service.ReviewService
import com.jobik.shkiper.screens.AppLayout.AppLayout
import com.jobik.shkiper.services.billing.BillingService
import com.jobik.shkiper.services.inAppUpdates.InAppUpdatesService
import com.jobik.shkiper.services.review.ReviewService
import com.jobik.shkiper.screens.layout.AppLayout
import com.jobik.shkiper.ui.components.modals.OfferWriteReview
import com.jobik.shkiper.ui.theme.AppTheme
import com.jobik.shkiper.ui.theme.CustomThemeStyle
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import com.jobik.shkiper.ui.theme.AppTheme
import com.jobik.shkiper.ui.theme.CustomThemeStyle
import com.jobik.shkiper.ui.theme.ShkiperTheme
import com.jobik.shkiper.util.ThemeUtil
import com.jobik.shkiper.widgets.screens.NoteSelectionScreen.NoteSelectionScreen
import com.jobik.shkiper.widgets.screens.noteSelection.NoteSelectionScreen
import dagger.hilt.android.AndroidEntryPoint
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.launch
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
import androidx.hilt.navigation.compose.hiltViewModel
import com.jobik.shkiper.NotepadApplication
import com.jobik.shkiper.services.localization.LocaleHelper
import com.jobik.shkiper.services.statistics_service.StatisticsService
import com.jobik.shkiper.services.statistics.StatisticsService
import com.jobik.shkiper.viewmodels.NotesViewModel
import dagger.hilt.android.AndroidEntryPoint
import kotlinx.coroutines.DelicateCoroutinesApi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import androidx.glance.appwidget.GlanceAppWidgetManager
import com.jobik.shkiper.database.data.reminder.ReminderMongoRepositoryImpl
import com.jobik.shkiper.database.models.Note
import com.jobik.shkiper.database.models.NotePosition
import com.jobik.shkiper.services.notification_service.NotificationScheduler
import com.jobik.shkiper.services.statistics_service.StatisticsService
import com.jobik.shkiper.services.notification.NotificationScheduler
import com.jobik.shkiper.services.statistics.StatisticsService
import com.jobik.shkiper.widgets.handlers.mapNoteToWidget
import dagger.hilt.android.qualifiers.ApplicationContext
import io.realm.kotlin.Realm
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import com.jobik.shkiper.database.models.Note
import com.jobik.shkiper.database.models.Reminder
import com.jobik.shkiper.database.models.RepeatMode
import com.jobik.shkiper.helpers.DateHelper
import com.jobik.shkiper.services.notification_service.NotificationData
import com.jobik.shkiper.services.notification_service.NotificationScheduler
import com.jobik.shkiper.services.statistics_service.StatisticsService
import com.jobik.shkiper.services.notification.NotificationData
import com.jobik.shkiper.services.notification.NotificationScheduler
import com.jobik.shkiper.services.statistics.StatisticsService
import dagger.hilt.android.qualifiers.ApplicationContext
import io.realm.kotlin.Realm
import io.realm.kotlin.UpdatePolicy
Expand Down
4 changes: 1 addition & 3 deletions app/src/main/java/com/jobik/shkiper/helpers/AppHelper.kt
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,10 @@ package com.jobik.shkiper.helpers
import android.app.AlarmManager
import android.app.NotificationManager
import android.content.Context
import android.content.Intent
import android.os.Build
import android.provider.Settings.ACTION_REQUEST_SCHEDULE_EXACT_ALARM
import androidx.core.app.NotificationManagerCompat
import androidx.core.content.ContextCompat
import com.jobik.shkiper.services.notification_service.NotificationScheduler
import com.jobik.shkiper.services.notification.NotificationScheduler

fun areChanelNotificationsEnabled(context: Context, channelId: String): Boolean {
runCatching {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.jobik.shkiper.navigation

import android.util.Log
import androidx.compose.animation.*
import androidx.compose.runtime.Composable
import androidx.compose.ui.ExperimentalComposeUiApi
Expand All @@ -13,15 +12,15 @@ import androidx.navigation.NavType
import androidx.navigation.compose.NavHost
import androidx.navigation.compose.composable
import androidx.navigation.navArgument
import com.jobik.shkiper.screens.AboutNotepadScreen.AboutNotepadScreen
import com.jobik.shkiper.screens.ArchiveNotesScreen.ArchiveNotesScreen
import com.jobik.shkiper.screens.BasketNotesScreen.BasketNotesScreen
import com.jobik.shkiper.screens.NoteListScreen.NoteListScreen
import com.jobik.shkiper.screens.NoteScreen.NoteScreen
import com.jobik.shkiper.screens.OnboardingScreen.OnBoardingScreen
import com.jobik.shkiper.screens.PurchaseScreen.PurchaseScreen
import com.jobik.shkiper.screens.SettingsScreen.SettingsScreen
import com.jobik.shkiper.screens.StatisticsScreen.StatisticsScreen
import com.jobik.shkiper.screens.about.AboutNotepadScreen
import com.jobik.shkiper.screens.archive.ArchiveNotesScreen
import com.jobik.shkiper.screens.basket.BasketNotesScreen
import com.jobik.shkiper.screens.noteListScreen.NoteListScreen
import com.jobik.shkiper.screens.note.NoteScreen
import com.jobik.shkiper.screens.onboarding.OnBoardingScreen
import com.jobik.shkiper.screens.purchase.PurchaseScreen
import com.jobik.shkiper.screens.settings.SettingsScreen
import com.jobik.shkiper.screens.statistics.StatisticsScreen

@OptIn(ExperimentalComposeUiApi::class)
@ExperimentalAnimationApi
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.jobik.shkiper.screens.AboutNotepadScreen
package com.jobik.shkiper.screens.about

import android.annotation.SuppressLint
import androidx.compose.foundation.*
Expand All @@ -24,7 +24,7 @@ import androidx.compose.ui.unit.dp
import com.jobik.shkiper.BuildConfig
import com.jobik.shkiper.R
import com.jobik.shkiper.helpers.IntentHelper
import com.jobik.shkiper.services.statistics_service.StatisticsService
import com.jobik.shkiper.services.statistics.StatisticsService
import com.jobik.shkiper.ui.components.cards.LinkCard
import com.jobik.shkiper.ui.components.cards.UserCard
import com.jobik.shkiper.ui.components.cards.UserCardLink
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.jobik.shkiper.screens.ArchiveNotesScreen
package com.jobik.shkiper.screens.archive

import androidx.activity.compose.BackHandler
import androidx.compose.animation.Crossfade
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.jobik.shkiper.screens.BasketNotesScreen
package com.jobik.shkiper.screens.basket

import androidx.activity.compose.BackHandler
import androidx.compose.animation.Crossfade
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.jobik.shkiper.screens.AppLayout
package com.jobik.shkiper.screens.layout

import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxSize
Expand All @@ -7,7 +7,7 @@ import androidx.compose.ui.Modifier
import androidx.navigation.NavHostController
import androidx.navigation.compose.rememberNavController
import com.jobik.shkiper.navigation.Route
import com.jobik.shkiper.screens.AppLayout.NavigationBar.BottomAppBarProvider
import com.jobik.shkiper.screens.layout.NavigationBar.BottomAppBarProvider

@Composable
fun AppLayout(startDestination: String = Route.NoteList.route) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.jobik.shkiper.screens.AppLayout.NavigationBar
package com.jobik.shkiper.screens.layout.NavigationBar

import androidx.annotation.StringRes
import androidx.compose.animation.animateColorAsState
Expand All @@ -8,7 +8,6 @@ import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.material3.*
import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.jobik.shkiper.screens.AppLayout.NavigationBar
package com.jobik.shkiper.screens.layout.NavigationBar

import androidx.compose.runtime.MutableState
import androidx.compose.runtime.State
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.jobik.shkiper.screens.AppLayout.NavigationBar
package com.jobik.shkiper.screens.layout.NavigationBar

import androidx.compose.animation.*
import androidx.compose.foundation.background
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.jobik.shkiper.screens.AppLayout.NavigationBar
package com.jobik.shkiper.screens.layout.NavigationBar

import androidx.lifecycle.ViewModel
import com.jobik.shkiper.database.data.note.NoteMongoRepository
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.jobik.shkiper.screens.AppLayout
package com.jobik.shkiper.screens.layout

import androidx.compose.animation.ExperimentalAnimationApi
import androidx.compose.foundation.layout.Box
Expand All @@ -17,7 +17,7 @@ import androidx.navigation.NavHostController
import com.jobik.shkiper.database.models.NotePosition
import com.jobik.shkiper.navigation.Route
import com.jobik.shkiper.navigation.SetupAppScreenNavGraph
import com.jobik.shkiper.screens.AppLayout.NavigationBar.AppNavigationBarState
import com.jobik.shkiper.screens.layout.NavigationBar.AppNavigationBarState

@Composable
@OptIn(ExperimentalAnimationApi::class)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.jobik.shkiper.screens.AppLayout
package com.jobik.shkiper.screens.layout

import androidx.compose.animation.core.animateDpAsState
import androidx.compose.foundation.layout.*
Expand All @@ -7,8 +7,8 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp
import com.jobik.shkiper.screens.AppLayout.NavigationBar.AppNavigationBarState
import com.jobik.shkiper.screens.AppLayout.NavigationBar.DefaultNavigationValues
import com.jobik.shkiper.screens.layout.NavigationBar.AppNavigationBarState
import com.jobik.shkiper.screens.layout.NavigationBar.DefaultNavigationValues
import com.jobik.shkiper.ui.components.cards.SnackbarCard
import com.jobik.shkiper.util.SnackbarHostUtil
import com.jobik.shkiper.util.SnackbarVisualsCustom
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.jobik.shkiper.screens.NoteScreen
package com.jobik.shkiper.screens.note

import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.jobik.shkiper.screens.NoteScreen
package com.jobik.shkiper.screens.note

import androidx.activity.compose.BackHandler
import androidx.compose.foundation.clickable
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.jobik.shkiper.screens.NoteScreen
package com.jobik.shkiper.screens.note

import android.annotation.SuppressLint
import androidx.compose.animation.animateColorAsState
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.jobik.shkiper.screens.NoteScreen
package com.jobik.shkiper.screens.note

import androidx.compose.animation.animateColorAsState
import androidx.compose.animation.core.animateDpAsState
Expand All @@ -7,7 +7,6 @@ import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material.icons.filled.ArrowBack
import androidx.compose.material.icons.outlined.*
import androidx.compose.material3.Surface
import androidx.compose.runtime.*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.jobik.shkiper.screens.NoteScreen
package com.jobik.shkiper.screens.note

import androidx.compose.animation.*
import androidx.compose.animation.core.animateDpAsState
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.jobik.shkiper.screens.NoteScreen
package com.jobik.shkiper.screens.note

import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.Code
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.jobik.shkiper.screens.NoteScreen
package com.jobik.shkiper.screens.note

import android.app.Application
import android.content.Context
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.jobik.shkiper.screens.NoteListScreen.NoteListCalendarContent
package com.jobik.shkiper.screens.noteListScreen.NoteListCalendarContent

import android.app.Application
import androidx.compose.runtime.State
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.jobik.shkiper.screens.NoteListScreen.NoteListCalendarContent
package com.jobik.shkiper.screens.noteListScreen.NoteListCalendarContent

import androidx.activity.compose.BackHandler
import androidx.compose.foundation.background
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.jobik.shkiper.screens.NoteListScreen.NoteListCalendarContent
package com.jobik.shkiper.screens.noteListScreen.NoteListCalendarContent

import androidx.compose.animation.*
import androidx.compose.foundation.background
Expand All @@ -15,7 +15,7 @@ import androidx.navigation.compose.currentBackStackEntryAsState
import com.jobik.shkiper.R
import com.jobik.shkiper.database.models.Note
import com.jobik.shkiper.database.models.Reminder
import com.jobik.shkiper.screens.AppLayout.NavigationBar.AppNavigationBarState
import com.jobik.shkiper.screens.layout.NavigationBar.AppNavigationBarState
import com.jobik.shkiper.ui.animation.AnimateVerticalSwitch
import com.jobik.shkiper.ui.components.layouts.*
import com.jobik.shkiper.ui.helpers.bottomWindowInsetsPadding
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.jobik.shkiper.screens.NoteListScreen.NoteListCalendarContent
package com.jobik.shkiper.screens.noteListScreen.NoteListCalendarContent

import androidx.compose.foundation.background
import androidx.compose.foundation.layout.*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.jobik.shkiper.screens.NoteListScreen
package com.jobik.shkiper.screens.noteListScreen

import androidx.activity.compose.BackHandler
import androidx.compose.animation.*
Expand All @@ -12,10 +12,10 @@ import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.ui.Modifier
import androidx.hilt.navigation.compose.hiltViewModel
import androidx.navigation.NavController
import com.jobik.shkiper.screens.AppLayout.NavigationBar.AppNavigationBarState
import com.jobik.shkiper.screens.NoteListScreen.NoteListCalendarContent.CalendarViewModel
import com.jobik.shkiper.screens.NoteListScreen.NoteListCalendarContent.ScreenCalendarContent
import com.jobik.shkiper.screens.NoteListScreen.NoteListScreenContent.NoteListScreenContent
import com.jobik.shkiper.screens.layout.NavigationBar.AppNavigationBarState
import com.jobik.shkiper.screens.noteListScreen.NoteListCalendarContent.CalendarViewModel
import com.jobik.shkiper.screens.noteListScreen.NoteListCalendarContent.ScreenCalendarContent
import com.jobik.shkiper.screens.noteListScreen.NoteListScreenContent.NoteListScreenContent
import com.jobik.shkiper.viewmodels.NotesViewModel

@Composable
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.jobik.shkiper.screens.NoteListScreen.NoteListScreenContent
package com.jobik.shkiper.screens.noteListScreen.NoteListScreenContent

import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Close
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.jobik.shkiper.screens.NoteListScreen.NoteListScreenContent
package com.jobik.shkiper.screens.noteListScreen.NoteListScreenContent

import androidx.activity.compose.BackHandler
import androidx.compose.animation.Crossfade
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.jobik.shkiper.screens.NoteListScreen.NoteListScreenContent
package com.jobik.shkiper.screens.noteListScreen.NoteListScreenContent

import android.content.Context
import androidx.compose.material.icons.Icons
Expand All @@ -16,7 +16,7 @@ import com.jobik.shkiper.helpers.IntentHelper
import com.jobik.shkiper.helpers.areChanelNotificationsEnabled
import com.jobik.shkiper.helpers.areEXACTNotificationsEnabled
import com.jobik.shkiper.helpers.areNotificationsEnabled
import com.jobik.shkiper.services.notification_service.NotificationScheduler
import com.jobik.shkiper.services.notification.NotificationScheduler
import com.jobik.shkiper.ui.components.modals.ActionDialog
import com.jobik.shkiper.viewmodels.NotesViewModel

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.jobik.shkiper.screens.OnboardingScreen
package com.jobik.shkiper.screens.onboarding

import androidx.annotation.DrawableRes
import androidx.annotation.StringRes
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.jobik.shkiper.screens.OnboardingScreen
package com.jobik.shkiper.screens.onboarding

import android.content.Context
import android.util.Log
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.jobik.shkiper.screens.PurchaseScreen
package com.jobik.shkiper.screens.purchase

import android.app.Activity
import android.content.Context
Expand Down Expand Up @@ -27,7 +27,7 @@ import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import androidx.hilt.navigation.compose.hiltViewModel
import com.jobik.shkiper.R
import com.jobik.shkiper.services.billing_service.AppProducts
import com.jobik.shkiper.services.billing.AppProducts
import com.jobik.shkiper.ui.components.cards.ProductPurchaseCardContent
import com.jobik.shkiper.ui.components.cards.PurchaseCard
import com.jobik.shkiper.ui.components.cards.TitlePurchaseCardContent
Expand Down
Loading