From 63c89c63af30027e75660e607b2e997c0fc829cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=A4rkl?= <info@florianmaerkl.de>
Date: Sun, 20 Oct 2019 22:07:00 +0200
Subject: [PATCH] Start Session from MainActivity on Android

---
 .../main/DisplayHostRecyclerViewAdapter.kt    |   3 +-
 .../com/metallic/chiaki/main/MainActivity.kt  |  25 ++-
 .../src/main/res/layout/item_display_host.xml | 179 +++++++++---------
 3 files changed, 113 insertions(+), 94 deletions(-)

diff --git a/android/app/src/main/java/com/metallic/chiaki/main/DisplayHostRecyclerViewAdapter.kt b/android/app/src/main/java/com/metallic/chiaki/main/DisplayHostRecyclerViewAdapter.kt
index 5762a0d..b733678 100644
--- a/android/app/src/main/java/com/metallic/chiaki/main/DisplayHostRecyclerViewAdapter.kt
+++ b/android/app/src/main/java/com/metallic/chiaki/main/DisplayHostRecyclerViewAdapter.kt
@@ -27,7 +27,7 @@ import com.metallic.chiaki.common.ext.inflate
 import com.metallic.chiaki.lib.DiscoveryHost
 import kotlinx.android.synthetic.main.item_display_host.view.*
 
-class DisplayHostRecyclerViewAdapter: RecyclerView.Adapter<DisplayHostRecyclerViewAdapter.ViewHolder>()
+class DisplayHostRecyclerViewAdapter(val clickCallback: (DisplayHost) -> Unit): RecyclerView.Adapter<DisplayHostRecyclerViewAdapter.ViewHolder>()
 {
 	var hosts: List<DisplayHost> = listOf()
 		set(value)
@@ -78,6 +78,7 @@ class DisplayHostRecyclerViewAdapter: RecyclerView.Adapter<DisplayHostRecyclerVi
 					}
 				else
 					R.drawable.ic_console)
+			it.setOnClickListener { clickCallback(host) }
 		}
 	}
 }
\ No newline at end of file
diff --git a/android/app/src/main/java/com/metallic/chiaki/main/MainActivity.kt b/android/app/src/main/java/com/metallic/chiaki/main/MainActivity.kt
index 6d06d7d..9c8b110 100644
--- a/android/app/src/main/java/com/metallic/chiaki/main/MainActivity.kt
+++ b/android/app/src/main/java/com/metallic/chiaki/main/MainActivity.kt
@@ -30,12 +30,16 @@ import androidx.lifecycle.ViewModelProviders
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.metallic.chiaki.R
 import com.metallic.chiaki.TestStartActivity
+import com.metallic.chiaki.common.DisplayHost
+import com.metallic.chiaki.common.Preferences
 import com.metallic.chiaki.common.ext.RevealActivity
 import com.metallic.chiaki.common.ext.putRevealExtra
 import com.metallic.chiaki.common.getDatabase
 import com.metallic.chiaki.common.ext.viewModelFactory
+import com.metallic.chiaki.lib.ConnectInfo
 import com.metallic.chiaki.regist.RegistActivity
 import com.metallic.chiaki.settings.SettingsActivity
+import com.metallic.chiaki.stream.StreamActivity
 import io.reactivex.disposables.CompositeDisposable
 import kotlinx.android.synthetic.main.activity_main.*
 
@@ -70,7 +74,7 @@ class MainActivity : AppCompatActivity()
 			.of(this, viewModelFactory { MainViewModel(getDatabase(this)) })
 			.get(MainViewModel::class.java)
 
-		val recyclerViewAdapter = DisplayHostRecyclerViewAdapter()
+		val recyclerViewAdapter = DisplayHostRecyclerViewAdapter(this::hostTriggered)
 		hostsRecyclerView.adapter = recyclerViewAdapter
 		hostsRecyclerView.layoutManager = LinearLayoutManager(this)
 		viewModel.displayHosts.observe(this, Observer {
@@ -161,4 +165,23 @@ class MainActivity : AppCompatActivity()
 			startActivity(it, ActivityOptions.makeSceneTransitionAnimation(this).toBundle())
 		}
 	}
+
+	private fun hostTriggered(host: DisplayHost)
+	{
+		val registeredHost = host.registeredHost
+		if(registeredHost != null)
+		{
+			// TODO: check standby
+
+			val connectInfo = ConnectInfo(host.host, registeredHost.rpRegistKey, registeredHost.rpKey, Preferences(this).videoProfile)
+			Intent(this, StreamActivity::class.java).let {
+				it.putExtra(StreamActivity.EXTRA_CONNECT_INFO, connectInfo)
+				startActivity(it)
+			}
+		}
+		else
+		{
+			// TODO: show registration
+		}
+	}
 }
diff --git a/android/app/src/main/res/layout/item_display_host.xml b/android/app/src/main/res/layout/item_display_host.xml
index 08859ec..1d4a953 100644
--- a/android/app/src/main/res/layout/item_display_host.xml
+++ b/android/app/src/main/res/layout/item_display_host.xml
@@ -1,109 +1,104 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+
+<androidx.cardview.widget.CardView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="250dp"
+    app:cardCornerRadius="4dp"
+    android:layout_marginTop="8dp"
+    android:layout_marginLeft="8dp"
+    android:layout_marginRight="8dp"
+    android:layout_marginBottom="0dp"
+    android:elevation="8dp"
+    android:foreground="?android:attr/selectableItemBackground">
 
-    <androidx.cardview.widget.CardView
-        android:layout_width="match_parent"
-        android:layout_height="250dp"
-        app:cardCornerRadius="4dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="8dp"
-        android:layout_marginBottom="0dp"
-        android:elevation="8dp">
-
-        <FrameLayout
-            android:id="@+id/discoveredIndicatorLayout"
+    <FrameLayout
+        android:id="@+id/discoveredIndicatorLayout"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="left|top" >
+        <ImageView
+            android:layout_width="72dp"
+            android:layout_height="72dp"
+            android:src="@drawable/ic_triangle"/>
+        <ImageView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="left|top" >
-            <ImageView
-                android:layout_width="72dp"
-                android:layout_height="72dp"
-                android:src="@drawable/ic_triangle"/>
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_discovered_on_secondary"
-                android:layout_gravity="left|top"
-                android:layout_margin="8dp" />
-        </FrameLayout>
+            android:src="@drawable/ic_discovered_on_secondary"
+            android:layout_gravity="left|top"
+            android:layout_margin="8dp" />
+    </FrameLayout>
 
 
-        <androidx.constraintlayout.widget.ConstraintLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:padding="8dp">
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/nameTextView"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:padding="8dp">
+            android:layout_height="wrap_content"
+            android:fontFamily="sans-serif-condensed-medium"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="Name"
+            android:textSize="32sp"
+            android:gravity="center"
+            android:textColor="?attr/colorOnSurface"/>
 
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/nameTextView"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:fontFamily="sans-serif-condensed-medium"
-                app:layout_constraintTop_toTopOf="parent"
-                tools:text="Name"
-                android:textSize="32sp"
-                android:gravity="center"
-                android:textColor="?attr/colorOnSurface"/>
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/hostTextView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="sans-serif-condensed-medium"
+            app:layout_constraintTop_toBottomOf="@id/nameTextView"
+            tools:text="Address: Host"
+            android:textSize="16sp"
+            android:gravity="center"
+            android:textColor="?attr/colorOnSurface"
+            android:maxLines="1"
+            android:ellipsize="end"/>
 
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/hostTextView"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:fontFamily="sans-serif-condensed-medium"
-                app:layout_constraintTop_toBottomOf="@id/nameTextView"
-                tools:text="Address: Host"
-                android:textSize="16sp"
-                android:gravity="center"
-                android:textColor="?attr/colorOnSurface"
-                android:maxLines="1"
-                android:ellipsize="end"/>
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/idTextView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="sans-serif-condensed-medium"
+            app:layout_constraintTop_toBottomOf="@id/hostTextView"
+            tools:text="ID: C0FFEE1337"
+            android:textSize="16sp"
+            android:gravity="center"
+            android:textColor="?attr/colorOnSurface"
+            android:maxLines="1"
+            android:ellipsize="end"/>
 
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/idTextView"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:fontFamily="sans-serif-condensed-medium"
-                app:layout_constraintTop_toBottomOf="@id/hostTextView"
-                tools:text="ID: C0FFEE1337"
-                android:textSize="16sp"
-                android:gravity="center"
-                android:textColor="?attr/colorOnSurface"
-                android:maxLines="1"
-                android:ellipsize="end"/>
+        <ImageView
+            android:id="@+id/stateIndicatorImageView"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:src="@drawable/ic_console"
+            app:layout_constraintTop_toBottomOf="@id/idTextView"
+            android:layout_marginLeft="32dp"
+            android:layout_marginRight="32dp"
+            android:layout_marginTop="8dp"/>
 
-            <ImageView
-                android:id="@+id/stateIndicatorImageView"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:src="@drawable/ic_console"
-                app:layout_constraintTop_toBottomOf="@id/idTextView"
-                android:layout_marginLeft="32dp"
-                android:layout_marginRight="32dp"
-                android:layout_marginTop="8dp"/>
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/bottomInfoTextView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textColor="?attr/colorOnSurface"
+            android:textSize="16sp"
+            android:fontFamily="sans-serif-condensed-light"
+            android:gravity="center"
+            tools:text="App: Persona 5\nTitle ID: 1337"
+            app:layout_constraintTop_toBottomOf="@id/stateIndicatorImageView"
+            app:layout_constraintBottom_toBottomOf="parent"
+            android:layout_marginBottom="8dp"
+            android:maxLines="2"
+            android:ellipsize="end"/>
 
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/bottomInfoTextView"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textColor="?attr/colorOnSurface"
-                android:textSize="16sp"
-                android:fontFamily="sans-serif-condensed-light"
-                android:gravity="center"
-                tools:text="App: Persona 5\nTitle ID: 1337"
-                app:layout_constraintTop_toBottomOf="@id/stateIndicatorImageView"
-                app:layout_constraintBottom_toBottomOf="parent"
-                android:layout_marginBottom="8dp"
-                android:maxLines="2"
-                android:ellipsize="end"/>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-    </androidx.cardview.widget.CardView>
-
-</LinearLayout>
\ No newline at end of file
+</androidx.cardview.widget.CardView>
\ No newline at end of file