srctree

Robin Lindén parent a4025038 54295eeb
Move all activities to a separate package

inline split

app/src/main/AndroidManifest.xml added: 26, removed: 16, total 10

@@ -10,14 +10,14 @@

android:supportsRtl="true"

android:theme="@style/AppTheme">

<activity

android:name=".ChatActivity"

android:name=".activity.ChatActivity"

android:theme="@style/AppTheme.NoActionBar">

</activity>

<activity

android:name=".ContactListActivity"

android:name=".activity.ContactListActivity"

android:theme="@style/AppTheme.NoActionBar">

</activity>

<intent-filter>

app/src/main/java/ltd/evilcorp/atox/ChatActivity.kt added: 26, removed: 16, total 10

@@ -1,10 +1,14 @@

package ltd.evilcorp.atox

package ltd.evilcorp.atox.activity

import android.os.Bundle

import android.support.v7.app.AppCompatActivity

import android.support.v7.widget.Toolbar

import android.widget.ListView

import kotlinx.android.synthetic.main.activity_chat.*

import ltd.evilcorp.atox.MessageModel

import ltd.evilcorp.atox.MessagesAdapter

import ltd.evilcorp.atox.R

import ltd.evilcorp.atox.Sender

class ChatActivity : AppCompatActivity() {

private val messages = ArrayList<MessageModel>()

app/src/main/java/ltd/evilcorp/atox/ContactListActivity.kt added: 26, removed: 16, total 10

@@ -1,4 +1,4 @@

package ltd.evilcorp.atox

package ltd.evilcorp.atox.activity

import android.content.Intent

import android.os.Bundle

@@ -12,6 +12,9 @@ import android.widget.AdapterView

import android.widget.ArrayAdapter

import android.widget.ListView

import kotlinx.android.synthetic.main.contact_list_view_item.view.*

import ltd.evilcorp.atox.ContactAdapter

import ltd.evilcorp.atox.ContactModel

import ltd.evilcorp.atox.R

import kotlin.random.Random

class ContactListActivity : AppCompatActivity() {

app/src/main/java/ltd/evilcorp/atox/ProfileActivity.kt added: 26, removed: 16, total 10

@@ -1,4 +1,4 @@

package ltd.evilcorp.atox

package ltd.evilcorp.atox.activity

import android.content.Intent

import android.support.v7.app.AppCompatActivity

@@ -6,6 +6,9 @@ import android.os.Bundle

import android.util.Log

import im.tox.tox4j.core.options.SaveDataOptions

import kotlinx.android.synthetic.main.activity_profile.*

import ltd.evilcorp.atox.App

import ltd.evilcorp.atox.R

import ltd.evilcorp.atox.ToxThread

import java.io.File

private fun loadToxSave(saveFile: File): ByteArray? {

app/src/main/res/layout/activity_chat.xml added: 26, removed: 16, total 10

@@ -5,7 +5,7 @@

xmlns:app="http://schemas.android.com/apk/res-auto"