From 7d60dc8c0fe8385c14cc94f3fa252acc54408764 Mon Sep 17 00:00:00 2001
From: ivan agosto <spartan360@live.com.mx>
Date: Wed, 23 Jan 2019 15:40:41 -0600
Subject: [PATCH 01/14] Updated kotlin + commentaries

---
 app/app.iml                                   | 80 ++++++++++---------
 .../main/res/layout/activity_reproductor.xml  | 66 ++++++++++++---
 app/src/main/res/values-es/strings.xml        |  2 +
 app/src/main/res/values/strings.xml           |  2 +
 build.gradle                                  |  4 +-
 gradle/wrapper/gradle-wrapper.properties      |  4 +-
 p2play.iml                                    |  8 --
 7 files changed, 106 insertions(+), 60 deletions(-)

diff --git a/app/app.iml b/app/app.iml
index e1aef5e..bcbc323 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -22,18 +22,18 @@
       </configuration>
     </facet>
     <facet type="kotlin-language" name="Kotlin">
-      <configuration version="3" platform="JVM 1.8" useProjectSettings="false">
+      <configuration version="3" platform="JVM 1.6" useProjectSettings="false">
         <compilerSettings />
         <compilerArguments>
           <option name="destination" value="$MODULE_DIR$/build/tmp/kotlin-classes/debug" />
+          <option name="classpath" value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.0/683e04a4e7f17437d7e1390480f312e122e42e9e/kotlin-stdlib-jdk7-1.3.0.jar:/home/darkside/.gradle/caches/transforms-1/files-1.1/design-27.1.0.aar/5ca2e2fcd4119d11d987ce50addd21d3/jars/classes.jar:/home/darkside/.gradle/caches/transforms-1/files-1.1/appcompat-v7-27.1.0.aar/fcbe128b12829dd7f39a004dd39229e7/jars/classes.jar:/home/darkside/.gradle/caches/transforms-1/files-1.1/constraint-layout-1.1.2.aar/d2482662d1382e3df3108848c37fb7b9/jars/classes.jar:/home/darkside/.gradle/caches/transforms-1/files-1.1/support-v4-27.1.0.aar/631234fd7603425b34c9cbaa34915dd7/jars/classes.jar:/home/darkside/.gradle/caches/transforms-1/files-1.1/picasso-2.71828.aar/aa320a3988c502fe1fdfe28ee2da1d98/jars/classes.jar:/home/darkside/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.0/a134b0cfe9bb44f98b0b3e889cda07923eea9428/kotlin-stdlib-1.3.0.jar:/home/darkside/.gradle/caches/transforms-1/files-1.1/support-fragment-27.1.0.aar/651bb40da42a5ca740bcfc0d847e0912/jars/classes.jar:/home/darkside/.gradle/caches/transforms-1/files-1.1/animated-vector-drawable-27.1.0.aar/f6a2fa6cc369c9d12bacaa59c4d3f1bf/jars/classes.jar:/home/darkside/.gradle/caches/transforms-1/files-1.1/recyclerview-v7-27.1.0.aar/9f1c4102690fbb17053dccd795e01137/jars/classes.jar:/home/darkside/.gradle/caches/transforms-1/files-1.1/support-core-ui-27.1.0.aar/d9165daf4bc04b87f1a7e20c3de309c3/jars/classes.jar:/home/darkside/.gradle/caches/transforms-1/files-1.1/support-core-utils-27.1.0.aar/30ce600e445acd0cb51e748acd546585/jars/classes.jar:/home/darkside/.gradle/caches/transforms-1/files-1.1/support-vector-drawable-27.1.0.aar/9fab5380dc020a3469acca464bc41013/jars/classes.jar:/home/darkside/.gradle/caches/transforms-1/files-1.1/support-media-compat-27.1.0.aar/59a4778aff1fdcb2952e8b5d6f0208bb/jars/classes.jar:/home/darkside/.gradle/caches/transforms-1/files-1.1/transition-27.1.0.aar/2ea9f3cd8d724d3b7a776e6b72acf9a9/jars/classes.jar:/home/darkside/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/c286caee1c93d0e80861dabe0a6c7a4a/jars/classes.jar:/home/darkside/.gradle/caches/transforms-1/files-1.1/exifinterface-27.1.0.aar/64ca5adea99d80f9711e75f0ed7a7cca/jars/classes.jar:/home/darkside/.gradle/caches/modules-2/files-2.1/com.android.support/support-annotations/27.1.0/39ded76b5e1ce1c5b2688e1d25cdc20ecee32007/support-annotations-27.1.0.jar:/home/darkside/.gradle/caches/modules-2/files-2.1/com.android.support.constraint/constraint-layout-solver/1.1.2/bfc967828daffc35ba01c9ee204d98b664930a0f/constraint-layout-solver-1.1.2.jar:/home/darkside/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.10.0/7ef0f1d95bf4c0b3ba30bbae25e0e562b05cf75e/okhttp-3.10.0.jar:/home/darkside/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.0/84a2e0288dc17cd64d692eb1e5e0de8cd5ff0846/kotlin-stdlib-common-1.3.0.jar:/home/darkside/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/13.0/919f0dfe192fb4e063e7dacadee7f8bb9a2672a9/annotations-13.0.jar:/home/darkside/.gradle/caches/transforms-1/files-1.1/livedata-core-1.1.0.aar/baa40eba6814af0b70ebbc4f497dfb02/jars/classes.jar:/home/darkside/.gradle/caches/transforms-1/files-1.1/viewmodel-1.1.0.aar/340db1313bba434f4e2fb3a67536af36/jars/classes.jar:/home/darkside/.gradle/caches/transforms-1/files-1.1/runtime-1.1.0.aar/3e40a1ae27410bb30b8695b8029fbb68/jars/classes.jar:/home/darkside/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.14.0/102d7be47241d781ef95f1581d414b0943053130/okio-1.14.0.jar:/home/darkside/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/common/1.1.0/edf3f7bfb84a7521d0599efa3b0113a0ee90f85/common-1.1.0.jar:/home/darkside/.gradle/caches/transforms-1/files-1.1/runtime-1.1.0.aar/1600d21f7baef4bc63132f4ed14de45c/jars/classes.jar:/home/darkside/.gradle/caches/modules-2/files-2.1/android.arch.core/common/1.1.0/8007981f7d7540d89cd18471b8e5dcd2b4f99167/common-1.1.0.jar:/home/darkside/Android/Sdk/platforms/android-27/android.jar" />
           <option name="noStdlib" value="true" />
           <option name="noReflect" value="true" />
           <option name="moduleName" value="app_debug" />
-          <option name="jvmTarget" value="1.8" />
           <option name="addCompilerBuiltIns" value="true" />
           <option name="loadBuiltInsFromDependencies" value="true" />
-          <option name="languageVersion" value="1.2" />
-          <option name="apiVersion" value="1.2" />
+          <option name="languageVersion" value="1.3" />
+          <option name="apiVersion" value="1.3" />
           <option name="pluginOptions">
             <array>
               <option value="plugin:org.jetbrains.kotlin.android:experimental=false" />
@@ -43,7 +43,7 @@
           </option>
           <option name="pluginClasspaths">
             <array>
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-android-extensions/1.2.51/1755c607e5fabf4ba949ef626c73fc7421d35123/kotlin-android-extensions-1.2.51.jar" />
+              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-android-extensions/1.3.0/87970b36b9e1855d0d0e4942865f63a1015026c9/kotlin-android-extensions-1.3.0.jar" />
             </array>
           </option>
         </compilerArguments>
@@ -56,17 +56,15 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources/debugAndroidTest/processDebugAndroidTestResources/r" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
@@ -112,14 +110,18 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources" />
+      <excludeFolder url="file://$MODULE_DIR$/build/generated/source/r" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotation_processor_list" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/apk_list" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/build-info" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundle_manifest" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-libraries" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/checkDebugClasspath" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check_manifest_result" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/compatible_screen_manifest" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
@@ -127,6 +129,8 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-apk" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_app_manifest" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_app_info_output_file" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_merged_manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_split_apk_resources" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javac" />
@@ -135,6 +139,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifest-checker" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/metadata_feature_manifest" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/processed_res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
@@ -143,6 +148,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shader_assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/signing_config" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/split_list" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
@@ -153,47 +159,47 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 27 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Gradle: com.android.support:transition-27.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:runner-1.0.2" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata-core:1.1.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime:1.1.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.1.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.51@jar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: com.android.support:support-annotations:27.1.1@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable-27.1.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.2.51@jar" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.lifecycle:viewmodel-1.1.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-v4-27.1.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-compat-27.1.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:recyclerview-v7-27.1.0" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.lifecycle:viewmodel:1.1.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout:1.1.2@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-idling-resource:3.0.2@aar" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.3.0@jar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:runner:1.0.2@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-media-compat:27.1.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:transition:27.1.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.core:runtime:1.1.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:recyclerview-v7:27.1.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable:27.1.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-core-utils:27.1.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: com.squareup:javawriter:2.1.1@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-media-compat-27.1.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable-27.1.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-core:3.0.2@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:support-annotations:27.1.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout-1.1.2" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-core-utils-27.1.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-core-ui-27.1.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-v4:27.1.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0@jar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: com.google.code.findbugs:jsr305:2.0.1@jar" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.14.0@jar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-core-3.0.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.picasso:picasso:2.71828@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:design:27.1.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: javax.inject:javax.inject:1@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-fragment-27.1.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-core-ui:27.1.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable:27.1.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12@jar" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.2.51@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:design-27.1.0" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.core:runtime-1.1.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:appcompat-v7:27.1.0@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3@jar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:monitor-1.0.2" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:appcompat-v7-27.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-idling-resource-3.0.2" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:exifinterface:27.1.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-fragment:27.1.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:3.10.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout-solver:1.1.2@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:exifinterface-27.1.0" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata-core-1.1.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:monitor:1.0.2@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-library:1.3@jar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-integration:1.3@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.picasso:picasso-2.71828" level="project" />
     <orderEntry type="library" name="Gradle: android.arch.core:common:1.1.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.0@jar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: net.sf.kxml:kxml2:2.3.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime-1.1.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-compat:27.1.0@aar" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_reproductor.xml b/app/src/main/res/layout/activity_reproductor.xml
index 3eeb428..a4195ff 100644
--- a/app/src/main/res/layout/activity_reproductor.xml
+++ b/app/src/main/res/layout/activity_reproductor.xml
@@ -7,11 +7,11 @@
     tools:context=".ReproductorActivity">
 
     <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        app:layout_constraintTop_toTopOf="parent"
+        android:layout_height="wrap_content">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -25,7 +25,7 @@
             <WebView
                 android:id="@+id/videoView"
                 android:layout_width="match_parent"
-                android:layout_height="220dp">
+                android:layout_height="270dp">
 
             </WebView>
 
@@ -33,7 +33,7 @@
                 android:id="@+id/tittleVideoTxt"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingLeft="5dp"
+                android:paddingStart="5dp"
                 android:textAppearance="@android:style/TextAppearance.Material.Large"
                 android:textStyle="bold" />
 
@@ -42,6 +42,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingLeft="5dp"
+                android:paddingRight="5dp"
                 android:textSize="12sp" />
 
             <LinearLayout
@@ -69,7 +70,7 @@
                         app:srcCompat="@drawable/ic_like" />
 
                     <TextView
-                        android:id="@+id/textView"
+                        android:id="@+id/textViewLike"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -94,7 +95,7 @@
                         app:srcCompat="@drawable/ic_dislike" />
 
                     <TextView
-                        android:id="@+id/textView"
+                        android:id="@+id/textViewDislike"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
@@ -121,7 +122,7 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="0dp"
                 android:layout_weight="1"
                 android:orientation="horizontal">
 
@@ -170,10 +171,10 @@
                     android:id="@+id/descriptionVideoTxt"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:inputType="none|textLongMessage"
                     android:maxLength="1000"
-                    android:maxLines="1000"
-                    android:paddingLeft="5dp"
-                    android:text="TextView"
+                    android:maxLines="10"
+                    android:text="-"
                     android:textStyle="italic" />
             </ScrollView>
 
@@ -183,6 +184,49 @@
                 android:layout_height="1dp"
                 android:background="?android:attr/listDivider" />
 
+            <TextView
+                android:id="@+id/commentariesTxt"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingLeft="5dp"
+                android:text="@string/commentariesTxt" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <ImageView
+                        android:id="@+id/imageView3"
+                        android:layout_width="40dp"
+                        android:layout_height="50dp"
+                        android:layout_weight="1"
+                        app:srcCompat="@drawable/default_avatar" />
+
+                    <EditText
+                        android:id="@+id/commentaryText"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:ems="10"
+                        android:inputType="textMultiLine" />
+
+                </LinearLayout>
+
+                <Button
+                    android:id="@+id/button2"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:text="@string/commentaryText" />
+
+            </LinearLayout>
+
 
         </LinearLayout>
     </ScrollView>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 02ef70b..7da1628 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -62,6 +62,7 @@
     <!-- End MiniMenu strings -->
     <!-- Start Reproductor strings -->
     <string name="descriptionTxt">Descripcion:</string>
+    <string name="commentariesTxt">Comentarios:</string>
     <!-- Actions -->
     <string name="likeBtn">Like</string>
     <string name="dislikeBtn">Dislike</string>
@@ -69,6 +70,7 @@
     <string name="reportBtn">Reportar</string>
     <string name="subscribeBtn">Subscribir</string>
     <string name="unSubscribeBtn">Desubscribir</string>
+    <string name="commentaryText">Comentar</string>
     <!-- Messages -->
     <string name="subscribeMsg">Te has subscribido a este canal</string>
     <string name="rateMsg">Has valorado este video</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ed838c1..12f15c4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -72,6 +72,7 @@
     <!-- End MiniMenu strings -->
     <!-- Start Reproductor strings -->
     <string name="descriptionTxt">Description:</string>
+    <string name="commentariesTxt">Commentaries:</string>
     <!-- Actions -->
     <string name="subscribeBtn">Subscribe</string>
     <string name="likeBtn">Like</string>
@@ -79,6 +80,7 @@
     <string name="shareBtn">Share</string>
     <string name="reportBtn">Report</string>
     <string name="unSubscribeBtn">Unsubscribe</string>
+    <string name="commentaryText">Comment</string>
     <!-- Messages -->
     <string name="subscribeMsg">You are subscribed to this channel</string>
     <string name="rateMsg">You are rated the video</string>
diff --git a/build.gradle b/build.gradle
index ea89d91..0d5a2ba 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,13 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.2.51'
+    ext.kotlin_version = '1.3.0'
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 6d915f0..b14b672 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Sep 30 14:50:40 CDT 2018
+#Wed Jan 23 14:44:01 CST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
diff --git a/p2play.iml b/p2play.iml
index a79916e..8e75e30 100644
--- a/p2play.iml
+++ b/p2play.iml
@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.id="p2play" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="java-gradle" name="Java-Gradle">
-      <configuration>
-        <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
-        <option name="BUILDABLE" value="false" />
-      </configuration>
-    </facet>
-  </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">

From d918824d741e1792248004b0f96b71e320598d6c Mon Sep 17 00:00:00 2001
From: ivan agosto <spartan360@live.com.mx>
Date: Thu, 24 Jan 2019 14:45:08 -0600
Subject: [PATCH 02/14] gitignore updated

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 06de402..395b47d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,5 @@ proguard/
 captures/
 
 \.idea/
+
+*.iml

From 6413bb078dc517f8e61d3bc8f4ae239e036ee447 Mon Sep 17 00:00:00 2001
From: ivan agosto <spartan360@live.com.mx>
Date: Thu, 24 Jan 2019 14:46:34 -0600
Subject: [PATCH 03/14] iml files ignored

---
 .gitignore  |   2 +
 app/app.iml | 205 ----------------------------------------------------
 p2play.iml  |  11 ---
 3 files changed, 2 insertions(+), 216 deletions(-)
 delete mode 100644 app/app.iml
 delete mode 100644 p2play.iml

diff --git a/.gitignore b/.gitignore
index 395b47d..1879412 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,4 +33,6 @@ captures/
 
 \.idea/
 
+# iml Files
 *.iml
+app/app.iml
diff --git a/app/app.iml b/app/app.iml
deleted file mode 100644
index bcbc323..0000000
--- a/app/app.iml
+++ /dev/null
@@ -1,205 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="android-gradle" name="Android-Gradle">
-      <configuration>
-        <option name="GRADLE_PROJECT_PATH" value=":app" />
-      </configuration>
-    </facet>
-    <facet type="android" name="Android">
-      <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <afterSyncTasks>
-          <task>generateDebugSources</task>
-        </afterSyncTasks>
-        <option name="ALLOW_USER_CONFIGURATION" value="false" />
-        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
-        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
-        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
-      </configuration>
-    </facet>
-    <facet type="kotlin-language" name="Kotlin">
-      <configuration version="3" platform="JVM 1.6" useProjectSettings="false">
-        <compilerSettings />
-        <compilerArguments>
-          <option name="destination" value="$MODULE_DIR$/build/tmp/kotlin-classes/debug" />
-          <option name="classpath" value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.0/683e04a4e7f17437d7e1390480f312e122e42e9e/kotlin-stdlib-jdk7-1.3.0.jar:/home/darkside/.gradle/caches/transforms-1/files-1.1/design-27.1.0.aar/5ca2e2fcd4119d11d987ce50addd21d3/jars/classes.jar:/home/darkside/.gradle/caches/transforms-1/files-1.1/appcompat-v7-27.1.0.aar/fcbe128b12829dd7f39a004dd39229e7/jars/classes.jar:/home/darkside/.gradle/caches/transforms-1/files-1.1/constraint-layout-1.1.2.aar/d2482662d1382e3df3108848c37fb7b9/jars/classes.jar:/home/darkside/.gradle/caches/transforms-1/files-1.1/support-v4-27.1.0.aar/631234fd7603425b34c9cbaa34915dd7/jars/classes.jar:/home/darkside/.gradle/caches/transforms-1/files-1.1/picasso-2.71828.aar/aa320a3988c502fe1fdfe28ee2da1d98/jars/classes.jar:/home/darkside/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.0/a134b0cfe9bb44f98b0b3e889cda07923eea9428/kotlin-stdlib-1.3.0.jar:/home/darkside/.gradle/caches/transforms-1/files-1.1/support-fragment-27.1.0.aar/651bb40da42a5ca740bcfc0d847e0912/jars/classes.jar:/home/darkside/.gradle/caches/transforms-1/files-1.1/animated-vector-drawable-27.1.0.aar/f6a2fa6cc369c9d12bacaa59c4d3f1bf/jars/classes.jar:/home/darkside/.gradle/caches/transforms-1/files-1.1/recyclerview-v7-27.1.0.aar/9f1c4102690fbb17053dccd795e01137/jars/classes.jar:/home/darkside/.gradle/caches/transforms-1/files-1.1/support-core-ui-27.1.0.aar/d9165daf4bc04b87f1a7e20c3de309c3/jars/classes.jar:/home/darkside/.gradle/caches/transforms-1/files-1.1/support-core-utils-27.1.0.aar/30ce600e445acd0cb51e748acd546585/jars/classes.jar:/home/darkside/.gradle/caches/transforms-1/files-1.1/support-vector-drawable-27.1.0.aar/9fab5380dc020a3469acca464bc41013/jars/classes.jar:/home/darkside/.gradle/caches/transforms-1/files-1.1/support-media-compat-27.1.0.aar/59a4778aff1fdcb2952e8b5d6f0208bb/jars/classes.jar:/home/darkside/.gradle/caches/transforms-1/files-1.1/transition-27.1.0.aar/2ea9f3cd8d724d3b7a776e6b72acf9a9/jars/classes.jar:/home/darkside/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/c286caee1c93d0e80861dabe0a6c7a4a/jars/classes.jar:/home/darkside/.gradle/caches/transforms-1/files-1.1/exifinterface-27.1.0.aar/64ca5adea99d80f9711e75f0ed7a7cca/jars/classes.jar:/home/darkside/.gradle/caches/modules-2/files-2.1/com.android.support/support-annotations/27.1.0/39ded76b5e1ce1c5b2688e1d25cdc20ecee32007/support-annotations-27.1.0.jar:/home/darkside/.gradle/caches/modules-2/files-2.1/com.android.support.constraint/constraint-layout-solver/1.1.2/bfc967828daffc35ba01c9ee204d98b664930a0f/constraint-layout-solver-1.1.2.jar:/home/darkside/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.10.0/7ef0f1d95bf4c0b3ba30bbae25e0e562b05cf75e/okhttp-3.10.0.jar:/home/darkside/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.0/84a2e0288dc17cd64d692eb1e5e0de8cd5ff0846/kotlin-stdlib-common-1.3.0.jar:/home/darkside/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/13.0/919f0dfe192fb4e063e7dacadee7f8bb9a2672a9/annotations-13.0.jar:/home/darkside/.gradle/caches/transforms-1/files-1.1/livedata-core-1.1.0.aar/baa40eba6814af0b70ebbc4f497dfb02/jars/classes.jar:/home/darkside/.gradle/caches/transforms-1/files-1.1/viewmodel-1.1.0.aar/340db1313bba434f4e2fb3a67536af36/jars/classes.jar:/home/darkside/.gradle/caches/transforms-1/files-1.1/runtime-1.1.0.aar/3e40a1ae27410bb30b8695b8029fbb68/jars/classes.jar:/home/darkside/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.14.0/102d7be47241d781ef95f1581d414b0943053130/okio-1.14.0.jar:/home/darkside/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/common/1.1.0/edf3f7bfb84a7521d0599efa3b0113a0ee90f85/common-1.1.0.jar:/home/darkside/.gradle/caches/transforms-1/files-1.1/runtime-1.1.0.aar/1600d21f7baef4bc63132f4ed14de45c/jars/classes.jar:/home/darkside/.gradle/caches/modules-2/files-2.1/android.arch.core/common/1.1.0/8007981f7d7540d89cd18471b8e5dcd2b4f99167/common-1.1.0.jar:/home/darkside/Android/Sdk/platforms/android-27/android.jar" />
-          <option name="noStdlib" value="true" />
-          <option name="noReflect" value="true" />
-          <option name="moduleName" value="app_debug" />
-          <option name="addCompilerBuiltIns" value="true" />
-          <option name="loadBuiltInsFromDependencies" value="true" />
-          <option name="languageVersion" value="1.3" />
-          <option name="apiVersion" value="1.3" />
-          <option name="pluginOptions">
-            <array>
-              <option value="plugin:org.jetbrains.kotlin.android:experimental=false" />
-              <option value="plugin:org.jetbrains.kotlin.android:enabled=true" />
-              <option value="plugin:org.jetbrains.kotlin.android:defaultCacheImplementation=hashMap" />
-            </array>
-          </option>
-          <option name="pluginClasspaths">
-            <array>
-              <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-android-extensions/1.3.0/87970b36b9e1855d0d0e4942865f63a1015026c9/kotlin-android-extensions-1.3.0.jar" />
-            </array>
-          </option>
-        </compilerArguments>
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6">
-    <output url="file://$MODULE_DIR$/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/classes" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources" />
-      <excludeFolder url="file://$MODULE_DIR$/build/generated/source/r" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotation_processor_list" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/apk_list" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/build-info" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundle_manifest" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-libraries" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/checkDebugClasspath" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check_manifest_result" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/compatible_screen_manifest" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-apk" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_app_manifest" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_app_info_output_file" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_merged_manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_split_apk_resources" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javac" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint_jar" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifest-checker" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_assets" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/metadata_feature_manifest" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/processed_res" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shader_assets" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/signing_config" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/split_list" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
-      <excludeFolder url="file://$MODULE_DIR$/build/kotlin" />
-      <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
-    </content>
-    <orderEntry type="jdk" jdkName="Android API 27 Platform" jdkType="Android SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata-core:1.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime:1.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.1.0@jar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support:support-annotations:27.1.1@jar" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.lifecycle:viewmodel:1.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout:1.1.2@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-idling-resource:3.0.2@aar" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.3.0@jar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:runner:1.0.2@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-media-compat:27.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:transition:27.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.core:runtime:1.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:recyclerview-v7:27.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable:27.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-core-utils:27.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.squareup:javawriter:2.1.1@jar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-core:3.0.2@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-annotations:27.1.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-v4:27.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0@jar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.google.code.findbugs:jsr305:2.0.1@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.14.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.picasso:picasso:2.71828@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:design:27.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: javax.inject:javax.inject:1@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-core-ui:27.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable:27.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:appcompat-v7:27.1.0@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:exifinterface:27.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-fragment:27.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:3.10.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout-solver:1.1.2@jar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:monitor:1.0.2@aar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-library:1.3@jar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-integration:1.3@jar" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.core:common:1.1.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.0@jar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: net.sf.kxml:kxml2:2.3.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-compat:27.1.0@aar" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/p2play.iml b/p2play.iml
deleted file mode 100644
index 8e75e30..0000000
--- a/p2play.iml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="p2play" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-    </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file

From 9bf8ea0483db403740e6d4e37b7b07b2dda1c085 Mon Sep 17 00:00:00 2001
From: ivan agosto <spartan360@live.com.mx>
Date: Thu, 24 Jan 2019 15:56:20 -0600
Subject: [PATCH 04/14] Adapter and model of commentaries maked

---
 .../org/libre/agosto/p2play/MainActivity.kt   | 24 ++++---
 .../agosto/p2play/ReproductorActivity.kt      | 46 ++++++++++--
 .../p2play/adapters/CommentariesAdapter.kt    | 71 +++++++++++++++++++
 .../agosto/p2play/models/CommentaryModel.kt   |  9 +++
 .../main/res/layout/activity_reproductor.xml  |  8 +++
 app/src/main/res/layout/view_commentary.xml   | 48 +++++++++++++
 6 files changed, 188 insertions(+), 18 deletions(-)
 create mode 100644 app/src/main/java/org/libre/agosto/p2play/adapters/CommentariesAdapter.kt
 create mode 100644 app/src/main/java/org/libre/agosto/p2play/models/CommentaryModel.kt
 create mode 100644 app/src/main/res/layout/view_commentary.xml

diff --git a/app/src/main/java/org/libre/agosto/p2play/MainActivity.kt b/app/src/main/java/org/libre/agosto/p2play/MainActivity.kt
index b58ab01..e236c93 100644
--- a/app/src/main/java/org/libre/agosto/p2play/MainActivity.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/MainActivity.kt
@@ -27,11 +27,11 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
     private lateinit var recyclerView: RecyclerView
     private lateinit var viewAdapter: RecyclerView.Adapter<*>
     private lateinit var viewManager: RecyclerView.LayoutManager
-    val client: Videos = Videos()
+    private val client: Videos = Videos()
     private lateinit var lastItem: MenuItem
     private lateinit var subItem: MenuItem
     lateinit var myMenu: Menu
-    val _db = Database(this)
+    private val _db = Database(this)
     var section: String = ""
 
 
@@ -67,7 +67,7 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
     }
 
     // Generic function for set data to RecyclerView
-    fun setData(data:ArrayList<VideoModel>){
+    private fun setData(data:ArrayList<VideoModel>){
         viewAdapter = VideosAdapter(data)
 
         recyclerView = findViewById<RecyclerView>(R.id.list).apply {
@@ -84,7 +84,7 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
         swipeContainer.isRefreshing = false
     }
 
-    fun refresh(){
+    private fun refresh(){
         swipeContainer.isRefreshing = true
         when(section){
             "local" -> this.getLocalVideos()
@@ -100,7 +100,7 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
         }
     }
 
-    fun getSubscriptionVideos(){
+    private fun getSubscriptionVideos(){
         if(ManagerSingleton.user.status != 1){
             ManagerSingleton.Toast("Inicia session primero")
             startActivity(Intent(this, LoginActivity::class.java))
@@ -118,7 +118,7 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
     }
 
     // Last videos
-    fun getLastVideos(){
+    private fun getLastVideos(){
         swipeContainer.isRefreshing = true
         section = "last"
         setTitle(R.string.title_recent)
@@ -130,8 +130,8 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
         }
     }
 
-    //
-    fun getPopularVideos(){
+    // Popular videos
+    private fun getPopularVideos(){
         swipeContainer.isRefreshing = true
         section = "popular"
         setTitle(R.string.title_popular)
@@ -143,7 +143,8 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
         }
     }
 
-    fun getLocalVideos(){
+    // Local videos
+    private fun getLocalVideos(){
         swipeContainer.isRefreshing = true
         section = "local"
         setTitle(R.string.title_local)
@@ -155,7 +156,8 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
         }
     }
 
-    fun getMyVideos(){
+    // Videos of user
+    private fun getMyVideos(){
         swipeContainer.isRefreshing = true
         section = "my_videos"
         setTitle(R.string.title_myVideos)
@@ -266,7 +268,7 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
         }
     }
 
-    fun logout(){
+    private fun logout(){
         if(::myMenu.isInitialized){
             myMenu.findItem(R.id.action_login).isVisible = true
             myMenu.findItem(R.id.action_logout).isVisible = false
diff --git a/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt b/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt
index 1877e22..e2a0a0a 100644
--- a/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt
@@ -6,10 +6,14 @@ import android.support.v7.app.AppCompatActivity
 import android.os.Bundle
 import android.os.Looper
 import android.support.v4.content.ContextCompat
+import android.support.v7.widget.LinearLayoutManager
+import android.support.v7.widget.RecyclerView
 import android.util.Log
 import android.view.View
 import com.squareup.picasso.Picasso
+import kotlinx.android.synthetic.main.activity_main.*
 import kotlinx.android.synthetic.main.activity_reproductor.*
+import org.libre.agosto.p2play.adapters.CommentariesAdapter
 import org.libre.agosto.p2play.ajax.Actions
 import org.libre.agosto.p2play.models.VideoModel
 
@@ -17,6 +21,11 @@ class ReproductorActivity : AppCompatActivity() {
     lateinit var video:VideoModel
     private val _actions: Actions = Actions()
 
+    // Commentaries adapter values
+    private lateinit var recyclerView: RecyclerView
+    private lateinit var viewAdapter: RecyclerView.Adapter<*>
+    private lateinit var viewManager: RecyclerView.LayoutManager
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_reproductor)
@@ -30,6 +39,30 @@ class ReproductorActivity : AppCompatActivity() {
         videoView.settings.allowUniversalAccessFromFileURLs = true
         videoView.settings.domStorageEnabled = true
 
+        try {
+
+            viewManager = LinearLayoutManager(this)
+
+            // Set data for RecyclerView
+            viewAdapter = CommentariesAdapter(arrayListOf())
+
+            recyclerView = findViewById<RecyclerView>(R.id.listCommentaries).apply {
+                // use this setting to improve performance if you know that changes
+                // in content do not change the layout size of the RecyclerView
+                setHasFixedSize(true)
+
+                // use a linear layout manager
+                layoutManager = viewManager
+
+                // specify an viewAdapter (see also next example)
+                adapter = viewAdapter
+            }
+
+        }catch (err: Exception){
+            err.printStackTrace()
+            Log.d("Error", err?.message)
+        }
+
         try {
             this.video =  this.intent.extras.getSerializable("video") as VideoModel
             tittleVideoTxt.text = this.video.name
@@ -47,13 +80,12 @@ class ReproductorActivity : AppCompatActivity() {
             Log.d("Error", err?.message)
         }
 
-        // subscribeBtn.setOnClickListener { ManagerSingleton.Toast(getString(R.string.comming)) }
         subscribeBtn.setOnClickListener { subscribe() }
         likeLayout.setOnClickListener { rate("like") }
         dislikeLayout.setOnClickListener { rate("dislike") }
     }
 
-    fun subscribe(){
+    private fun subscribe(){
         val account = this.video.userUuid+"@"+this.video.userHost
         AsyncTask.execute {
             if (Looper.myLooper() == null)
@@ -68,7 +100,7 @@ class ReproductorActivity : AppCompatActivity() {
         }
     }
 
-    fun unSubscribe(){
+    private fun unSubscribe(){
         val account = this.video.userUuid+"@"+this.video.userHost
         AsyncTask.execute {
             if (Looper.myLooper() == null)
@@ -83,7 +115,7 @@ class ReproductorActivity : AppCompatActivity() {
         }
     }
 
-    fun rate(rate: String){
+    private fun rate(rate: String){
         AsyncTask.execute {
             if (Looper.myLooper() == null)
                 Looper.prepare()
@@ -104,7 +136,7 @@ class ReproductorActivity : AppCompatActivity() {
         }
     }
 
-    fun getRate(){
+    private fun getRate(){
         AsyncTask.execute {
             if (Looper.myLooper() == null)
                 Looper.prepare()
@@ -128,7 +160,7 @@ class ReproductorActivity : AppCompatActivity() {
         }
     }
 
-    fun getSubscription(){
+    private fun getSubscription(){
         val account = this.video.userUuid+"@"+this.video.userHost
         AsyncTask.execute {
             if (Looper.myLooper() == null)
@@ -140,7 +172,7 @@ class ReproductorActivity : AppCompatActivity() {
         }
     }
 
-    fun changeSubscribeBtn(subscribed: Boolean){
+    private fun changeSubscribeBtn(subscribed: Boolean){
         if(subscribed){
             subscribeBtn.text = getText(R.string.unSubscribeBtn)
             subscribeBtn.setOnClickListener { this.unSubscribe() }
diff --git a/app/src/main/java/org/libre/agosto/p2play/adapters/CommentariesAdapter.kt b/app/src/main/java/org/libre/agosto/p2play/adapters/CommentariesAdapter.kt
new file mode 100644
index 0000000..0df1b35
--- /dev/null
+++ b/app/src/main/java/org/libre/agosto/p2play/adapters/CommentariesAdapter.kt
@@ -0,0 +1,71 @@
+package org.libre.agosto.p2play.adapters
+
+import android.app.Activity
+import android.content.Intent
+import android.graphics.drawable.Drawable
+import android.os.AsyncTask
+import android.support.v7.widget.RecyclerView
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.LinearLayout
+import android.widget.TextView
+import com.squareup.picasso.Picasso
+import org.libre.agosto.p2play.MainActivity
+import org.libre.agosto.p2play.ManagerSingleton
+import org.libre.agosto.p2play.R
+import org.libre.agosto.p2play.ReproductorActivity
+import org.libre.agosto.p2play.models.CommentaryModel
+import org.libre.agosto.p2play.models.VideoModel
+import java.io.InputStream
+import java.io.Serializable
+import java.net.URL
+
+class CommentariesAdapter(private val myDataset: ArrayList<CommentaryModel>) :
+        RecyclerView.Adapter<CommentariesAdapter.ViewHolder>() {
+
+    // Provide a reference to the views for each data item
+    // Complex data items may need more than one view per item, and
+    // you provide access to all the views for a data item in a view holder.
+    // Each data item is just a string in this case that is shown in a TextView.
+    class ViewHolder(val view: View) : RecyclerView.ViewHolder(view){
+        val userImg: ImageView
+        val username: TextView
+        val commentary: TextView
+
+        init {
+            // Define click listener for the ViewHolder's View
+            username = view.findViewById(R.id.userTxt)
+            commentary = view.findViewById(R.id.userCommentary)
+            userImg = view.findViewById(R.id.userCommentImg)
+        }
+    }
+
+
+    // Create new views (invoked by the layout manager)
+    override fun onCreateViewHolder(parent: ViewGroup,
+                                    viewType: Int): CommentariesAdapter.ViewHolder {
+        // create a new view
+        val view = LayoutInflater.from(parent.context)
+                .inflate(R.layout.view_video, parent, false) as View
+        // set the view's size, margins, paddings and layout parameters
+        return ViewHolder(view)
+    }
+
+    // Replace the contents of a view (invoked by the layout manager)
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+        // - get element from your dataset at this position
+        // - replace the contents of the view with that element
+        holder.username.text = myDataset[position].username
+
+        if(myDataset[position].userImageUrl!="")
+            Picasso.get().load("https://"+ManagerSingleton.url+myDataset[position].userImageUrl).into(holder.userImg);
+
+        holder.commentary.text = myDataset[position].commentary
+
+    }
+
+    // Return the size of your dataset (invoked by the layout manager)
+    override fun getItemCount() = myDataset.size
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/libre/agosto/p2play/models/CommentaryModel.kt b/app/src/main/java/org/libre/agosto/p2play/models/CommentaryModel.kt
new file mode 100644
index 0000000..2ab6093
--- /dev/null
+++ b/app/src/main/java/org/libre/agosto/p2play/models/CommentaryModel.kt
@@ -0,0 +1,9 @@
+package org.libre.agosto.p2play.models
+
+class CommentaryModel (
+        var id: Int = 0,
+        var uuid: Int = 0,
+        var username: String = "",
+        var userImageUrl: String = "",
+        var commentary: String = ""
+)
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_reproductor.xml b/app/src/main/res/layout/activity_reproductor.xml
index a4195ff..29361e9 100644
--- a/app/src/main/res/layout/activity_reproductor.xml
+++ b/app/src/main/res/layout/activity_reproductor.xml
@@ -227,6 +227,14 @@
 
             </LinearLayout>
 
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/listCommentaries"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
 
         </LinearLayout>
     </ScrollView>
diff --git a/app/src/main/res/layout/view_commentary.xml b/app/src/main/res/layout/view_commentary.xml
new file mode 100644
index 0000000..7f42519
--- /dev/null
+++ b/app/src/main/res/layout/view_commentary.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="horizontal"
+        android:paddingLeft="10dp"
+        android:paddingRight="10dp">
+
+        <ImageView
+            android:id="@+id/userCommentImg"
+            android:layout_width="100dp"
+            android:layout_height="60dp"
+            android:layout_weight="1"
+            android:contentDescription="@string/app_name"
+            app:srcCompat="@drawable/default_avatar" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical"
+            android:paddingLeft="10dp"
+            android:paddingRight="10dp">
+
+            <TextView
+                android:id="@+id/userTxt"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textColor="@android:color/darker_gray"
+                android:textStyle="italic" />
+
+            <TextView
+                android:id="@+id/userCommentary"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:autoLink="web"
+                android:linksClickable="true"
+                android:maxLength="1000"
+                android:maxLines="10" />
+        </LinearLayout>
+    </LinearLayout>
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file

From 5cf806577a9df2affaa53fb26fc6fad62d4ac5da Mon Sep 17 00:00:00 2001
From: ivan agosto <spartan360@live.com.mx>
Date: Fri, 25 Jan 2019 11:38:37 -0600
Subject: [PATCH 05/14] Ajax petitions for commentaries

---
 .../org/libre/agosto/p2play/ajax/Comments.kt  | 92 +++++++++++++++++++
 .../agosto/p2play/models/CommentaryModel.kt   |  7 +-
 2 files changed, 97 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/java/org/libre/agosto/p2play/ajax/Comments.kt

diff --git a/app/src/main/java/org/libre/agosto/p2play/ajax/Comments.kt b/app/src/main/java/org/libre/agosto/p2play/ajax/Comments.kt
new file mode 100644
index 0000000..043357e
--- /dev/null
+++ b/app/src/main/java/org/libre/agosto/p2play/ajax/Comments.kt
@@ -0,0 +1,92 @@
+package org.libre.agosto.p2play.ajax
+
+import android.util.JsonReader
+import android.util.JsonToken
+import android.util.Log
+import org.libre.agosto.p2play.models.CommentaryModel
+import java.io.InputStreamReader
+
+class Comments: Client() {
+
+    fun parseCommentaries(data: JsonReader): ArrayList<CommentaryModel> {
+        var commentaries = arrayListOf<CommentaryModel>()
+        data.beginObject()
+        while (data.hasNext()){
+            when(data.nextName()) {
+                "data" -> {
+                    data.beginArray()
+                    while (data.hasNext()) {
+                        val comment = CommentaryModel()
+                        data.beginObject()
+                        while (data.hasNext()) {
+                            val key = data.nextName()
+                            when (key.toString()) {
+                                "id" -> comment.id = data.nextInt()
+                                "threadId" -> comment.threadId = data.nextInt()
+                                "text" -> comment.commentary = data.nextString()
+                                "totalReplies" -> comment.replies = data.nextInt()
+                                "account" -> {
+                                    data.beginObject()
+                                    while (data.hasNext()){
+                                        val acKey = data.nextName()
+                                        when(acKey.toString()){
+                                            "displayName"-> comment.username=data.nextString()
+                                            "avatar"-> {
+                                                if(data.peek() == JsonToken.BEGIN_OBJECT){
+                                                    data.beginObject()
+                                                    while (data.hasNext()){
+                                                        val avKey = data.nextName()
+                                                        when(avKey){
+                                                            "path"-> comment.userImageUrl = data.nextString()
+                                                            else-> data.skipValue()
+                                                        }
+                                                    }
+                                                    data.endObject()
+                                                }
+                                                else
+                                                    data.skipValue()
+
+                                            }
+                                            "uuid" -> comment.userUuid = data.nextString()
+                                            "host" -> comment.userHost = data.nextString()
+                                            else -> data.skipValue()
+                                        }
+                                    }
+                                    data.endObject()
+                                }
+                                else -> data.skipValue()
+                            }
+                        }
+                        data.endObject()
+                        commentaries.add(comment)
+                    }
+                    data.endArray()
+                }
+                else -> data.skipValue()
+            }
+        }
+        data.endObject()
+
+        return commentaries
+    }
+
+    fun getCommentaries(videoId: Int): ArrayList<CommentaryModel> {
+        var commentaries = arrayListOf<CommentaryModel>()
+        val con = this._newCon("videos/$videoId/comment-threads", "GET")
+
+        try {
+            if (con.responseCode == 200) {
+                var response = InputStreamReader(con.inputStream)
+                var data = JsonReader(response)
+                commentaries = parseCommentaries(data)
+            }
+        } catch(err:Exception){
+            err?.printStackTrace()
+            Log.d("TypeErr",err?.message ,err.cause)
+            Log.d("Error","fallo la coneccion")
+        }
+
+        return commentaries
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/libre/agosto/p2play/models/CommentaryModel.kt b/app/src/main/java/org/libre/agosto/p2play/models/CommentaryModel.kt
index 2ab6093..f1b5b47 100644
--- a/app/src/main/java/org/libre/agosto/p2play/models/CommentaryModel.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/models/CommentaryModel.kt
@@ -2,8 +2,11 @@ package org.libre.agosto.p2play.models
 
 class CommentaryModel (
         var id: Int = 0,
-        var uuid: Int = 0,
+        var threadId: Int = 0,
+        var userUuid: String = "",
         var username: String = "",
         var userImageUrl: String = "",
-        var commentary: String = ""
+        var commentary: String = "",
+        var userHost: String = "",
+        var replies: Int = 0
 )
\ No newline at end of file

From ab69d59f9ad8f03217473e44661961d71ce4bc8e Mon Sep 17 00:00:00 2001
From: ivan agosto <spartan360@live.com.mx>
Date: Fri, 25 Jan 2019 11:38:59 -0600
Subject: [PATCH 06/14] Showing commentaries on videos

---
 .../agosto/p2play/ReproductorActivity.kt      | 61 +++++++++++--------
 .../p2play/adapters/CommentariesAdapter.kt    |  2 +-
 .../main/res/layout/activity_reproductor.xml  |  1 +
 app/src/main/res/layout/view_commentary.xml   | 11 ++--
 4 files changed, 44 insertions(+), 31 deletions(-)

diff --git a/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt b/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt
index e2a0a0a..7f3911e 100644
--- a/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt
@@ -15,11 +15,14 @@ import kotlinx.android.synthetic.main.activity_main.*
 import kotlinx.android.synthetic.main.activity_reproductor.*
 import org.libre.agosto.p2play.adapters.CommentariesAdapter
 import org.libre.agosto.p2play.ajax.Actions
+import org.libre.agosto.p2play.ajax.Comments
+import org.libre.agosto.p2play.models.CommentaryModel
 import org.libre.agosto.p2play.models.VideoModel
 
 class ReproductorActivity : AppCompatActivity() {
     lateinit var video:VideoModel
     private val _actions: Actions = Actions()
+    private val client: Comments = Comments()
 
     // Commentaries adapter values
     private lateinit var recyclerView: RecyclerView
@@ -39,30 +42,6 @@ class ReproductorActivity : AppCompatActivity() {
         videoView.settings.allowUniversalAccessFromFileURLs = true
         videoView.settings.domStorageEnabled = true
 
-        try {
-
-            viewManager = LinearLayoutManager(this)
-
-            // Set data for RecyclerView
-            viewAdapter = CommentariesAdapter(arrayListOf())
-
-            recyclerView = findViewById<RecyclerView>(R.id.listCommentaries).apply {
-                // use this setting to improve performance if you know that changes
-                // in content do not change the layout size of the RecyclerView
-                setHasFixedSize(true)
-
-                // use a linear layout manager
-                layoutManager = viewManager
-
-                // specify an viewAdapter (see also next example)
-                adapter = viewAdapter
-            }
-
-        }catch (err: Exception){
-            err.printStackTrace()
-            Log.d("Error", err?.message)
-        }
-
         try {
             this.video =  this.intent.extras.getSerializable("video") as VideoModel
             tittleVideoTxt.text = this.video.name
@@ -73,13 +52,19 @@ class ReproductorActivity : AppCompatActivity() {
             if(this.video.userImageUrl!="")
                 Picasso.get().load("https://"+ManagerSingleton.url+this.video.userImageUrl).into(userImg)
             videoView.loadUrl("https://"+ManagerSingleton.url+this.video.embedUrl)
-            Log.d("url", videoView.url)
+
+
         }
         catch (err:Exception){
             err.printStackTrace()
             Log.d("Error", err?.message)
         }
 
+        viewManager = LinearLayoutManager(this)
+        this.setDataComments(arrayListOf())
+
+        this.getComments()
+
         subscribeBtn.setOnClickListener { subscribe() }
         likeLayout.setOnClickListener { rate("like") }
         dislikeLayout.setOnClickListener { rate("dislike") }
@@ -183,6 +168,32 @@ class ReproductorActivity : AppCompatActivity() {
         }
     }
 
+    private fun setDataComments(data: ArrayList<CommentaryModel>) {
+        // Set data for RecyclerView
+        viewAdapter = CommentariesAdapter(data)
+
+        recyclerView = findViewById<RecyclerView>(R.id.listCommentaries).apply {
+            // use this setting to improve performance if you know that changes
+            // in content do not change the layout size of the RecyclerView
+            setHasFixedSize(true)
+
+            // use a linear layout manager
+            layoutManager = viewManager
+
+            // specify an viewAdapter (see also next example)
+            adapter = viewAdapter
+        }
+    }
+
+    private fun getComments() {
+        AsyncTask.execute {
+            val data = this.client.getCommentaries(this.video.id)
+            runOnUiThread {
+                this.setDataComments(data)
+            }
+        }
+    }
+
     override fun onResume() {
         super.onResume()
         if(ManagerSingleton.user.status == 1) {
diff --git a/app/src/main/java/org/libre/agosto/p2play/adapters/CommentariesAdapter.kt b/app/src/main/java/org/libre/agosto/p2play/adapters/CommentariesAdapter.kt
index 0df1b35..7053460 100644
--- a/app/src/main/java/org/libre/agosto/p2play/adapters/CommentariesAdapter.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/adapters/CommentariesAdapter.kt
@@ -48,7 +48,7 @@ class CommentariesAdapter(private val myDataset: ArrayList<CommentaryModel>) :
                                     viewType: Int): CommentariesAdapter.ViewHolder {
         // create a new view
         val view = LayoutInflater.from(parent.context)
-                .inflate(R.layout.view_video, parent, false) as View
+                .inflate(R.layout.view_commentary, parent, false) as View
         // set the view's size, margins, paddings and layout parameters
         return ViewHolder(view)
     }
diff --git a/app/src/main/res/layout/activity_reproductor.xml b/app/src/main/res/layout/activity_reproductor.xml
index 29361e9..b32611d 100644
--- a/app/src/main/res/layout/activity_reproductor.xml
+++ b/app/src/main/res/layout/activity_reproductor.xml
@@ -231,6 +231,7 @@
                 android:id="@+id/listCommentaries"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:scrollbars="none"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/view_commentary.xml b/app/src/main/res/layout/view_commentary.xml
index 7f42519..37c9051 100644
--- a/app/src/main/res/layout/view_commentary.xml
+++ b/app/src/main/res/layout/view_commentary.xml
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="wrap_content">
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:orientation="horizontal"
         android:paddingLeft="10dp"
-        android:paddingRight="10dp">
+        android:paddingRight="10dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
 
         <ImageView
             android:id="@+id/userCommentImg"

From 176e580f1f47c19ac79e3b4b905a012f5d69224f Mon Sep 17 00:00:00 2001
From: ivan agosto <spartan360@live.com.mx>
Date: Fri, 25 Jan 2019 12:30:48 -0600
Subject: [PATCH 07/14] Make commentaries on videos

---
 .../agosto/p2play/ReproductorActivity.kt      | 28 +++++++++++++++++--
 .../org/libre/agosto/p2play/ajax/Comments.kt  | 20 +++++++++++++
 .../main/res/layout/activity_reproductor.xml  | 15 ++++++----
 app/src/main/res/values-es/strings.xml        |  3 ++
 app/src/main/res/values/strings.xml           |  9 ++++--
 5 files changed, 64 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt b/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt
index 7f3911e..6828307 100644
--- a/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt
@@ -1,6 +1,5 @@
 package org.libre.agosto.p2play
 
-import android.opengl.Visibility
 import android.os.AsyncTask
 import android.support.v7.app.AppCompatActivity
 import android.os.Bundle
@@ -11,7 +10,6 @@ import android.support.v7.widget.RecyclerView
 import android.util.Log
 import android.view.View
 import com.squareup.picasso.Picasso
-import kotlinx.android.synthetic.main.activity_main.*
 import kotlinx.android.synthetic.main.activity_reproductor.*
 import org.libre.agosto.p2play.adapters.CommentariesAdapter
 import org.libre.agosto.p2play.ajax.Actions
@@ -68,6 +66,7 @@ class ReproductorActivity : AppCompatActivity() {
         subscribeBtn.setOnClickListener { subscribe() }
         likeLayout.setOnClickListener { rate("like") }
         dislikeLayout.setOnClickListener { rate("dislike") }
+        commentaryBtn.setOnClickListener { makeComment() }
     }
 
     private fun subscribe(){
@@ -194,6 +193,27 @@ class ReproductorActivity : AppCompatActivity() {
         }
     }
 
+    private fun makeComment() {
+        if(commentaryText.text.toString() == ""){
+            ManagerSingleton.Toast(getString(R.string.emptyCommentaryMsg))
+            return
+        }
+        val text = commentaryText.text.toString()
+        AsyncTask.execute {
+            val res = this.client.makeCommentary(ManagerSingleton.token.token, this.video.id, text)
+            runOnUiThread {
+                if (res) {
+                    ManagerSingleton.Toast(getString(R.string.makedCommentaryMsg))
+                    commentaryText.text.clear()
+                    this.getComments()
+                }
+                else {
+                    ManagerSingleton.Toast(getString(R.string.errorCommentaryMsg))
+                }
+            }
+        }
+    }
+
     override fun onResume() {
         super.onResume()
         if(ManagerSingleton.user.status == 1) {
@@ -201,6 +221,10 @@ class ReproductorActivity : AppCompatActivity() {
             this.getSubscription()
             actionsLayout.visibility = View.VISIBLE
             subscribeBtn.visibility = View.VISIBLE
+            commentaryLayout.visibility = View.VISIBLE
+            if(ManagerSingleton.user.avatar != ""){
+                Picasso.get().load("https://"+ManagerSingleton.url+ManagerSingleton.user.avatar).into(userImgCom)
+            }
         }
     }
 }
diff --git a/app/src/main/java/org/libre/agosto/p2play/ajax/Comments.kt b/app/src/main/java/org/libre/agosto/p2play/ajax/Comments.kt
index 043357e..a909a60 100644
--- a/app/src/main/java/org/libre/agosto/p2play/ajax/Comments.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/ajax/Comments.kt
@@ -89,4 +89,24 @@ class Comments: Client() {
         return commentaries
     }
 
+    fun makeCommentary(token: String, videoId: Int, text: String): Boolean {
+        val con = this._newCon("videos/$videoId/comment-threads", "POST", token)
+        val params:String= "text=$text"
+        con.outputStream.write(params.toByteArray())
+
+        try {
+            if (con.responseCode == 200) {
+                return true
+            }
+            else{
+                Log.d("Status", con.responseMessage)
+            }
+        }
+        catch (err: Exception){
+            err.printStackTrace()
+        }
+
+        return false
+    }
+
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_reproductor.xml b/app/src/main/res/layout/activity_reproductor.xml
index b32611d..18af040 100644
--- a/app/src/main/res/layout/activity_reproductor.xml
+++ b/app/src/main/res/layout/activity_reproductor.xml
@@ -192,9 +192,11 @@
                 android:text="@string/commentariesTxt" />
 
             <LinearLayout
+                android:id="@+id/commentaryLayout"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                android:visibility="visible">
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -202,9 +204,9 @@
                     android:orientation="horizontal">
 
                     <ImageView
-                        android:id="@+id/imageView3"
-                        android:layout_width="40dp"
-                        android:layout_height="50dp"
+                        android:id="@+id/userImgCom"
+                        android:layout_width="10dp"
+                        android:layout_height="60dp"
                         android:layout_weight="1"
                         app:srcCompat="@drawable/default_avatar" />
 
@@ -212,14 +214,15 @@
                         android:id="@+id/commentaryText"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1"
+                        android:layout_weight="2"
                         android:ems="10"
                         android:inputType="textMultiLine" />
 
                 </LinearLayout>
 
                 <Button
-                    android:id="@+id/button2"
+                    android:id="@+id/commentaryBtn"
+                    style="@style/Widget.AppCompat.Button.Colored"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:layout_weight="1"
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 7da1628..a0089c9 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -75,6 +75,9 @@
     <string name="subscribeMsg">Te has subscribido a este canal</string>
     <string name="rateMsg">Has valorado este video</string>
     <string name="unSubscribeMsg">Te has desubscribido de este canal</string>
+    <string name="makedCommentaryMsg">Has comentado este video</string>
+    <string name="errorCommentaryMsg">A ocurrido un error, intenta de nuevo</string>
+    <string name="emptyCommentaryMsg">Porfavor has un comentario primero</string>
     <!-- End Reproductor strings -->
     <!-- Start Settings strings -->
     <string name="title_activity_settings">Configuracion</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 12f15c4..146758e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -5,7 +5,7 @@
     <string name="navigation_drawer_open" translatable="false">Open navigation drawer</string>
     <string name="navigation_drawer_close" translatable="false">Close navigation drawer</string>
     <string name="nav_header_desc" translatable="false">Navigation header</string>
-    <string name="comming">Comming soon!</string>
+    <string name="comming">Coming soon!</string>
     <!-- End Global string -->
 
 
@@ -35,10 +35,10 @@
     <string name="registerActionBtn">Create new account</string>
     <!-- Toast msg -->
     <string name="loginSuccess_msg">You are logged</string>
-    <string name="loginError_msg">An error has ocurred</string>
+    <string name="loginError_msg">An error has occurred</string>
     <string name="loginFailed_msg">Invalid credentials</string>
     <string name="registerSuccess_msg">You are registered</string>
-    <string name="registerError_msg">An error has ocurred</string>
+    <string name="registerError_msg">An error has occurred</string>
     <string name="registerFailed_msg">Invalid data</string>
     <!-- Register msg -->
     <string name="registerBtn">Register now</string>
@@ -85,6 +85,9 @@
     <string name="subscribeMsg">You are subscribed to this channel</string>
     <string name="rateMsg">You are rated the video</string>
     <string name="unSubscribeMsg">You are unsubscribed to this channel</string>
+    <string name="makedCommentaryMsg">You are commented this video</string>
+    <string name="errorCommentaryMsg">An error has occurred, try again</string>
+    <string name="emptyCommentaryMsg">Please make a comment first</string>
     <!-- End Reproductor strings -->
     <!-- Start Settings strings -->
     <string name="title_activity_settings">Settings</string>

From e74e39fe28fc5833136efcd388ea358cb8e9ad84 Mon Sep 17 00:00:00 2001
From: ivan agosto <spartan360@live.com.mx>
Date: Fri, 25 Jan 2019 12:35:15 -0600
Subject: [PATCH 08/14] Color of buttons changed

---
 app/src/main/res/layout/activity_host.xml     | 1 +
 app/src/main/res/layout/activity_login.xml    | 2 ++
 app/src/main/res/layout/activity_register.xml | 1 +
 3 files changed, 4 insertions(+)

diff --git a/app/src/main/res/layout/activity_host.xml b/app/src/main/res/layout/activity_host.xml
index 2049a50..25f7f13 100644
--- a/app/src/main/res/layout/activity_host.xml
+++ b/app/src/main/res/layout/activity_host.xml
@@ -56,6 +56,7 @@
 
             <Button
                 android:id="@+id/button"
+                style="@style/Widget.AppCompat.Button.Colored"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/okButton" />
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 3135acc..8ce0137 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -76,6 +76,7 @@
 
             <Button
                 android:id="@+id/loginBtn"
+                style="@style/Widget.AppCompat.Button.Colored"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/loginBtn"
@@ -87,6 +88,7 @@
 
             <Button
                 android:id="@+id/registerActionBtn"
+                style="@style/Widget.AppCompat.Button.Borderless"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/registerActionBtn"
diff --git a/app/src/main/res/layout/activity_register.xml b/app/src/main/res/layout/activity_register.xml
index acb9e6d..ad4e7a9 100644
--- a/app/src/main/res/layout/activity_register.xml
+++ b/app/src/main/res/layout/activity_register.xml
@@ -90,6 +90,7 @@
 
             <Button
                 android:id="@+id/registerBtn"
+                style="@style/Widget.AppCompat.Button.Colored"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/registerBtn"

From abec98d172ff9ec9cebd78177edfa6a0d061911d Mon Sep 17 00:00:00 2001
From: ivan agosto <spartan360@live.com.mx>
Date: Mon, 28 Jan 2019 14:54:08 -0600
Subject: [PATCH 09/14] Splash screen + commentaries changes

---
 app/src/main/AndroidManifest.xml              | 11 ++-
 .../org/libre/agosto/p2play/HostActivity.kt   | 37 +-------
 .../org/libre/agosto/p2play/SplashActivity.kt | 95 +++++++++++++++++++
 .../main/res/layout/activity_reproductor.xml  | 22 +++--
 app/src/main/res/layout/activity_splash.xml   | 58 +++++++++++
 app/src/main/res/values-es/strings.xml        |  1 +
 app/src/main/res/values/strings.xml           |  1 +
 7 files changed, 182 insertions(+), 43 deletions(-)
 create mode 100644 app/src/main/java/org/libre/agosto/p2play/SplashActivity.kt
 create mode 100644 app/src/main/res/layout/activity_splash.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0fd316f..359a8dc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -7,19 +7,22 @@
 
     <application
         android:allowBackup="true"
+        android:hardwareAccelerated="true"
         android:icon="@mipmap/ic_p2play"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_p2play"
         android:supportsRtl="true"
-        android:theme="@style/P2playTheme"
-        android:hardwareAccelerated="true">
-        <activity android:name=".HostActivity">
+        android:theme="@style/P2playTheme">
+        <activity
+            android:name=".SplashActivity"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity android:name=".HostActivity" />
         <activity
             android:name=".MainActivity"
             android:theme="@style/P2playTheme.NoActionBar" />
@@ -29,7 +32,7 @@
         <activity android:name=".AboutActivity" />
         <activity
             android:name=".SettingsActivity"
-            android:label="@string/title_activity_settings"></activity>
+            android:label="@string/title_activity_settings" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/org/libre/agosto/p2play/HostActivity.kt b/app/src/main/java/org/libre/agosto/p2play/HostActivity.kt
index ade6200..8c7ea2f 100644
--- a/app/src/main/java/org/libre/agosto/p2play/HostActivity.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/HostActivity.kt
@@ -29,48 +29,20 @@ class HostActivity : AppCompatActivity() {
             getKeys(hostText.text.toString())
         }
 
-        val host = settings.getString("hostP2play","")
-        val lastHost = settings.getString("last_host","")
+        val host = settings.getString("hostP2play", "")
+        val lastHost = settings.getString("last_host", "")
         if(host!=""){
             if(lastHost!=host){
                 _db.logout()
                 getKeys(host)
             }else{
                 ManagerSingleton.url=host
-                checkUser()
+                startApp()
             }
         }
     }
 
-    fun checkUser(){
-        val token = _db.getToken()
-        val user = _db.getUser()
-        AsyncTask.execute {
-            if (Looper.myLooper() == null)
-                Looper.prepare()
 
-            startApp()
-            if (token.status == 1 && user.status == 1) {
-                val client_id = settings.getString("client_id", "")
-                val client_secret = settings.getString("client_secret", "")
-
-                val newToken = client.refreshToken(token, client_id, client_secret)
-
-                when (token.status.toString()) {
-                    "1" -> {
-                        _db.newToken(newToken)
-                        ManagerSingleton.token = newToken
-                        ManagerSingleton.user = user
-                    }
-                    else -> _db.logout()
-                }
-            } else {
-                _db.logout()
-            }
-            
-            this.finish()
-        }
-    }
 
     fun saveHost(host: String){
         editor.putString("last_host",host)
@@ -78,7 +50,7 @@ class HostActivity : AppCompatActivity() {
         editor.apply()
         ManagerSingleton.Toast(getString(R.string.finallyMsg))
         ManagerSingleton.url=host
-        checkUser()
+        startApp()
     }
 
     private fun getKeys(hostText: String){
@@ -112,6 +84,7 @@ class HostActivity : AppCompatActivity() {
         runOnUiThread {
             val intent = Intent(ManagerSingleton.context,MainActivity::class.java)
             startActivity(intent)
+            this.finish()
         }
     }
 }
diff --git a/app/src/main/java/org/libre/agosto/p2play/SplashActivity.kt b/app/src/main/java/org/libre/agosto/p2play/SplashActivity.kt
new file mode 100644
index 0000000..15ab068
--- /dev/null
+++ b/app/src/main/java/org/libre/agosto/p2play/SplashActivity.kt
@@ -0,0 +1,95 @@
+package org.libre.agosto.p2play
+
+import android.content.Intent
+import android.content.SharedPreferences
+import android.os.AsyncTask
+import android.support.v7.app.AppCompatActivity
+import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
+import android.preference.PreferenceManager
+import org.libre.agosto.p2play.ajax.Auth
+
+class SplashActivity : AppCompatActivity() {
+    lateinit var settings: SharedPreferences
+    lateinit var editor: SharedPreferences.Editor
+    val client: Auth = Auth()
+    val _db = Database(this)
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_splash)
+
+        settings = PreferenceManager.getDefaultSharedPreferences(this)
+
+        editor = settings.edit()
+        ManagerSingleton.context = this
+
+        val host = settings.getString("hostP2play","")
+        val lastHost = settings.getString("last_host","")
+        if(host!=""){
+            if(lastHost!=host){
+                _db.logout()
+                Handler().postDelayed({
+                    startHostActivity()
+                }, 2000)
+            }else{
+                ManagerSingleton.url=host
+                checkUser()
+            }
+        }
+
+        Handler().postDelayed({
+            startHostActivity()
+        }, 2000)
+    }
+
+    private fun checkUser(){
+        val token = _db.getToken()
+        val user = _db.getUser()
+        AsyncTask.execute {
+            if (Looper.myLooper() == null)
+                Looper.prepare()
+
+
+            if (token.status == 1 && user.status == 1) {
+                val client_id = settings.getString("client_id", "")
+                val client_secret = settings.getString("client_secret", "")
+
+                val newToken = client.refreshToken(token, client_id, client_secret)
+
+                when (token.status.toString()) {
+                    "1" -> {
+                        _db.newToken(newToken)
+                        ManagerSingleton.token = newToken
+                        ManagerSingleton.user = user
+                    }
+                    else -> _db.logout()
+                }
+            } else {
+                _db.logout()
+            }
+
+            Handler().postDelayed({
+                startApp()
+            }, 2000)
+
+        }
+    }
+
+    private fun startApp() {
+        runOnUiThread {
+            val intent = Intent(ManagerSingleton.context, MainActivity::class.java)
+            startActivity(intent)
+            this.finish()
+        }
+    }
+
+    private fun startHostActivity() {
+        runOnUiThread {
+            val intent = Intent(ManagerSingleton.context, HostActivity::class.java)
+            startActivity(intent)
+            this.finish()
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_reproductor.xml b/app/src/main/res/layout/activity_reproductor.xml
index 18af040..e2dbbff 100644
--- a/app/src/main/res/layout/activity_reproductor.xml
+++ b/app/src/main/res/layout/activity_reproductor.xml
@@ -160,22 +160,22 @@
                 android:id="@+id/descriptionTxt"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:maxLength="1000"
+                android:maxLines="100"
                 android:paddingLeft="5dp"
                 android:text="@string/descriptionTxt" />
 
             <ScrollView
                 android:layout_width="match_parent"
-                android:layout_height="80dp">
+                android:layout_height="80dp"
+                android:scrollbarStyle="insideInset">
 
                 <TextView
                     android:id="@+id/descriptionVideoTxt"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:inputType="none|textLongMessage"
                     android:maxLength="1000"
-                    android:maxLines="10"
-                    android:text="-"
-                    android:textStyle="italic" />
+                    android:maxLines="100" />
             </ScrollView>
 
             <View
@@ -184,6 +184,10 @@
                 android:layout_height="1dp"
                 android:background="?android:attr/listDivider" />
 
+            <Space
+                android:layout_width="match_parent"
+                android:layout_height="30dp" />
+
             <TextView
                 android:id="@+id/commentariesTxt"
                 android:layout_width="match_parent"
@@ -191,12 +195,16 @@
                 android:paddingLeft="5dp"
                 android:text="@string/commentariesTxt" />
 
+            <Space
+                android:layout_width="match_parent"
+                android:layout_height="20dp" />
+
             <LinearLayout
                 android:id="@+id/commentaryLayout"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:visibility="visible">
+                android:visibility="gone">
 
                 <LinearLayout
                     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml
new file mode 100644
index 0000000..b6af49d
--- /dev/null
+++ b/app/src/main/res/layout/activity_splash.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout 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:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".SplashActivity">
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="32dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+            <ImageView
+                android:id="@+id/imageView2"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:contentDescription="@string/app_name"
+                app:srcCompat="@drawable/icon" />
+
+            <Space
+                android:layout_width="match_parent"
+                android:layout_height="30dp" />
+
+            <TextView
+                android:id="@+id/hostInfoText"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/charging"
+                android:textAlignment="center"
+                android:textAppearance="@android:style/TextAppearance.Material.Medium.Inverse"
+                android:textColor="@android:color/black" />
+
+            <Space
+                android:layout_width="match_parent"
+                android:layout_height="30dp" />
+
+            <ProgressBar
+                android:id="@+id/progressBar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:backgroundTint="?attr/colorAccent"
+                android:indeterminate="true" />
+
+        </LinearLayout>
+    </FrameLayout>
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index a0089c9..976888b 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -2,6 +2,7 @@
 <resources>
     <!-- Start Global strings -->
     <string name="comming">Proximamente</string>
+    <string name="charging">Cargando...</string>
     <!-- End Global strings -->
 
     <!-- Start About strings -->
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 146758e..99c09a3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -6,6 +6,7 @@
     <string name="navigation_drawer_close" translatable="false">Close navigation drawer</string>
     <string name="nav_header_desc" translatable="false">Navigation header</string>
     <string name="comming">Coming soon!</string>
+    <string name="charging">Loading...</string>
     <!-- End Global string -->
 
 

From 7930ffa582b8eb695939dad1c6b4e77246e22821 Mon Sep 17 00:00:00 2001
From: ivan agosto <spartan360@live.com.mx>
Date: Tue, 29 Jan 2019 14:56:50 -0600
Subject: [PATCH 10/14] Splash screen fix + description on videos

---
 .../java/org/libre/agosto/p2play/Database.kt  | 29 +++++----
 .../org/libre/agosto/p2play/HostActivity.kt   |  1 +
 .../agosto/p2play/ReproductorActivity.kt      | 58 ++++++++++++++++-
 .../org/libre/agosto/p2play/SplashActivity.kt | 65 +++++++++++--------
 .../main/res/layout/activity_reproductor.xml  | 58 ++++++++++-------
 app/src/main/res/values-es/strings.xml        |  1 +
 app/src/main/res/values/strings.xml           |  1 +
 7 files changed, 149 insertions(+), 64 deletions(-)

diff --git a/app/src/main/java/org/libre/agosto/p2play/Database.kt b/app/src/main/java/org/libre/agosto/p2play/Database.kt
index 200a865..af0dabe 100644
--- a/app/src/main/java/org/libre/agosto/p2play/Database.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/Database.kt
@@ -61,12 +61,14 @@ class Database(context:Context): SQLiteOpenHelper(context,"p2play",null,1) {
 
         try {
             var cursor= db.rawQuery("SELECT * FROM tokens WHERE status=1 ORDER BY id DESC LIMIT 1",null)
-            cursor.moveToFirst()
 
-            token.token = cursor.getString(cursor.getColumnIndex("token")).toString()
-            token.refresh_token = cursor.getString(cursor.getColumnIndex("refresh_token")).toString()
-            token.status = cursor.getString(cursor.getColumnIndex("status")).toInt()
+            if(cursor.count != 0){
+                cursor.moveToFirst()
 
+                token.token = cursor.getString(cursor.getColumnIndex("token")).toString()
+                token.refresh_token = cursor.getString(cursor.getColumnIndex("refresh_token")).toString()
+                token.status = cursor.getString(cursor.getColumnIndex("status")).toInt()
+            }
             cursor.close()
 
             return token
@@ -85,15 +87,18 @@ class Database(context:Context): SQLiteOpenHelper(context,"p2play",null,1) {
 
         try {
             var cursor= db.rawQuery("SELECT * FROM users WHERE status=1 ORDER BY id DESC LIMIT 1",null)
-            cursor.moveToFirst()
 
-            user.uuid = cursor.getString(cursor.getColumnIndex("uuid")).toInt()
-            user.username = cursor.getString(cursor.getColumnIndex("username")).toString()
-            user.email = cursor.getString(cursor.getColumnIndex("email")).toString()
-            user.nsfw = cursor.getString(cursor.getColumnIndex("nsfw")).toBoolean()
-            user.followers = cursor.getString(cursor.getColumnIndex("followers")).toInt()
-            user.avatar = cursor.getString(cursor.getColumnIndex("avatar")).toString()
-            user.status = cursor.getString(cursor.getColumnIndex("status")).toInt()
+            if(cursor.count != 0){
+                cursor.moveToFirst()
+
+                user.uuid = cursor.getString(cursor.getColumnIndex("uuid")).toInt()
+                user.username = cursor.getString(cursor.getColumnIndex("username")).toString()
+                user.email = cursor.getString(cursor.getColumnIndex("email")).toString()
+                user.nsfw = cursor.getString(cursor.getColumnIndex("nsfw")).toBoolean()
+                user.followers = cursor.getString(cursor.getColumnIndex("followers")).toInt()
+                user.avatar = cursor.getString(cursor.getColumnIndex("avatar")).toString()
+                user.status = cursor.getString(cursor.getColumnIndex("status")).toInt()
+            }
 
             cursor.close()
 
diff --git a/app/src/main/java/org/libre/agosto/p2play/HostActivity.kt b/app/src/main/java/org/libre/agosto/p2play/HostActivity.kt
index 8c7ea2f..432a6e6 100644
--- a/app/src/main/java/org/libre/agosto/p2play/HostActivity.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/HostActivity.kt
@@ -34,6 +34,7 @@ class HostActivity : AppCompatActivity() {
         if(host!=""){
             if(lastHost!=host){
                 _db.logout()
+                ManagerSingleton.logout()
                 getKeys(host)
             }else{
                 ManagerSingleton.url=host
diff --git a/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt b/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt
index 6828307..de22ac4 100644
--- a/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt
@@ -1,5 +1,8 @@
 package org.libre.agosto.p2play
 
+import android.app.Activity
+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
 import android.os.AsyncTask
 import android.support.v7.app.AppCompatActivity
 import android.os.Bundle
@@ -9,6 +12,8 @@ import android.support.v7.widget.LinearLayoutManager
 import android.support.v7.widget.RecyclerView
 import android.util.Log
 import android.view.View
+import android.webkit.WebChromeClient
+import android.widget.FrameLayout
 import com.squareup.picasso.Picasso
 import kotlinx.android.synthetic.main.activity_reproductor.*
 import org.libre.agosto.p2play.adapters.CommentariesAdapter
@@ -32,6 +37,7 @@ class ReproductorActivity : AppCompatActivity() {
         setContentView(R.layout.activity_reproductor)
         ManagerSingleton.context = this
 
+        videoView.webChromeClient = WebClient()
         videoView.settings.javaScriptEnabled = true
         videoView.settings.allowContentAccess = true
         videoView.settings.javaScriptCanOpenWindowsAutomatically = true
@@ -45,7 +51,7 @@ class ReproductorActivity : AppCompatActivity() {
             tittleVideoTxt.text = this.video.name
             viewsTxt.text = this.video.views.toString() + ' ' + getString(R.string.view_text)
             userTxt.text = this.video.username
-            descriptionVideoTxt.text = this.video.description
+            descriptionVideoTxt.text = this.video.description.toString()
 
             if(this.video.userImageUrl!="")
                 Picasso.get().load("https://"+ManagerSingleton.url+this.video.userImageUrl).into(userImg)
@@ -227,4 +233,54 @@ class ReproductorActivity : AppCompatActivity() {
             }
         }
     }
+
+    internal inner class WebClient(): WebChromeClient() {
+        private var mCustomView: View? = null
+        private var mCustomViewCallback: WebChromeClient.CustomViewCallback? = null
+        private var mFullscreenContainer: FrameLayout? = null
+        private var mOriginalOrientation: Int = 0
+        private var mOriginalSystemUiVisibility: Int = 0
+
+        fun WebClient() {}
+
+        override fun getDefaultVideoPoster(): Bitmap? {
+            return if (mCustomView == null) {
+                null
+            } else BitmapFactory.decodeResource(this@ReproductorActivity.resources, 2130837573)
+        }
+
+        override fun onHideCustomView() {
+            try {
+                (this@ReproductorActivity.window.decorView as FrameLayout).removeView(this.mCustomView)
+                this.mCustomView = null
+                this@ReproductorActivity.window.decorView.systemUiVisibility = this.mOriginalSystemUiVisibility
+                this@ReproductorActivity.requestedOrientation = this.mOriginalOrientation
+                this.mCustomViewCallback?.onCustomViewHidden()
+                this.mCustomViewCallback = null
+            }
+            catch (err: Exception){
+                err.printStackTrace()
+            }
+        }
+
+        override fun onShowCustomView(paramView: View, paramCustomViewCallback: WebChromeClient.CustomViewCallback) {
+            if (this.mCustomView != null) {
+                this.onHideCustomView()
+                return
+            }
+            try {
+
+                this.mCustomView = paramView
+                this.mOriginalSystemUiVisibility = this@ReproductorActivity.window.decorView.systemUiVisibility
+                this.mOriginalOrientation = this@ReproductorActivity.requestedOrientation
+                this.mCustomViewCallback = paramCustomViewCallback
+                (this@ReproductorActivity.window.decorView as FrameLayout).addView(this.mCustomView, FrameLayout.LayoutParams(-1, -1))
+                this@ReproductorActivity.window.decorView.systemUiVisibility = 3846
+            }
+            catch (err: Exception){
+                err.printStackTrace()
+            }
+        }
+
+    }
 }
diff --git a/app/src/main/java/org/libre/agosto/p2play/SplashActivity.kt b/app/src/main/java/org/libre/agosto/p2play/SplashActivity.kt
index 15ab068..fc5845c 100644
--- a/app/src/main/java/org/libre/agosto/p2play/SplashActivity.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/SplashActivity.kt
@@ -8,7 +8,9 @@ import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
 import android.preference.PreferenceManager
+import android.util.Log
 import org.libre.agosto.p2play.ajax.Auth
+import java.lang.Exception
 
 class SplashActivity : AppCompatActivity() {
     lateinit var settings: SharedPreferences
@@ -27,53 +29,64 @@ class SplashActivity : AppCompatActivity() {
 
         val host = settings.getString("hostP2play","")
         val lastHost = settings.getString("last_host","")
-        if(host!=""){
-            if(lastHost!=host){
+        if(host != ""){
+            if(lastHost != host){
                 _db.logout()
                 Handler().postDelayed({
                     startHostActivity()
                 }, 2000)
             }else{
-                ManagerSingleton.url=host
+                ManagerSingleton.url = host
                 checkUser()
             }
         }
-
-        Handler().postDelayed({
-            startHostActivity()
-        }, 2000)
+        else{
+            Handler().postDelayed({
+                startHostActivity()
+            }, 2000)
+        }
     }
 
     private fun checkUser(){
-        val token = _db.getToken()
-        val user = _db.getUser()
-        AsyncTask.execute {
-            if (Looper.myLooper() == null)
-                Looper.prepare()
+        Log.d("was", "Chequed")
+        try {
+            val token = _db.getToken()
+            val user = _db.getUser()
+            AsyncTask.execute {
+                if (Looper.myLooper() == null)
+                    Looper.prepare()
 
 
-            if (token.status == 1 && user.status == 1) {
-                val client_id = settings.getString("client_id", "")
-                val client_secret = settings.getString("client_secret", "")
+                if (token.status == 1 && user.status == 1) {
+                    val client_id = settings.getString("client_id", "")
+                    val client_secret = settings.getString("client_secret", "")
 
-                val newToken = client.refreshToken(token, client_id, client_secret)
+                    val newToken = client.refreshToken(token, client_id, client_secret)
 
-                when (token.status.toString()) {
-                    "1" -> {
-                        _db.newToken(newToken)
-                        ManagerSingleton.token = newToken
-                        ManagerSingleton.user = user
+                    when (token.status.toString()) {
+                        "1" -> {
+                            _db.newToken(newToken)
+                            ManagerSingleton.token = newToken
+                            ManagerSingleton.user = user
+                        }
+                        else -> _db.logout()
                     }
-                    else -> _db.logout()
+                } else {
+                    _db.logout()
                 }
-            } else {
-                _db.logout()
-            }
 
+
+                startApp()
+                Log.d("Aqui", "81")
+
+            }
+        }
+        catch (err: Exception){
+            err.printStackTrace()
+            Log.d("Aqui", "89")
             Handler().postDelayed({
                 startApp()
             }, 2000)
-
         }
     }
 
diff --git a/app/src/main/res/layout/activity_reproductor.xml b/app/src/main/res/layout/activity_reproductor.xml
index e2dbbff..84974b6 100644
--- a/app/src/main/res/layout/activity_reproductor.xml
+++ b/app/src/main/res/layout/activity_reproductor.xml
@@ -8,10 +8,11 @@
 
     <ScrollView
         android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:layout_height="wrap_content">
+        app:layout_constraintTop_toTopOf="parent">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -25,7 +26,8 @@
             <WebView
                 android:id="@+id/videoView"
                 android:layout_width="match_parent"
-                android:layout_height="270dp">
+                android:layout_height="270dp"
+                android:layout_weight="1">
 
             </WebView>
 
@@ -48,7 +50,7 @@
             <LinearLayout
                 android:id="@+id/actionsLayout"
                 android:layout_width="match_parent"
-                android:layout_height="40dp"
+                android:layout_height="50dp"
                 android:gravity="top"
                 android:orientation="horizontal"
                 android:visibility="gone">
@@ -58,21 +60,25 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:layout_weight="1"
-                    android:orientation="vertical">
+                    android:orientation="vertical"
+                    android:visibility="visible">
 
                     <ImageView
                         android:id="@+id/imageView"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
+                        android:layout_height="match_parent"
                         android:layout_weight="1"
                         android:adjustViewBounds="false"
+                        android:contentDescription="@string/likeBtn"
                         android:cropToPadding="false"
+                        android:scaleType="center"
+                        android:visibility="visible"
                         app:srcCompat="@drawable/ic_like" />
 
                     <TextView
                         android:id="@+id/textViewLike"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
+                        android:layout_height="match_parent"
                         android:layout_weight="1"
                         android:text="@string/likeBtn"
                         android:textAlignment="center" />
@@ -83,21 +89,24 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:layout_weight="1"
-                    android:orientation="vertical">
+                    android:orientation="vertical"
+                    android:visibility="visible">
 
                     <ImageView
                         android:id="@+id/imageView2"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
+                        android:layout_height="match_parent"
                         android:layout_weight="1"
                         android:adjustViewBounds="false"
+                        android:contentDescription="@string/dislikeBtn"
                         android:cropToPadding="false"
+                        android:visibility="visible"
                         app:srcCompat="@drawable/ic_dislike" />
 
                     <TextView
                         android:id="@+id/textViewDislike"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
+                        android:layout_height="match_parent"
                         android:layout_weight="1"
                         android:text="@string/dislikeBtn"
                         android:textAlignment="center" />
@@ -105,7 +114,7 @@
 
                 <Button
                     android:id="@+id/button4"
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:text="@string/shareBtn"
@@ -113,7 +122,7 @@
 
                 <Button
                     android:id="@+id/button3"
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:text="@string/reportBtn"
@@ -122,14 +131,14 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="0dp"
+                android:layout_height="60dp"
                 android:layout_weight="1"
                 android:orientation="horizontal">
 
                 <ImageView
                     android:id="@+id/userImg"
                     android:layout_width="40dp"
-                    android:layout_height="50dp"
+                    android:layout_height="match_parent"
                     android:layout_margin="0dp"
                     android:layout_weight="1"
                     android:adjustViewBounds="false"
@@ -165,18 +174,16 @@
                 android:paddingLeft="5dp"
                 android:text="@string/descriptionTxt" />
 
-            <ScrollView
+            <TextView
+                android:id="@+id/descriptionVideoTxt"
                 android:layout_width="match_parent"
-                android:layout_height="80dp"
-                android:scrollbarStyle="insideInset">
-
-                <TextView
-                    android:id="@+id/descriptionVideoTxt"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:maxLength="1000"
-                    android:maxLines="100" />
-            </ScrollView>
+                android:layout_height="wrap_content"
+                android:autoLink="web"
+                android:linksClickable="true"
+                android:maxLength="10000"
+                android:maxLines="100"
+                android:paddingLeft="10dp"
+                android:paddingRight="10dp" />
 
             <View
                 android:id="@+id/divider"
@@ -224,6 +231,7 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="2"
                         android:ems="10"
+                        android:hint="@string/commentHolder"
                         android:inputType="textMultiLine" />
 
                 </LinearLayout>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 976888b..848465d 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -64,6 +64,7 @@
     <!-- Start Reproductor strings -->
     <string name="descriptionTxt">Descripcion:</string>
     <string name="commentariesTxt">Comentarios:</string>
+    <string name="commentHolder">Has un comentario</string>
     <!-- Actions -->
     <string name="likeBtn">Like</string>
     <string name="dislikeBtn">Dislike</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 99c09a3..47e541c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -74,6 +74,7 @@
     <!-- Start Reproductor strings -->
     <string name="descriptionTxt">Description:</string>
     <string name="commentariesTxt">Commentaries:</string>
+    <string name="commentHolder">Make a commentary</string>
     <!-- Actions -->
     <string name="subscribeBtn">Subscribe</string>
     <string name="likeBtn">Like</string>

From 97c85c7bba807e6f7553170862384d66131b762b Mon Sep 17 00:00:00 2001
From: ivan agosto <spartan360@live.com.mx>
Date: Tue, 29 Jan 2019 16:23:33 -0600
Subject: [PATCH 11/14] Version name added +fix screen on reproductor

---
 app/src/main/AndroidManifest.xml                           | 4 +++-
 app/src/main/java/org/libre/agosto/p2play/AboutActivity.kt | 2 ++
 app/src/main/java/org/libre/agosto/p2play/MainActivity.kt  | 5 ++++-
 app/src/main/res/layout/activity_reproductor.xml           | 4 ++--
 app/src/main/res/values-es/strings.xml                     | 1 -
 app/src/main/res/values/strings.xml                        | 2 +-
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 359a8dc..a8bca63 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -26,7 +26,9 @@
         <activity
             android:name=".MainActivity"
             android:theme="@style/P2playTheme.NoActionBar" />
-        <activity android:name=".ReproductorActivity" />
+        <activity
+            android:name=".ReproductorActivity"
+            android:configChanges="orientation|screenSize"/>
         <activity android:name=".LoginActivity" />
         <activity android:name=".RegisterActivity" />
         <activity android:name=".AboutActivity" />
diff --git a/app/src/main/java/org/libre/agosto/p2play/AboutActivity.kt b/app/src/main/java/org/libre/agosto/p2play/AboutActivity.kt
index 120432f..cdb81e2 100644
--- a/app/src/main/java/org/libre/agosto/p2play/AboutActivity.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/AboutActivity.kt
@@ -12,5 +12,7 @@ class AboutActivity : AppCompatActivity() {
         setContentView(R.layout.activity_about)
 
         aboutUrl.text = "https://"+ManagerSingleton.url+"/about/instance"
+
+        aboutLabel.text = aboutLabel.text.toString() + " " + this.packageManager.getPackageInfo(this.packageName, 0).versionName
     }
 }
diff --git a/app/src/main/java/org/libre/agosto/p2play/MainActivity.kt b/app/src/main/java/org/libre/agosto/p2play/MainActivity.kt
index e236c93..016bdc5 100644
--- a/app/src/main/java/org/libre/agosto/p2play/MainActivity.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/MainActivity.kt
@@ -40,6 +40,9 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
         setContentView(R.layout.activity_main)
         setSupportActionBar(toolbar)
 
+        // Title for nav_bar
+        side_emailTxt?.text = getString(R.string.nav_header_subtitle) + " " + this.packageManager.getPackageInfo(this.packageName, 0).versionName
+
         /* fab.setOnClickListener { view ->
             Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
                     .setAction("Action", null).show()
@@ -275,7 +278,7 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
         }
 
         side_usernameTxt?.text = getString(R.string.nav_header_title)
-        side_emailTxt?.text = getString(R.string.nav_header_subtitle)
+        side_emailTxt?.text = getString(R.string.nav_header_subtitle) + " " + this.packageManager.getPackageInfo(this.packageName, 0).versionName
         side_imageView?.setImageResource(R.mipmap.ic_launcher_round)
         side_imageView?.setOnClickListener {  }
         _db.logout()
diff --git a/app/src/main/res/layout/activity_reproductor.xml b/app/src/main/res/layout/activity_reproductor.xml
index 84974b6..1abc106 100644
--- a/app/src/main/res/layout/activity_reproductor.xml
+++ b/app/src/main/res/layout/activity_reproductor.xml
@@ -7,8 +7,8 @@
     tools:context=".ReproductorActivity">
 
     <ScrollView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 848465d..11d0022 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -45,7 +45,6 @@
     <string name="view_text">vistas</string>
     <string name="time_text">segundos</string>
     <string name="nav_header_title">Inicia session</string>
-    <string name="nav_header_subtitle">P2Play (alfa)</string>
     <!-- Toast msg -->
     <string name="logout_msg">Te has desconectado</string>
     <!-- End Main strings -->
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 47e541c..bef61a4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -55,7 +55,7 @@
     <string name="view_text">views</string>
     <string name="time_text">seconds</string>
     <string name="nav_header_title">Log In</string>
-    <string name="nav_header_subtitle">P2Play</string>
+    <string name="nav_header_subtitle" translatable="false">P2Play</string>
     <!-- Toast msg -->
     <string name="logout_msg">You are disconnected</string>
     <!-- End Main strings -->

From e2d1ffdb157d52b3f84de5da2a20a791e8bab411 Mon Sep 17 00:00:00 2001
From: ivan agosto <spartan360@live.com.mx>
Date: Tue, 29 Jan 2019 17:17:32 -0600
Subject: [PATCH 12/14] Update for 0.2

---
 README.md        | 7 ++++---
 app/build.gradle | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 72fef44..dec7311 100644
--- a/README.md
+++ b/README.md
@@ -20,14 +20,15 @@ Comming soon!
 - Subscribe to accounts
 - Show your subscripcion videos
 - Rate videos
+- Show and make commentaries
+- Splash screen
 
 ## What to do? (in next version)
 
 - Search videos
-- Show and make commentaries
 - Share videos
-- View Peertube profiles
-- Splash screen
+- Peertube profiles
+- Infinite scroll
 
 ## Demostrations
 Demostration P2Play Beta 0.1: [https://peertube.video/videos/watch/2eb7b953-0b1b-4019-9300-817539f5f4e8](https://peertube.video/videos/watch/2eb7b953-0b1b-4019-9300-817539f5f4e8)
diff --git a/app/build.gradle b/app/build.gradle
index 4f37ec5..29c041d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "org.libre.agosto.p2play"
         minSdkVersion 21
         targetSdkVersion 27
-        versionCode 2
-        versionName "0.1.5"
+        versionCode 3
+        versionName "0.2"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

From 76a1d2f4b390df36dbcb5482d5357f492dc7ec10 Mon Sep 17 00:00:00 2001
From: ivan agosto <spartan360@live.com.mx>
Date: Wed, 30 Jan 2019 12:40:36 -0600
Subject: [PATCH 13/14] Adding lint skips for releases

---
 .gitignore                                             |  2 ++
 app/build.gradle                                       |  6 +++++-
 .../main/java/org/libre/agosto/p2play/MainActivity.kt  | 10 +++++++---
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1879412..de593ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,5 @@ captures/
 # iml Files
 *.iml
 app/app.iml
+
+app/release/
diff --git a/app/build.gradle b/app/build.gradle
index 29c041d..0b32c89 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,7 +7,7 @@ apply plugin: 'kotlin-android-extensions'
 android {
     compileSdkVersion 27
     defaultConfig {
-        applicationId "org.libre.agosto.p2play"
+        applicationId "mx.agosto182.p2play"
         minSdkVersion 21
         targetSdkVersion 27
         versionCode 3
@@ -25,6 +25,10 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_6
         targetCompatibility JavaVersion.VERSION_1_6
     }
+    lintOptions {
+        checkReleaseBuilds false
+        abortOnError false
+    }
 }
 
 dependencies {
diff --git a/app/src/main/java/org/libre/agosto/p2play/MainActivity.kt b/app/src/main/java/org/libre/agosto/p2play/MainActivity.kt
index 016bdc5..3ceb1a9 100644
--- a/app/src/main/java/org/libre/agosto/p2play/MainActivity.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/MainActivity.kt
@@ -3,6 +3,7 @@ package org.libre.agosto.p2play
 import android.content.Intent
 import android.os.AsyncTask
 import android.os.Bundle
+import android.os.Handler
 import android.support.design.widget.Snackbar
 import android.support.design.widget.NavigationView
 import android.support.v4.view.GravityCompat
@@ -40,9 +41,6 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
         setContentView(R.layout.activity_main)
         setSupportActionBar(toolbar)
 
-        // Title for nav_bar
-        side_emailTxt?.text = getString(R.string.nav_header_subtitle) + " " + this.packageManager.getPackageInfo(this.packageName, 0).versionName
-
         /* fab.setOnClickListener { view ->
             Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
                     .setAction("Action", null).show()
@@ -57,6 +55,7 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
         ManagerSingleton.context = this
 
         nav_view.setNavigationItemSelectedListener(this)
+
         viewManager = LinearLayoutManager(this)
 
         // Set data for RecyclerView
@@ -67,6 +66,11 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
         swipeContainer.setOnRefreshListener {
             this.refresh()
         }
+
+        Handler().postDelayed({
+            // Title for nav_bar
+            side_emailTxt?.text = getString(R.string.nav_header_subtitle) + " " + this.packageManager.getPackageInfo(this.packageName, 0).versionName
+        }, 2000)
     }
 
     // Generic function for set data to RecyclerView

From 66428e0c3411ac3e5b9cc91769acf7117eeb5b4b Mon Sep 17 00:00:00 2001
From: ivan agosto <spartan360@live.com.mx>
Date: Wed, 30 Jan 2019 13:03:00 -0600
Subject: [PATCH 14/14] Fix subscriptions problems

---
 .../java/org/libre/agosto/p2play/ReproductorActivity.kt   | 8 +++++---
 app/src/main/java/org/libre/agosto/p2play/ajax/Videos.kt  | 1 +
 .../java/org/libre/agosto/p2play/models/VideoModel.kt     | 3 ++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt b/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt
index de22ac4..206642e 100644
--- a/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/ReproductorActivity.kt
@@ -53,8 +53,10 @@ class ReproductorActivity : AppCompatActivity() {
             userTxt.text = this.video.username
             descriptionVideoTxt.text = this.video.description.toString()
 
+            // Check if user had profile image
             if(this.video.userImageUrl!="")
                 Picasso.get().load("https://"+ManagerSingleton.url+this.video.userImageUrl).into(userImg)
+            // Load the video
             videoView.loadUrl("https://"+ManagerSingleton.url+this.video.embedUrl)
 
 
@@ -76,7 +78,7 @@ class ReproductorActivity : AppCompatActivity() {
     }
 
     private fun subscribe(){
-        val account = this.video.userUuid+"@"+this.video.userHost
+        val account = this.video.nameChannel+"@"+this.video.userHost
         AsyncTask.execute {
             if (Looper.myLooper() == null)
                 Looper.prepare()
@@ -91,7 +93,7 @@ class ReproductorActivity : AppCompatActivity() {
     }
 
     private fun unSubscribe(){
-        val account = this.video.userUuid+"@"+this.video.userHost
+        val account = this.video.nameChannel+"@"+this.video.userHost
         AsyncTask.execute {
             if (Looper.myLooper() == null)
                 Looper.prepare()
@@ -151,7 +153,7 @@ class ReproductorActivity : AppCompatActivity() {
     }
 
     private fun getSubscription(){
-        val account = this.video.userUuid+"@"+this.video.userHost
+        val account = this.video.nameChannel+"@"+this.video.userHost
         AsyncTask.execute {
             if (Looper.myLooper() == null)
                 Looper.prepare()
diff --git a/app/src/main/java/org/libre/agosto/p2play/ajax/Videos.kt b/app/src/main/java/org/libre/agosto/p2play/ajax/Videos.kt
index 1b203e7..bd3f5b1 100644
--- a/app/src/main/java/org/libre/agosto/p2play/ajax/Videos.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/ajax/Videos.kt
@@ -67,6 +67,7 @@ class Videos: Client() {
                                             }
                                             "uuid" -> video.userUuid = data.nextString()
                                             "host" -> video.userHost = data.nextString()
+                                            "name" -> video.nameChannel = data.nextString()
                                             else-> data.skipValue()
                                         }
                                     }
diff --git a/app/src/main/java/org/libre/agosto/p2play/models/VideoModel.kt b/app/src/main/java/org/libre/agosto/p2play/models/VideoModel.kt
index 22f7333..e7bfa95 100644
--- a/app/src/main/java/org/libre/agosto/p2play/models/VideoModel.kt
+++ b/app/src/main/java/org/libre/agosto/p2play/models/VideoModel.kt
@@ -13,5 +13,6 @@ class VideoModel(
         var username: String = "",
         var views: Number = 0,
         var userUuid: String = "",
-        var userHost: String = ""
+        var userHost: String = "",
+        var nameChannel: String = ""
         ):Serializable
\ No newline at end of file