Skip to content

Commit 5dca594

Browse files
ferdyrodferdyrod
committed
resolve code smell. now dialog uses SAM interface for the NoConnectionListener
1 parent f7b988b commit 5dca594

File tree

9 files changed

+73
-117
lines changed

9 files changed

+73
-117
lines changed

‎app/src/main/java/org/dhis2/usescases/datasets/dataSetTable/DataSetTableActivity.kt

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ import org.dhis2.commons.extensions.closeKeyboard
3838
import org.dhis2.commons.matomo.Labels.Companion.CLICK
3939
import org.dhis2.commons.popupmenu.AppMenuHelper
4040
import org.dhis2.commons.sync.OnDismissListener
41-
import org.dhis2.commons.sync.OnNoConnectionListener
4241
import org.dhis2.commons.sync.SyncContext
4342
import org.dhis2.databinding.ActivityDatasetTableBinding
4443
import org.dhis2.usescases.datasets.dataSetTable.dataSetDetail.DataSetDetailFragment.Companion.create
@@ -173,18 +172,14 @@ class DataSetTableActivity : ActivityGlobalAbstract(), DataSetTableContract.View
173172
if (hasChanged) presenter.updateData()
174173
}
175174
})
176-
.onNoConnectionListener(
177-
object : OnNoConnectionListener {
178-
override fun onNoConnection() {
179-
val contextView = findViewById<View>(R.id.navigationBar)
180-
Snackbar.make(
181-
contextView,
182-
R.string.sync_offline_check_connection,
183-
Snackbar.LENGTH_SHORT,
184-
).show()
185-
}
186-
},
187-
)
175+
.onNoConnectionListener {
176+
val contextView = findViewById<View>(R.id.navigationBar)
177+
Snackbar.make(
178+
contextView,
179+
R.string.sync_offline_check_connection,
180+
Snackbar.LENGTH_SHORT,
181+
).show()
182+
}
188183
.show(DATAVALUE_SYNC)
189184
}
190185

‎app/src/main/java/org/dhis2/usescases/datasets/datasetDetail/datasetList/DataSetListFragment.kt

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import com.google.android.material.snackbar.Snackbar
99
import org.dhis2.R
1010
import org.dhis2.commons.Constants
1111
import org.dhis2.commons.sync.OnDismissListener
12-
import org.dhis2.commons.sync.OnNoConnectionListener
1312
import org.dhis2.commons.sync.SyncContext
1413
import org.dhis2.databinding.FragmentDataSetListBinding
1514
import org.dhis2.usescases.datasets.dataSetTable.DataSetTableActivity
@@ -135,18 +134,14 @@ class DataSetListFragment : FragmentGlobalAbstract() {
135134
}
136135
}
137136
})
138-
.onNoConnectionListener(
139-
object : OnNoConnectionListener {
140-
override fun onNoConnection() {
141-
val contextView = activity.findViewById<View>(R.id.navigationBar)
142-
Snackbar.make(
143-
contextView,
144-
R.string.sync_offline_check_connection,
145-
Snackbar.LENGTH_SHORT,
146-
).show()
147-
}
148-
},
149-
)
137+
.onNoConnectionListener {
138+
val contextView = activity.findViewById<View>(R.id.navigationBar)
139+
Snackbar.make(
140+
contextView,
141+
R.string.sync_offline_check_connection,
142+
Snackbar.LENGTH_SHORT,
143+
).show()
144+
}
150145
.show(FRAGMENT_TAG)
151146
}
152147

‎app/src/main/java/org/dhis2/usescases/eventsWithoutRegistration/eventCapture/EventCaptureActivity.kt

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import org.dhis2.commons.dialogs.AlertBottomDialog
2222
import org.dhis2.commons.dialogs.CustomDialog
2323
import org.dhis2.commons.dialogs.DialogClickListener
2424
import org.dhis2.commons.popupmenu.AppMenuHelper
25-
import org.dhis2.commons.sync.OnNoConnectionListener
2625
import org.dhis2.commons.sync.SyncContext
2726
import org.dhis2.databinding.ActivityEventCaptureBinding
2827
import org.dhis2.ui.ErrorFieldList
@@ -445,18 +444,14 @@ class EventCaptureActivity :
445444
SyncStatusDialog.Builder()
446445
.withContext(this)
447446
.withSyncContext(SyncContext.Event(eventUid!!))
448-
.onNoConnectionListener(
449-
object : OnNoConnectionListener {
450-
override fun onNoConnection() {
451-
val contextView = findViewById<View>(R.id.navigationBar)
452-
Snackbar.make(
453-
contextView,
454-
R.string.sync_offline_check_connection,
455-
Snackbar.LENGTH_SHORT,
456-
).show()
457-
}
458-
},
459-
)
447+
.onNoConnectionListener {
448+
val contextView = findViewById<View>(R.id.navigationBar)
449+
Snackbar.make(
450+
contextView,
451+
R.string.sync_offline_check_connection,
452+
Snackbar.LENGTH_SHORT,
453+
).show()
454+
}
460455
.show("EVENT_SYNC")
461456
}
462457

‎app/src/main/java/org/dhis2/usescases/main/MainActivity.kt

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ import org.dhis2.commons.filters.FilterItem
3131
import org.dhis2.commons.filters.FilterManager
3232
import org.dhis2.commons.filters.FiltersAdapter
3333
import org.dhis2.commons.sync.OnDismissListener
34-
import org.dhis2.commons.sync.OnNoConnectionListener
3534
import org.dhis2.commons.sync.SyncContext
3635
import org.dhis2.databinding.ActivityMainBinding
3736
import org.dhis2.ui.dialogs.alert.AlertDialog
@@ -306,18 +305,14 @@ class MainActivity :
306305
}
307306
},
308307
)
309-
.onNoConnectionListener(
310-
object : OnNoConnectionListener {
311-
override fun onNoConnection() {
312-
val contextView = findViewById<View>(R.id.navigationBar)
313-
Snackbar.make(
314-
contextView,
315-
R.string.sync_offline_check_connection,
316-
Snackbar.LENGTH_SHORT,
317-
).show()
318-
}
319-
},
320-
)
308+
.onNoConnectionListener {
309+
val contextView = findViewById<View>(R.id.navigationBar)
310+
Snackbar.make(
311+
contextView,
312+
R.string.sync_offline_check_connection,
313+
Snackbar.LENGTH_SHORT,
314+
).show()
315+
}
321316
.show("ALL_SYNC")
322317
}
323318

‎app/src/main/java/org/dhis2/usescases/main/program/ProgramFragment.kt

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import org.dhis2.bindings.dp
2828
import org.dhis2.commons.filters.FilterManager
2929
import org.dhis2.commons.orgunitselector.OUTreeFragment
3030
import org.dhis2.commons.sync.OnDismissListener
31-
import org.dhis2.commons.sync.OnNoConnectionListener
3231
import org.dhis2.commons.sync.SyncContext
3332
import org.dhis2.databinding.FragmentProgramBinding
3433
import org.dhis2.usescases.general.FragmentGlobalAbstract
@@ -223,18 +222,14 @@ class ProgramFragment : FragmentGlobalAbstract(), ProgramView {
223222
}
224223
},
225224
)
226-
.onNoConnectionListener(
227-
object : OnNoConnectionListener {
228-
override fun onNoConnection() {
229-
val contextView = activity?.findViewById<View>(R.id.navigationBar)
230-
Snackbar.make(
231-
contextView!!,
232-
R.string.sync_offline_check_connection,
233-
Snackbar.LENGTH_SHORT,
234-
).show()
235-
}
236-
},
237-
)
225+
.onNoConnectionListener {
226+
val contextView = activity?.findViewById<View>(R.id.navigationBar)
227+
Snackbar.make(
228+
contextView!!,
229+
R.string.sync_offline_check_connection,
230+
Snackbar.LENGTH_SHORT,
231+
).show()
232+
}
238233
.show(FRAGMENT_TAG)
239234
}
240235

‎app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailActivity.kt

Lines changed: 16 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import org.dhis2.commons.matomo.Actions.Companion.CREATE_EVENT
2828
import org.dhis2.commons.network.NetworkUtils
2929
import org.dhis2.commons.orgunitselector.OUTreeFragment
3030
import org.dhis2.commons.sync.OnDismissListener
31-
import org.dhis2.commons.sync.OnNoConnectionListener
3231
import org.dhis2.commons.sync.SyncContext
3332
import org.dhis2.databinding.ActivityProgramEventDetailBinding
3433
import org.dhis2.ui.ThemeManager
@@ -198,18 +197,14 @@ class ProgramEventDetailActivity :
198197
if (hasChanged) FilterManager.getInstance().publishData()
199198
}
200199
})
201-
.onNoConnectionListener(
202-
object : OnNoConnectionListener {
203-
override fun onNoConnection() {
204-
val contextView = findViewById<View>(R.id.navigationBar)
205-
Snackbar.make(
206-
contextView,
207-
R.string.sync_offline_check_connection,
208-
Snackbar.LENGTH_SHORT,
209-
).show()
210-
}
211-
},
212-
)
200+
.onNoConnectionListener {
201+
val contextView = findViewById<View>(R.id.navigationBar)
202+
Snackbar.make(
203+
contextView,
204+
R.string.sync_offline_check_connection,
205+
Snackbar.LENGTH_SHORT,
206+
).show()
207+
}
213208
.show("EVENT_SYNC")
214209
}
215210

@@ -392,18 +387,14 @@ class ProgramEventDetailActivity :
392387
if (hasChanged) FilterManager.getInstance().publishData()
393388
}
394389
})
395-
.onNoConnectionListener(
396-
object : OnNoConnectionListener {
397-
override fun onNoConnection() {
398-
val contextView = findViewById<View>(R.id.rootView)
399-
Snackbar.make(
400-
contextView,
401-
R.string.sync_offline_check_connection,
402-
Snackbar.LENGTH_SHORT,
403-
).show()
404-
}
405-
},
406-
)
390+
.onNoConnectionListener {
391+
val contextView = findViewById<View>(R.id.rootView)
392+
Snackbar.make(
393+
contextView,
394+
R.string.sync_offline_check_connection,
395+
Snackbar.LENGTH_SHORT,
396+
).show()
397+
}
407398
.show(FRAGMENT_TAG)
408399
}
409400

‎app/src/main/java/org/dhis2/usescases/teiDashboard/TeiDashboardMobileActivity.kt

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ import org.dhis2.commons.network.NetworkUtils
3232
import org.dhis2.commons.popupmenu.AppMenuHelper
3333
import org.dhis2.commons.resources.ResourceManager
3434
import org.dhis2.commons.sync.OnDismissListener
35-
import org.dhis2.commons.sync.OnNoConnectionListener
3635
import org.dhis2.commons.sync.SyncContext
3736
import org.dhis2.databinding.ActivityDashboardMobileBinding
3837
import org.dhis2.ui.ThemeManager
@@ -305,18 +304,14 @@ class TeiDashboardMobileActivity :
305304
}
306305
}
307306
})
308-
.onNoConnectionListener(
309-
object : OnNoConnectionListener {
310-
override fun onNoConnection() {
311-
val contextView = findViewById<View>(R.id.navigationBar)
312-
Snackbar.make(
313-
contextView,
314-
R.string.sync_offline_check_connection,
315-
Snackbar.LENGTH_SHORT,
316-
).show()
317-
}
318-
},
319-
).show(TEI_SYNC)
307+
.onNoConnectionListener {
308+
val contextView = findViewById<View>(R.id.navigationBar)
309+
Snackbar.make(
310+
contextView,
311+
R.string.sync_offline_check_connection,
312+
Snackbar.LENGTH_SHORT,
313+
).show()
314+
}.show(TEI_SYNC)
320315
}
321316
}
322317

‎app/src/main/java/org/dhis2/usescases/teiDashboard/dashboardfragments/teidata/TEIDataFragment.kt

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ import org.dhis2.commons.orgunitselector.OUTreeFragment
4141
import org.dhis2.commons.resources.ColorUtils
4242
import org.dhis2.commons.resources.ObjectStyleUtils.getIconResource
4343
import org.dhis2.commons.sync.OnDismissListener
44-
import org.dhis2.commons.sync.OnNoConnectionListener
4544
import org.dhis2.commons.sync.SyncContext.EnrollmentEvent
4645
import org.dhis2.databinding.FragmentTeiDataBinding
4746
import org.dhis2.usescases.eventsWithoutRegistration.eventInitial.EventInitialActivity
@@ -622,18 +621,14 @@ class TEIDataFragment : FragmentGlobalAbstract(), TEIDataContracts.View {
622621
if (hasChanged) FilterManager.getInstance().publishData()
623622
}
624623
})
625-
.onNoConnectionListener(
626-
object : OnNoConnectionListener {
627-
override fun onNoConnection() {
628-
val contextView = activity?.findViewById<View>(R.id.navigationBar)
629-
Snackbar.make(
630-
contextView!!,
631-
R.string.sync_offline_check_connection,
632-
Snackbar.LENGTH_SHORT,
633-
).show()
634-
}
635-
},
636-
).show(enrollmentUid)
624+
.onNoConnectionListener {
625+
val contextView = activity?.findViewById<View>(R.id.navigationBar)
626+
Snackbar.make(
627+
contextView!!,
628+
R.string.sync_offline_check_connection,
629+
Snackbar.LENGTH_SHORT,
630+
).show()
631+
}.show(enrollmentUid)
637632
}
638633

639634
override fun displayCatComboOptionSelectorForEvents(data: List<EventViewModel>) {

‎commons/src/main/java/org/dhis2/commons/sync/OnNoConnectionListener.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
package org.dhis2.commons.sync
22

3-
interface OnNoConnectionListener {
3+
fun interface OnNoConnectionListener {
44
fun onNoConnection()
55
}

0 commit comments

Comments
 (0)