Compare commits
32 Commits
Author | SHA1 | Date | |
---|---|---|---|
7d6f364223 | |||
390b1a7add | |||
904319674d | |||
c26ab0b8a2 | |||
9167977c7c | |||
8394484eb0 | |||
4946a55215 | |||
9638468191 | |||
b763ed2088 | |||
5c966fe81c | |||
23dfb98a67 | |||
22a2772a3c | |||
abcf2f0e6e | |||
398265c6ed | |||
743c3147c1 | |||
d360a1849e | |||
90f2ab6e7d | |||
d680eb77b8 | |||
90aac608be | |||
2abdcb8375 | |||
a6f3a4b6b4 | |||
d15ad1006e | |||
fb98d96f66 | |||
c1b746da80 | |||
130ece5982 | |||
999bd4ad9d | |||
4347831907 | |||
d783b4887d | |||
329813d1b3 | |||
700559e28f | |||
c07c15c766 | |||
305acc87e7 |
42
README.md
@ -3,51 +3,67 @@ P2Play is an Android Application for Peertube.
|
||||
|
||||
[What is Peertube?](https://github.com/Chocobozzz/PeerTube/)
|
||||
|
||||
## Screenshots
|
||||
|
||||

|
||||

|
||||

|
||||

|
||||

|
||||

|
||||
|
||||
|
||||
## Documentation
|
||||
Comming soon!
|
||||
|
||||
## Realeases
|
||||
## Realeases (apk's)
|
||||
|
||||
[All realeases are here](https://gitlab.com/agosto182/p2play/tags)
|
||||
|
||||
## Features
|
||||
|
||||
- Show recent, popular and local list of videos.
|
||||
- Reproduce videos (very simple)
|
||||
- Reproduce videos
|
||||
- Login and register in your instance
|
||||
- Pull to refresh
|
||||
- Show uploaded videos
|
||||
- Subscribe to accounts
|
||||
- Show your subscripcion videos
|
||||
- Show your history
|
||||
- Rate videos
|
||||
- Show and make commentaries
|
||||
- Splash screen
|
||||
- Search videos
|
||||
- Infinite scroll
|
||||
- Share videos
|
||||
- Report videos
|
||||
- Peertube profiles
|
||||
|
||||
## What to do? (in next version)
|
||||
|
||||
- Search videos
|
||||
- Share videos
|
||||
- Peertube profiles
|
||||
- Infinite scroll
|
||||
- Notifications
|
||||
- Upload videos
|
||||
|
||||
## 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)
|
||||
|
||||
[Spanish] Demostracion P2Play Beta 0.1: [https://peertube.video/videos/watch/d6a7da26-d3dd-43aa-ad5c-7d032603c848](https://peertube.video/videos/watch/d6a7da26-d3dd-43aa-ad5c-7d032603c848)
|
||||
Demostration P2play Beta 0.2: https://peertube.video/videos/watch/730fa68e-32c4-4cdb-a7bb-1a819c9d3a46
|
||||
|
||||
Demostration P2Play Beta 0.1: https://peertube.video/videos/watch/2eb7b953-0b1b-4019-9300-817539f5f4e8
|
||||
|
||||
[Spanish] Demostracion P2Play Beta 0.1: https://peertube.video/videos/watch/d6a7da26-d3dd-43aa-ad5c-7d032603c848
|
||||
|
||||
## Contact
|
||||
You can follow our accounts for get news and contact with the developers.
|
||||
|
||||
- GNU Social: [https://gnusocial.ml/p2play](https://gnusocial.ml/p2play)
|
||||
- Peertube Channel: [https://peertube.video/video-channels/90df4e5f-c834-4720-a5d7-c9faa0af0af5/videos](https://peertube.video/video-channels/90df4e5f-c834-4720-a5d7-c9faa0af0af5/videos)
|
||||
- WriteFreely (ActivityPub): https://personaljournal.ca/p2play/
|
||||
- Peertube Channel: https://peertube.video/video-channels/90df4e5f-c834-4720-a5d7-c9faa0af0af5/videos
|
||||
|
||||
## About
|
||||
P2Play is made in Android Studio with Kotlin code.
|
||||
|
||||
<img src="https://weblizar.com/blog/wp-content/uploads/2017/11/Kotlin-A-New-Programming-Platform-For-Android-Developers.png" width="200px">
|
||||

|
||||
|
||||
### Developers
|
||||
- Ivan Agosto: [https://gnusocial.ml/agosto182](https://gnusocial.ml/agosto182)
|
||||
- Ivan Agosto: [https://nerdica.net/profile/agosto182](https://gnusocial.ml/agosto182)
|
||||
|
||||
## License
|
||||
This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
|
||||
|
@ -7,11 +7,12 @@ apply plugin: 'kotlin-android-extensions'
|
||||
android {
|
||||
compileSdkVersion 27
|
||||
defaultConfig {
|
||||
applicationId "mx.agosto182.p2play"
|
||||
applicationId "org.libre.agosto.p2play"
|
||||
minSdkVersion 21
|
||||
//noinspection OldTargetApi
|
||||
targetSdkVersion 27
|
||||
versionCode 3
|
||||
versionName "0.2"
|
||||
versionCode 6
|
||||
versionName "0.5"
|
||||
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
|
||||
}
|
||||
buildTypes {
|
||||
@ -33,7 +34,7 @@ android {
|
||||
|
||||
dependencies {
|
||||
implementation fileTree(include: ['*.jar'], dir: 'libs')
|
||||
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
|
||||
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
|
||||
implementation 'com.android.support:appcompat-v7:27.1.0'
|
||||
implementation 'com.android.support.constraint:constraint-layout:1.1.2'
|
||||
implementation 'com.android.support:support-v4:27.1.0'
|
||||
|
@ -7,12 +7,13 @@
|
||||
|
||||
<application
|
||||
android:allowBackup="true"
|
||||
android:hardwareAccelerated="true"
|
||||
android:icon="@mipmap/ic_p2play"
|
||||
android:icon="@mipmap/ic_launcher"
|
||||
android:label="@string/app_name"
|
||||
android:roundIcon="@mipmap/ic_p2play"
|
||||
android:roundIcon="@mipmap/ic_launcher_round"
|
||||
android:supportsRtl="true"
|
||||
android:theme="@style/P2playTheme">
|
||||
<activity android:name=".ChannelActivity"
|
||||
android:theme="@style/P2playTheme.noBar"></activity>
|
||||
<activity
|
||||
android:name=".SplashActivity"
|
||||
android:theme="@style/Theme.AppCompat.Light.NoActionBar">
|
||||
@ -28,7 +29,9 @@
|
||||
android:theme="@style/P2playTheme.NoActionBar" />
|
||||
<activity
|
||||
android:name=".ReproductorActivity"
|
||||
android:configChanges="orientation|screenSize"/>
|
||||
android:configChanges="orientation|screenSize"
|
||||
android:hardwareAccelerated="true"
|
||||
android:theme="@style/P2playTheme.noBar" />
|
||||
<activity android:name=".LoginActivity" />
|
||||
<activity android:name=".RegisterActivity" />
|
||||
<activity android:name=".AboutActivity" />
|
||||
|
BIN
app/src/main/ic_launcher-web.png
Normal file
After Width: | Height: | Size: 13 KiB |
149
app/src/main/java/org/libre/agosto/p2play/ChannelActivity.kt
Normal file
@ -0,0 +1,149 @@
|
||||
package org.libre.agosto.p2play
|
||||
|
||||
import android.os.AsyncTask
|
||||
import android.support.v7.app.AppCompatActivity
|
||||
import android.os.Bundle
|
||||
import android.support.v7.widget.LinearLayoutManager
|
||||
import android.support.v7.widget.RecyclerView
|
||||
import android.view.View
|
||||
import com.squareup.picasso.Picasso
|
||||
import kotlinx.android.synthetic.main.activity_channel.*
|
||||
import org.libre.agosto.p2play.adapters.VideosAdapter
|
||||
import org.libre.agosto.p2play.ajax.Actions
|
||||
import org.libre.agosto.p2play.ajax.Channels
|
||||
import org.libre.agosto.p2play.ajax.Videos
|
||||
import org.libre.agosto.p2play.models.ChannelModel
|
||||
import org.libre.agosto.p2play.models.VideoModel
|
||||
|
||||
class ChannelActivity : AppCompatActivity() {
|
||||
private lateinit var channelId: String
|
||||
private lateinit var channel: ChannelModel
|
||||
private var isSubcribed: Boolean = false
|
||||
private val _channel = Channels()
|
||||
private val _videos = Videos()
|
||||
private val _actions = Actions()
|
||||
|
||||
private lateinit var recyclerView: RecyclerView
|
||||
private lateinit var viewAdapter: RecyclerView.Adapter<VideosAdapter.ViewHolder>
|
||||
private lateinit var viewManager: RecyclerView.LayoutManager
|
||||
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
super.onCreate(savedInstanceState)
|
||||
setContentView(R.layout.activity_channel)
|
||||
|
||||
channelId = this.intent.extras.getString("channel")
|
||||
|
||||
viewManager = LinearLayoutManager(this)
|
||||
|
||||
subcriptionBtn.setOnClickListener {
|
||||
subscribeAction()
|
||||
}
|
||||
}
|
||||
|
||||
override fun onResume() {
|
||||
super.onResume()
|
||||
|
||||
getChannel()
|
||||
getSubscription()
|
||||
getVideos()
|
||||
|
||||
if(ManagerSingleton.user.status == 1) {
|
||||
subcriptionBtn.visibility = View.VISIBLE
|
||||
getSubscription()
|
||||
}
|
||||
}
|
||||
|
||||
private fun getChannel() {
|
||||
AsyncTask.execute {
|
||||
channel = _channel.getChannelInfo(channelId)
|
||||
runOnUiThread {
|
||||
usernameProfile.text = channel.name
|
||||
hostTxt.text = channel.host
|
||||
subcriptionsTxt.text = channel.followers.toString()
|
||||
if(channel.channelImg != "")
|
||||
Picasso.get().load("https://${ManagerSingleton.url}${channel.channelImg}").into(channelImg)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private fun subscribe() {
|
||||
AsyncTask.execute {
|
||||
val res = _actions.subscribe(ManagerSingleton.token.token, channel.getAccount())
|
||||
runOnUiThread {
|
||||
if(res == 1){
|
||||
subcriptionBtn.text = getString(R.string.unSubscribeBtn)
|
||||
ManagerSingleton.Toast(getString(R.string.subscribeMsg), this)
|
||||
getSubscription()
|
||||
}
|
||||
else {
|
||||
ManagerSingleton.Toast(getString(R.string.errorMsg), this)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private fun unSubscribe() {
|
||||
AsyncTask.execute {
|
||||
val res = _actions.unSubscribe(ManagerSingleton.token.token, channel.getAccount())
|
||||
runOnUiThread {
|
||||
if(res == 1){
|
||||
subcriptionBtn.text = getString(R.string.subscribeBtn)
|
||||
ManagerSingleton.Toast(getString(R.string.unSubscribeMsg), this)
|
||||
getSubscription()
|
||||
}
|
||||
else {
|
||||
ManagerSingleton.Toast(getString(R.string.errorMsg), this)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private fun subscribeAction() {
|
||||
if(isSubcribed)
|
||||
unSubscribe()
|
||||
else
|
||||
subscribe()
|
||||
}
|
||||
|
||||
private fun getSubscription() {
|
||||
AsyncTask.execute {
|
||||
isSubcribed = _actions.getSubscription(ManagerSingleton.token.token, channel.getAccount())
|
||||
runOnUiThread {
|
||||
if(isSubcribed){
|
||||
subcriptionBtn.text = getText(R.string.unSubscribeBtn)
|
||||
}
|
||||
else {
|
||||
subcriptionBtn.text = getText(R.string.subscribeBtn)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private fun getVideos() {
|
||||
AsyncTask.execute {
|
||||
val videos = _videos.channelVideos(channel.getAccount(), 0)
|
||||
runOnUiThread {
|
||||
initRecycler(videos)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Generic function for set data to RecyclerView
|
||||
private fun initRecycler(data: ArrayList<VideoModel>){
|
||||
// val data = arrayListOf<VideoModel>()
|
||||
viewAdapter = VideosAdapter(data)
|
||||
|
||||
recyclerView = findViewById<RecyclerView>(R.id.listVideosChannel).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
|
||||
}
|
||||
// swipeContainer.isRefreshing = false
|
||||
}
|
||||
}
|
@ -24,7 +24,7 @@ class HostActivity : AppCompatActivity() {
|
||||
settings = PreferenceManager.getDefaultSharedPreferences(this)
|
||||
|
||||
editor = settings.edit()
|
||||
ManagerSingleton.context = this
|
||||
|
||||
button.setOnClickListener {
|
||||
getKeys(hostText.text.toString())
|
||||
}
|
||||
@ -49,7 +49,7 @@ class HostActivity : AppCompatActivity() {
|
||||
editor.putString("last_host",host)
|
||||
editor.putString("hostP2play",host)
|
||||
editor.apply()
|
||||
ManagerSingleton.Toast(getString(R.string.finallyMsg))
|
||||
ManagerSingleton.Toast(getString(R.string.finallyMsg), this)
|
||||
ManagerSingleton.url=host
|
||||
startApp()
|
||||
}
|
||||
@ -74,7 +74,7 @@ class HostActivity : AppCompatActivity() {
|
||||
}
|
||||
else{
|
||||
runOnUiThread {
|
||||
ManagerSingleton.Toast(getString(R.string.errorMsg))
|
||||
ManagerSingleton.Toast(getString(R.string.errorMsg), this)
|
||||
button.isEnabled = true
|
||||
}
|
||||
}
|
||||
@ -83,7 +83,7 @@ class HostActivity : AppCompatActivity() {
|
||||
|
||||
private fun startApp(){
|
||||
runOnUiThread {
|
||||
val intent = Intent(ManagerSingleton.context,MainActivity::class.java)
|
||||
val intent = Intent(this,MainActivity::class.java)
|
||||
startActivity(intent)
|
||||
this.finish()
|
||||
}
|
||||
|
@ -22,7 +22,6 @@ class LoginActivity : AppCompatActivity() {
|
||||
super.onCreate(savedInstanceState)
|
||||
setContentView(R.layout.activity_login)
|
||||
setTitle(R.string.action_login)
|
||||
ManagerSingleton.context = this
|
||||
_db = Database(this)
|
||||
|
||||
settings = PreferenceManager.getDefaultSharedPreferences(this)
|
||||
@ -56,13 +55,13 @@ class LoginActivity : AppCompatActivity() {
|
||||
}
|
||||
"0" -> {
|
||||
runOnUiThread {
|
||||
ManagerSingleton.Toast(getString(R.string.loginError_msg))
|
||||
ManagerSingleton.Toast(getString(R.string.loginError_msg), this)
|
||||
}
|
||||
}
|
||||
"-1" -> {
|
||||
runOnUiThread {
|
||||
loginBtn.isEnabled = true
|
||||
ManagerSingleton.Toast(getString(R.string.loginFailed_msg))
|
||||
ManagerSingleton.Toast(getString(R.string.loginFailed_msg), this)
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -76,13 +75,13 @@ class LoginActivity : AppCompatActivity() {
|
||||
_db.newUser(user)
|
||||
ManagerSingleton.user = user
|
||||
runOnUiThread {
|
||||
ManagerSingleton.Toast(getString(R.string.loginSuccess_msg))
|
||||
ManagerSingleton.Toast(getString(R.string.loginSuccess_msg), this)
|
||||
finish()
|
||||
}
|
||||
}
|
||||
else{
|
||||
runOnUiThread {
|
||||
ManagerSingleton.Toast(getString(R.string.loginError_msg))
|
||||
ManagerSingleton.Toast(getString(R.string.loginError_msg), this)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -15,6 +15,7 @@ import android.view.Menu
|
||||
import android.view.MenuInflater
|
||||
import android.view.MenuItem
|
||||
import android.widget.ImageView
|
||||
import android.widget.SearchView
|
||||
import com.squareup.picasso.Picasso
|
||||
import kotlinx.android.synthetic.main.activity_main.*
|
||||
import kotlinx.android.synthetic.main.app_bar_main.*
|
||||
@ -26,7 +27,7 @@ import org.libre.agosto.p2play.models.VideoModel
|
||||
|
||||
class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelectedListener {
|
||||
private lateinit var recyclerView: RecyclerView
|
||||
private lateinit var viewAdapter: RecyclerView.Adapter<*>
|
||||
private lateinit var viewAdapter: RecyclerView.Adapter<VideosAdapter.ViewHolder>
|
||||
private lateinit var viewManager: RecyclerView.LayoutManager
|
||||
private val client: Videos = Videos()
|
||||
private lateinit var lastItem: MenuItem
|
||||
@ -34,6 +35,8 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
|
||||
lateinit var myMenu: Menu
|
||||
private val _db = Database(this)
|
||||
var section: String = ""
|
||||
var searchVal: String = ""
|
||||
var pagination = 0
|
||||
|
||||
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
@ -46,22 +49,18 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
|
||||
.setAction("Action", null).show()
|
||||
} */
|
||||
|
||||
val toggle = ActionBarDrawerToggle(
|
||||
this, drawer_layout, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close)
|
||||
val toggle = ActionBarDrawerToggle(this, drawer_layout, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close)
|
||||
drawer_layout.addDrawerListener(toggle)
|
||||
toggle.syncState()
|
||||
|
||||
// Context for ManagerSingleton
|
||||
ManagerSingleton.context = this
|
||||
|
||||
nav_view.setNavigationItemSelectedListener(this)
|
||||
|
||||
viewManager = LinearLayoutManager(this)
|
||||
|
||||
// Set data for RecyclerView
|
||||
this.setData(arrayListOf())
|
||||
// Init RecyclerView
|
||||
this.initRecycler()
|
||||
|
||||
this.getLastVideos()
|
||||
this.getTrengindVideos()
|
||||
|
||||
swipeContainer.setOnRefreshListener {
|
||||
this.refresh()
|
||||
@ -74,7 +73,8 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
|
||||
}
|
||||
|
||||
// Generic function for set data to RecyclerView
|
||||
private fun setData(data:ArrayList<VideoModel>){
|
||||
private fun initRecycler(){
|
||||
val data = arrayListOf<VideoModel>()
|
||||
viewAdapter = VideosAdapter(data)
|
||||
|
||||
recyclerView = findViewById<RecyclerView>(R.id.list).apply {
|
||||
@ -87,17 +87,50 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
|
||||
|
||||
// specify an viewAdapter (see also next example)
|
||||
adapter = viewAdapter
|
||||
|
||||
this.addOnScrollListener(object : RecyclerView.OnScrollListener() {
|
||||
override fun onScrolled(recyclerView: RecyclerView?, dx: Int, dy: Int) {
|
||||
super.onScrolled(recyclerView, dx, dy)
|
||||
|
||||
if(!swipeContainer.isRefreshing){
|
||||
if(!canScrollVertically(1)){
|
||||
loadMore()
|
||||
}
|
||||
swipeContainer.isRefreshing = false
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
// swipeContainer.isRefreshing = false
|
||||
}
|
||||
|
||||
private fun addVideos(videos: ArrayList<VideoModel>){
|
||||
this.swipeContainer.isRefreshing = true
|
||||
|
||||
try {
|
||||
if(this.pagination == 0){
|
||||
(viewAdapter as VideosAdapter).clearData()
|
||||
recyclerView.scrollToPosition(0)
|
||||
}
|
||||
|
||||
(viewAdapter as VideosAdapter).addData(videos)
|
||||
}catch (err: Exception){
|
||||
err.printStackTrace()
|
||||
ManagerSingleton.Toast(getString(R.string.errorMsg), this)
|
||||
}
|
||||
|
||||
this.swipeContainer.isRefreshing = false
|
||||
}
|
||||
|
||||
private fun refresh(){
|
||||
swipeContainer.isRefreshing = true
|
||||
this.pagination = 0
|
||||
when(section){
|
||||
"local" -> this.getLocalVideos()
|
||||
"popular" -> this.getPopularVideos()
|
||||
"trending" -> this.getTrengindVideos()
|
||||
"last" -> this.getLastVideos()
|
||||
"sub" -> this.getSubscriptionVideos()
|
||||
"search" -> this.searchVideos()
|
||||
"my_videos" -> {
|
||||
if(ManagerSingleton.token.token != "")
|
||||
this.getMyVideos()
|
||||
@ -109,7 +142,7 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
|
||||
|
||||
private fun getSubscriptionVideos(){
|
||||
if(ManagerSingleton.user.status != 1){
|
||||
ManagerSingleton.Toast("Inicia session primero")
|
||||
ManagerSingleton.Toast("Inicia session primero", this)
|
||||
startActivity(Intent(this, LoginActivity::class.java))
|
||||
return
|
||||
}
|
||||
@ -117,9 +150,9 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
|
||||
section = "sub"
|
||||
setTitle(R.string.title_subscriptions)
|
||||
AsyncTask.execute {
|
||||
val videos = client.videoSubscriptions(ManagerSingleton.token.token)
|
||||
val videos = client.videoSubscriptions(ManagerSingleton.token.token, this.pagination)
|
||||
runOnUiThread {
|
||||
this.setData(videos)
|
||||
this.addVideos(videos)
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -130,9 +163,9 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
|
||||
section = "last"
|
||||
setTitle(R.string.title_recent)
|
||||
AsyncTask.execute {
|
||||
val videos = client.getLastVideos()
|
||||
val videos = client.getLastVideos(this.pagination)
|
||||
runOnUiThread {
|
||||
this.setData(videos)
|
||||
this.addVideos(videos)
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -143,9 +176,22 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
|
||||
section = "popular"
|
||||
setTitle(R.string.title_popular)
|
||||
AsyncTask.execute {
|
||||
val videos = client.getPopularVideos()
|
||||
val videos = client.getPopularVideos(this.pagination)
|
||||
runOnUiThread {
|
||||
this.setData(videos)
|
||||
this.addVideos(videos)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Trending videos
|
||||
private fun getTrengindVideos(){
|
||||
swipeContainer.isRefreshing = true
|
||||
section = "trending"
|
||||
setTitle(R.string.title_trending)
|
||||
AsyncTask.execute {
|
||||
val videos = client.getTrendingVideos(this.pagination)
|
||||
runOnUiThread {
|
||||
this.addVideos(videos)
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -156,9 +202,9 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
|
||||
section = "local"
|
||||
setTitle(R.string.title_local)
|
||||
AsyncTask.execute {
|
||||
val videos = client.getLocalVideos()
|
||||
val videos = client.getLocalVideos(this.pagination)
|
||||
runOnUiThread {
|
||||
this.setData(videos)
|
||||
this.addVideos(videos)
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -169,9 +215,22 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
|
||||
section = "my_videos"
|
||||
setTitle(R.string.title_myVideos)
|
||||
AsyncTask.execute {
|
||||
val videos = client.myVideos(ManagerSingleton.token.token)
|
||||
val videos = client.myVideos(ManagerSingleton.token.token, this.pagination)
|
||||
runOnUiThread {
|
||||
this.setData(videos)
|
||||
this.addVideos(videos)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 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)
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -187,6 +246,28 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
|
||||
override fun onCreateOptionsMenu(menu: Menu): Boolean {
|
||||
// Inflate the menu; this adds items to the action bar if it is present.
|
||||
menuInflater.inflate(R.menu.main, menu)
|
||||
|
||||
val searchItem = menu.findItem(R.id.app_bar_search)
|
||||
val searchView = searchItem.actionView as SearchView
|
||||
|
||||
searchView.setOnQueryTextListener(object : SearchView.OnQueryTextListener{
|
||||
override fun onQueryTextChange(p0: String?): Boolean {
|
||||
return true
|
||||
}
|
||||
|
||||
override fun onQueryTextSubmit(p0: String?): Boolean {
|
||||
if(!p0.isNullOrBlank()){
|
||||
searchVal = p0
|
||||
pagination = 0
|
||||
searchView.onActionViewCollapsed()
|
||||
searchVideos()
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
})
|
||||
|
||||
|
||||
myMenu = menu
|
||||
setSideData()
|
||||
return true
|
||||
@ -228,24 +309,21 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
|
||||
// lastItem.isChecked = false
|
||||
// }
|
||||
lastItem = item
|
||||
pagination = 0
|
||||
|
||||
// item.isChecked = true
|
||||
when (item.itemId) {
|
||||
R.id.nav_subscriptions->{
|
||||
getSubscriptionVideos()
|
||||
}
|
||||
R.id.nav_popular-> {
|
||||
getPopularVideos()
|
||||
}
|
||||
R.id.nav_recent-> {
|
||||
getLastVideos()
|
||||
}
|
||||
R.id.nav_local-> {
|
||||
getLocalVideos()
|
||||
}
|
||||
R.id.nav_subscriptions -> getSubscriptionVideos()
|
||||
R.id.nav_popular -> getPopularVideos()
|
||||
R.id.nav_trending -> getTrengindVideos()
|
||||
R.id.nav_recent -> getLastVideos()
|
||||
R.id.nav_local -> getLocalVideos()
|
||||
R.id.nav_about -> {
|
||||
val intent = Intent(this, AboutActivity::class.java)
|
||||
startActivity(intent)
|
||||
}
|
||||
R.id.nav_history -> getHistory()
|
||||
R.id.nav_myVideos -> getMyVideos()
|
||||
}
|
||||
|
||||
drawer_layout.closeDrawer(GravityCompat.START)
|
||||
@ -254,23 +332,27 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
|
||||
|
||||
override fun onResume() {
|
||||
super.onResume()
|
||||
ManagerSingleton.context = this
|
||||
setSideData()
|
||||
}
|
||||
|
||||
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)
|
||||
if(ManagerSingleton.user.avatar!="" && side_imageView != null) {
|
||||
Picasso.get().load("https://" + ManagerSingleton.url + ManagerSingleton.user.avatar).into(side_imageView)
|
||||
side_imageView?.setOnClickListener {
|
||||
getMyVideos()
|
||||
drawer_layout.closeDrawer(GravityCompat.START)
|
||||
}
|
||||
// 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
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -280,18 +362,49 @@ 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.mipmap.ic_launcher_round)
|
||||
side_imageView?.setImageResource(R.drawable.default_avatar)
|
||||
side_imageView?.setOnClickListener { }
|
||||
_db.logout()
|
||||
ManagerSingleton.logout()
|
||||
|
||||
this.refresh()
|
||||
ManagerSingleton.Toast(getString(R.string.logout_msg))
|
||||
ManagerSingleton.Toast(getString(R.string.logout_msg), this)
|
||||
|
||||
}
|
||||
|
||||
private fun loadMore(){
|
||||
swipeContainer.isRefreshing = true
|
||||
this.pagination += ManagerSingleton.videos_count
|
||||
|
||||
when(section){
|
||||
"local" -> this.getLocalVideos()
|
||||
"popular" -> this.getPopularVideos()
|
||||
"trending" -> this.getTrengindVideos()
|
||||
"last" -> this.getLastVideos()
|
||||
"sub" -> this.getSubscriptionVideos()
|
||||
"search" -> this.searchVideos()
|
||||
"my_videos" -> {
|
||||
if(ManagerSingleton.token.token != "")
|
||||
this.getMyVideos()
|
||||
else
|
||||
this.getLastVideos()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private fun searchVideos(){
|
||||
swipeContainer.isRefreshing = true
|
||||
section = "search"
|
||||
this.title = this.searchVal
|
||||
AsyncTask.execute {
|
||||
val videos = client.search(this.searchVal, this.pagination)
|
||||
runOnUiThread {
|
||||
this.addVideos(videos)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -5,15 +5,14 @@ import org.libre.agosto.p2play.models.TokenModel
|
||||
import org.libre.agosto.p2play.models.UserModel
|
||||
|
||||
object ManagerSingleton {
|
||||
var context: Context?= null
|
||||
var url: String?= null
|
||||
var user: UserModel = UserModel()
|
||||
var token: TokenModel = TokenModel()
|
||||
// var keys:
|
||||
var nfsw: Boolean = false
|
||||
var videos_count: Int = 0
|
||||
|
||||
fun Toast(text: String?) {
|
||||
if(this.context == null) { return }
|
||||
android.widget.Toast.makeText(this.context, text, android.widget.Toast.LENGTH_SHORT).show()
|
||||
fun Toast(text: String?, context: Context) {
|
||||
android.widget.Toast.makeText(context, text, android.widget.Toast.LENGTH_SHORT).show()
|
||||
}
|
||||
|
||||
fun logout(){
|
||||
|
@ -20,7 +20,6 @@ class RegisterActivity : AppCompatActivity() {
|
||||
super.onCreate(savedInstanceState)
|
||||
setContentView(R.layout.activity_register)
|
||||
setTitle(R.string.registerActionBtn)
|
||||
ManagerSingleton.context = this
|
||||
|
||||
settings = PreferenceManager.getDefaultSharedPreferences(this)
|
||||
client_id = settings.getString("client_id", "")
|
||||
@ -43,11 +42,11 @@ class RegisterActivity : AppCompatActivity() {
|
||||
runOnUiThread {
|
||||
when (res) {
|
||||
1 -> {
|
||||
ManagerSingleton.Toast(getString(R.string.registerSuccess_msg))
|
||||
ManagerSingleton.Toast(getString(R.string.registerSuccess_msg), this)
|
||||
finish()
|
||||
}
|
||||
0 -> ManagerSingleton.Toast(getString(R.string.registerFailed_msg))
|
||||
-1 -> ManagerSingleton.Toast(getString(R.string.registerError_msg))
|
||||
0 -> ManagerSingleton.Toast(getString(R.string.registerFailed_msg), this)
|
||||
-1 -> ManagerSingleton.Toast(getString(R.string.registerError_msg), this)
|
||||
}
|
||||
registerBtn.isEnabled = true
|
||||
}
|
||||
|
@ -1,6 +1,10 @@
|
||||
package org.libre.agosto.p2play
|
||||
|
||||
import android.annotation.SuppressLint
|
||||
import android.app.Activity
|
||||
import android.content.DialogInterface
|
||||
import android.content.Intent
|
||||
import android.content.pm.ActivityInfo
|
||||
import android.graphics.Bitmap
|
||||
import android.graphics.BitmapFactory
|
||||
import android.os.AsyncTask
|
||||
@ -8,34 +12,43 @@ import android.support.v7.app.AppCompatActivity
|
||||
import android.os.Bundle
|
||||
import android.os.Looper
|
||||
import android.support.v4.content.ContextCompat
|
||||
import android.support.v7.app.AlertDialog
|
||||
import android.support.v7.widget.LinearLayoutManager
|
||||
import android.support.v7.widget.RecyclerView
|
||||
import android.util.Log
|
||||
import android.view.View
|
||||
import android.view.WindowManager
|
||||
import android.webkit.WebChromeClient
|
||||
import android.widget.EditText
|
||||
import android.widget.FrameLayout
|
||||
import com.squareup.picasso.Picasso
|
||||
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.ajax.Videos
|
||||
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()
|
||||
private val videos: Videos = Videos()
|
||||
|
||||
// Commentaries adapter values
|
||||
private lateinit var recyclerView: RecyclerView
|
||||
private lateinit var viewAdapter: RecyclerView.Adapter<*>
|
||||
private lateinit var viewManager: RecyclerView.LayoutManager
|
||||
|
||||
@SuppressLint("SetJavaScriptEnabled", "SetTextI18n")
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
super.onCreate(savedInstanceState)
|
||||
setContentView(R.layout.activity_reproductor)
|
||||
ManagerSingleton.context = this
|
||||
|
||||
videoView.webChromeClient = WebClient()
|
||||
videoView.settings.javaScriptEnabled = true
|
||||
@ -49,9 +62,14 @@ class ReproductorActivity : AppCompatActivity() {
|
||||
try {
|
||||
this.video = this.intent.extras.getSerializable("video") as VideoModel
|
||||
tittleVideoTxt.text = this.video.name
|
||||
viewsTxt.text = this.video.views.toString() + ' ' + getString(R.string.view_text)
|
||||
viewsTxt.text = "${this.video.views} ${getString(R.string.view_text)}"
|
||||
userTxt.text = this.video.username
|
||||
descriptionVideoTxt.text = this.video.description.toString()
|
||||
descriptionVideoTxt.text = this.video.description
|
||||
val haveDescription = this.video.description.endsWith("...")
|
||||
if (haveDescription) {
|
||||
showMoreBtn.visibility = View.VISIBLE
|
||||
}
|
||||
hostTxt.text = this.video.userHost
|
||||
|
||||
// Check if user had profile image
|
||||
if (this.video.userImageUrl != "")
|
||||
@ -59,11 +77,8 @@ class ReproductorActivity : AppCompatActivity() {
|
||||
// Load the video
|
||||
videoView.loadUrl("https://" + ManagerSingleton.url + this.video.embedUrl)
|
||||
|
||||
|
||||
}
|
||||
catch (err:Exception){
|
||||
} catch (err: Exception) {
|
||||
err.printStackTrace()
|
||||
Log.d("Error", err?.message)
|
||||
}
|
||||
|
||||
viewManager = LinearLayoutManager(this)
|
||||
@ -75,17 +90,25 @@ class ReproductorActivity : AppCompatActivity() {
|
||||
likeLayout.setOnClickListener { rate("like") }
|
||||
dislikeLayout.setOnClickListener { rate("dislike") }
|
||||
commentaryBtn.setOnClickListener { makeComment() }
|
||||
showMoreBtn.setOnClickListener { getDescription() }
|
||||
shareLayout.setOnClickListener { shareIntent() }
|
||||
reportLayout.setOnClickListener { reportIntent() }
|
||||
|
||||
userImg.setOnClickListener {
|
||||
val intent = Intent(this, ChannelActivity::class.java)
|
||||
intent.putExtra("channel", video.getAccount())
|
||||
startActivity(intent)
|
||||
}
|
||||
}
|
||||
|
||||
private fun subscribe() {
|
||||
val account = this.video.nameChannel+"@"+this.video.userHost
|
||||
AsyncTask.execute {
|
||||
if (Looper.myLooper() == null)
|
||||
Looper.prepare()
|
||||
val res = this._actions.subscribe(ManagerSingleton.token.token, account)
|
||||
val res = this._actions.subscribe(ManagerSingleton.token.token, video.getAccount())
|
||||
if (res == 1) {
|
||||
runOnUiThread {
|
||||
ManagerSingleton.Toast(getString(R.string.subscribeMsg))
|
||||
ManagerSingleton.Toast(getString(R.string.subscribeMsg), this)
|
||||
this.changeSubscribeBtn(true)
|
||||
}
|
||||
}
|
||||
@ -93,14 +116,13 @@ class ReproductorActivity : AppCompatActivity() {
|
||||
}
|
||||
|
||||
private fun unSubscribe() {
|
||||
val account = this.video.nameChannel+"@"+this.video.userHost
|
||||
AsyncTask.execute {
|
||||
if (Looper.myLooper() == null)
|
||||
Looper.prepare()
|
||||
val res = this._actions.unSubscribe(ManagerSingleton.token.token, account)
|
||||
val res = this._actions.unSubscribe(ManagerSingleton.token.token, video.getAccount())
|
||||
if (res == 1) {
|
||||
runOnUiThread {
|
||||
ManagerSingleton.Toast(getString(R.string.unSubscribeMsg))
|
||||
ManagerSingleton.Toast(getString(R.string.unSubscribeMsg), this)
|
||||
this.changeSubscribeBtn(false)
|
||||
}
|
||||
}
|
||||
@ -114,14 +136,13 @@ class ReproductorActivity : AppCompatActivity() {
|
||||
val res = this._actions.rate(ManagerSingleton.token.token, this.video.id, rate)
|
||||
if (res == 1) {
|
||||
runOnUiThread {
|
||||
ManagerSingleton.Toast(getString(R.string.rateMsg))
|
||||
ManagerSingleton.Toast(getString(R.string.rateMsg), this)
|
||||
if (rate == "like") {
|
||||
likeLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.colorLike))
|
||||
dislikeLayout.background = null
|
||||
}
|
||||
else if(rate=="dislike"){
|
||||
dislikeLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.colorDislike))
|
||||
likeLayout.background = null
|
||||
textViewLike.setTextColor(ContextCompat.getColor(this, R.color.colorLike))
|
||||
textViewDislike.setTextColor(ContextCompat.getColor(this, R.color.primary_dark_material_light))
|
||||
} else if (rate == "dislike") {
|
||||
textViewDislike.setTextColor(ContextCompat.getColor(this, R.color.colorDislike))
|
||||
textViewLike.setTextColor(ContextCompat.getColor(this, R.color.primary_dark_material_light))
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -136,16 +157,16 @@ class ReproductorActivity : AppCompatActivity() {
|
||||
runOnUiThread {
|
||||
when (rate) {
|
||||
"like" -> {
|
||||
likeLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.colorLike))
|
||||
dislikeLayout.background = null
|
||||
textViewLike.setTextColor(ContextCompat.getColor(this, R.color.colorLike))
|
||||
textViewDislike.setTextColor(ContextCompat.getColor(this, R.color.primary_dark_material_light))
|
||||
}
|
||||
"dislike" -> {
|
||||
dislikeLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.colorDislike))
|
||||
likeLayout.background = null
|
||||
textViewDislike.setTextColor(ContextCompat.getColor(this, R.color.colorDislike))
|
||||
textViewLike.setTextColor(ContextCompat.getColor(this, R.color.primary_dark_material_light))
|
||||
}
|
||||
else -> {
|
||||
likeLayout.background = null
|
||||
dislikeLayout.background = null
|
||||
textViewLike.setTextColor(ContextCompat.getColor(this, R.color.primary_dark_material_light))
|
||||
textViewDislike.setTextColor(ContextCompat.getColor(this, R.color.primary_dark_material_light))
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -168,8 +189,7 @@ class ReproductorActivity : AppCompatActivity() {
|
||||
if (subscribed) {
|
||||
subscribeBtn.text = getText(R.string.unSubscribeBtn)
|
||||
subscribeBtn.setOnClickListener { this.unSubscribe() }
|
||||
}
|
||||
else{
|
||||
} else {
|
||||
subscribeBtn.text = getText(R.string.subscribeBtn)
|
||||
subscribeBtn.setOnClickListener { this.subscribe() }
|
||||
}
|
||||
@ -203,7 +223,7 @@ class ReproductorActivity : AppCompatActivity() {
|
||||
|
||||
private fun makeComment() {
|
||||
if (commentaryText.text.toString() == "") {
|
||||
ManagerSingleton.Toast(getString(R.string.emptyCommentaryMsg))
|
||||
ManagerSingleton.Toast(getString(R.string.emptyCommentaryMsg), this)
|
||||
return
|
||||
}
|
||||
val text = commentaryText.text.toString()
|
||||
@ -211,12 +231,11 @@ class ReproductorActivity : AppCompatActivity() {
|
||||
val res = this.client.makeCommentary(ManagerSingleton.token.token, this.video.id, text)
|
||||
runOnUiThread {
|
||||
if (res) {
|
||||
ManagerSingleton.Toast(getString(R.string.makedCommentaryMsg))
|
||||
ManagerSingleton.Toast(getString(R.string.makedCommentaryMsg), this)
|
||||
commentaryText.text.clear()
|
||||
this.getComments()
|
||||
}
|
||||
else {
|
||||
ManagerSingleton.Toast(getString(R.string.errorCommentaryMsg))
|
||||
} else {
|
||||
ManagerSingleton.Toast(getString(R.string.errorCommentaryMsg), this)
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -236,16 +255,73 @@ class ReproductorActivity : AppCompatActivity() {
|
||||
}
|
||||
}
|
||||
|
||||
internal inner class WebClient(): WebChromeClient() {
|
||||
fun getDescription() {
|
||||
AsyncTask.execute {
|
||||
val fullDescription = this.videos.fullDescription(this.video.id)
|
||||
runOnUiThread {
|
||||
descriptionVideoTxt.text = fullDescription
|
||||
showMoreBtn.visibility = View.GONE
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private fun shareIntent() {
|
||||
val sendIntent: Intent = Intent().apply {
|
||||
action = Intent.ACTION_SEND
|
||||
putExtra(Intent.EXTRA_TEXT, "${video.name} ${video.getVideoUrl()}")
|
||||
type = "text/plain"
|
||||
}
|
||||
startActivity(Intent.createChooser(sendIntent, resources.getText(R.string.shareBtn)))
|
||||
}
|
||||
|
||||
private fun reportIntent() {
|
||||
val builder = AlertDialog.Builder(this)
|
||||
// Get the layout inflater
|
||||
val dialog = layoutInflater.inflate(R.layout.report_dialog, null)
|
||||
|
||||
val inputReason = dialog.findViewById<EditText>(R.id.reportText)
|
||||
|
||||
// Inflate and set the layout for the dialog
|
||||
// Pass null as the parent view because its going in the dialog layout
|
||||
builder.setView(dialog)
|
||||
// Add action buttons
|
||||
.setPositiveButton(R.string.reportBtn) { _, _ ->
|
||||
val reason = inputReason.text.toString()
|
||||
reportVideo(reason)
|
||||
}
|
||||
.setNegativeButton("Cancel") { dialog, _ ->
|
||||
dialog.run { cancel() }
|
||||
}
|
||||
val alertDialog = builder.create()
|
||||
alertDialog.show()
|
||||
}
|
||||
|
||||
private fun reportVideo(reason: String){
|
||||
AsyncTask.execute {
|
||||
val res = _actions.reportVideo(video.id, reason, ManagerSingleton.token.token)
|
||||
|
||||
runOnUiThread {
|
||||
if(res) {
|
||||
ManagerSingleton.Toast(getText(R.string.reportDialogMsg).toString(), this)
|
||||
}
|
||||
else {
|
||||
ManagerSingleton.Toast(getText(R.string.errorMsg).toString(), this)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
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? {
|
||||
AsyncTask.execute {
|
||||
this@ReproductorActivity._actions.watchVideo(this@ReproductorActivity.video.id, ManagerSingleton.token.token)
|
||||
}
|
||||
|
||||
return if (mCustomView == null) {
|
||||
null
|
||||
} else BitmapFactory.decodeResource(this@ReproductorActivity.resources, 2130837573)
|
||||
@ -253,12 +329,22 @@ class ReproductorActivity : AppCompatActivity() {
|
||||
|
||||
override fun onHideCustomView() {
|
||||
try {
|
||||
(this@ReproductorActivity.window.decorView as FrameLayout).removeView(this.mCustomView)
|
||||
this@ReproductorActivity.nonFullScreen.visibility = View.VISIBLE
|
||||
this@ReproductorActivity.fullScreen.visibility = View.GONE
|
||||
this@ReproductorActivity.fullScreen.removeView(this.mCustomView)
|
||||
this.mCustomView = null
|
||||
this@ReproductorActivity.window.decorView.systemUiVisibility = this.mOriginalSystemUiVisibility
|
||||
this@ReproductorActivity.requestedOrientation = this.mOriginalOrientation
|
||||
this.mCustomViewCallback?.onCustomViewHidden()
|
||||
|
||||
this.mCustomViewCallback!!.onCustomViewHidden()
|
||||
this.mCustomViewCallback = null
|
||||
|
||||
this@ReproductorActivity.requestedOrientation = this.mOriginalOrientation
|
||||
// this@ReproductorActivity.window.decorView.systemUiVisibility = this.mOriginalSystemUiVisibility
|
||||
|
||||
val attrs = this@ReproductorActivity.window.attributes
|
||||
attrs.flags = attrs.flags and WindowManager.LayoutParams.FLAG_FULLSCREEN.inv()
|
||||
attrs.flags = attrs.flags and WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON.inv()
|
||||
window.attributes = attrs
|
||||
this@ReproductorActivity.window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_VISIBLE
|
||||
}
|
||||
catch (err: Exception){
|
||||
err.printStackTrace()
|
||||
@ -271,18 +357,29 @@ class ReproductorActivity : AppCompatActivity() {
|
||||
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
|
||||
val match_parent = WindowManager.LayoutParams.MATCH_PARENT
|
||||
|
||||
this@ReproductorActivity.nonFullScreen.visibility = View.GONE
|
||||
this@ReproductorActivity.fullScreen.visibility = View.VISIBLE
|
||||
|
||||
this@ReproductorActivity.fullScreen.addView(paramView, FrameLayout.LayoutParams(match_parent, match_parent))
|
||||
|
||||
|
||||
val attrs = this@ReproductorActivity.window.attributes
|
||||
attrs.flags = attrs.flags or WindowManager.LayoutParams.FLAG_FULLSCREEN
|
||||
attrs.flags = attrs.flags or WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON
|
||||
window.attributes = attrs
|
||||
this@ReproductorActivity.window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_LOW_PROFILE
|
||||
|
||||
this@ReproductorActivity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE
|
||||
}
|
||||
catch (err: Exception){
|
||||
err.printStackTrace()
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
@ -32,13 +32,12 @@ class SettingsActivity : AppCompatPreferenceActivity() {
|
||||
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
super.onCreate(savedInstanceState)
|
||||
ManagerSingleton.context = this
|
||||
setupActionBar()
|
||||
}
|
||||
|
||||
override fun onBackPressed() {
|
||||
super.onBackPressed()
|
||||
ManagerSingleton.Toast(getString(R.string.pref_message_exit))
|
||||
ManagerSingleton.Toast(getString(R.string.pref_message_exit), this)
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -24,8 +24,9 @@ class SplashActivity : AppCompatActivity() {
|
||||
|
||||
settings = PreferenceManager.getDefaultSharedPreferences(this)
|
||||
|
||||
editor = settings.edit()
|
||||
ManagerSingleton.context = this
|
||||
ManagerSingleton.nfsw = settings.getBoolean("show_nfsw", false)
|
||||
ManagerSingleton.videos_count = settings.getString("videos_count", "15").toInt()
|
||||
|
||||
|
||||
val host = settings.getString("hostP2play","")
|
||||
val lastHost = settings.getString("last_host","")
|
||||
@ -92,7 +93,7 @@ class SplashActivity : AppCompatActivity() {
|
||||
|
||||
private fun startApp() {
|
||||
runOnUiThread {
|
||||
val intent = Intent(ManagerSingleton.context, MainActivity::class.java)
|
||||
val intent = Intent(this, MainActivity::class.java)
|
||||
startActivity(intent)
|
||||
this.finish()
|
||||
}
|
||||
@ -100,7 +101,7 @@ class SplashActivity : AppCompatActivity() {
|
||||
|
||||
private fun startHostActivity() {
|
||||
runOnUiThread {
|
||||
val intent = Intent(ManagerSingleton.context, HostActivity::class.java)
|
||||
val intent = Intent(this, HostActivity::class.java)
|
||||
startActivity(intent)
|
||||
this.finish()
|
||||
}
|
||||
|
@ -1,10 +1,12 @@
|
||||
package org.libre.agosto.p2play.adapters
|
||||
|
||||
import android.app.Activity
|
||||
import android.content.Context
|
||||
import android.content.Intent
|
||||
import android.graphics.drawable.Drawable
|
||||
import android.os.AsyncTask
|
||||
import android.support.v7.widget.RecyclerView
|
||||
import android.text.Html
|
||||
import android.view.LayoutInflater
|
||||
import android.view.View
|
||||
import android.view.ViewGroup
|
||||
@ -12,10 +14,7 @@ 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.*
|
||||
import org.libre.agosto.p2play.models.CommentaryModel
|
||||
import org.libre.agosto.p2play.models.VideoModel
|
||||
import java.io.InputStream
|
||||
@ -33,12 +32,14 @@ class CommentariesAdapter(private val myDataset: ArrayList<CommentaryModel>) :
|
||||
val userImg: ImageView
|
||||
val username: TextView
|
||||
val commentary: TextView
|
||||
val context: Context
|
||||
|
||||
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)
|
||||
context = view.context
|
||||
}
|
||||
}
|
||||
|
||||
@ -59,10 +60,16 @@ class CommentariesAdapter(private val myDataset: ArrayList<CommentaryModel>) :
|
||||
// - replace the contents of the view with that element
|
||||
holder.username.text = myDataset[position].username
|
||||
|
||||
// holder.userImg.setOnClickListener {
|
||||
// val intent = Intent(holder.context, ChannelActivity::class.java)
|
||||
// intent.putExtra("channel", myDataset[position])
|
||||
// holder.context.startActivity(intent)
|
||||
// }
|
||||
|
||||
if(myDataset[position].userImageUrl!="")
|
||||
Picasso.get().load("https://"+ManagerSingleton.url+myDataset[position].userImageUrl).into(holder.userImg);
|
||||
|
||||
holder.commentary.text = myDataset[position].commentary
|
||||
holder.commentary.text = Html.fromHtml(myDataset[position].commentary)
|
||||
|
||||
}
|
||||
|
||||
|
@ -1,6 +1,7 @@
|
||||
package org.libre.agosto.p2play.adapters
|
||||
|
||||
import android.app.Activity
|
||||
import android.content.Context
|
||||
import android.content.Intent
|
||||
import android.graphics.drawable.Drawable
|
||||
import android.os.AsyncTask
|
||||
@ -12,18 +13,17 @@ 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.*
|
||||
import org.libre.agosto.p2play.models.VideoModel
|
||||
import java.io.InputStream
|
||||
import java.io.Serializable
|
||||
import java.net.URL
|
||||
import java.util.concurrent.TimeUnit
|
||||
|
||||
class VideosAdapter(private val myDataset: ArrayList<VideoModel>) :
|
||||
RecyclerView.Adapter<VideosAdapter.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.
|
||||
@ -33,6 +33,7 @@ class VideosAdapter(private val myDataset: ArrayList<VideoModel>) :
|
||||
val userImg: ImageView
|
||||
val tittle: TextView
|
||||
val description: TextView
|
||||
val context: Context
|
||||
|
||||
init {
|
||||
// Define click listener for the ViewHolder's View
|
||||
@ -40,10 +41,10 @@ class VideosAdapter(private val myDataset: ArrayList<VideoModel>) :
|
||||
description = view.findViewById(R.id.descriptionTxt)
|
||||
thumb = view.findViewById(R.id.thumb)
|
||||
userImg = view.findViewById(R.id.userImg)
|
||||
context = view.context
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Create new views (invoked by the layout manager)
|
||||
override fun onCreateViewHolder(parent: ViewGroup,
|
||||
viewType: Int): VideosAdapter.ViewHolder {
|
||||
@ -61,19 +62,52 @@ class VideosAdapter(private val myDataset: ArrayList<VideoModel>) :
|
||||
holder.tittle.text = myDataset[position].name
|
||||
Picasso.get().load("https://"+ManagerSingleton.url+myDataset[position].thumbUrl).into(holder.thumb)
|
||||
holder.thumb.setOnClickListener {
|
||||
val intent = Intent(ManagerSingleton.context, ReproductorActivity::class.java)
|
||||
val intent = Intent(holder.context, ReproductorActivity::class.java)
|
||||
intent.putExtra("video", myDataset[position] as Serializable)
|
||||
ManagerSingleton.context!!.startActivity(intent)
|
||||
holder.context.startActivity(intent)
|
||||
}
|
||||
if(myDataset[position].userImageUrl!="")
|
||||
Picasso.get().load("https://"+ManagerSingleton.url+myDataset[position].userImageUrl).into(holder.userImg);
|
||||
|
||||
val viewsText = ManagerSingleton.context!!.getString(R.string.view_text)
|
||||
val timeText = ManagerSingleton.context!!.getString(R.string.time_text)
|
||||
holder.description.text = myDataset[position].username+" - "+myDataset[position].views+" "+viewsText+" - "+myDataset[position].duration+" "+timeText
|
||||
holder.userImg.setOnClickListener {
|
||||
val intent = Intent(holder.context, ChannelActivity::class.java)
|
||||
intent.putExtra("channel", myDataset[position].getAccount())
|
||||
holder.context.startActivity(intent)
|
||||
}
|
||||
|
||||
if(myDataset[position].userImageUrl!="")
|
||||
Picasso.get().load("https://"+ManagerSingleton.url+myDataset[position].userImageUrl).into(holder.userImg)
|
||||
else
|
||||
Picasso.get().load(R.drawable.default_avatar).into(holder.userImg)
|
||||
|
||||
val viewsText = holder.context.getString(R.string.view_text)
|
||||
var timeText = holder.context.getString(R.string.timeSec_text)
|
||||
var timeString = myDataset[position].duration.toString()
|
||||
val seconds = myDataset[position].duration.toInt();
|
||||
if(seconds > 60 && seconds < (60 * 60)){
|
||||
timeText = holder.context.getString(R.string.timeMin_text)
|
||||
timeString = (seconds / 60).toString() + ":" + (seconds % 60).toString()
|
||||
}
|
||||
else if(seconds > (60 * 60)){
|
||||
timeText = holder.context.getString(R.string.timeHrs_text)
|
||||
timeString = (seconds / 60 / 60).toString() + ":" + (seconds / 60 % 60).toString()
|
||||
}
|
||||
|
||||
holder.description.text = myDataset[position].username+" - "+myDataset[position].views+" "+viewsText+" - "+timeString+" "+timeText
|
||||
|
||||
}
|
||||
|
||||
// Return the size of your dataset (invoked by the layout manager)
|
||||
override fun getItemCount() = myDataset.size
|
||||
|
||||
fun clearData(){
|
||||
myDataset.clear()
|
||||
notifyDataSetChanged()
|
||||
}
|
||||
|
||||
fun addData(newItems: ArrayList<VideoModel>){
|
||||
val lastPos = myDataset.size
|
||||
myDataset.addAll(newItems)
|
||||
notifyItemRangeInserted(lastPos, newItems.size)
|
||||
}
|
||||
|
||||
|
||||
}
|
@ -6,7 +6,7 @@ import java.io.InputStreamReader
|
||||
class Actions: Client() {
|
||||
|
||||
fun subscribe(token: String, account: String):Int{
|
||||
var con=this._newCon("users/me/subscriptions","POST", token)
|
||||
val con = this._newCon("users/me/subscriptions","POST", token)
|
||||
val params:String= "uri=$account"
|
||||
con.outputStream.write(params.toByteArray())
|
||||
var response = 0
|
||||
@ -21,11 +21,12 @@ class Actions: Client() {
|
||||
response = -1
|
||||
}
|
||||
|
||||
con.disconnect()
|
||||
return response
|
||||
}
|
||||
|
||||
fun unSubscribe(token: String, account: String):Int{
|
||||
var con=this._newCon("users/me/subscriptions/$account","DELETE", token)
|
||||
val con = this._newCon("users/me/subscriptions/$account","DELETE", token)
|
||||
var response = 0
|
||||
|
||||
try {
|
||||
@ -38,17 +39,18 @@ class Actions: Client() {
|
||||
response = -1
|
||||
}
|
||||
|
||||
con.disconnect()
|
||||
return response
|
||||
}
|
||||
|
||||
fun getSubscription(token: String, account: String): Boolean{
|
||||
var con=this._newCon("users/me/subscriptions/exist?uris=$account","GET", token)
|
||||
val con = this._newCon("users/me/subscriptions/exist?uris=$account","GET", token)
|
||||
var isSubscribed = false
|
||||
|
||||
try {
|
||||
if (con.responseCode == 200) {
|
||||
var response = InputStreamReader(con.inputStream)
|
||||
var data = JsonReader(response)
|
||||
val response = InputStreamReader(con.inputStream)
|
||||
val data = JsonReader(response)
|
||||
data.beginObject()
|
||||
while (data.hasNext()){
|
||||
val key = data.nextName()
|
||||
@ -61,6 +63,7 @@ class Actions: Client() {
|
||||
}
|
||||
}
|
||||
}
|
||||
data.close()
|
||||
}
|
||||
}
|
||||
catch (err: Exception){
|
||||
@ -68,12 +71,13 @@ class Actions: Client() {
|
||||
isSubscribed = false
|
||||
}
|
||||
|
||||
con.disconnect()
|
||||
return isSubscribed
|
||||
}
|
||||
|
||||
fun rate(token: String, id_video: Int, rate: String):Int{
|
||||
var con=this._newCon("videos/$id_video/rate","PUT", token)
|
||||
val params:String= "rating=$rate"
|
||||
val con = this._newCon("videos/$id_video/rate","PUT", token)
|
||||
val params = "rating=$rate"
|
||||
con.outputStream.write(params.toByteArray())
|
||||
var response = 0
|
||||
|
||||
@ -87,17 +91,18 @@ class Actions: Client() {
|
||||
response = -1
|
||||
}
|
||||
|
||||
con.disconnect()
|
||||
return response
|
||||
}
|
||||
|
||||
fun getRate(token: String, id_video: Int):String{
|
||||
var con=this._newCon("users/me/videos/$id_video/rating","GET", token)
|
||||
val con = this._newCon("users/me/videos/$id_video/rating","GET", token)
|
||||
var rating = "none"
|
||||
|
||||
try {
|
||||
if (con.responseCode == 200) {
|
||||
var response = InputStreamReader(con.inputStream)
|
||||
var data = JsonReader(response)
|
||||
val response = InputStreamReader(con.inputStream)
|
||||
val data = JsonReader(response)
|
||||
data.beginObject()
|
||||
while (data.hasNext()){
|
||||
val key = data.nextName()
|
||||
@ -110,6 +115,7 @@ class Actions: Client() {
|
||||
}
|
||||
}
|
||||
}
|
||||
con.disconnect()
|
||||
}
|
||||
}
|
||||
catch (err: Exception){
|
||||
@ -117,7 +123,43 @@ class Actions: Client() {
|
||||
rating = "none"
|
||||
}
|
||||
|
||||
con.disconnect()
|
||||
return rating
|
||||
}
|
||||
|
||||
fun reportVideo(videoId: Int, reason: String, token: String): Boolean {
|
||||
val con = this._newCon("videos/$videoId/abuse", "POST", token)
|
||||
val params = "reason=$reason"
|
||||
con.outputStream.write(params.toByteArray())
|
||||
|
||||
var response = false
|
||||
try {
|
||||
if(con.responseCode == 200){
|
||||
response = true
|
||||
}
|
||||
} catch (err: Exception) {
|
||||
err.printStackTrace()
|
||||
response = false
|
||||
}
|
||||
|
||||
return response
|
||||
}
|
||||
|
||||
fun watchVideo(videoId: Int, token: String): Boolean {
|
||||
val con = this._newCon("videos/$videoId/watching", "PUT", token)
|
||||
val params = "currentTime=1"
|
||||
con.outputStream.write(params.toByteArray())
|
||||
|
||||
var response = false
|
||||
try {
|
||||
if(con.responseCode == 204){
|
||||
response = true
|
||||
}
|
||||
} catch (err: Exception) {
|
||||
err.printStackTrace()
|
||||
response = false
|
||||
}
|
||||
|
||||
return response
|
||||
}
|
||||
}
|
@ -10,19 +10,19 @@ import org.libre.agosto.p2play.models.UserModel
|
||||
import java.io.InputStreamReader
|
||||
|
||||
class Auth: Client() {
|
||||
val stockParams = "grant_type=password"
|
||||
private val stockParams = "grant_type=password"
|
||||
|
||||
fun login(username: String, password: String, client_id: String, client_secret: String): TokenModel{
|
||||
var con = this._newCon("users/token","POST")
|
||||
val params:String= "$stockParams&username=$username&password=$password&client_id=$client_id&client_secret=$client_secret"
|
||||
val con = this._newCon("users/token","POST")
|
||||
val params = "$stockParams&username=$username&password=$password&client_id=$client_id&client_secret=$client_secret"
|
||||
con.outputStream.write(params.toByteArray())
|
||||
var token = TokenModel()
|
||||
val token = TokenModel()
|
||||
|
||||
try {
|
||||
|
||||
if(con.responseCode==200){
|
||||
var response = InputStreamReader(con.inputStream)
|
||||
var data = JsonReader(response)
|
||||
val response = InputStreamReader(con.inputStream)
|
||||
val data = JsonReader(response)
|
||||
data.beginObject()
|
||||
|
||||
while(data.hasNext()){
|
||||
@ -35,6 +35,7 @@ class Auth: Client() {
|
||||
}
|
||||
|
||||
data.endObject()
|
||||
data.close()
|
||||
token.status = 1
|
||||
|
||||
}
|
||||
@ -47,12 +48,13 @@ class Auth: Client() {
|
||||
token.status = 0
|
||||
}
|
||||
|
||||
con.disconnect()
|
||||
return token
|
||||
}
|
||||
|
||||
fun register(username: String, password: String, email: String): Int{
|
||||
var con = this._newCon("users/register","POST")
|
||||
val params:String= "username=$username&password=$password&email=$email"
|
||||
val con = this._newCon("users/register","POST")
|
||||
val params = "username=$username&password=$password&email=$email"
|
||||
con.outputStream.write(params.toByteArray())
|
||||
|
||||
var response = 0
|
||||
@ -67,20 +69,21 @@ class Auth: Client() {
|
||||
response = -1
|
||||
}
|
||||
|
||||
con.disconnect()
|
||||
return response
|
||||
|
||||
}
|
||||
|
||||
fun refreshToken(token: TokenModel, client_id: String, client_secret: String): TokenModel{
|
||||
var con = this._newCon("users/token", "POST", token.token)
|
||||
val params:String = "refresh_token=${token.refresh_token}&response_type=code&grant_type=refresh_token&client_id=$client_id&client_secret=$client_secret"
|
||||
val con = this._newCon("users/token", "POST", token.token)
|
||||
val params = "refresh_token=${token.refresh_token}&response_type=code&grant_type=refresh_token&client_id=$client_id&client_secret=$client_secret"
|
||||
con.outputStream.write(params.toByteArray())
|
||||
var token = TokenModel()
|
||||
// val token = TokenModel()
|
||||
|
||||
try {
|
||||
if(con.responseCode==200){
|
||||
var response = InputStreamReader(con.inputStream)
|
||||
var data = JsonReader(response)
|
||||
val response = InputStreamReader(con.inputStream)
|
||||
val data = JsonReader(response)
|
||||
data.beginObject()
|
||||
|
||||
while(data.hasNext()){
|
||||
@ -93,6 +96,7 @@ class Auth: Client() {
|
||||
}
|
||||
|
||||
data.endObject()
|
||||
data.close()
|
||||
token.status = 1
|
||||
|
||||
}
|
||||
@ -105,19 +109,19 @@ class Auth: Client() {
|
||||
token.status = 0
|
||||
}
|
||||
|
||||
con.disconnect()
|
||||
return token
|
||||
}
|
||||
|
||||
fun me(token: String): UserModel{
|
||||
var con = this._newCon("users/me","GET", token)
|
||||
|
||||
var user = UserModel()
|
||||
val con = this._newCon("users/me","GET", token)
|
||||
val user = UserModel()
|
||||
|
||||
try {
|
||||
|
||||
if(con.responseCode==200){
|
||||
var response = InputStreamReader(con.inputStream)
|
||||
var data = JsonReader(response)
|
||||
val response = InputStreamReader(con.inputStream)
|
||||
val data = JsonReader(response)
|
||||
data.beginObject()
|
||||
|
||||
while(data.hasNext()){
|
||||
@ -159,6 +163,7 @@ class Auth: Client() {
|
||||
}
|
||||
|
||||
data.endObject()
|
||||
data.close()
|
||||
user.status = 1
|
||||
|
||||
}
|
||||
@ -171,6 +176,7 @@ class Auth: Client() {
|
||||
user.status = 0
|
||||
}
|
||||
|
||||
con.disconnect()
|
||||
return user
|
||||
}
|
||||
|
||||
|
35
app/src/main/java/org/libre/agosto/p2play/ajax/Channels.kt
Normal file
@ -0,0 +1,35 @@
|
||||
package org.libre.agosto.p2play.ajax
|
||||
|
||||
import android.util.JsonReader
|
||||
import android.util.JsonToken
|
||||
import org.libre.agosto.p2play.models.ChannelModel
|
||||
import org.libre.agosto.p2play.models.CommentaryModel
|
||||
import java.io.InputStreamReader
|
||||
|
||||
class Channels: Client() {
|
||||
|
||||
private fun parseChannel(data: JsonReader): ChannelModel{
|
||||
val channel = ChannelModel()
|
||||
|
||||
data.close()
|
||||
|
||||
return channel
|
||||
}
|
||||
|
||||
fun getChannelInfo(account: String): ChannelModel {
|
||||
val con = this._newCon("video-channels/$account", "GET")
|
||||
var channel = ChannelModel()
|
||||
try {
|
||||
if(con.responseCode == 200){
|
||||
val response = InputStreamReader(con.inputStream)
|
||||
val data = JsonReader(response)
|
||||
channel.parseChannel(data)
|
||||
data.close()
|
||||
}
|
||||
}catch (err: Exception) {
|
||||
err.printStackTrace()
|
||||
}
|
||||
|
||||
return channel
|
||||
}
|
||||
}
|
@ -1,11 +1,11 @@
|
||||
package org.libre.agosto.p2play.ajax
|
||||
|
||||
import android.content.SharedPreferences
|
||||
import android.util.JsonReader
|
||||
import android.util.Log
|
||||
import org.libre.agosto.p2play.ManagerSingleton
|
||||
import org.libre.agosto.p2play.models.HostModel
|
||||
import java.io.InputStreamReader
|
||||
import java.io.Reader
|
||||
import java.net.HttpURLConnection
|
||||
import java.net.URL
|
||||
|
||||
@ -13,22 +13,22 @@ open class Client {
|
||||
|
||||
|
||||
protected fun _newCon(uri: String, method: String, token: String = ""): HttpURLConnection {
|
||||
var url = URL("https://"+ManagerSingleton.url+"/api/v1/"+uri)
|
||||
var con = url.openConnection() as HttpURLConnection
|
||||
val url = URL("https://${ManagerSingleton.url}/api/v1/$uri")
|
||||
val con = url.openConnection() as HttpURLConnection
|
||||
|
||||
con.setRequestProperty("User-Agent", "P2play/0.1")
|
||||
con.setRequestProperty("Content-Type", "application/x-www-form-urlencoded")
|
||||
con.setRequestProperty("Accept", "*/*")
|
||||
|
||||
if(token != ""){
|
||||
con.setRequestProperty("Authorization", "Bearer ${token}")
|
||||
con.setRequestProperty("Authorization", "Bearer $token")
|
||||
}
|
||||
|
||||
con.requestMethod=method
|
||||
con.connectTimeout=10000
|
||||
con.readTimeout=10000
|
||||
con.connectTimeout=60000
|
||||
con.readTimeout=60000
|
||||
|
||||
if(method.equals("POST"))
|
||||
if(method == "POST")
|
||||
con.doOutput=true
|
||||
|
||||
Log.d("Petition", url.toString())
|
||||
@ -36,12 +36,12 @@ open class Client {
|
||||
}
|
||||
|
||||
fun getKeys():HostModel{
|
||||
var con=this._newCon("oauth-clients/local","GET")
|
||||
var keys = HostModel("","")
|
||||
val con = this._newCon("oauth-clients/local","GET")
|
||||
val keys = HostModel("","")
|
||||
try {
|
||||
if (con.responseCode == 200) {
|
||||
var response = InputStreamReader(con.inputStream)
|
||||
var data = JsonReader(response)
|
||||
val response = InputStreamReader(con.inputStream)
|
||||
val data = JsonReader(response)
|
||||
data.beginObject()
|
||||
while (data.hasNext()) {
|
||||
val key = data.nextName()
|
||||
@ -57,14 +57,15 @@ open class Client {
|
||||
}
|
||||
}
|
||||
}
|
||||
data.close()
|
||||
}
|
||||
Log.d("Key",keys.client_id)
|
||||
return keys
|
||||
} catch(err:Exception){
|
||||
Log.d("Error",err.message)
|
||||
err.printStackTrace()
|
||||
}
|
||||
|
||||
con.disconnect()
|
||||
return keys
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
@ -8,8 +8,8 @@ import java.io.InputStreamReader
|
||||
|
||||
class Comments: Client() {
|
||||
|
||||
fun parseCommentaries(data: JsonReader): ArrayList<CommentaryModel> {
|
||||
var commentaries = arrayListOf<CommentaryModel>()
|
||||
private fun parseCommentaries(data: JsonReader): ArrayList<CommentaryModel> {
|
||||
val commentaries = arrayListOf<CommentaryModel>()
|
||||
data.beginObject()
|
||||
while (data.hasNext()){
|
||||
when(data.nextName()) {
|
||||
@ -17,47 +17,7 @@ class Comments: Client() {
|
||||
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()
|
||||
comment.parseCommentary(data)
|
||||
commentaries.add(comment)
|
||||
}
|
||||
data.endArray()
|
||||
@ -76,37 +36,42 @@ class Comments: Client() {
|
||||
|
||||
try {
|
||||
if (con.responseCode == 200) {
|
||||
var response = InputStreamReader(con.inputStream)
|
||||
var data = JsonReader(response)
|
||||
val response = InputStreamReader(con.inputStream)
|
||||
val data = JsonReader(response)
|
||||
commentaries = parseCommentaries(data)
|
||||
data.close()
|
||||
}
|
||||
} catch(err:Exception){
|
||||
err?.printStackTrace()
|
||||
Log.d("TypeErr",err?.message ,err.cause)
|
||||
Log.d("Error","fallo la coneccion")
|
||||
err.printStackTrace()
|
||||
}
|
||||
|
||||
con.disconnect()
|
||||
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"
|
||||
val params = "text=$text"
|
||||
con.outputStream.write(params.toByteArray())
|
||||
|
||||
var response: Boolean
|
||||
|
||||
try {
|
||||
if (con.responseCode == 200) {
|
||||
return true
|
||||
con.disconnect()
|
||||
response = true
|
||||
}
|
||||
else{
|
||||
Log.d("Status", con.responseMessage)
|
||||
response = false
|
||||
}
|
||||
}
|
||||
catch (err: Exception){
|
||||
err.printStackTrace()
|
||||
response = false
|
||||
}
|
||||
|
||||
return false
|
||||
con.disconnect()
|
||||
return response
|
||||
}
|
||||
|
||||
}
|
@ -2,14 +2,14 @@ package org.libre.agosto.p2play.ajax
|
||||
|
||||
import android.util.JsonReader
|
||||
import android.util.JsonToken
|
||||
import android.util.Log
|
||||
import org.libre.agosto.p2play.ManagerSingleton
|
||||
import org.libre.agosto.p2play.models.VideoModel
|
||||
import java.io.InputStreamReader
|
||||
|
||||
class Videos: Client() {
|
||||
|
||||
fun parseVideos(data: JsonReader): ArrayList<VideoModel>{
|
||||
var videos = arrayListOf<VideoModel>()
|
||||
private fun parseVideos(data: JsonReader): ArrayList<VideoModel>{
|
||||
val videos = arrayListOf<VideoModel>()
|
||||
data.beginObject()
|
||||
while (data.hasNext()){
|
||||
when(data.nextName()){
|
||||
@ -17,68 +17,7 @@ class Videos: Client() {
|
||||
data.beginArray()
|
||||
while (data.hasNext()) {
|
||||
val video = VideoModel()
|
||||
data.beginObject()
|
||||
while (data.hasNext()){
|
||||
val key = data.nextName()
|
||||
when (key.toString()) {
|
||||
"id"-> video.id = data.nextInt()
|
||||
"name"->{
|
||||
video.name= data.nextString()
|
||||
}
|
||||
"description"->{
|
||||
if(data.peek() == JsonToken.STRING)
|
||||
video.description = data.nextString()
|
||||
else
|
||||
data.skipValue()
|
||||
}
|
||||
"duration"->{
|
||||
video.duration = data.nextInt()
|
||||
}
|
||||
"thumbnailPath"->{
|
||||
video.thumbUrl = data.nextString()
|
||||
}
|
||||
"embedPath"->{
|
||||
video.embedUrl = data.nextString()
|
||||
}
|
||||
"views"->{
|
||||
video.views = data.nextInt()
|
||||
}
|
||||
"channel"->{
|
||||
data.beginObject()
|
||||
while (data.hasNext()){
|
||||
val acKey = data.nextName()
|
||||
when(acKey.toString()){
|
||||
"displayName"-> video.username=data.nextString()
|
||||
"avatar"-> {
|
||||
if(data.peek() == JsonToken.BEGIN_OBJECT){
|
||||
data.beginObject()
|
||||
while (data.hasNext()){
|
||||
val avKey = data.nextName()
|
||||
when(avKey){
|
||||
"path"-> video.userImageUrl = data.nextString()
|
||||
else-> data.skipValue()
|
||||
}
|
||||
}
|
||||
data.endObject()
|
||||
}
|
||||
else
|
||||
data.skipValue()
|
||||
|
||||
}
|
||||
"uuid" -> video.userUuid = data.nextString()
|
||||
"host" -> video.userHost = data.nextString()
|
||||
"name" -> video.nameChannel = data.nextString()
|
||||
else-> data.skipValue()
|
||||
}
|
||||
}
|
||||
data.endObject()
|
||||
}
|
||||
else->{
|
||||
data.skipValue()
|
||||
}
|
||||
}
|
||||
}
|
||||
data.endObject()
|
||||
video.parseVideo(data)
|
||||
videos.add(video)
|
||||
}
|
||||
data.endArray()
|
||||
@ -91,69 +30,168 @@ class Videos: Client() {
|
||||
return videos
|
||||
}
|
||||
|
||||
private fun getVideos(start:Int, count:Int, sort:String = "-publishedAt", filter:String = ""):ArrayList<VideoModel>{
|
||||
var params = "start=$start&count=$count&sort=$sort"
|
||||
private fun getVideos(start:Int, sort:String = "-publishedAt", filter:String = ""):ArrayList<VideoModel>{
|
||||
val nsfw = ManagerSingleton.nfsw
|
||||
val count = ManagerSingleton.videos_count
|
||||
var params = "start=$start&count=$count&sort=$sort&nsfw=$nsfw"
|
||||
if(filter != "")
|
||||
params+="&filter=$filter"
|
||||
var con=this._newCon("videos?$params","GET")
|
||||
val con = this._newCon("videos?$params","GET")
|
||||
var videos = arrayListOf<VideoModel>()
|
||||
try {
|
||||
if (con.responseCode == 200) {
|
||||
var response = InputStreamReader(con.inputStream)
|
||||
var data = JsonReader(response)
|
||||
val response = InputStreamReader(con.inputStream)
|
||||
val data = JsonReader(response)
|
||||
videos = parseVideos(data)
|
||||
data.close()
|
||||
}
|
||||
} catch(err:Exception){
|
||||
err?.printStackTrace()
|
||||
Log.d("TypeErr",err?.message ,err.cause)
|
||||
Log.d("Error","fallo la coneccion")
|
||||
err.printStackTrace()
|
||||
}
|
||||
con.disconnect()
|
||||
return videos
|
||||
}
|
||||
|
||||
fun getLastVideos(start:Int = 0, count:Int = 30): ArrayList<VideoModel>{
|
||||
return this.getVideos(start, count)
|
||||
fun getLastVideos(start:Int = 0): ArrayList<VideoModel>{
|
||||
return this.getVideos(start)
|
||||
}
|
||||
|
||||
fun getPopularVideos(start:Int = 0, count:Int = 30): ArrayList<VideoModel>{
|
||||
return this.getVideos(start, count,"-views")
|
||||
fun getPopularVideos(start:Int = 0): ArrayList<VideoModel>{
|
||||
return this.getVideos(start,"-views")
|
||||
}
|
||||
|
||||
fun getLocalVideos(start:Int = 0, count:Int = 30): ArrayList<VideoModel>{
|
||||
return this.getVideos(start, count,"-publishedAt", "local")
|
||||
fun getTrendingVideos(start:Int = 0): ArrayList<VideoModel>{
|
||||
return this.getVideos(start,"-trending")
|
||||
}
|
||||
|
||||
fun myVideos(token: String): ArrayList<VideoModel>{
|
||||
var con=this._newCon("users/me/videos","GET", token)
|
||||
fun getLocalVideos(start:Int = 0): ArrayList<VideoModel>{
|
||||
return this.getVideos(start,"-publishedAt", "local")
|
||||
}
|
||||
|
||||
fun myVideos(token: String, start: Int = 0): ArrayList<VideoModel>{
|
||||
val count = ManagerSingleton.videos_count
|
||||
val params = "start=$start&count=$count"
|
||||
val con = this._newCon("users/me/videos?$params","GET", token)
|
||||
var videos = arrayListOf<VideoModel>()
|
||||
try {
|
||||
if (con.responseCode == 200) {
|
||||
var response = InputStreamReader(con.inputStream)
|
||||
var data = JsonReader(response)
|
||||
val response = InputStreamReader(con.inputStream)
|
||||
val data = JsonReader(response)
|
||||
videos = parseVideos(data)
|
||||
data.close()
|
||||
}
|
||||
} catch(err:Exception){
|
||||
err?.printStackTrace()
|
||||
Log.d("TypeErr",err?.message ,err.cause)
|
||||
Log.d("Error","fallo la coneccion")
|
||||
err.printStackTrace()
|
||||
}
|
||||
|
||||
con.disconnect()
|
||||
return videos
|
||||
}
|
||||
|
||||
fun videoSubscriptions(token: String): ArrayList<VideoModel>{
|
||||
var con=this._newCon("users/me/subscriptions/videos","GET", token)
|
||||
fun videoSubscriptions(token: String, start: Int = 0): ArrayList<VideoModel>{
|
||||
val count = ManagerSingleton.videos_count
|
||||
val params = "start=$start&count=$count"
|
||||
val con = this._newCon("users/me/subscriptions/videos?$params","GET", token)
|
||||
var videos = arrayListOf<VideoModel>()
|
||||
try {
|
||||
if (con.responseCode == 200) {
|
||||
var response = InputStreamReader(con.inputStream)
|
||||
var data = JsonReader(response)
|
||||
val response = InputStreamReader(con.inputStream)
|
||||
val data = JsonReader(response)
|
||||
videos = parseVideos(data)
|
||||
data.close()
|
||||
}
|
||||
} catch(err:Exception){
|
||||
err?.printStackTrace()
|
||||
Log.d("TypeErr",err?.message ,err.cause)
|
||||
Log.d("Error","fallo la coneccion")
|
||||
err.printStackTrace()
|
||||
}
|
||||
|
||||
con.disconnect()
|
||||
return videos
|
||||
}
|
||||
|
||||
fun videoHistory(token: String, start: Int = 0): ArrayList<VideoModel>{
|
||||
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<VideoModel>()
|
||||
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<VideoModel>{
|
||||
val count = ManagerSingleton.videos_count
|
||||
val nsfw = ManagerSingleton.nfsw
|
||||
val params = "search=$text&start=$start&count=$count&nsfw=$nsfw"
|
||||
val con = this._newCon("search/videos?$params","GET")
|
||||
var videos = arrayListOf<VideoModel>()
|
||||
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 fullDescription(videoId: Int): String{
|
||||
val con = this._newCon("videos/$videoId/description","GET")
|
||||
var description = ""
|
||||
try {
|
||||
if (con.responseCode == 200) {
|
||||
val response = InputStreamReader(con.inputStream)
|
||||
val data = JsonReader(response)
|
||||
|
||||
data.beginObject()
|
||||
while (data.hasNext()){
|
||||
val name = data.nextName()
|
||||
when(name){
|
||||
"description" -> description = data.nextString()
|
||||
else -> data.skipValue()
|
||||
}
|
||||
}
|
||||
data.endObject()
|
||||
data.close()
|
||||
}
|
||||
} catch(err:Exception){
|
||||
err.printStackTrace()
|
||||
description = "Error!"
|
||||
}
|
||||
con.disconnect()
|
||||
return description
|
||||
}
|
||||
|
||||
fun channelVideos(account: String, start: Int): ArrayList<VideoModel> {
|
||||
val count = ManagerSingleton.videos_count
|
||||
val params = "start=$start&count=$count"
|
||||
val con = this._newCon("video-channels/$account/videos?$params","GET")
|
||||
var videos = arrayListOf<VideoModel>()
|
||||
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
|
||||
}
|
||||
}
|
@ -0,0 +1,64 @@
|
||||
package org.libre.agosto.p2play.models
|
||||
|
||||
import android.util.JsonReader
|
||||
import android.util.JsonToken
|
||||
|
||||
class ChannelModel (
|
||||
var id: Int = 0,
|
||||
var url: String = "",
|
||||
var nameChannel: String = "",
|
||||
var followers: Int = 0,
|
||||
var host: String = "",
|
||||
var name: String = "",
|
||||
var description: String = "",
|
||||
var support: String = "",
|
||||
var channelImg: String = ""
|
||||
) {
|
||||
fun getAccount(): String {
|
||||
return "$nameChannel@$host"
|
||||
}
|
||||
|
||||
fun parseChannel(data: JsonReader) {
|
||||
data.beginObject()
|
||||
|
||||
while (data.hasNext()) {
|
||||
|
||||
when(data.nextName()){
|
||||
"id" -> this.id = data.nextInt()
|
||||
"url" -> this.url = data.nextString()
|
||||
"name" -> this.nameChannel = data.nextString()
|
||||
"host" -> this.host = data.nextString()
|
||||
"followersCount" -> this.followers = data.nextInt()
|
||||
"displayName" -> this.name = data.nextString()
|
||||
"description" -> {
|
||||
if(data.peek() == JsonToken.STRING)
|
||||
this.description = data.nextString()
|
||||
else
|
||||
data.skipValue()
|
||||
}
|
||||
"support" -> {
|
||||
if(data.peek() == JsonToken.STRING)
|
||||
this.support = data.nextString()
|
||||
else
|
||||
data.skipValue()
|
||||
}
|
||||
"avatar" -> {
|
||||
if(data.peek() == JsonToken.BEGIN_OBJECT){
|
||||
data.beginObject()
|
||||
while (data.hasNext()){
|
||||
when(data.nextName()){
|
||||
"path" -> this.channelImg = data.nextString()
|
||||
else -> data.skipValue()
|
||||
}
|
||||
}
|
||||
data.endObject()
|
||||
}
|
||||
else
|
||||
data.skipValue()
|
||||
}
|
||||
else -> data.skipValue()
|
||||
}
|
||||
}
|
||||
data.endObject()
|
||||
}
|
||||
}
|
@ -1,5 +1,8 @@
|
||||
package org.libre.agosto.p2play.models
|
||||
|
||||
import android.util.JsonReader
|
||||
import android.util.JsonToken
|
||||
|
||||
class CommentaryModel (
|
||||
var id: Int = 0,
|
||||
var threadId: Int = 0,
|
||||
@ -9,4 +12,48 @@ class CommentaryModel (
|
||||
var commentary: String = "",
|
||||
var userHost: String = "",
|
||||
var replies: Int = 0
|
||||
)
|
||||
) {
|
||||
fun parseCommentary(data: JsonReader) {
|
||||
data.beginObject()
|
||||
while (data.hasNext()) {
|
||||
val key = data.nextName()
|
||||
when (key.toString()) {
|
||||
"id" -> this.id = data.nextInt()
|
||||
"threadId" -> this.threadId = data.nextInt()
|
||||
"text" -> this.commentary = data.nextString()
|
||||
"totalReplies" -> this.replies = data.nextInt()
|
||||
"account" -> {
|
||||
data.beginObject()
|
||||
while (data.hasNext()){
|
||||
val acKey = data.nextName()
|
||||
when(acKey.toString()){
|
||||
"displayName"-> this.username=data.nextString()
|
||||
"avatar"-> {
|
||||
if(data.peek() == JsonToken.BEGIN_OBJECT){
|
||||
data.beginObject()
|
||||
while (data.hasNext()){
|
||||
val avKey = data.nextName()
|
||||
when(avKey){
|
||||
"path"-> this.userImageUrl = data.nextString()
|
||||
else-> data.skipValue()
|
||||
}
|
||||
}
|
||||
data.endObject()
|
||||
}
|
||||
else
|
||||
data.skipValue()
|
||||
|
||||
}
|
||||
"uuid" -> this.userUuid = data.nextString()
|
||||
"host" -> this.userHost = data.nextString()
|
||||
else -> data.skipValue()
|
||||
}
|
||||
}
|
||||
data.endObject()
|
||||
}
|
||||
else -> data.skipValue()
|
||||
}
|
||||
}
|
||||
data.endObject()
|
||||
}
|
||||
}
|
@ -1,9 +1,12 @@
|
||||
package org.libre.agosto.p2play.models
|
||||
|
||||
import android.util.JsonReader
|
||||
import android.util.JsonToken
|
||||
import java.io.Serializable
|
||||
|
||||
class VideoModel(
|
||||
var id: Int = 0,
|
||||
var uuid: String = "",
|
||||
var name: String = "",
|
||||
var description: String = "",
|
||||
var thumbUrl: String = "",
|
||||
@ -15,4 +18,78 @@ class VideoModel(
|
||||
var userUuid: String = "",
|
||||
var userHost: String = "",
|
||||
var nameChannel: String = ""
|
||||
):Serializable
|
||||
):Serializable {
|
||||
fun getAccount(): String {
|
||||
return "$nameChannel@$userHost"
|
||||
}
|
||||
|
||||
fun getVideoUrl(): String {
|
||||
return "https://$userHost/videos/watch/$uuid"
|
||||
}
|
||||
|
||||
fun parseVideo(data: JsonReader){
|
||||
data.beginObject()
|
||||
while (data.hasNext()){
|
||||
val key = data.nextName()
|
||||
when (key.toString()) {
|
||||
"id"-> this.id = data.nextInt()
|
||||
"uuid" -> this.uuid = data.nextString()
|
||||
"name"->{
|
||||
this.name= data.nextString()
|
||||
}
|
||||
"description"->{
|
||||
if(data.peek() == JsonToken.STRING)
|
||||
this.description = data.nextString()
|
||||
else
|
||||
data.skipValue()
|
||||
}
|
||||
"duration"->{
|
||||
this.duration = data.nextInt()
|
||||
}
|
||||
"thumbnailPath"->{
|
||||
this.thumbUrl = data.nextString()
|
||||
}
|
||||
"embedPath"->{
|
||||
this.embedUrl = data.nextString()
|
||||
}
|
||||
"views"->{
|
||||
this.views = data.nextInt()
|
||||
}
|
||||
"channel"->{
|
||||
data.beginObject()
|
||||
while (data.hasNext()){
|
||||
val acKey = data.nextName()
|
||||
when(acKey.toString()){
|
||||
"displayName"-> this.username=data.nextString()
|
||||
"avatar"-> {
|
||||
if(data.peek() == JsonToken.BEGIN_OBJECT){
|
||||
data.beginObject()
|
||||
while (data.hasNext()){
|
||||
val avKey = data.nextName()
|
||||
when(avKey){
|
||||
"path"-> this.userImageUrl = data.nextString()
|
||||
else-> data.skipValue()
|
||||
}
|
||||
}
|
||||
data.endObject()
|
||||
}
|
||||
else
|
||||
data.skipValue()
|
||||
|
||||
}
|
||||
"uuid" -> this.userUuid = data.nextString()
|
||||
"host" -> this.userHost = data.nextString()
|
||||
"name" -> this.nameChannel = data.nextString()
|
||||
else-> data.skipValue()
|
||||
}
|
||||
}
|
||||
data.endObject()
|
||||
}
|
||||
else->{
|
||||
data.skipValue()
|
||||
}
|
||||
}
|
||||
}
|
||||
data.endObject()
|
||||
}
|
||||
}
|
@ -1,34 +0,0 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:aapt="http://schemas.android.com/aapt"
|
||||
android:width="108dp"
|
||||
android:height="108dp"
|
||||
android:viewportHeight="108"
|
||||
android:viewportWidth="108">
|
||||
<path
|
||||
android:fillType="evenOdd"
|
||||
android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
|
||||
android:strokeColor="#00000000"
|
||||
android:strokeWidth="1">
|
||||
<aapt:attr name="android:fillColor">
|
||||
<gradient
|
||||
android:endX="78.5885"
|
||||
android:endY="90.9159"
|
||||
android:startX="48.7653"
|
||||
android:startY="61.0927"
|
||||
android:type="linear">
|
||||
<item
|
||||
android:color="#44000000"
|
||||
android:offset="0.0" />
|
||||
<item
|
||||
android:color="#00000000"
|
||||
android:offset="1.0" />
|
||||
</gradient>
|
||||
</aapt:attr>
|
||||
</path>
|
||||
<path
|
||||
android:fillColor="#FFFFFF"
|
||||
android:fillType="nonZero"
|
||||
android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
|
||||
android:strokeColor="#00000000"
|
||||
android:strokeWidth="1" />
|
||||
</vector>
|
25
app/src/main/res/drawable/ic_alert.xml
Normal file
@ -0,0 +1,25 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24">
|
||||
<path
|
||||
android:pathData="M12.8716,3.5097L12,1.9603L11.1284,3.5097L2.1284,19.5097L1.2902,21L3,21L21,21L22.7098,21L21.8716,19.5097L12.8716,3.5097Z"
|
||||
android:strokeLineJoin="round"
|
||||
android:strokeWidth="2"
|
||||
android:fillColor="#00000000"
|
||||
android:strokeColor="#000000"
|
||||
android:fillType="evenOdd"/>
|
||||
<path
|
||||
android:pathData="M12,17.75C12.6904,17.75 13.25,17.1904 13.25,16.5C13.25,15.8096 12.6904,15.25 12,15.25C11.3096,15.25 10.75,15.8096 10.75,16.5C10.75,17.1904 11.3096,17.75 12,17.75Z"
|
||||
android:strokeWidth="1"
|
||||
android:fillColor="#000000"
|
||||
android:fillType="evenOdd"
|
||||
android:strokeColor="#00000000"/>
|
||||
<path
|
||||
android:pathData="M12,9L12,9A1,1 0,0 1,13 10L13,13A1,1 0,0 1,12 14L12,14A1,1 0,0 1,11 13L11,10A1,1 0,0 1,12 9z"
|
||||
android:strokeWidth="1"
|
||||
android:fillColor="#000000"
|
||||
android:fillType="evenOdd"
|
||||
android:strokeColor="#00000000"/>
|
||||
</vector>
|
9
app/src/main/res/drawable/ic_history_black_24dp.xml
Normal file
@ -0,0 +1,9 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24.0"
|
||||
android:viewportHeight="24.0">
|
||||
<path
|
||||
android:fillColor="#FF000000"
|
||||
android:pathData="M13,3c-4.97,0 -9,4.03 -9,9L1,12l3.89,3.89 0.07,0.14L9,12L6,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,8v5l4.28,2.54 0.72,-1.21 -3.5,-2.08L13.5,8L12,8z"/>
|
||||
</vector>
|
@ -1,170 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="108dp"
|
||||
android:height="108dp"
|
||||
android:viewportHeight="108"
|
||||
android:viewportWidth="108">
|
||||
<path
|
||||
android:fillColor="#26A69A"
|
||||
android:pathData="M0,0h108v108h-108z" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M9,0L9,108"
|
||||
android:strokeColor="#33FFFFFF"
|
||||
android:strokeWidth="0.8" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M19,0L19,108"
|
||||
android:strokeColor="#33FFFFFF"
|
||||
android:strokeWidth="0.8" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M29,0L29,108"
|
||||
android:strokeColor="#33FFFFFF"
|
||||
android:strokeWidth="0.8" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M39,0L39,108"
|
||||
android:strokeColor="#33FFFFFF"
|
||||
android:strokeWidth="0.8" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M49,0L49,108"
|
||||
android:strokeColor="#33FFFFFF"
|
||||
android:strokeWidth="0.8" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M59,0L59,108"
|
||||
android:strokeColor="#33FFFFFF"
|
||||
android:strokeWidth="0.8" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M69,0L69,108"
|
||||
android:strokeColor="#33FFFFFF"
|
||||
android:strokeWidth="0.8" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M79,0L79,108"
|
||||
android:strokeColor="#33FFFFFF"
|
||||
android:strokeWidth="0.8" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M89,0L89,108"
|
||||
android:strokeColor="#33FFFFFF"
|
||||
android:strokeWidth="0.8" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M99,0L99,108"
|
||||
android:strokeColor="#33FFFFFF"
|
||||
android:strokeWidth="0.8" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M0,9L108,9"
|
||||
android:strokeColor="#33FFFFFF"
|
||||
android:strokeWidth="0.8" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M0,19L108,19"
|
||||
android:strokeColor="#33FFFFFF"
|
||||
android:strokeWidth="0.8" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M0,29L108,29"
|
||||
android:strokeColor="#33FFFFFF"
|
||||
android:strokeWidth="0.8" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M0,39L108,39"
|
||||
android:strokeColor="#33FFFFFF"
|
||||
android:strokeWidth="0.8" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M0,49L108,49"
|
||||
android:strokeColor="#33FFFFFF"
|
||||
android:strokeWidth="0.8" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M0,59L108,59"
|
||||
android:strokeColor="#33FFFFFF"
|
||||
android:strokeWidth="0.8" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M0,69L108,69"
|
||||
android:strokeColor="#33FFFFFF"
|
||||
android:strokeWidth="0.8" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M0,79L108,79"
|
||||
android:strokeColor="#33FFFFFF"
|
||||
android:strokeWidth="0.8" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M0,89L108,89"
|
||||
android:strokeColor="#33FFFFFF"
|
||||
android:strokeWidth="0.8" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M0,99L108,99"
|
||||
android:strokeColor="#33FFFFFF"
|
||||
android:strokeWidth="0.8" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M19,29L89,29"
|
||||
android:strokeColor="#33FFFFFF"
|
||||
android:strokeWidth="0.8" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M19,39L89,39"
|
||||
android:strokeColor="#33FFFFFF"
|
||||
android:strokeWidth="0.8" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M19,49L89,49"
|
||||
android:strokeColor="#33FFFFFF"
|
||||
android:strokeWidth="0.8" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M19,59L89,59"
|
||||
android:strokeColor="#33FFFFFF"
|
||||
android:strokeWidth="0.8" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M19,69L89,69"
|
||||
android:strokeColor="#33FFFFFF"
|
||||
android:strokeWidth="0.8" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M19,79L89,79"
|
||||
android:strokeColor="#33FFFFFF"
|
||||
android:strokeWidth="0.8" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M29,19L29,89"
|
||||
android:strokeColor="#33FFFFFF"
|
||||
android:strokeWidth="0.8" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M39,19L39,89"
|
||||
android:strokeColor="#33FFFFFF"
|
||||
android:strokeWidth="0.8" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M49,19L49,89"
|
||||
android:strokeColor="#33FFFFFF"
|
||||
android:strokeWidth="0.8" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M59,19L59,89"
|
||||
android:strokeColor="#33FFFFFF"
|
||||
android:strokeWidth="0.8" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M69,19L69,89"
|
||||
android:strokeColor="#33FFFFFF"
|
||||
android:strokeWidth="0.8" />
|
||||
<path
|
||||
android:fillColor="#00000000"
|
||||
android:pathData="M79,19L79,89"
|
||||
android:strokeColor="#33FFFFFF"
|
||||
android:strokeWidth="0.8" />
|
||||
</vector>
|
9
app/src/main/res/drawable/ic_live_tv_black_24dp.xml
Normal file
@ -0,0 +1,9 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24.0"
|
||||
android:viewportHeight="24.0">
|
||||
<path
|
||||
android:fillColor="#FF000000"
|
||||
android:pathData="M21,6h-7.59l3.29,-3.29L16,2l-4,4 -4,-4 -0.71,0.71L10.59,6L3,6c-1.1,0 -2,0.89 -2,2v12c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2L23,8c0,-1.11 -0.9,-2 -2,-2zM21,20L3,20L3,8h18v12zM9,10v8l7,-4z"/>
|
||||
</vector>
|
9
app/src/main/res/drawable/ic_search_black_24dp.xml
Normal file
@ -0,0 +1,9 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24.0"
|
||||
android:viewportHeight="24.0">
|
||||
<path
|
||||
android:fillColor="#FF000000"
|
||||
android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
|
||||
</vector>
|
29
app/src/main/res/drawable/ic_share.xml
Normal file
@ -0,0 +1,29 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24">
|
||||
<path
|
||||
android:pathData="M20,15L20,18.0026C20,19.1057 19.1074,20 18.0049,20L5.9951,20C4.8932,20 4,19.1074 4,18.0049L4,5.9951C4,4.8932 4.8959,4 5.9974,4L9,4"
|
||||
android:strokeWidth="2"
|
||||
android:fillColor="#00000000"
|
||||
android:strokeColor="#000000"
|
||||
android:fillType="evenOdd"
|
||||
android:strokeLineCap="round"/>
|
||||
<path
|
||||
android:pathData="M13,4l7.0208,0l0,7.0191"
|
||||
android:strokeLineJoin="round"
|
||||
android:strokeWidth="2"
|
||||
android:fillColor="#00000000"
|
||||
android:strokeColor="#000000"
|
||||
android:fillType="evenOdd"
|
||||
android:strokeLineCap="round"/>
|
||||
<path
|
||||
android:pathData="M19,5L12,12"
|
||||
android:strokeLineJoin="round"
|
||||
android:strokeWidth="2"
|
||||
android:fillColor="#00000000"
|
||||
android:strokeColor="#000000"
|
||||
android:fillType="evenOdd"
|
||||
android:strokeLineCap="round"/>
|
||||
</vector>
|
9
app/src/main/res/drawable/ic_trending_up_black_24dp.xml
Normal file
@ -0,0 +1,9 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24.0"
|
||||
android:viewportHeight="24.0">
|
||||
<path
|
||||
android:fillColor="#FF000000"
|
||||
android:pathData="M16,6l2.29,2.29 -4.88,4.88 -4,-4L2,16.59 3.41,18l6,-6 4,4 6.3,-6.29L22,12V6z"/>
|
||||
</vector>
|
@ -27,7 +27,7 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:contentDescription="Logo"
|
||||
app:srcCompat="@drawable/icon" />
|
||||
app:srcCompat="@mipmap/ic_launcher" />
|
||||
|
||||
<Space
|
||||
android:layout_width="match_parent"
|
||||
|
154
app/src/main/res/layout/activity_channel.xml
Normal file
@ -0,0 +1,154 @@
|
||||
<?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="wrap_content"
|
||||
tools:context=".ChannelActivity">
|
||||
|
||||
<ScrollView
|
||||
android:layout_width="match_parent"
|
||||
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">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical">
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/linearLayout2"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/colorProfile"
|
||||
android:gravity="center_horizontal"
|
||||
android:orientation="vertical"
|
||||
android:paddingTop="20dp"
|
||||
android:paddingBottom="10dp"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent">
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/channelImg"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="70dp"
|
||||
android:adjustViewBounds="false"
|
||||
android:background="@android:color/transparent"
|
||||
android:contentDescription="@string/app_name"
|
||||
android:cropToPadding="false"
|
||||
android:scaleType="fitCenter"
|
||||
app:srcCompat="@drawable/default_avatar" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/usernameProfile"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="5dp"
|
||||
android:layout_marginBottom="5dp"
|
||||
android:textAlignment="center"
|
||||
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
|
||||
android:textColor="@android:color/white" />
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="horizontal"
|
||||
android:baselineAligned="false">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center_vertical"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/textView2"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:text="@string/followersIndicator"
|
||||
android:textAlignment="center"
|
||||
android:textColor="@android:color/white"
|
||||
android:textStyle="bold" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/subcriptionsTxt"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:textAlignment="textStart"
|
||||
android:textColor="@android:color/white" />
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="1"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/textView3"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:text="@string/hostIndicator"
|
||||
android:textAlignment="center"
|
||||
android:textColor="@android:color/white"
|
||||
android:textStyle="bold" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/hostTxt"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:textAlignment="textStart"
|
||||
android:textColor="@android:color/white" />
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<Button
|
||||
android:id="@+id/subcriptionBtn"
|
||||
style="@style/Widget.AppCompat.Button.Colored"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/subscribeBtn"
|
||||
android:textAlignment="center"
|
||||
android:visibility="invisible" />
|
||||
</LinearLayout>
|
||||
|
||||
<FrameLayout
|
||||
android:id="@+id/frameLayout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingLeft="5dp"
|
||||
android:paddingRight="5dp"
|
||||
app:layout_constraintTop_toBottomOf="@+id/linearLayout2"
|
||||
tools:layout_editor_absoluteX="0dp">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/textView"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Videos:"
|
||||
android:textStyle="bold"
|
||||
tools:layout_editor_absoluteX="176dp"
|
||||
tools:layout_editor_absoluteY="214dp" />
|
||||
</FrameLayout>
|
||||
|
||||
<android.support.v7.widget.RecyclerView
|
||||
android:id="@+id/listVideosChannel"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:scrollbars="none" />
|
||||
|
||||
</LinearLayout>
|
||||
</ScrollView>
|
||||
|
||||
|
||||
</android.support.constraint.ConstraintLayout>
|
@ -18,6 +18,10 @@
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_gravity="start"
|
||||
android:background="@color/colorMenu"
|
||||
app:itemTextColor="@color/colorBody"
|
||||
app:itemIconTint="@android:color/darker_gray"
|
||||
android:theme="@style/ThemeOverlay.AppCompat.Dark"
|
||||
android:fitsSystemWindows="true"
|
||||
app:headerLayout="@layout/nav_header_main"
|
||||
app:menu="@menu/activity_main_drawer" />
|
||||
|
@ -6,7 +6,18 @@
|
||||
android:layout_height="match_parent"
|
||||
tools:context=".ReproductorActivity">
|
||||
|
||||
<RelativeLayout
|
||||
android:id="@+id/fullScreen"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
android:layout_alignParentTop="true"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:layout_alignParentRight="true"
|
||||
android:visibility="gone" />
|
||||
|
||||
<ScrollView
|
||||
android:id="@+id/nonFullScreen"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
@ -37,6 +48,7 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingStart="5dp"
|
||||
android:textAppearance="@android:style/TextAppearance.Material.Large"
|
||||
android:textSize="18sp"
|
||||
android:textStyle="bold" />
|
||||
|
||||
<TextView
|
||||
@ -112,21 +124,61 @@
|
||||
android:textAlignment="center" />
|
||||
</LinearLayout>
|
||||
|
||||
<Button
|
||||
android:id="@+id/button4"
|
||||
<LinearLayout
|
||||
android:id="@+id/reportLayout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="1"
|
||||
android:text="@string/shareBtn"
|
||||
android:visibility="gone" />
|
||||
android:orientation="vertical"
|
||||
android:visibility="visible">
|
||||
|
||||
<Button
|
||||
android:id="@+id/button3"
|
||||
<ImageView
|
||||
android:id="@+id/imageViewAlert"
|
||||
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_alert" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/textViewAlert"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="1"
|
||||
android:text="@string/reportBtn"
|
||||
android:visibility="gone" />
|
||||
android:textAlignment="center" />
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/shareLayout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="1"
|
||||
android:orientation="vertical"
|
||||
android:visibility="visible">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/imageViewShare"
|
||||
android:layout_width="match_parent"
|
||||
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_share" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/textViewShare"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="1"
|
||||
android:text="@string/shareBtn"
|
||||
android:textAlignment="center" />
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
@ -147,22 +199,39 @@
|
||||
android:scaleType="centerInside"
|
||||
app:srcCompat="@drawable/default_avatar" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/userTxt"
|
||||
android:layout_width="70dp"
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="2"
|
||||
android:orientation="vertical">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/userTxt"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textAppearance="@android:style/TextAppearance.Material.Large"
|
||||
android:textColor="@android:color/black" />
|
||||
android:textColor="@android:color/black"
|
||||
android:textSize="18sp"
|
||||
android:textStyle="bold" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/hostTxt"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textSize="10sp"
|
||||
android:textStyle="italic" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<Button
|
||||
android:id="@+id/subscribeBtn"
|
||||
style="@android:style/Widget.Holo.Button.Small"
|
||||
style="@style/Widget.AppCompat.Button.Colored"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:text="@string/subscribeBtn"
|
||||
android:visibility="gone" />
|
||||
android:textSize="10sp"
|
||||
android:visibility="invisible" />
|
||||
</LinearLayout>
|
||||
|
||||
<TextView
|
||||
@ -172,12 +241,15 @@
|
||||
android:maxLength="1000"
|
||||
android:maxLines="100"
|
||||
android:paddingLeft="5dp"
|
||||
android:text="@string/descriptionTxt" />
|
||||
android:text="@string/descriptionTxt"
|
||||
android:textStyle="bold" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/descriptionVideoTxt"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="2dp"
|
||||
android:layout_marginBottom="2dp"
|
||||
android:autoLink="web"
|
||||
android:linksClickable="true"
|
||||
android:maxLength="10000"
|
||||
@ -185,6 +257,15 @@
|
||||
android:paddingLeft="10dp"
|
||||
android:paddingRight="10dp" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/showMoreBtn"
|
||||
style="@style/Widget.AppCompat.Button.Borderless.Colored"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:text="@string/showMore"
|
||||
android:visibility="gone" />
|
||||
|
||||
<View
|
||||
android:id="@+id/divider"
|
||||
android:layout_width="match_parent"
|
||||
@ -193,14 +274,16 @@
|
||||
|
||||
<Space
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="30dp" />
|
||||
android:layout_height="10dp"
|
||||
android:layout_weight="1" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/commentariesTxt"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingLeft="5dp"
|
||||
android:text="@string/commentariesTxt" />
|
||||
android:text="@string/commentariesTxt"
|
||||
android:textStyle="bold" />
|
||||
|
||||
<Space
|
||||
android:layout_width="match_parent"
|
||||
@ -250,7 +333,6 @@
|
||||
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" />
|
||||
|
@ -27,7 +27,7 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:contentDescription="@string/app_name"
|
||||
app:srcCompat="@drawable/icon" />
|
||||
app:srcCompat="@mipmap/ic_launcher" />
|
||||
|
||||
<Space
|
||||
android:layout_width="match_parent"
|
||||
|
@ -3,22 +3,21 @@
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/nav_header_height"
|
||||
android:background="@android:color/darker_gray"
|
||||
android:background="@color/colorProfile"
|
||||
android:gravity="bottom"
|
||||
android:orientation="vertical"
|
||||
android:paddingBottom="@dimen/activity_vertical_margin"
|
||||
android:paddingLeft="@dimen/activity_horizontal_margin"
|
||||
android:paddingRight="@dimen/activity_horizontal_margin"
|
||||
android:paddingTop="@dimen/activity_vertical_margin"
|
||||
android:paddingBottom="@dimen/activity_vertical_margin"
|
||||
android:theme="@style/ThemeOverlay.AppCompat.Dark">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/side_imageView"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="50dp"
|
||||
android:layout_height="50dp"
|
||||
android:contentDescription="@string/nav_header_desc"
|
||||
android:paddingTop="@dimen/nav_header_vertical_spacing"
|
||||
app:srcCompat="@mipmap/ic_launcher_round" />
|
||||
app:srcCompat="@drawable/default_avatar" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/side_usernameTxt"
|
||||
@ -26,12 +25,15 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingTop="@dimen/nav_header_vertical_spacing"
|
||||
android:text="@string/nav_header_title"
|
||||
android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
|
||||
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="18sp" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/side_emailTxt"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/nav_header_subtitle" />
|
||||
android:text="@string/nav_header_subtitle"
|
||||
android:textColor="@android:color/darker_gray" />
|
||||
|
||||
</LinearLayout>
|
||||
|
26
app/src/main/res/layout/report_dialog.xml
Normal file
@ -0,0 +1,26 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:id="@+id/layout_root"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
android:orientation="vertical"
|
||||
android:padding="10dp" >
|
||||
|
||||
<TextView
|
||||
android:id="@+id/reportTxt"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/reportDialog"
|
||||
android:textAppearance="?android:attr/textAppearanceLarge" />
|
||||
|
||||
<EditText
|
||||
android:id="@+id/reportText"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:inputType="textMultiLine">
|
||||
|
||||
<requestFocus />
|
||||
|
||||
</EditText>
|
||||
|
||||
</LinearLayout>
|
@ -25,6 +25,7 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center"
|
||||
android:orientation="vertical"
|
||||
android:paddingLeft="10dp"
|
||||
android:paddingRight="10dp">
|
||||
|
@ -41,6 +41,7 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center"
|
||||
android:orientation="vertical">
|
||||
|
||||
<TextView
|
||||
@ -48,16 +49,15 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:maxLength="70"
|
||||
android:text="TextView"
|
||||
android:textSize="18sp"
|
||||
android:textSize="14sp"
|
||||
android:textStyle="bold" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/descriptionTxt"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="TextView"
|
||||
android:textColor="@android:color/darker_gray" />
|
||||
android:textColor="@android:color/darker_gray"
|
||||
android:textSize="12sp" />
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
||||
|
@ -3,16 +3,39 @@
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
tools:showIn="navigation_view">
|
||||
|
||||
<item android:title="Videos">
|
||||
<item
|
||||
android:id="@+id/ml"
|
||||
android:icon="@android:color/darker_gray"
|
||||
android:title="@string/nav_menu_myLibrary"
|
||||
android:visible="false">
|
||||
<menu>
|
||||
<item
|
||||
android:id="@+id/nav_subscriptions"
|
||||
android:id="@+id/nav_myVideos"
|
||||
android:icon="@drawable/ic_video_library_black_24dp"
|
||||
android:title="@string/title_myVideos" />
|
||||
<item
|
||||
android:id="@+id/nav_subscriptions"
|
||||
android:icon="@drawable/ic_live_tv_black_24dp"
|
||||
android:title="@string/nav_subscriptions" />
|
||||
<item
|
||||
android:id="@+id/nav_history"
|
||||
android:icon="@drawable/ic_history_black_24dp"
|
||||
android:title="@string/nav_history" />
|
||||
</menu>
|
||||
</item>
|
||||
<item
|
||||
android:id="@+id/ai"
|
||||
android:icon="@android:color/darker_gray"
|
||||
android:title="@string/nav_menu_videos">
|
||||
<menu>
|
||||
<item
|
||||
android:id="@+id/nav_popular"
|
||||
android:icon="@android:drawable/btn_star"
|
||||
android:title="@string/nav_popular" />
|
||||
<item
|
||||
android:id="@+id/nav_trending"
|
||||
android:icon="@drawable/ic_trending_up_black_24dp"
|
||||
android:title="@string/nav_trending" />
|
||||
<item
|
||||
android:id="@+id/nav_recent"
|
||||
android:icon="@drawable/ic_add_circle_black_24dp"
|
||||
@ -24,7 +47,10 @@
|
||||
</menu>
|
||||
</item>
|
||||
|
||||
<item android:title="More">
|
||||
<item
|
||||
android:id="@+id/aiao"
|
||||
android:icon="@android:color/white"
|
||||
android:title="@string/nav_menu_more">
|
||||
<menu>
|
||||
<item
|
||||
android:id="@+id/nav_about"
|
||||
|
@ -2,6 +2,12 @@
|
||||
<menu xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
|
||||
<item
|
||||
android:id="@+id/app_bar_search"
|
||||
android:icon="@drawable/ic_search_black_24dp"
|
||||
app:actionViewClass="android.widget.SearchView"
|
||||
app:showAsAction="always"/>
|
||||
|
||||
<item
|
||||
android:id="@+id/action_login"
|
||||
android:title="@string/action_login"
|
||||
|
@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<background android:drawable="@drawable/ic_launcher_background" />
|
||||
<foreground android:drawable="@drawable/ic_launcher_foreground" />
|
||||
<background android:drawable="@color/ic_launcher_background"/>
|
||||
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
|
||||
</adaptive-icon>
|
@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<background android:drawable="@drawable/ic_launcher_background" />
|
||||
<foreground android:drawable="@drawable/ic_launcher_foreground" />
|
||||
<background android:drawable="@color/ic_launcher_background"/>
|
||||
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
|
||||
</adaptive-icon>
|
BIN
app/src/main/res/mipmap-hdpi/.DS_Store
vendored
Before Width: | Height: | Size: 3.0 KiB After Width: | Height: | Size: 1.3 KiB |
BIN
app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
Normal file
After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 4.9 KiB After Width: | Height: | Size: 3.2 KiB |
Before Width: | Height: | Size: 1.7 KiB |
BIN
app/src/main/res/mipmap-mdpi/.DS_Store
vendored
Before Width: | Height: | Size: 2.0 KiB After Width: | Height: | Size: 947 B |
BIN
app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
Normal file
After Width: | Height: | Size: 694 B |
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 2.0 KiB |
Before Width: | Height: | Size: 1.2 KiB |
BIN
app/src/main/res/mipmap-xhdpi/.DS_Store
vendored
Before Width: | Height: | Size: 4.5 KiB After Width: | Height: | Size: 1.8 KiB |
BIN
app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
Normal file
After Width: | Height: | Size: 1.5 KiB |
Before Width: | Height: | Size: 6.9 KiB After Width: | Height: | Size: 4.6 KiB |
Before Width: | Height: | Size: 1.9 KiB |
BIN
app/src/main/res/mipmap-xxhdpi/.DS_Store
vendored
Before Width: | Height: | Size: 6.3 KiB After Width: | Height: | Size: 2.8 KiB |
BIN
app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
Normal file
After Width: | Height: | Size: 2.5 KiB |
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 7.1 KiB |
Before Width: | Height: | Size: 2.3 KiB |
BIN
app/src/main/res/mipmap-xxxhdpi/.DS_Store
vendored
Before Width: | Height: | Size: 9.0 KiB After Width: | Height: | Size: 4.0 KiB |
BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
Normal file
After Width: | Height: | Size: 3.7 KiB |
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 10 KiB |
Before Width: | Height: | Size: 3.6 KiB |
@ -8,7 +8,7 @@
|
||||
<!-- Start About strings -->
|
||||
<string name="aboutLabel">Sobre P2Play</string>
|
||||
<string name="aboutText">P2Play es una aplicacion no-oficial de PeerTube. Tu puedes ver y cntribuir con el codigo en GitLab:</string>
|
||||
<string name="aboutStatus">Puedes subscribirte a nuestro perfil en GNU Social:</string>
|
||||
<string name="aboutStatus">Puedes seguir nuestro blog:</string>
|
||||
<string name="aboutLicense">Copyleft GNU GPLv3 License</string>
|
||||
<string name="aboutInstance">Sobre la instancia</string>
|
||||
<string name="aboutInWeb">Para ver los terminos y mas visita la web:</string>
|
||||
@ -43,7 +43,9 @@
|
||||
<string name="title_subscriptions">Suscripciones</string>
|
||||
<string name="title_myVideos">Mis videos</string>
|
||||
<string name="view_text">vistas</string>
|
||||
<string name="time_text">segundos</string>
|
||||
<string name="timeSec_text">segundos</string>
|
||||
<string name="timeMin_text">minutos</string>
|
||||
<string name="timeHrs_text">horas</string>
|
||||
<string name="nav_header_title">Inicia session</string>
|
||||
<!-- Toast msg -->
|
||||
<string name="logout_msg">Te has desconectado</string>
|
||||
@ -54,6 +56,10 @@
|
||||
<string name="nav_local">Local</string>
|
||||
<string name="nav_about">Sobre</string>
|
||||
<string name="nav_subscriptions">Suscripciones</string>
|
||||
<string name="nav_history">Historial</string>
|
||||
<string name="nav_menu_myLibrary">Mi libreria</string>
|
||||
<string name="nav_menu_videos">Videos</string>
|
||||
<string name="nav_menu_more">Mas</string>
|
||||
<!-- End Menu strings -->
|
||||
<!-- Start MiniMenu strings -->
|
||||
<string name="action_settings">Configuracion</string>
|
||||
@ -88,6 +94,14 @@
|
||||
<string name="pref_nfsw_description">Si es activado podria mostrar contenido para adultos o sencible.</string>
|
||||
<string name="pref_hostname_title">Instancia Peertube</string>
|
||||
<string name="pref_message_exit">Reinicia para aplicar los cambios</string>
|
||||
<string name="pref_videos_count_title">Videos por pagina</string>
|
||||
<string name="showMore">Mostrar mas</string>
|
||||
<string name="nav_trending">Tendencias</string>
|
||||
<string name="title_trending">Tendencias</string>
|
||||
<string name="followersIndicator">Seguidores:</string>
|
||||
<string name="hostIndicator">Host:</string>
|
||||
<string name="reportDialog">Razon para reportar:</string>
|
||||
<string name="reportDialogMsg">Has reportado el video</string>
|
||||
<!-- End Settings strings -->
|
||||
|
||||
</resources>
|
@ -9,4 +9,5 @@
|
||||
<color name="colorBlack">#000</color>
|
||||
<color name="colorLike">#FF3C9100</color>
|
||||
<color name="colorDislike">#ec020e</color>
|
||||
<color name="colorProfile">#262626</color>
|
||||
</resources>
|
||||
|
4
app/src/main/res/values/ic_launcher_background.xml
Normal file
@ -0,0 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<color name="ic_launcher_background">#E95921</color>
|
||||
</resources>
|
@ -6,16 +6,16 @@
|
||||
<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>
|
||||
<string name="charging">Loading…</string>
|
||||
<!-- End Global string -->
|
||||
|
||||
|
||||
<!-- Start About strings -->
|
||||
<string name="aboutGitUrl" translatable="false">https://gitlab.com/agosto182/p2play/</string>
|
||||
<string name="aboutGnuUrl" translatable="false">https://gnusocial.ml/p2play</string>
|
||||
<string name="aboutGnuUrl" translatable="false">https://personaljournal.ca/p2play/</string>
|
||||
<string name="aboutLabel">About P2Play</string>
|
||||
<string name="aboutText">P2Play is an Android application unnoficial of PeerTube. You can watch and contribute with the code on GitLab:</string>
|
||||
<string name="aboutStatus">You can subscribe to our profile on GNU Social:</string>
|
||||
<string name="aboutStatus">You can follow our blog:</string>
|
||||
<string name="aboutLicense">Copyleft GNU GPLv3 License</string>
|
||||
<string name="aboutInstance">About instance</string>
|
||||
<string name="aboutInWeb">You can see terms and more on the web:</string>
|
||||
@ -48,12 +48,15 @@
|
||||
<!-- End Login strings -->
|
||||
<!-- Start Main strings -->
|
||||
<string name="title_subscriptions">Subscriptions</string>
|
||||
<string name="title_recent">Recent videos</string>
|
||||
<string name="title_popular">Popular videos</string>
|
||||
<string name="title_recent">Recent</string>
|
||||
<string name="title_popular">Popular</string>
|
||||
<string name="title_trending">Trending</string>
|
||||
<string name="title_local">Local videos</string>
|
||||
<string name="title_myVideos">My videos</string>
|
||||
<string name="view_text">views</string>
|
||||
<string name="time_text">seconds</string>
|
||||
<string name="timeSec_text">seconds</string>
|
||||
<string name="timeMin_text">minutes</string>
|
||||
<string name="timeHrs_text">hours</string>
|
||||
<string name="nav_header_title">Log In</string>
|
||||
<string name="nav_header_subtitle" translatable="false">P2Play</string>
|
||||
<!-- Toast msg -->
|
||||
@ -62,9 +65,14 @@
|
||||
<!-- Start Menu strings -->
|
||||
<string name="nav_subscriptions">Subscriptions</string>
|
||||
<string name="nav_popular">Popular</string>
|
||||
<string name="nav_trending">Trending</string>
|
||||
<string name="nav_recent">Recent</string>
|
||||
<string name="nav_local">Local</string>
|
||||
<string name="nav_about">About</string>
|
||||
<string name="nav_history">History</string>
|
||||
<string name="nav_menu_myLibrary">My Library</string>
|
||||
<string name="nav_menu_videos">Videos</string>
|
||||
<string name="nav_menu_more">More</string>
|
||||
<!-- End Menu strings -->
|
||||
<!-- Start MiniMenu strings -->
|
||||
<string name="action_settings">Settings</string>
|
||||
@ -83,6 +91,7 @@
|
||||
<string name="reportBtn">Report</string>
|
||||
<string name="unSubscribeBtn">Unsubscribe</string>
|
||||
<string name="commentaryText">Comment</string>
|
||||
<string name="showMore">Show more</string>
|
||||
<!-- Messages -->
|
||||
<string name="subscribeMsg">You are subscribed to this channel</string>
|
||||
<string name="rateMsg">You are rated the video</string>
|
||||
@ -100,6 +109,14 @@
|
||||
<string name="pref_hostname_title">Peertube instance</string>
|
||||
<string name="pref_hostname_error" translatable="false">-</string>
|
||||
<string name="pref_message_exit">Restart app to apply changes</string>
|
||||
<string name="pref_videos_count_title">Videos per page</string>
|
||||
<!-- End Settings strings -->
|
||||
|
||||
<!-- Start Channel strings -->
|
||||
<string name="followersIndicator">Followers:</string>
|
||||
<string name="hostIndicator">Host:</string>
|
||||
<!-- End Channel strings -->
|
||||
<!-- Start Prompt string -->
|
||||
<string name="reportDialog">Reason for report video:</string>
|
||||
<string name="reportDialogMsg">You are reported the video</string>
|
||||
<!-- End Prompt strings -->
|
||||
</resources>
|
||||
|
@ -13,6 +13,12 @@
|
||||
<item name="windowNoTitle">true</item>
|
||||
</style>
|
||||
|
||||
<style name="P2playTheme.noBar" parent="Theme.AppCompat.Light.NoActionBar">
|
||||
<item name="colorPrimary">@color/colorHeader</item>
|
||||
<item name="colorPrimaryDark">@android:color/darker_gray</item>
|
||||
<item name="colorAccent">@android:color/holo_orange_dark</item>
|
||||
</style>
|
||||
|
||||
<style name="P2playTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.ActionBar" />
|
||||
|
||||
<style name="P2playTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
|
||||
|
@ -18,4 +18,12 @@
|
||||
android:summary="@string/pref_nfsw_description"
|
||||
android:title="@string/pref_nfsw_title" />
|
||||
|
||||
<EditTextPreference
|
||||
android:defaultValue="15"
|
||||
android:inputType="number"
|
||||
android:key="videos_count"
|
||||
android:selectAllOnFocus="true"
|
||||
android:singleLine="true"
|
||||
android:title="@string/pref_videos_count_title" />
|
||||
|
||||
</PreferenceScreen>
|
||||
|
@ -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.3.0'
|
||||
ext.kotlin_version = '1.3.50'
|
||||
repositories {
|
||||
google()
|
||||
jcenter()
|
||||
}
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:3.3.0'
|
||||
classpath 'com.android.tools.build:gradle:3.4.2'
|
||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
||||
|
||||
// NOTE: Do not place your application dependencies here; they belong
|
||||
|
BIN
docs/p2playv2.png
Normal file
After Width: | Height: | Size: 7.9 KiB |
BIN
docs/p2playv2.xcf
Normal file
4
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,6 +1,6 @@
|
||||
#Wed Jan 23 14:44:01 CST 2019
|
||||
#Thu Oct 17 20:10:56 CDT 2019
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
|
||||
|
BIN
screenshots/screenshot.png
Normal file
After Width: | Height: | Size: 149 KiB |
BIN
screenshots/screenshot2.png
Normal file
After Width: | Height: | Size: 32 KiB |
BIN
screenshots/screenshot3.png
Normal file
After Width: | Height: | Size: 58 KiB |
BIN
screenshots/screenshot4.png
Normal file
After Width: | Height: | Size: 51 KiB |
BIN
screenshots/screenshot5.png
Normal file
After Width: | Height: | Size: 22 KiB |
BIN
screenshots/screenshot6.png
Normal file
After Width: | Height: | Size: 23 KiB |