Skip to content
This repository was archived by the owner on Dec 18, 2022. It is now read-only.

Commit 278237b

Browse files
committed
implement use of messaging system in lieu of using Toasts
1 parent 65bf2c1 commit 278237b

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

sampleapp/src/main/java/io/matthewnelson/sampleapp/App.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ import io.matthewnelson.encrypted_storage.Prefs
7373
import io.matthewnelson.sampleapp.topl_android.MyEventBroadcaster
7474
import io.matthewnelson.sampleapp.topl_android.MyTorSettings
7575
import io.matthewnelson.sampleapp.ui.MainActivity
76+
import io.matthewnelson.sampleapp.ui.fragments.dashboard.DashboardFragment
7677
import io.matthewnelson.sampleapp.ui.fragments.settings.library.LibraryPrefs
7778
import io.matthewnelson.topl_service.TorServiceController
7879
import io.matthewnelson.topl_service.notification.ServiceNotification
@@ -211,7 +212,9 @@ class App: Application() {
211212
)
212213
}
213214
} catch (e: Exception) {
214-
Toast.makeText(this, e.message, Toast.LENGTH_LONG).show()
215+
e.message?.let {
216+
DashboardFragment.showMessage(it, 5_000, true)
217+
}
215218
}
216219
}
217220
}

sampleapp/src/main/java/io/matthewnelson/sampleapp/ui/fragments/home/HomeFragment.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,15 +66,14 @@
6666
* */
6767
package io.matthewnelson.sampleapp.ui.fragments.home
6868

69-
import android.content.Context
7069
import android.os.Bundle
7170
import androidx.fragment.app.Fragment
7271
import android.view.LayoutInflater
7372
import android.view.View
7473
import android.view.ViewGroup
7574
import android.widget.Button
76-
import android.widget.Toast
7775
import io.matthewnelson.sampleapp.R
76+
import io.matthewnelson.sampleapp.ui.fragments.dashboard.DashboardFragment
7877
import io.matthewnelson.topl_service.TorServiceController
7978
import io.matthewnelson.topl_service.prefs.TorServicePrefs
8079
import io.matthewnelson.topl_service.util.ServiceConsts
@@ -118,7 +117,7 @@ class HomeFragment : Fragment() {
118117
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
119118
super.onViewCreated(view, savedInstanceState)
120119
findViews(view)
121-
initButtons(view.context)
120+
initButtons()
122121
logMessageAdapter = LogMessageAdapter(viewLifecycleOwner, view)
123122
}
124123

@@ -139,7 +138,7 @@ class HomeFragment : Fragment() {
139138
buttonStop = view.findViewById(R.id.home_button_stop)
140139
}
141140

142-
private fun initButtons(context: Context) {
141+
private fun initButtons() {
143142
setButtonDebugText()
144143
buttonDebug.setOnClickListener {
145144
hasDebugLogs = !hasDebugLogs
@@ -154,7 +153,8 @@ class HomeFragment : Fragment() {
154153
try {
155154
TorServiceController.startTor()
156155
} catch (e: RuntimeException) {
157-
Toast.makeText(context, e.message, Toast.LENGTH_LONG).show()
156+
DashboardFragment.showMessage(
157+
"TorServiceController.Builder.build() has not been called yet.", 3_000, true)
158158
}
159159
}
160160
buttonStop.setOnClickListener {

0 commit comments

Comments
 (0)