srctree

Robin Lindén parent 39b43a7b fae41ecf
Rename MainActivity to ProfileActivity

inlinesplit
app/src/main/AndroidManifest.xml added: 10, removed: 13, total 0
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="ltd.evilcorp.atox">
 
<application
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
@@ -13,13 +12,11 @@
</activity>
<activity android:name=".ContactListActivity">
</activity>
<activity android:name=".MainActivity">
<activity android:name=".ProfileActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
 
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
</application>
 
</manifest>
No newline at end of file
</manifest>
 
app/src/main/java/ltd/evilcorp/atox/MainActivity.kt added: 10, removed: 13, total 0
@@ -3,18 +3,18 @@ package ltd.evilcorp.atox
import android.content.Intent
import android.support.v7.app.AppCompatActivity
import android.os.Bundle
import kotlinx.android.synthetic.main.activity_main.*
import kotlinx.android.synthetic.main.activity_profile.*
 
class MainActivity : AppCompatActivity() {
class ProfileActivity : AppCompatActivity() {
 
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_main)
setContentView(R.layout.activity_profile)
 
btnCreate.setOnClickListener {
App.profile = if (username.text.isNotEmpty()) username.text.toString() else "aTox user"
App.password = if (password.text.isNotEmpty()) password.text.toString() else ""
startActivity(Intent(this@MainActivity, ContactListActivity::class.java))
startActivity(Intent(this@ProfileActivity, ContactListActivity::class.java))
}
}
 
 
app/src/main/res/layout/activity_main.xml added: 10, removed: 13, total 0
@@ -5,7 +5,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".MainActivity">
tools:context=".ProfileActivity">
 
<TextView
android:id="@+id/profileCreationLabel"