FinalCommit2

Author: perusudroid

app/src/main/java/com/perusudroid/exoplay/presenter/DetailPresenter.kt

@@ -42,34 +42,38 @@ class DetailPresenter(val iDetailView: IDetailView) : BasePresenter(iDetailView)
         }
     }
 
-    override fun changeVideo() {
-        iDetailView.onVideoChanged(getChangeableVideo())
-    }
-
     /**
      * Loop to the next video
      */
 
-    private fun getChangeableVideo(): VideoListResponse {
+    override fun changeVideo() {
+
 
+        val orgSize = vidList?.size!! + 1
 
-        if (playablePosition == vidList?.size!!) {
-            playablePosition = vidList?.size!! - 1
+        Log.d("Detail","playablePosition $playablePosition vidList ${vidList?.size} org size $orgSize")
+
+
+        if (playablePosition == (vidList?.size!!-1)) {
+            iDetailView.showMessage("You have reached end of the list")
+        }else{
+            iDetailView.showMessage("Playing next video")
+            val tmp = vidList!![playablePosition]
+            playablePosition++
+            iDetailView.onVideoChanged(tmp)
         }
 
-        val tmp = vidList!![playablePosition]
-        playablePosition++
-        return tmp
 
     }
 
-
     /**
      * Update or add video item info to local DB
      */
 
     override fun addOrUpdateVidInfo(currentPosition: Long, state: Int) {
 
+
+
         DBHelper.getInstance(iDetailView.getActivity() as Context).addOrUpdateOnConflict(vidList!![playablePosition].id!!, currentPosition, state)
 
     }

app/src/main/java/com/perusudroid/exoplay/view/activity/DetailActivity.kt

@@ -297,6 +297,8 @@ class DetailActivity : BaseActivity(), IDetailView {
 
     override fun onVideoChanged(vidList: VideoListResponse) {
         Log.d("Detail","onVideoChanged ${vidList.url}")
+
+
         currentUri = Uri.parse(vidList.url)
         tvTitle.text = vidList.title
         tvDesc.text = vidList.description

app/src/main/java/com/perusudroid/exoplay/view/activity/LaunchActivity.kt

@@ -39,6 +39,7 @@ class LaunchActivity : BaseActivity(), ILaunchView, IBaseListener {
 
     override fun setRecyclerAdapter(vidLists: List<VideoListResponse>) {
         this.vidList = vidLists as MutableList<VideoListResponse>
+        Log.d(TAG,"Size ${vidList.size}")
         recyclerView.adapter = LaunchAdapter(vidList, this)
 
         vsParent.setChildVisible()
@@ -59,6 +60,7 @@ class LaunchActivity : BaseActivity(), ILaunchView, IBaseListener {
 
     override fun onClick(data: Any?, position: Int) {
 
+        Log.d(TAG, "onClick pos $position")
 
         val intent = Intent(this@LaunchActivity, DetailActivity::class.java)
 

app/src/main/res/layout-land/activity_detail.xml

@@ -46,23 +46,30 @@
         android:textColor="#000000"
         android:layout_marginStart="@dimen/d10"
         android:layout_marginTop="@dimen/d5"
+        android:gravity="start"
+        android:text="@string/app_name"
+        app:layout_constraintEnd_toEndOf="@+id/guideline_end"
         app:layout_constraintTop_toBottomOf="@+id/player_view"
         app:layout_constraintBottom_toTopOf="@+id/tvDesc"
         app:layout_constraintStart_toStartOf="@+id/guideline_start"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content" />
 
 
     <TextView
         android:id="@+id/tvDesc"
         android:textSize="16sp"
         android:maxLines="3"
+        android:gravity="start"
+        android:text="@string/app_name"
+        android:ellipsize="end"
         android:textColor="@color/lightBlack"
         android:layout_marginTop="@dimen/d5"
+        app:layout_constraintEnd_toEndOf="@+id/guideline_end"
         app:layout_constraintTop_toBottomOf="@+id/tvTitle"
         app:layout_constraintBottom_toTopOf="@+id/tvRelated"
         app:layout_constraintStart_toStartOf="@+id/tvTitle"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content" />
 
 

app/src/main/res/layout/activity_detail.xml

@@ -62,6 +62,7 @@
         android:maxLines="3"
         android:gravity="start"
         android:text="@string/app_name"
+        android:ellipsize="end"
         android:textColor="@color/lightBlack"
         android:layout_marginTop="@dimen/d5"
         app:layout_constraintEnd_toEndOf="@+id/guideline_end"

app/src/main/res/layout/inflater_detail_list.xml

@@ -72,6 +72,7 @@
         android:text="@string/app_name"
         android:textColor="@color/lightBlack"
         android:maxLines="3"
+        android:ellipsize="end"
         app:layout_constraintEnd_toEndOf="@+id/guideline_end"
         app:layout_constraintBottom_toBottomOf="@+id/ivPic"
         app:layout_constraintStart_toStartOf="@+id/tvTitle"