Skip to content

Commit 1297bdb

Browse files
committed
deleted unused funtions
1 parent 9998fb2 commit 1297bdb

4 files changed

Lines changed: 6 additions & 73 deletions

File tree

app/src/main/java/com/nlinterface/activities/GroceryListActivity.kt

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -214,35 +214,6 @@ class GroceryListActivity : AppCompatActivity(), GroceryListCallback {
214214
}
215215
}
216216

217-
private fun listActionOptions() {
218-
219-
viewModel.say(resources.getString(R.string.add_item) +
220-
resources.getString(R.string.list_all_grocery_items) +
221-
resources.getString(R.string.list_all_items_in_cart) +
222-
resources.getString(R.string.list_all_items_not_in_cart),
223-
TextToSpeech.QUEUE_ADD)
224-
225-
}
226-
227-
private fun listItems(all: Boolean = false, inCart: Boolean = false, onList: Boolean = false) {
228-
229-
var text = ""
230-
231-
for (item in groceryItemList) {
232-
233-
if (all) {
234-
text = text.plus(item.itemName)
235-
} else if (inCart && item.inCart) {
236-
text = text.plus(item.itemName)
237-
} else if (onList && !item.inCart) {
238-
text = text.plus(item.itemName)
239-
}
240-
}
241-
242-
viewModel.say(text , TextToSpeech.QUEUE_ADD)
243-
244-
}
245-
246217
private fun onVoiceActivationButtonClick() {
247218
if (viewModel.isListening.value == false) {
248219
viewModel.handleSpeechBegin()

app/src/main/java/com/nlinterface/activities/MainActivity.kt

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -143,23 +143,20 @@ class MainActivity : AppCompatActivity() {
143143

144144
// set up button to navigate to GroceryListActivity
145145
val groceryListButton: Button = findViewById<View>(R.id.grocery_list_bt) as Button
146-
groceryListButton.setOnClickListener { view ->
147-
val intent = Intent(view.context, GroceryListActivity::class.java)
148-
view.context.startActivity(intent)
146+
groceryListButton.setOnClickListener { _ ->
147+
navToActivity(ActivityType.GROCERYLIST.toString())
149148
}
150149

151150
// set up button to navigate to PlaceDetailsActivity
152151
val placeDetailsButton: Button = findViewById<View>(R.id.place_details_bt) as Button
153-
placeDetailsButton.setOnClickListener { view ->
154-
val intent = Intent(view.context, PlaceDetailsActivity::class.java)
155-
view.context.startActivity(intent)
152+
placeDetailsButton.setOnClickListener { _ ->
153+
navToActivity(ActivityType.PLACEDETAILS.toString())
156154
}
157155

158156
// set up button to navigate to SettingsActivity
159157
val settingsActivityButton: Button = findViewById<View>(R.id.settings_bt) as Button
160-
settingsActivityButton.setOnClickListener { view ->
161-
val intent = Intent(view.context, SettingsActivity::class.java)
162-
view.context.startActivity(intent)
158+
settingsActivityButton.setOnClickListener { _ ->
159+
navToActivity(ActivityType.SETTINGS.toString())
163160
}
164161

165162
// set up voice Activation Button listener
@@ -196,14 +193,6 @@ class MainActivity : AppCompatActivity() {
196193
}
197194
}
198195

199-
private fun readMenuOptions() {
200-
viewModel.say(
201-
resources.getString(R.string.grocery_list) +
202-
resources.getString(R.string.place_details) +
203-
resources.getString(R.string.settings)
204-
)
205-
}
206-
207196
private fun onVoiceActivationButtonClick() {
208197
if (viewModel.isListening.value == false) {
209198
viewModel.handleSpeechBegin()

app/src/main/java/com/nlinterface/activities/PlaceDetailsActivity.kt

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -252,18 +252,4 @@ class PlaceDetailsActivity: AppCompatActivity(), PlaceDetailsItemCallback {
252252
}
253253
}
254254

255-
private fun readStores(all: Boolean = false, favorite: Boolean = false) {
256-
257-
var text = ""
258-
259-
for (item in placeDetailsItemList) {
260-
if (all) {
261-
text = text.plus(item.storeName).plus(item.openingHours)
262-
} else if (favorite && item.favorite) {
263-
text = text.plus(item.storeName).plus(item.openingHours)
264-
}
265-
}
266-
267-
viewModel.say(text, TextToSpeech.QUEUE_ADD)
268-
}
269255
}

app/src/main/java/com/nlinterface/activities/SettingsActivity.kt

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -183,19 +183,6 @@ class SettingsActivity : AppCompatActivity() {
183183

184184
}
185185

186-
private fun readSettings(all: Boolean = false, screen: Boolean = false, theme: Boolean = false) {
187-
188-
var text = ""
189-
190-
if (all || screen) {
191-
text = text.plus("${keepScreenOnButton?.text}")
192-
}
193-
if (all || theme) {
194-
text = text.plus("${themeButton?.text}")
195-
}
196-
viewModel.say(text, TextToSpeech.QUEUE_ADD)
197-
}
198-
199186
private fun executeCommand(command: ArrayList<String>?) {
200187

201188
if ((command != null) && (command.size == 3)) {

0 commit comments

Comments
 (0)