nutomic/ensichat
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Moved exit button to ContactsFragment so it isn't shown when chat is open.

Browse source
This commit is contained in:
Felix Ableitner 2014-11-07 17:20:29 +02:00
parent c1c4239499
commit 2129107684
2 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/src/main/scala/com/nutomic/ensichat/activities/MainActivity.scala
View file

@ -59,11 +59,6 @@ class MainActivity extends Activity {
currentChat.collect{case c => outState.putString("current_chat", c.toString)}
}
override def onCreateOptionsMenu(menu: Menu): Boolean = {
getMenuInflater.inflate(R.menu.main, menu)
true
}
/**
* Exits with error if bluetooth was not enabled/not set discoverable,
*/
@ -77,17 +72,6 @@ class MainActivity extends Activity {
}
}
override def onOptionsItemSelected(item: MenuItem): Boolean = {
item.getItemId match {
case R.id.exit =>
stopService(new Intent(this, classOf[ChatService]))
finish()
true
case _ =>
false
}
}
/**
* Opens a chat fragment for the given device, creating the fragment if needed.
*/

19
app/src/main/scala/com/nutomic/ensichat/fragments/ContactsFragment.scala
View file

@ -3,7 +3,7 @@ package com.nutomic.ensichat.fragments
import android.app.ListFragment
import android.content.{ComponentName, Context, Intent, ServiceConnection}
import android.os.{Bundle, IBinder}
import android.view.{LayoutInflater, View, ViewGroup}
import android.view._
import android.widget.{ArrayAdapter, ListView}
import com.nutomic.ensichat.R
import com.nutomic.ensichat.activities.MainActivity
@ -44,6 +44,7 @@ class ContactsFragment extends ListFragment with ChatService.OnDeviceConnectedLi
setListAdapter(adapter)
getActivity.bindService(new Intent(getActivity, classOf[ChatService]),
ChatServiceConnection, Context.BIND_AUTO_CREATE)
setHasOptionsMenu(true)
}
override def onDestroy(): Unit = {
@ -51,6 +52,22 @@ class ContactsFragment extends ListFragment with ChatService.OnDeviceConnectedLi
getActivity.unbindService(ChatServiceConnection)
}
override def onCreateOptionsMenu(menu: Menu, inflater: MenuInflater): Unit = {
super.onCreateOptionsMenu(menu, inflater)
inflater.inflate(R.menu.main, menu)
}
override def onOptionsItemSelected(item: MenuItem): Boolean = {
item.getItemId match {
case R.id.exit =>
getActivity.stopService(new Intent(getActivity, classOf[ChatService]))
getActivity.finish()
true
case _ =>
super.onOptionsItemSelected(item)
}
}
/**
* Displays newly connected devices in the list.
*/