Skip to content

Commit

Permalink
Updated package name
Browse files Browse the repository at this point in the history
  • Loading branch information
HeyPouya committed Jul 20, 2024
1 parent df5cf00 commit c510436
Show file tree
Hide file tree
Showing 29 changed files with 79 additions and 78 deletions.
4 changes: 2 additions & 2 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ plugins {
android {
compileSdk = libs.versions.compileSdkVersion.get().toInt()
defaultConfig {
applicationId = "ir.apptune.calendar"
applicationId = "com.pouyaheydari.calendar"
minSdk = libs.versions.minSdkVersion.get().toInt()
targetSdk = libs.versions.targetSdkVersion.get().toInt()
versionCode = libs.versions.appVersion.get().toInt()
Expand All @@ -34,7 +34,7 @@ android {
buildFeatures {
viewBinding = true
}
namespace = "ir.apptune.calendar"
namespace = "com.pouyaheydari.calendar"
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion app/proguard-rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@
#}
-keepattributes EnclosingMethod
-keepattributes *Annotation*,Signature
-keep class ir.apptune.calendar.pojo** {*;}
-keep class com.pouyaheydari.calendar.pojo** {*;}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ir.apptune.calendar
package com.pouyaheydari.calendar

import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ir.apptune.calendar
package com.pouyaheydari.calendar

import android.app.Application
import dagger.hilt.android.HiltAndroidApp
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package ir.apptune.calendar.di
package com.pouyaheydari.calendar.di

import android.app.Application
import dagger.Module
import dagger.Provides
import dagger.hilt.InstallIn
import dagger.hilt.components.SingletonComponent
import ir.apptune.calendar.core.pojo.CalendarModel
import ir.apptune.calendar.core.utils.CalendarTool
import ir.apptune.calendar.core.utils.ResourceUtils
import ir.apptune.calendar.repository.MonthGeneratorClass
import com.pouyaheydari.calendar.core.pojo.CalendarModel
import com.pouyaheydari.calendar.core.utils.CalendarTool
import com.pouyaheydari.calendar.core.utils.ResourceUtils
import com.pouyaheydari.calendar.repository.MonthGeneratorClass
import java.util.*
import javax.inject.Singleton

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ir.apptune.calendar.features.calendar.main
package com.pouyaheydari.calendar.features.calendar.main

import android.view.LayoutInflater
import android.view.View
Expand All @@ -8,11 +8,12 @@ import androidx.core.view.isVisible
import androidx.recyclerview.widget.DiffUtil
import androidx.recyclerview.widget.ListAdapter
import androidx.recyclerview.widget.RecyclerView
import ir.apptune.calendar.R
import ir.apptune.calendar.core.pojo.CalendarModel
import ir.apptune.calendar.core.utils.extensions.toPersianNumber
import ir.apptune.calendar.databinding.CalendarItemBinding
import ir.apptune.calendar.features.calendar.main.CalendarAdapter.CalendarViewHolder
import com.pouyaheydari.calendar.R
import com.pouyaheydari.calendar.core.pojo.CalendarModel
import com.pouyaheydari.calendar.core.utils.EMPTY_DATE
import com.pouyaheydari.calendar.core.utils.extensions.toPersianNumber
import com.pouyaheydari.calendar.databinding.CalendarItemBinding
import com.pouyaheydari.calendar.features.calendar.main.CalendarAdapter.CalendarViewHolder

/**
* Adapter to show the calendar days
Expand All @@ -39,10 +40,10 @@ class CalendarAdapter(private val clickListener: (CalendarModel) -> Unit) :
with(dateModel) {
with(binding) {
txtIranianDate.isVisible =
iranianDay != ir.apptune.calendar.core.utils.EMPTY_DATE
iranianDay != EMPTY_DATE
txtGregorianDate.isVisible =
iranianDay != ir.apptune.calendar.core.utils.EMPTY_DATE
if (iranianDay == ir.apptune.calendar.core.utils.EMPTY_DATE) return
iranianDay != EMPTY_DATE
if (iranianDay == EMPTY_DATE) return

itemView.setOnClickListener { clickListener(dateModel) }
txtIranianDate.text = iranianDay.toPersianNumber()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ir.apptune.calendar.features.calendar.main
package com.pouyaheydari.calendar.features.calendar.main

import android.os.Bundle
import android.view.LayoutInflater
Expand All @@ -8,13 +8,13 @@ import androidx.fragment.app.Fragment
import androidx.fragment.app.viewModels
import androidx.navigation.fragment.findNavController
import dagger.hilt.android.AndroidEntryPoint
import ir.apptune.calendar.R
import ir.apptune.calendar.core.pojo.CalendarModel
import ir.apptune.calendar.core.utils.SELECTED_DAY_DETAILS
import ir.apptune.calendar.core.utils.extensions.toPersianMonth
import ir.apptune.calendar.core.utils.extensions.toPersianNumber
import ir.apptune.calendar.core.utils.extensions.toPersianWeekDay
import ir.apptune.calendar.databinding.CalendarFragmentBinding
import com.pouyaheydari.calendar.R
import com.pouyaheydari.calendar.core.pojo.CalendarModel
import com.pouyaheydari.calendar.core.utils.SELECTED_DAY_DETAILS
import com.pouyaheydari.calendar.core.utils.extensions.toPersianMonth
import com.pouyaheydari.calendar.core.utils.extensions.toPersianNumber
import com.pouyaheydari.calendar.core.utils.extensions.toPersianWeekDay
import com.pouyaheydari.calendar.databinding.CalendarFragmentBinding
import javax.inject.Inject

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package ir.apptune.calendar.features.calendar.main
package com.pouyaheydari.calendar.features.calendar.main

import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import dagger.hilt.android.lifecycle.HiltViewModel
import ir.apptune.calendar.core.pojo.CalendarModel
import ir.apptune.calendar.pojo.MonthType.NEXT_MONTH
import ir.apptune.calendar.pojo.MonthType.PREVIOUS_MONTH
import ir.apptune.calendar.repository.MonthGeneratorClass
import com.pouyaheydari.calendar.core.pojo.CalendarModel
import com.pouyaheydari.calendar.pojo.MonthType.NEXT_MONTH
import com.pouyaheydari.calendar.pojo.MonthType.PREVIOUS_MONTH
import com.pouyaheydari.calendar.repository.MonthGeneratorClass
import javax.inject.Inject

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ir.apptune.calendar.pojo
package com.pouyaheydari.calendar.pojo

/**
* Contains details of a day
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ir.apptune.calendar.pojo
package com.pouyaheydari.calendar.pojo

/**
* An Enum to request next or previous month
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package ir.apptune.calendar.repository
package com.pouyaheydari.calendar.repository

import ir.apptune.calendar.core.pojo.CalendarModel
import ir.apptune.calendar.core.utils.CalendarTool
import ir.apptune.calendar.core.utils.EMPTY_DATE
import ir.apptune.calendar.core.utils.ResourceUtils
import ir.apptune.calendar.pojo.DateModel
import ir.apptune.calendar.pojo.MonthType
import com.pouyaheydari.calendar.core.pojo.CalendarModel
import com.pouyaheydari.calendar.core.utils.CalendarTool
import com.pouyaheydari.calendar.core.utils.EMPTY_DATE
import com.pouyaheydari.calendar.core.utils.ResourceUtils
import com.pouyaheydari.calendar.pojo.DateModel
import com.pouyaheydari.calendar.pojo.MonthType
import javax.inject.Inject

private const val MONDAY = 0
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/calendar_fragment.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="ir.apptune.calendar.MainActivity">
tools:context="com.pouyaheydari.calendar.MainActivity">

<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/res/navigation/nav_graph.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@

<fragment
android:id="@+id/calendarFragment"
android:name="ir.apptune.calendar.features.calendar.main.CalendarFragment"
android:name="com.pouyaheydari.calendar.features.calendar.main.CalendarFragment"
android:label="CalendarFragment">
<action
android:id="@+id/action_calendarFragment_to_onClickDialogActivity"
app:destination="@id/onClickDialogActivity" />
</fragment>
<dialog
android:id="@+id/onClickDialogActivity"
android:name="ir.apptune.calendar.details.DateDetailsDialogFragment"
android:name="com.pouyaheydari.calendar.details.DateDetailsDialogFragment"
android:label="OnClickDialogActivity">
<argument
android:name="SelectedDayDetails"
app:argType="ir.apptune.calendar.core.pojo.CalendarModel" />
app:argType="com.pouyaheydari.calendar.core.pojo.CalendarModel" />
</dialog>
</navigation>
2 changes: 1 addition & 1 deletion core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ android {
minSdk = libs.versions.minSdkVersion.get().toInt()
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
namespace = "ir.apptune.calendar.core"
namespace = "com.pouyaheydari.calendar.core"

compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ir.apptune.calendar.core
package com.pouyaheydari.calendar.core

import androidx.test.platform.app.InstrumentationRegistry
import androidx.test.ext.junit.runners.AndroidJUnit4
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ir.apptune.calendar.core.pojo
package com.pouyaheydari.calendar.core.pojo

import android.os.Parcelable
import kotlinx.parcelize.Parcelize
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ir.apptune.calendar.core.utils
package com.pouyaheydari.calendar.core.utils

import java.util.Calendar
import java.util.GregorianCalendar
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ir.apptune.calendar.core.utils
package com.pouyaheydari.calendar.core.utils

const val SELECTED_DAY_DETAILS = "SelectedDayDetails"
const val EMPTY_DATE = -1
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package ir.apptune.calendar.core.utils
package com.pouyaheydari.calendar.core.utils

import android.content.Context
import android.util.Log
import ir.apptune.calendar.core.R
import com.pouyaheydari.calendar.core.R
import org.xmlpull.v1.XmlPullParser

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package ir.apptune.calendar.core.utils.extensions
package com.pouyaheydari.calendar.core.utils.extensions

import android.content.Context
import ir.apptune.calendar.core.R
import com.pouyaheydari.calendar.core.R


/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ir.apptune.calendar
package com.pouyaheydari.calendar.core

import org.junit.Test

Expand Down
2 changes: 1 addition & 1 deletion features/calendar-details/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ android {
buildFeatures {
viewBinding = true
}
namespace = "ir.apptune.calendar.details"
namespace = "com.pouyaheydari.calendar.details"
}

dependencies {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ir.apptune.calendar.details
package com.pouyaheydari.calendar.details

import android.content.ActivityNotFoundException
import android.content.Intent
Expand All @@ -12,14 +12,14 @@ import androidx.fragment.app.DialogFragment
import androidx.lifecycle.ViewModelProvider
import com.google.android.material.snackbar.Snackbar
import dagger.hilt.android.AndroidEntryPoint
import ir.apptune.calendar.core.pojo.CalendarModel
import ir.apptune.calendar.core.utils.SELECTED_DAY_DETAILS
import ir.apptune.calendar.core.utils.extensions.toEnglishMonth
import ir.apptune.calendar.core.utils.extensions.toPersianMonth
import ir.apptune.calendar.core.utils.extensions.toPersianNumber
import ir.apptune.calendar.core.utils.extensions.toPersianWeekDay
import ir.apptune.calendar.details.databinding.FragmentDialogDateDetailsBinding
import ir.apptune.calendar.details.utils.parcelable
import com.pouyaheydari.calendar.core.pojo.CalendarModel
import com.pouyaheydari.calendar.core.utils.SELECTED_DAY_DETAILS
import com.pouyaheydari.calendar.core.utils.extensions.toEnglishMonth
import com.pouyaheydari.calendar.core.utils.extensions.toPersianMonth
import com.pouyaheydari.calendar.core.utils.extensions.toPersianNumber
import com.pouyaheydari.calendar.core.utils.extensions.toPersianWeekDay
import com.pouyaheydari.calendar.details.databinding.FragmentDialogDateDetailsBinding
import com.pouyaheydari.calendar.details.utils.parcelable
import java.util.GregorianCalendar


Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package ir.apptune.calendar.details
package com.pouyaheydari.calendar.details

import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import dagger.hilt.android.lifecycle.HiltViewModel
import ir.apptune.calendar.core.pojo.CalendarModel
import ir.apptune.calendar.core.utils.ResourceUtils
import com.pouyaheydari.calendar.core.pojo.CalendarModel
import com.pouyaheydari.calendar.core.utils.ResourceUtils
import javax.inject.Inject

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ir.apptune.calendar.details.utils
package com.pouyaheydari.calendar.details.utils

import android.os.Build.VERSION.SDK_INT
import android.os.Bundle
Expand Down
2 changes: 1 addition & 1 deletion features/widget/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ android {
kotlinOptions {
jvmTarget = JavaVersion.VERSION_17.toString()
}
namespace = "ir.apptune.calendar.widget"
namespace = "com.pouyaheydari.calendar.widget"
}

dependencies {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ir.apptune.calendar
package com.pouyaheydari.calendar

import androidx.test.platform.app.InstrumentationRegistry
import androidx.test.ext.junit.runners.AndroidJUnit4
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ir.apptune.calendar.widget
package com.pouyaheydari.calendar.widget

import android.app.PendingIntent
import android.appwidget.AppWidgetManager
Expand All @@ -8,11 +8,11 @@ import android.content.Intent
import android.os.Build
import android.widget.RemoteViews
import dagger.hilt.android.AndroidEntryPoint
import ir.apptune.calendar.core.pojo.CalendarModel
import ir.apptune.calendar.core.utils.extensions.toEnglishMonth
import ir.apptune.calendar.core.utils.extensions.toPersianMonth
import ir.apptune.calendar.core.utils.extensions.toPersianNumber
import ir.apptune.calendar.core.utils.extensions.toPersianWeekDay
import com.pouyaheydari.calendar.core.pojo.CalendarModel
import com.pouyaheydari.calendar.core.utils.extensions.toEnglishMonth
import com.pouyaheydari.calendar.core.utils.extensions.toPersianMonth
import com.pouyaheydari.calendar.core.utils.extensions.toPersianNumber
import com.pouyaheydari.calendar.core.utils.extensions.toPersianWeekDay
import javax.inject.Inject

private const val MAIN_ACTIVITY = "ir.apptune.calendar.MainActivity"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ir.apptune.calendar.core
package com.pouyaheydari.calendar

import org.junit.Test

Expand Down

0 comments on commit c510436

Please sign in to comment.