Merge pull request #42 from enriquebarba97/CHEAT_006_debug

Cheat 006 debug
sw20-tug · Apr 29, 2020 · ad50653 · ad50653
2 parents f9bba68 + bc9847d
commit ad50653
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 3 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -14,6 +14,9 @@
         android:theme="@style/AppTheme">
         <activity android:name=".StartActivity"
             android:windowSoftInputMode="stateHidden|adjustResize">
+        </activity>
+        <activity android:name=".ChatActivity"
+            android:windowSoftInputMode="stateHidden|adjustResize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

diff --git a/app/src/main/java/com/example/cheat/ChatActivity.kt b/app/src/main/java/com/example/cheat/ChatActivity.kt
@@ -1,5 +1,6 @@
 package com.example.cheat
 
+import android.content.Intent
 import android.graphics.Color
 import android.os.Build
 import androidx.appcompat.app.AppCompatActivity
@@ -15,9 +16,11 @@ import android.widget.*
 
 import androidx.activity.viewModels
 import androidx.annotation.RequiresApi
+import kotlinx.android.synthetic.main.activity_start.*
 
 
 class ChatActivity : AppCompatActivity() {
+
     private val viewModel: MessageViewModel by viewModels()
 
     var debug = true;   // just for debugging
@@ -101,6 +104,10 @@ class ChatActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_chat)
 
+        btnDebug.setOnClickListener {
+            startActivity(Intent(this,StartActivity::class.java))
+        }
+
         if(debug) println("onCreate");
 
         history = findViewById<ScrollView>(R.id.scrollView);

diff --git a/app/src/main/java/com/example/cheat/StartActivity.kt b/app/src/main/java/com/example/cheat/StartActivity.kt
@@ -28,6 +28,10 @@ class StartActivity : AppCompatActivity() {
 
         acceptThread = conn.startAcceptThread(this)
 
+        btnDebug.setOnClickListener {
+            startActivity(Intent(this,ChatActivity::class.java))
+        }
+
         btnRefresh.setOnClickListener {
             refresh()
         }

diff --git a/app/src/main/res/layout/activity_chat.xml b/app/src/main/res/layout/activity_chat.xml
@@ -11,11 +11,11 @@
         android:id="@+id/scrollView"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_marginTop="10dp"
-        android:layout_marginBottom="10dp"
+        android:layout_above="@+id/linearLayout2"
         android:layout_marginLeft="3dp"
+        android:layout_marginTop="10dp"
         android:layout_marginRight="3dp"
-        android:layout_above="@+id/linearLayout2"
+        android:layout_marginBottom="50dp"
         android:scrollbarStyle="insideOverlay"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintBottom_toTopOf="@+id/linearLayout2"
@@ -87,4 +87,15 @@
             app:srcCompat="@drawable/ic_send" />
     </LinearLayout>
 
+    <Button
+        android:id="@+id/btnDebug"
+        android:layout_width="111dp"
+        android:layout_height="47dp"
+        android:layout_marginStart="72dp"
+        android:layout_marginLeft="72dp"
+        android:layout_marginBottom="2dp"
+        android:text="Connect"
+        app:layout_constraintBottom_toTopOf="@+id/linearLayout2"
+        app:layout_constraintStart_toStartOf="parent" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_start.xml b/app/src/main/res/layout/activity_start.xml
@@ -70,4 +70,13 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.498"
         app:layout_constraintStart_toStartOf="parent" />
+
+    <Button
+        android:id="@+id/btnDebug"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="20dp"
+        android:text="Chat View"
+        app:layout_constraintBottom_toTopOf="@+id/txtConnected"
+        app:layout_constraintStart_toStartOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>