Skip to content

BONUS: Troubleshooting module #1007

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

Merged
luhmirin-s merged 1 commit into from
Dec 5, 2024
Merged

BONUS: Troubleshooting module #1007

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: 3 additions & 1 deletion .github/workflows/pr-checks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,9 @@ jobs:
uses: ./.github/workflows/run-unit-tests.yml
secrets: inherit
with:
modules: feature:dashboard
modules: |
feature:dashboard
feature:troubleshooting
reportsId: dashboard

face-unit-tests:
Expand Down
4 changes: 1 addition & 3 deletions feature/dashboard/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,10 @@ dependencies {
implementation(project(":infra:auth-store"))
implementation(project(":infra:auth-logic"))
implementation(project(":infra:recent-user-activity"))
implementation(project(":infra:license"))

implementation(project(":feature:consent"))
implementation(project(":feature:login"))

implementation(project(":fingerprint:infra:scanner"))
implementation(project(":feature:troubleshooting"))

implementation(libs.fuzzywuzzy.core)

Expand Down
4 changes: 2 additions & 2 deletions ...hboard/src/main/java/com/simprints/feature/dashboard/requestlogin/RequestLoginFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import com.simprints.core.DeviceID
import com.simprints.core.PackageVersionName
import com.simprints.feature.dashboard.R
import com.simprints.feature.dashboard.databinding.FragmentRequestLoginBinding
import com.simprints.feature.dashboard.settings.troubleshooting.AutoResettingClickCounter
import com.simprints.feature.troubleshooting.AutoResettingClickCounter
import com.simprints.infra.authstore.AuthStore
import com.simprints.infra.uibase.viewbinding.viewBinding
import dagger.hilt.android.AndroidEntryPoint
Expand Down Expand Up @@ -51,7 +51,7 @@ internal class RequestLoginFragment : Fragment(R.layout.fragment_request_login)

binding.loginImageViewLogo.setOnClickListener {
if (clickCounter.handleClick(lifecycleScope)) {
findNavController().navigate(R.id.action_requestLoginFragment_to_troubleshootingFragment)
findNavController().navigate(R.id.action_aboutFragment_to_troubleshooting)
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...e/dashboard/src/main/java/com/simprints/feature/dashboard/settings/about/AboutFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ internal class AboutFragment : PreferenceFragmentCompat() {
}

private fun openTroubleshooting() {
findNavController().navigate(R.id.action_aboutFragment_to_troubleshootingFragment)
findNavController().navigate(R.id.action_aboutFragment_to_troubleshooting)
}

private fun getAppVersionPreference(): Preference? =
Expand Down
2 changes: 1 addition & 1 deletion .../dashboard/src/main/java/com/simprints/feature/dashboard/settings/about/AboutViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import com.simprints.core.livedata.LiveDataEvent
import com.simprints.core.livedata.LiveDataEventWithContent
import com.simprints.core.livedata.send
import com.simprints.feature.dashboard.logout.usecase.LogoutUseCase
import com.simprints.feature.dashboard.settings.troubleshooting.AutoResettingClickCounter
import com.simprints.feature.troubleshooting.AutoResettingClickCounter
import com.simprints.infra.config.store.models.GeneralConfiguration
import com.simprints.infra.config.store.models.SettingsPasswordConfig
import com.simprints.infra.config.store.models.canSyncDataToSimprints
Expand Down
12 changes: 0 additions & 12 deletions feature/dashboard/src/main/res/layout/fragment_troubleshooting_stub.xml
View file
Open in desktop

This file was deleted.

28 changes: 5 additions & 23 deletions feature/dashboard/src/main/res/navigation/graph_dashboard.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

<include app:graph="@navigation/graph_privacy" />
<include app:graph="@navigation/graph_login" />
<include app:graph="@navigation/graph_troubleshooting" />

<fragment
android:id="@+id/requestLoginFragment"
Expand All @@ -24,8 +25,8 @@
app:popUpTo="@id/dashboard_navigation"
app:popUpToInclusive="true" />
<action
android:id="@+id/action_requestLoginFragment_to_troubleshootingFragment"
app:destination="@id/troubleshootingFragment" />
android:id="@+id/action_requestLoginFragment_to_troubleshooting"
app:destination="@id/graph_troubleshooting" />
</fragment>
<fragment
android:id="@+id/baseFragment"
Expand Down Expand Up @@ -74,25 +75,6 @@
android:name="com.simprints.feature.dashboard.debug.DebugFragment"
android:label="DebugFragment"
tools:layout="@layout/fragment_debug" />
<fragment
android:id="@+id/troubleshootingFragment"
android:name="com.simprints.feature.dashboard.settings.troubleshooting.TroubleshootingFragment"
android:label="TroubleshootingFragment"
tools:layout="@layout/fragment_troubleshooting">
<action
android:id="@+id/action_troubleshootingFragment_to_troubleshootingEventLogFragment"
app:destination="@id/troubleshootingEventLogFragment" />
</fragment>
<fragment
android:id="@+id/troubleshootingEventLogFragment"
android:name="com.simprints.feature.dashboard.settings.troubleshooting.events.EventLogFragment"
android:label="TroubleshootingEventFragment"
tools:layout="@layout/fragment_troubleshooting_standalone_list">
<argument
android:name="scopeId"
app:argType="string"
app:nullable="false" />
</fragment>

<fragment
android:id="@+id/settingsFragment"
Expand Down Expand Up @@ -123,8 +105,8 @@
app:popUpTo="@id/dashboard_navigation"
app:popUpToInclusive="true" />
<action
android:id="@+id/action_aboutFragment_to_troubleshootingFragment"
app:destination="@id/troubleshootingFragment" />
android:id="@+id/action_aboutFragment_to_troubleshooting"
app:destination="@id/graph_troubleshooting" />
</fragment>
<fragment
android:id="@+id/syncInfoFragment"
Expand Down
1 change: 1 addition & 0 deletions feature/troubleshooting/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/build
21 changes: 21 additions & 0 deletions feature/troubleshooting/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
plugins {
id("simprints.feature")
id("kotlin-parcelize")
}

android {
namespace = "com.simprints.feature.troubleshooting"
}

dependencies {
implementation(project(":infra:auth-store"))
implementation(project(":infra:events"))
//implementation(project(":infra:event-sync"))
implementation(project(":infra:config-store"))
implementation(project(":infra:license"))
implementation(project(":infra:network"))

implementation(project(":fingerprint:infra:scanner"))

implementation(libs.workManager.work)
}
4 changes: 4 additions & 0 deletions feature/troubleshooting/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

</manifest>
4 changes: 2 additions & 2 deletions ...ubleshooting/AutoResettingClickCounter.kt → ...ubleshooting/AutoResettingClickCounter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.simprints.feature.dashboard.settings.troubleshooting
package com.simprints.feature.troubleshooting

import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Job
Expand All @@ -7,7 +7,7 @@ import kotlinx.coroutines.isActive
import kotlinx.coroutines.launch
import java.util.concurrent.atomic.AtomicInteger

internal class AutoResettingClickCounter(
class AutoResettingClickCounter(
private val requiredClicks: Int = DEFAULT_CLICKS_FOR_TROUBLESHOOTING,
private val resetDelayMs: Long = DEFAULT_CLICK_COUNTER_RESET_MS,
) {
Expand Down
5 changes: 2 additions & 3 deletions ...roubleshooting/TroubleshootingFragment.kt → ...roubleshooting/TroubleshootingFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
package com.simprints.feature.dashboard.settings.troubleshooting
package com.simprints.feature.troubleshooting

import android.os.Bundle
import android.view.View
import androidx.fragment.app.Fragment
import androidx.navigation.fragment.findNavController
import com.google.android.material.tabs.TabLayoutMediator
import com.simprints.feature.dashboard.R
import com.simprints.feature.dashboard.databinding.FragmentTroubleshootingBinding
import com.simprints.feature.troubleshooting.databinding.FragmentTroubleshootingBinding
import com.simprints.infra.uibase.viewbinding.viewBinding
import dagger.hilt.android.AndroidEntryPoint

Expand Down
8 changes: 4 additions & 4 deletions ...leshooting/TroubleshootingPagerAdapter.kt → ...leshooting/TroubleshootingPagerAdapter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package com.simprints.feature.dashboard.settings.troubleshooting
package com.simprints.feature.troubleshooting

import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentActivity
import androidx.viewpager2.adapter.FragmentStateAdapter
import com.simprints.feature.dashboard.settings.troubleshooting.events.EventScopeLogFragment
import com.simprints.feature.dashboard.settings.troubleshooting.overview.OverviewFragment
import com.simprints.feature.dashboard.settings.troubleshooting.workers.WorkerLogFragment
import com.simprints.feature.troubleshooting.events.EventScopeLogFragment
import com.simprints.feature.troubleshooting.overview.OverviewFragment
import com.simprints.feature.troubleshooting.workers.WorkerLogFragment
import com.simprints.infra.uibase.annotations.ExcludedFromGeneratedTestCoverageReports

@ExcludedFromGeneratedTestCoverageReports("UI code")
Expand Down
2 changes: 1 addition & 1 deletion ...ng/adapter/TroubleshootingItemViewData.kt → ...ng/adapter/TroubleshootingItemViewData.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.simprints.feature.dashboard.settings.troubleshooting.adapter
package com.simprints.feature.troubleshooting.adapter

data class TroubleshootingItemViewData(
val title: String,
Expand Down
4 changes: 2 additions & 2 deletions ...ing/adapter/TroubleshootingListAdapter.kt → ...ing/adapter/TroubleshootingListAdapter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package com.simprints.feature.dashboard.settings.troubleshooting.adapter
package com.simprints.feature.troubleshooting.adapter

import android.view.LayoutInflater
import android.view.ViewGroup
import android.widget.Toast
import androidx.core.view.isVisible
import androidx.recyclerview.widget.RecyclerView
import com.simprints.core.ExcludedFromGeneratedTestCoverageReports
import com.simprints.feature.dashboard.databinding.ItemTroubleshootingListBinding
import com.simprints.feature.troubleshooting.databinding.ItemTroubleshootingListBinding
import com.simprints.infra.uibase.system.Clipboard


Expand Down
8 changes: 4 additions & 4 deletions ...roubleshooting/events/EventLogFragment.kt → ...roubleshooting/events/EventLogFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.simprints.feature.dashboard.settings.troubleshooting.events
package com.simprints.feature.troubleshooting.events

import android.os.Bundle
import android.view.View
Expand All @@ -7,9 +7,9 @@ import androidx.fragment.app.Fragment
import androidx.fragment.app.viewModels
import androidx.navigation.fragment.findNavController
import androidx.navigation.fragment.navArgs
import com.simprints.feature.dashboard.R
import com.simprints.feature.dashboard.databinding.FragmentTroubleshootingStandaloneListBinding
import com.simprints.feature.dashboard.settings.troubleshooting.adapter.TroubleshootingListAdapter
import com.simprints.feature.troubleshooting.R
import com.simprints.feature.troubleshooting.databinding.FragmentTroubleshootingStandaloneListBinding
import com.simprints.feature.troubleshooting.adapter.TroubleshootingListAdapter
import com.simprints.infra.uibase.viewbinding.viewBinding
import dagger.hilt.android.AndroidEntryPoint

Expand Down
10 changes: 5 additions & 5 deletions ...eshooting/events/EventScopeLogFragment.kt → ...eshooting/events/EventScopeLogFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package com.simprints.feature.dashboard.settings.troubleshooting.events
package com.simprints.feature.troubleshooting.events

import android.os.Bundle
import android.view.View
import androidx.core.view.isGone
import androidx.fragment.app.Fragment
import androidx.fragment.app.viewModels
import androidx.navigation.fragment.findNavController
import com.simprints.feature.dashboard.R
import com.simprints.feature.dashboard.databinding.FragmentTroubleshootingListBinding
import com.simprints.feature.dashboard.settings.troubleshooting.TroubleshootingFragmentDirections
import com.simprints.feature.dashboard.settings.troubleshooting.adapter.TroubleshootingListAdapter
import com.simprints.feature.troubleshooting.R
import com.simprints.feature.troubleshooting.databinding.FragmentTroubleshootingListBinding
import com.simprints.feature.troubleshooting.TroubleshootingFragmentDirections
import com.simprints.feature.troubleshooting.adapter.TroubleshootingListAdapter
import com.simprints.infra.uibase.viewbinding.viewBinding
import dagger.hilt.android.AndroidEntryPoint

Expand Down
4 changes: 2 additions & 2 deletions ...ubleshooting/events/EventsLogViewModel.kt → ...ubleshooting/events/EventsLogViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.simprints.feature.dashboard.settings.troubleshooting.events
package com.simprints.feature.troubleshooting.events

import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.simprints.feature.dashboard.settings.troubleshooting.adapter.TroubleshootingItemViewData
import com.simprints.feature.troubleshooting.adapter.TroubleshootingItemViewData
import com.simprints.infra.events.EventRepository
import com.simprints.infra.events.event.domain.models.Event
import com.simprints.infra.events.event.domain.models.scope.EventScope
Expand Down
8 changes: 4 additions & 4 deletions ...ubleshooting/overview/OverviewFragment.kt → ...ubleshooting/overview/OverviewFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package com.simprints.feature.dashboard.settings.troubleshooting.overview
package com.simprints.feature.troubleshooting.overview

import android.os.Bundle
import android.view.View
import androidx.fragment.app.Fragment
import androidx.fragment.app.viewModels
import com.simprints.feature.dashboard.R
import com.simprints.feature.dashboard.databinding.FragmentTroubleshootingOverviewBinding
import com.simprints.feature.dashboard.settings.troubleshooting.overview.usecase.PingServerUseCase.PingResult
import com.simprints.feature.troubleshooting.R
import com.simprints.feature.troubleshooting.databinding.FragmentTroubleshootingOverviewBinding
import com.simprints.feature.troubleshooting.overview.usecase.PingServerUseCase.PingResult
import com.simprints.infra.uibase.viewbinding.viewBinding
import dagger.hilt.android.AndroidEntryPoint

Expand Down
14 changes: 7 additions & 7 deletions ...bleshooting/overview/OverviewViewModel.kt → ...bleshooting/overview/OverviewViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package com.simprints.feature.dashboard.settings.troubleshooting.overview
package com.simprints.feature.troubleshooting.overview

import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.simprints.feature.dashboard.settings.troubleshooting.overview.usecase.CollectIdsUseCase
import com.simprints.feature.dashboard.settings.troubleshooting.overview.usecase.CollectLicenceStatesUseCase
import com.simprints.feature.dashboard.settings.troubleshooting.overview.usecase.CollectNetworkInformationUseCase
import com.simprints.feature.dashboard.settings.troubleshooting.overview.usecase.CollectScannerStateUseCase
import com.simprints.feature.dashboard.settings.troubleshooting.overview.usecase.PingServerUseCase
import com.simprints.feature.dashboard.settings.troubleshooting.overview.usecase.PingServerUseCase.PingResult
import com.simprints.feature.troubleshooting.overview.usecase.CollectIdsUseCase
import com.simprints.feature.troubleshooting.overview.usecase.CollectLicenceStatesUseCase
import com.simprints.feature.troubleshooting.overview.usecase.CollectNetworkInformationUseCase
import com.simprints.feature.troubleshooting.overview.usecase.CollectScannerStateUseCase
import com.simprints.feature.troubleshooting.overview.usecase.PingServerUseCase
import com.simprints.feature.troubleshooting.overview.usecase.PingServerUseCase.PingResult
import dagger.hilt.android.lifecycle.HiltViewModel
import kotlinx.coroutines.launch
import javax.inject.Inject
Expand Down
2 changes: 1 addition & 1 deletion ...ing/overview/usecase/CollectIdsUseCase.kt → ...ing/overview/usecase/CollectIdsUseCase.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.simprints.feature.dashboard.settings.troubleshooting.overview.usecase
package com.simprints.feature.troubleshooting.overview.usecase

import com.simprints.core.DeviceID
import com.simprints.infra.authstore.AuthStore
Expand Down
2 changes: 1 addition & 1 deletion ...ew/usecase/CollectLicenceStatesUseCase.kt → ...ew/usecase/CollectLicenceStatesUseCase.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.simprints.feature.dashboard.settings.troubleshooting.overview.usecase
package com.simprints.feature.troubleshooting.overview.usecase

import com.simprints.infra.license.LicenseRepository
import com.simprints.infra.license.models.Vendor
Expand Down
2 changes: 1 addition & 1 deletion ...ecase/CollectNetworkInformationUseCase.kt → ...ecase/CollectNetworkInformationUseCase.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.simprints.feature.dashboard.settings.troubleshooting.overview.usecase
package com.simprints.feature.troubleshooting.overview.usecase

import android.content.Context
import android.net.ConnectivityManager
Expand Down
2 changes: 1 addition & 1 deletion ...iew/usecase/CollectScannerStateUseCase.kt → ...iew/usecase/CollectScannerStateUseCase.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.simprints.feature.dashboard.settings.troubleshooting.overview.usecase
package com.simprints.feature.troubleshooting.overview.usecase

import com.simprints.fingerprint.infra.scanner.ScannerManager
import com.simprints.infra.config.store.ConfigRepository
Expand Down
2 changes: 1 addition & 1 deletion ...ing/overview/usecase/PingServerUseCase.kt → ...ing/overview/usecase/PingServerUseCase.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.simprints.feature.dashboard.settings.troubleshooting.overview.usecase
package com.simprints.feature.troubleshooting.overview.usecase

import com.simprints.core.DispatcherIO
import com.simprints.infra.network.url.BaseUrlProvider
Expand Down
8 changes: 4 additions & 4 deletions ...ubleshooting/workers/WorkerLogFragment.kt → ...ubleshooting/workers/WorkerLogFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package com.simprints.feature.dashboard.settings.troubleshooting.workers
package com.simprints.feature.troubleshooting.workers

import android.os.Bundle
import android.view.View
import androidx.core.view.isGone
import androidx.fragment.app.Fragment
import androidx.fragment.app.viewModels
import com.simprints.feature.dashboard.R
import com.simprints.feature.dashboard.databinding.FragmentTroubleshootingListBinding
import com.simprints.feature.dashboard.settings.troubleshooting.adapter.TroubleshootingListAdapter
import com.simprints.feature.troubleshooting.R
import com.simprints.feature.troubleshooting.databinding.FragmentTroubleshootingListBinding
import com.simprints.feature.troubleshooting.adapter.TroubleshootingListAdapter
import com.simprints.infra.uibase.viewbinding.viewBinding
import dagger.hilt.android.AndroidEntryPoint
import kotlin.getValue
Expand Down
4 changes: 2 additions & 2 deletions ...bleshooting/workers/WorkerLogViewModel.kt → ...bleshooting/workers/WorkerLogViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.simprints.feature.dashboard.settings.troubleshooting.workers
package com.simprints.feature.troubleshooting.workers

import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
Expand All @@ -7,7 +7,7 @@ import androidx.lifecycle.viewModelScope
import androidx.work.WorkInfo
import androidx.work.WorkManager
import androidx.work.WorkQuery
import com.simprints.feature.dashboard.settings.troubleshooting.adapter.TroubleshootingItemViewData
import com.simprints.feature.troubleshooting.adapter.TroubleshootingItemViewData
import dagger.hilt.android.lifecycle.HiltViewModel
import kotlinx.coroutines.launch
import java.util.Date
Expand Down
0 ...n/res/layout/fragment_troubleshooting.xml → ...n/res/layout/fragment_troubleshooting.xml
View file
Open in desktop
File renamed without changes.
0 .../layout/fragment_troubleshooting_list.xml → .../layout/fragment_troubleshooting_list.xml
View file
Open in desktop
File renamed without changes.
0 ...out/fragment_troubleshooting_overview.xml → ...out/fragment_troubleshooting_overview.xml
View file
Open in desktop
File renamed without changes.
0 ...gment_troubleshooting_standalone_list.xml → ...gment_troubleshooting_standalone_list.xml
View file
Open in desktop
File renamed without changes.
0 .../res/layout/item_troubleshooting_list.xml → .../res/layout/item_troubleshooting_list.xml
View file
Open in desktop
File renamed without changes.
Loading