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

Fixed app name higher/lower case.

Browse source
This commit is contained in:
Felix Ableitner 2015-06-24 16:20:30 +02:00
parent 11e1a4cba9
commit c1e091825e
10 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -1,4 +1,4 @@
ensichat
Ensichat
========
[![BitCoin donate button](https://img.shields.io/badge/bitcoin-donate-yellow.svg)](https://blockchain.info/address/1DmU6QVGSKXGXJU1bqmmStPDNsNnYoMJB4)

4
app/src/main/res/values/strings.xml
View file

@ -4,7 +4,7 @@
<!-- Global -->
<string name="app_name">EnsiChat</string>
<string name="app_name">Ensichat</string>
<!-- FirstStartActivity -->
@ -88,7 +88,7 @@
<string name="report_issue">Report Issue</string>
<!-- Preference summary -->
<string name="report_issue_summary">Open the EnsiChat issue tracker</string>
<string name="report_issue_summary">Open the Ensichat issue tracker</string>
<string name="issue_tracker_url" translatable="false">https://github.com/Nutomic/ensichat/issues</string>

2
app/src/main/scala/com/nutomic/ensichat/activities/AddContactsActivity.scala
View file

@ -15,7 +15,7 @@ import com.nutomic.ensichat.util.{Database, UsersAdapter}
/**
* Lists all nearby, connected devices and allows adding them to be added as contacts.
*/
class AddContactsActivity extends EnsiChatActivity with ChatService.OnConnectionsChangedListener
class AddContactsActivity extends EnsichatActivity with ChatService.OnConnectionsChangedListener
with OnItemClickListener with OnContactsUpdatedListener {
private val Tag = "AddContactsActivity"

2
app/src/main/scala/com/nutomic/ensichat/activities/ConfirmAddContactActivity.scala
View file

@ -20,7 +20,7 @@ object ConfirmAddContactActivity {
/**
* Shows a dialog for adding a new contact (including key fingerprints).
*/
class ConfirmAddContactActivity extends EnsiChatActivity with OnClickListener {
class ConfirmAddContactActivity extends EnsichatActivity with OnClickListener {
private lazy val user = service.getUser(
new Address(getIntent.getStringExtra(ConfirmAddContactActivity.ExtraContactAddress)))

2
app/src/main/scala/com/nutomic/ensichat/activities/EnsiChatActivity.scala → app/src/main/scala/com/nutomic/ensichat/activities/EnsichatActivity.scala
View file

@ -8,7 +8,7 @@ import com.nutomic.ensichat.protocol.{ChatService, ChatServiceBinder}
/**
* Connects to [[ChatService]] and provides access to it.
*/
class EnsiChatActivity extends AppCompatActivity with ServiceConnection {
class EnsichatActivity extends AppCompatActivity with ServiceConnection {
private var chatService: Option[ChatService] = None

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

@ -20,7 +20,7 @@ object MainActivity {
/**
* Main activity, entry point for app start.
*/
class MainActivity extends EnsiChatActivity {
class MainActivity extends EnsichatActivity {
private val RequestSetDiscoverable = 1

2
app/src/main/scala/com/nutomic/ensichat/activities/SettingsActivity.scala
View file

@ -9,7 +9,7 @@ import com.nutomic.ensichat.fragments.SettingsFragment
/**
* Holder for [[SettingsFragment]].
*/
class SettingsActivity extends EnsiChatActivity {
class SettingsActivity extends EnsichatActivity {
private var fragment: Fragment = _

4
app/src/main/scala/com/nutomic/ensichat/fragments/ChatFragment.scala
View file

@ -8,7 +8,7 @@ import android.view.{KeyEvent, LayoutInflater, View, ViewGroup}
import android.widget.TextView.OnEditorActionListener
import android.widget._
import com.nutomic.ensichat.R
import com.nutomic.ensichat.activities.EnsiChatActivity
import com.nutomic.ensichat.activities.EnsichatActivity
import com.nutomic.ensichat.protocol.ChatService.OnMessageReceivedListener
import com.nutomic.ensichat.protocol.body.Text
import com.nutomic.ensichat.protocol.{Message, Address, ChatService}
@ -45,7 +45,7 @@ class ChatFragment extends ListFragment with OnClickListener
override def onActivityCreated(savedInstanceState: Bundle): Unit = {
super.onActivityCreated(savedInstanceState)
val activity = getActivity.asInstanceOf[EnsiChatActivity]
val activity = getActivity.asInstanceOf[EnsichatActivity]
activity.runOnServiceConnected(() => {
chatService = activity.service

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

@ -9,7 +9,7 @@ import android.os.Bundle
import android.view._
import android.widget.ListView
import com.nutomic.ensichat.R
import com.nutomic.ensichat.activities.{AddContactsActivity, EnsiChatActivity, MainActivity, SettingsActivity}
import com.nutomic.ensichat.activities.{AddContactsActivity, EnsichatActivity, MainActivity, SettingsActivity}
import com.nutomic.ensichat.protocol.ChatService
import com.nutomic.ensichat.util.Database.OnContactsUpdatedListener
import com.nutomic.ensichat.util.{Database, UsersAdapter}
@ -30,7 +30,7 @@ class ContactsFragment extends ListFragment with OnContactsUpdatedListener {
setListAdapter(adapter)
setHasOptionsMenu(true)
getActivity.asInstanceOf[EnsiChatActivity].runOnServiceConnected(() => {
getActivity.asInstanceOf[EnsichatActivity].runOnServiceConnected(() => {
database.getContacts.foreach(adapter.add)
database.runOnContactsUpdated(this)
})

4
app/src/main/scala/com/nutomic/ensichat/fragments/SettingsFragment.scala
View file

@ -4,7 +4,7 @@ import android.os.Bundle
import android.preference.Preference.OnPreferenceChangeListener
import android.preference.{Preference, PreferenceFragment, PreferenceManager}
import com.nutomic.ensichat.R
import com.nutomic.ensichat.activities.EnsiChatActivity
import com.nutomic.ensichat.activities.EnsichatActivity
import com.nutomic.ensichat.fragments.SettingsFragment._
import com.nutomic.ensichat.protocol.body.UserName
import com.nutomic.ensichat.util.Database
@ -55,7 +55,7 @@ class SettingsFragment extends PreferenceFragment with OnPreferenceChangeListene
*/
override def onPreferenceChange(preference: Preference, newValue: AnyRef): Boolean = {
if (preference.getKey == KeyUserName) {
val service = getActivity.asInstanceOf[EnsiChatActivity].service
val service = getActivity.asInstanceOf[EnsichatActivity].service
database.getContacts.foreach(c => service.sendTo(c.address, new UserName(newValue.toString)))
}
preference.setSummary(newValue.toString)