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.

Sign up for GitHub

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

Jump to bottom

refactor: Move the DateUtil file to the Core library #509

Merged
merged 1 commit into from
Apr 19, 2023
Merged

refactor: Move the DateUtil file to the Core library #509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions ...ava/in/testpress/course/util/DateUtils.kt → .../main/java/in/testpress/util/DateUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package `in`.testpress.course.util
package `in`.testpress.util

import `in`.testpress.R
import android.content.Context
import android.os.Build
import android.provider.Settings
import java.text.SimpleDateFormat
import android.text.format.DateUtils.*
import `in`.testpress.course.R
import java.util.*
import java.util.concurrent.TimeUnit

Expand Down
6 changes: 6 additions & 0 deletions core/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,10 @@
<item>All</item>
<item>Commented By me</item>
</string-array>

<plurals name="time_duration">
<item quantity="one">in %d %s</item>
<item quantity="other">in %d %ss</item>
</plurals>

</resources>
2 changes: 1 addition & 1 deletion course/src/main/java/in/testpress/course/adapter/viewholder/RunningContentItemViewHolder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import `in`.testpress.course.adapter.BaseCourseContentItemViewHolder
import `in`.testpress.course.databinding.RunningUpcomingListItemBinding
import `in`.testpress.course.domain.DomainContent
import `in`.testpress.course.ui.ContentActivity
import `in`.testpress.course.util.DateUtils
import `in`.testpress.util.DateUtils
import `in`.testpress.util.ViewUtils

class RunningContentItemViewHolder(val binding: RunningUpcomingListItemBinding) :
Expand Down
2 changes: 1 addition & 1 deletion course/src/main/java/in/testpress/course/adapter/viewholder/UpcomingContentItemViewHolder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import android.widget.Toast
import `in`.testpress.course.adapter.BaseCourseContentItemViewHolder
import `in`.testpress.course.databinding.RunningUpcomingListItemBinding
import `in`.testpress.course.domain.DomainContent
import `in`.testpress.course.util.DateUtils
import `in`.testpress.util.DateUtils
import `in`.testpress.util.ViewUtils

class UpcomingContentItemViewHolder(val binding: RunningUpcomingListItemBinding) :
Expand Down
4 changes: 1 addition & 3 deletions course/src/main/java/in/testpress/course/fragments/DownloadsFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import `in`.testpress.course.repository.OfflineVideoRepository
import `in`.testpress.course.repository.VideoWatchDataRepository
import `in`.testpress.course.services.VideoDownloadService
import `in`.testpress.course.ui.OfflineVideoListAdapter
import `in`.testpress.course.util.DateUtils
import `in`.testpress.util.DateUtils
import `in`.testpress.course.viewmodels.CourseViewModel
import `in`.testpress.course.viewmodels.OfflineVideoViewModel
import `in`.testpress.database.TestpressDatabase
Expand All @@ -31,8 +31,6 @@ import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.facebook.shimmer.ShimmerFrameLayout
import kotlinx.coroutines.*
import java.util.*
import kotlin.concurrent.schedule


class DownloadsFragment : Fragment(), EmptyViewListener {
Expand Down
7 changes: 1 addition & 6 deletions course/src/main/java/in/testpress/course/fragments/VideoContentFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import `in`.testpress.course.repository.OfflineVideoRepository
import `in`.testpress.course.services.VideoDownloadService
import `in`.testpress.course.ui.DownloadsActivity
import `in`.testpress.course.ui.VideoDownloadQualityChooserDialog
import `in`.testpress.course.util.DateUtils.convertDurationStringToSeconds
import `in`.testpress.util.DateUtils.convertDurationStringToSeconds
import `in`.testpress.course.util.PatternEditableBuilder
import `in`.testpress.course.viewmodels.OfflineVideoViewModel
import `in`.testpress.models.InstituteSettings
Expand All @@ -31,11 +31,6 @@ import androidx.lifecycle.Observer
import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider
import io.netopen.hotbitmapgg.library.view.RingProgressBar
import java.text.DateFormat
import java.text.ParseException
import java.text.SimpleDateFormat
import java.util.Date
import java.util.TimeZone
import java.util.regex.Pattern

class VideoContentFragment : BaseContentDetailFragment() {
Expand Down
2 changes: 1 addition & 1 deletion course/src/main/java/in/testpress/course/helpers/CourseLastSyncedDate.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package `in`.testpress.course.helpers

import `in`.testpress.core.TestpressSdk
import `in`.testpress.course.util.DateUtils
import `in`.testpress.util.DateUtils
import android.content.Context
import java.util.Date

Expand Down
5 changes: 0 additions & 5 deletions course/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,4 @@
<item name="android:textColor">@color/testpress_black</item>
</style>

<plurals name="time_duration">
<item quantity="one">in %d %s</item>
<item quantity="other">in %d %ss</item>
</plurals>

</resources>