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 6ddef3c..f31448b 100644 --- a/app/src/main/java/org/libre/agosto/p2play/MainActivity.kt +++ b/app/src/main/java/org/libre/agosto/p2play/MainActivity.kt @@ -222,6 +222,19 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte } } + // Videos history of user + private fun getHistory(){ + swipeContainer.isRefreshing = true + section = "my_videos" + setTitle(R.string.nav_history) + AsyncTask.execute { + val videos = client.videoHistory(ManagerSingleton.token.token, this.pagination) + runOnUiThread { + this.addVideos(videos) + } + } + } + override fun onBackPressed() { if (drawer_layout.isDrawerOpen(GravityCompat.START)) { drawer_layout.closeDrawer(GravityCompat.START) @@ -309,6 +322,8 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte val intent = Intent(this, AboutActivity::class.java) startActivity(intent) } + R.id.nav_history -> getHistory() + R.id.nav_myVideos -> getMyVideos() } drawer_layout.closeDrawer(GravityCompat.START) @@ -322,18 +337,22 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte private fun setSideData(){ if(ManagerSingleton.user.status == 1){ + nav_view.menu.findItem(R.id.ml).isVisible = true + side_usernameTxt?.text = ManagerSingleton.user.username side_emailTxt?.text = ManagerSingleton.user.email - if(ManagerSingleton.user.avatar!="" && side_imageView != null) - Picasso.get().load("https://"+ManagerSingleton.url+ManagerSingleton.user.avatar).into(side_imageView) - side_imageView?.setOnClickListener { - pagination = 0 - getMyVideos() - drawer_layout.closeDrawer(GravityCompat.START) + if(ManagerSingleton.user.avatar!="" && side_imageView != null) { + Picasso.get().load("https://" + ManagerSingleton.url + ManagerSingleton.user.avatar).into(side_imageView) } +// side_imageView?.setOnClickListener { +// pagination = 0 +// getMyVideos() +// drawer_layout.closeDrawer(GravityCompat.START) +// } if(::myMenu.isInitialized){ myMenu.findItem(R.id.action_login).isVisible = false myMenu.findItem(R.id.action_logout).isVisible = true + } } } @@ -343,7 +362,7 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte myMenu.findItem(R.id.action_login).isVisible = true myMenu.findItem(R.id.action_logout).isVisible = false } - + nav_view.menu.findItem(R.id.ml).isVisible = false side_usernameTxt?.text = getString(R.string.nav_header_title) side_emailTxt?.text = getString(R.string.nav_header_subtitle) + " " + this.packageManager.getPackageInfo(this.packageName, 0).versionName side_imageView?.setImageResource(R.drawable.default_avatar) 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 fb47ff2..cb7f5bb 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 @@ -108,6 +108,26 @@ class Videos: Client() { return videos } + fun videoHistory(token: String, start: Int = 0): ArrayList{ + val count = ManagerSingleton.videos_count + val params = "start=$start&count=$count" + val con = this._newCon("users/me/history/videos?$params","GET", token) + var videos = arrayListOf() + try { + if (con.responseCode == 200) { + val response = InputStreamReader(con.inputStream) + val data = JsonReader(response) + videos = parseVideos(data) + data.close() + } + } catch(err:Exception){ + err.printStackTrace() + } + + con.disconnect() + return videos + } + fun search(text: String, start: Int = 0): ArrayList{ val count = ManagerSingleton.videos_count val nsfw = ManagerSingleton.nfsw diff --git a/app/src/main/res/drawable/ic_history_black_24dp.xml b/app/src/main/res/drawable/ic_history_black_24dp.xml new file mode 100644 index 0000000..a61de1b --- /dev/null +++ b/app/src/main/res/drawable/ic_history_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_live_tv_black_24dp.xml b/app/src/main/res/drawable/ic_live_tv_black_24dp.xml new file mode 100644 index 0000000..ca255f9 --- /dev/null +++ b/app/src/main/res/drawable/ic_live_tv_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/menu/activity_main_drawer.xml b/app/src/main/res/menu/activity_main_drawer.xml index da35853..a0d6d88 100644 --- a/app/src/main/res/menu/activity_main_drawer.xml +++ b/app/src/main/res/menu/activity_main_drawer.xml @@ -4,14 +4,30 @@ tools:showIn="navigation_view"> + android:title="@string/nav_menu_myLibrary" + android:visible="false"> + + + + + + + android:title="@string/nav_menu_more"> Local Sobre Suscripciones + Historial + Mi libreria + Videos + Mas Configuracion diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 395025a..27c740d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -69,6 +69,10 @@ Recent Local About + History + My Library + Videos + More Settings diff --git a/docs/p2playv2.xcf b/docs/p2playv2.xcf new file mode 100644 index 0000000..e876591 Binary files /dev/null and b/docs/p2playv2.xcf differ