srctree

endoffile78 parent 0d19e3e9 9a42ca4f
Migrate to androidx

inlinesplit
app/build.gradle added: 43, removed: 44, total 0
@@ -12,7 +12,7 @@ android {
targetSdkVersion 28
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {
release {
@@ -32,8 +32,8 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
implementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
implementation 'androidx.appcompat:appcompat:1.0.0'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
 
// For tox4j
implementation "org.scala-lang:scala-library:2.11.12"
@@ -42,6 +42,6 @@ dependencies {
implementation 'org.scodec:scodec-core_2.11:1.11.3'
 
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
androidTestImplementation 'androidx.test:runner:1.1.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
}
 
app/src/androidTest/java/ltd/evilcorp/atox/ExampleInstrumentedTest.kt added: 43, removed: 44, total 0
@@ -1,7 +1,7 @@
package ltd.evilcorp.atox
 
import android.support.test.InstrumentationRegistry
import android.support.test.runner.AndroidJUnit4
import androidx.test.InstrumentationRegistry
import androidx.test.runner.AndroidJUnit4
 
import org.junit.Test
import org.junit.runner.RunWith
 
app/src/main/java/ltd/evilcorp/atox/activity/AddContactActivity.kt added: 43, removed: 44, total 0
@@ -2,11 +2,11 @@ package ltd.evilcorp.atox.activity
 
import android.os.Bundle
import android.os.Message
import android.support.v7.app.AppCompatActivity
import android.text.Editable
import android.text.TextWatcher
import android.widget.Button
import android.widget.EditText
import androidx.appcompat.app.AppCompatActivity
import ltd.evilcorp.atox.App
import ltd.evilcorp.atox.MsgAddContact
import ltd.evilcorp.atox.R
@@ -27,7 +27,7 @@ class AddContactActivity : AppCompatActivity() {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_add_contact)
 
toxId.addTextChangedListener(object: TextWatcher {
toxId.addTextChangedListener(object : TextWatcher {
override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
override fun afterTextChanged(s: Editable?) {
@@ -38,7 +38,7 @@ class AddContactActivity : AppCompatActivity() {
}
})
 
message.addTextChangedListener(object: TextWatcher {
message.addTextChangedListener(object : TextWatcher {
override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
override fun afterTextChanged(s: Editable?) {
 
app/src/main/java/ltd/evilcorp/atox/activity/ChatActivity.kt added: 43, removed: 44, total 0
@@ -1,14 +1,11 @@
package ltd.evilcorp.atox.activity
 
import android.os.Bundle
import android.os.Handler
import android.os.Looper
import android.os.Message
import android.support.v7.app.AppCompatActivity
import android.support.v7.widget.Toolbar
import android.widget.ListView
import androidx.appcompat.app.AppCompatActivity
import androidx.appcompat.widget.Toolbar
import kotlinx.android.synthetic.main.activity_chat.*
import kotlinx.android.synthetic.main.contact_list_view_item.*
import ltd.evilcorp.atox.*
 
class ChatActivity : AppCompatActivity() {
 
app/src/main/java/ltd/evilcorp/atox/activity/ContactListActivity.kt added: 43, removed: 44, total 0
@@ -2,16 +2,16 @@ package ltd.evilcorp.atox.activity
 
import android.content.Intent
import android.os.Bundle
import android.support.v4.content.ContextCompat
import android.support.v4.view.GravityCompat
import android.support.v4.widget.DrawerLayout
import android.support.v7.app.ActionBarDrawerToggle
import android.support.v7.app.AppCompatActivity
import android.support.v7.widget.Toolbar
import android.view.View
import android.widget.AdapterView
import android.widget.ArrayAdapter
import android.widget.ListView
import androidx.appcompat.app.ActionBarDrawerToggle
import androidx.appcompat.app.AppCompatActivity
import androidx.appcompat.widget.Toolbar
import androidx.core.content.ContextCompat
import androidx.core.view.GravityCompat
import androidx.drawerlayout.widget.DrawerLayout
import kotlinx.android.synthetic.main.contact_list_view_item.view.*
import ltd.evilcorp.atox.App
import ltd.evilcorp.atox.ContactAdapter
 
app/src/main/java/ltd/evilcorp/atox/activity/ProfileActivity.kt added: 43, removed: 44, total 0
@@ -3,7 +3,7 @@ package ltd.evilcorp.atox.activity
import android.content.Intent
import android.os.Bundle
import android.os.Message
import android.support.v7.app.AppCompatActivity
import androidx.appcompat.app.AppCompatActivity
import im.tox.tox4j.core.options.SaveDataOptions
import kotlinx.android.synthetic.main.activity_profile.*
import ltd.evilcorp.atox.App
 
app/src/main/res/layout/activity_add_contact.xml added: 43, removed: 44, total 0
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".activity.AddContactActivity">
<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -46,4 +46,4 @@
android:text="@string/add"
app:layout_constraintTop_toBottomOf="@id/message"
app:layout_constraintEnd_toEndOf="@id/message"/>
</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
 
app/src/main/res/layout/activity_chat.xml added: 43, removed: 44, total 0
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".activity.ChatActivity">
<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -55,4 +55,4 @@
app:layout_constraintTop_toTopOf="@+id/outgoingMessage"
app:layout_constraintBottom_toBottomOf="@+id/outgoingMessage"
app:layout_constraintHorizontal_bias="0.5"/>
</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
 
app/src/main/res/layout/activity_contact_list.xml added: 43, removed: 44, total 0
@@ -4,13 +4,13 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".activity.ContactListActivity">
<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/colorPrimary"
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"/>
<android.support.v4.widget.DrawerLayout
<androidx.drawerlayout.widget.DrawerLayout
android:id="@+id/drawerLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -26,5 +26,5 @@
android:layout_gravity="start"
android:choiceMode="singleChoice"
android:background="@android:color/white"/>
</android.support.v4.widget.DrawerLayout>
</androidx.drawerlayout.widget.DrawerLayout>
</RelativeLayout>
 
app/src/main/res/layout/activity_profile.xml added: 43, removed: 44, total 0
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -45,4 +45,4 @@
android:text="@string/create"
app:layout_constraintTop_toBottomOf="@+id/password"
app:layout_constraintBottom_toBottomOf="parent"/>
</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
 
gradle.properties added: 43, removed: 44, total 0
@@ -13,3 +13,5 @@ org.gradle.jvmargs=-Xmx1536m
# org.gradle.parallel=true
# Kotlin code style for this project: "official" or "obsolete":
kotlin.code.style=official
android.useAndroidX=true
android.enableJetifier=true