diff --git a/TolucaGraphics - copia/app/src/main/AndroidManifest.xml b/TolucaGraphics - copia/app/src/main/AndroidManifest.xml
index c1b17b4..217b194 100644
--- a/TolucaGraphics - copia/app/src/main/AndroidManifest.xml
+++ b/TolucaGraphics - copia/app/src/main/AndroidManifest.xml
@@ -15,6 +15,7 @@
android:usesCleartextTraffic="true"
tools:targetApi="m">
+
diff --git a/TolucaGraphics - copia/app/src/main/java/com/example/tolucagraphics/MesaEnJuego.kt b/TolucaGraphics - copia/app/src/main/java/com/example/tolucagraphics/MesaJugando.kt
similarity index 93%
rename from TolucaGraphics - copia/app/src/main/java/com/example/tolucagraphics/MesaEnJuego.kt
rename to TolucaGraphics - copia/app/src/main/java/com/example/tolucagraphics/MesaJugando.kt
index f1cad02..37408ac 100644
--- a/TolucaGraphics - copia/app/src/main/java/com/example/tolucagraphics/MesaEnJuego.kt
+++ b/TolucaGraphics - copia/app/src/main/java/com/example/tolucagraphics/MesaJugando.kt
@@ -9,19 +9,19 @@ import okhttp3.Response
import okhttp3.WebSocket
import okhttp3.WebSocketListener
-class MesaEnJuego : AppCompatActivity() {
+class MesaJugando : AppCompatActivity() {
val single = Socket
val gson = Gson()
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_mesa_en_juego)
- val intentJoin = intent.getStringExtra("join")!!
- Log.d("TAG", "Join from Intent: $intentJoin")
+ //val intentJoin = intent.getStringExtra("join")
+ //Log.d("TAG", "Join from Intent: $intentJoin")
//single.listener = Listener2()
single.conectarconWS()
}
fun mensajeRecibido(text : String){
- Log.d("TAG", text)
+ Log.d("TAG", text)
}
inner class Listener2 : WebSocketListener(){
@SuppressLint("SetTextI18n")
diff --git a/TolucaGraphics - copia/app/src/main/java/com/example/tolucagraphics/MesasActivity.kt b/TolucaGraphics - copia/app/src/main/java/com/example/tolucagraphics/MesasActivity.kt
index 868e31f..131dc58 100644
--- a/TolucaGraphics - copia/app/src/main/java/com/example/tolucagraphics/MesasActivity.kt
+++ b/TolucaGraphics - copia/app/src/main/java/com/example/tolucagraphics/MesasActivity.kt
@@ -69,8 +69,8 @@ class MesasActivity : AppCompatActivity() {
fun iniciarRecyclerMesas(){
mesasAdapter = MesaAdapter(listaMesas){ cadena, join ->
Toast.makeText(this@MesasActivity, cadena, Toast.LENGTH_LONG).show()
- val intentJuego = Intent(this@MesasActivity, MesaEnJuego::class.java)
- intentJuego.putExtra("join", gson.toJson(join))
+ val intentJuego = Intent(this@MesasActivity, MesaJugando::class.java)
+ //intentJuego.putExtra("join", gson.toJson(join))
startActivity(intentJuego)
}
lista_mesas.apply {
diff --git a/TolucaGraphics - copia/app/src/main/res/drawable-v24/carta_oculta.png b/TolucaGraphics - copia/app/src/main/res/drawable-xxhdpi/carta_oculta.png
similarity index 100%
rename from TolucaGraphics - copia/app/src/main/res/drawable-v24/carta_oculta.png
rename to TolucaGraphics - copia/app/src/main/res/drawable-xxhdpi/carta_oculta.png
Binary files a/TolucaGraphics - copia/app/src/main/res/drawable-v24/carta_oculta.png and b/TolucaGraphics - copia/app/src/main/res/drawable-xxhdpi/carta_oculta.png differ
diff --git a/TolucaGraphics - copia/app/src/main/res/layout/activity_mesa_en_juego.xml b/TolucaGraphics - copia/app/src/main/res/layout/activity_mesa_en_juego.xml
index 16dd633..de9bb21 100644
--- a/TolucaGraphics - copia/app/src/main/res/layout/activity_mesa_en_juego.xml
+++ b/TolucaGraphics - copia/app/src/main/res/layout/activity_mesa_en_juego.xml
@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- tools:context=".MesaEnJuego">
+ tools:context=".MesaJugando">
-
-
-
-
+
+
+ app:layout_constraintEnd_toEndOf="parent">
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
-
-
-
-
-
-
+
+
+
-
+
+ app:layout_constraintTop_toBottomOf="@+id/lobbyMesas"
+ app:layout_constraintBottom_toTopOf="@+id/btnCreaMesa">
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+ app:layout_constraintTop_toBottomOf="@+id/layoutJugadores" />
-
-
-
-
-
+ app:layout_constraintTop_toBottomOf="@+id/btnCreaMesa" />
-
-
-
-
-
-
\ No newline at end of file
diff --git a/TolucaGraphics - copia/app/src/main/res/layout/modelo_recycler_mesas.xml b/TolucaGraphics - copia/app/src/main/res/layout/modelo_recycler_mesas.xml
index e1fd834..55e909c 100644
--- a/TolucaGraphics - copia/app/src/main/res/layout/modelo_recycler_mesas.xml
+++ b/TolucaGraphics - copia/app/src/main/res/layout/modelo_recycler_mesas.xml
@@ -4,103 +4,103 @@
android:layout_height="wrap_content"
android:layout_margin="5dp"
xmlns:app="http://schemas.android.com/apk/res-auto">
-
-
-
+
+
+
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
\ No newline at end of file