Compare commits

..
103 Commits
Author SHA1 Message Date
Akinwale Ariwodola 6fa308ef96 bumpversion 0.16.13 --> 0.16.14 2021-01-25 18:54:00 +01:00
Akinwale Ariwodola f3e513fc2d Update translations and content filters 2021-01-25 18:52:21 +01:00
Akinwale Ariwodola d72a8faec4 sdk 0.88.0 2021-01-23 19:23:11 +01:00
Akinwale Ariwodola fdb4578349 Merge pull request #1119 from kekkyojin/remove-sha256
Remove Helper.SHA256() method
2021-01-18 20:24:22 +01:00
Javi Rueda c08237d399 Remove Helper.SHA256() method 2021-01-14 13:04:43 +01:00
Akinwale Ariwodola bdf8a58818 bumpversion 0.16.12 --> 0.16.13 2021-01-12 09:11:26 +01:00
Akinwale Ariwodola e1d51c881a Fix crash bug for anonymous repost claim results. Better handle channel repost navigation. 2021-01-12 09:07:33 +01:00
Akinwale Ariwodola 28212808f8 Merge pull request #1115 from pakar/master
Upgrade ExoPlayer from 2.11.4 to 2.12.2
2021-01-12 08:35:04 +01:00
Akinwale Ariwodola 74f08f8f98 Merge pull request #1102 from kekkyojin/fix-markdown-rendering
Use Base64 to encode html when rendering Markdown files
2021-01-12 08:33:40 +01:00
Akinwale Ariwodola cb5c29fbce Merge pull request #1117 from kekkyojin/fix-nosuchmethod-commons
Fix NoSuchMethod exception for HelperSHA256 on API Level prior to P
2021-01-12 08:32:08 +01:00
Javi Rueda 4d775d3a17 Fix NoSuchMethod exception for HelperSHA256 on API Level prior to P 2021-01-11 20:44:03 +01:00
Patric Karlström fd94ef9fa7 Upgrade ExoPlayer from 2.11.4 to 2.12.2 2021-01-11 01:10:23 +01:00
Javi Rueda 2e0331305a Use Base64 to encode html when rendering Markdown files 2020-12-29 11:30:05 +01:00
Akinwale Ariwodola fb560f8f01 fix last resource build error 2020-12-29 07:20:46 +01:00
Akinwale Ariwodola ef80c9f7fd fix resource build error 2020-12-29 07:13:57 +01:00
Akinwale Ariwodola 99a4a0a22f Remove comment post confirmation. Fix resources build error. 2020-12-29 07:07:53 +01:00
Akinwale Ariwodola 136853853a bumpversion 0.16.11 --> 0.16.12 2020-12-29 07:02:13 +01:00
Akinwale Ariwodola ebf3299c30 add scrollbars attribute to listview 2020-12-29 07:00:45 +01:00
Akinwale Ariwodola 036b49a871 Merge pull request #1097 from kekkyojin/remove_stages_scrollbar
Avoid showing vertical scroll bar on stage error listview
2020-12-29 07:00:02 +01:00
Akinwale Ariwodola 67d5f88d34 Merge pull request #1100 from clay53/master
Changed wallet send notification to accept 4 digit decimal
2020-12-29 06:52:16 +01:00
Akinwale Ariwodola b1e0b9af33 sdk 0.87.0. Show confirmation for unfollow. 2020-12-29 06:47:10 +01:00
Clayton Hickey c30b012787 Changed wallet send notification to accept 4 digit decimal 2020-12-27 03:54:36 -05:00
Javi Rueda c8c6305757 Avoid showing vertical scroll bar on stage error listview 2020-12-22 02:26:37 +01:00
Akinwale Ariwodola ee1d090e62 Merge pull request #1068 from kekkyojin/fix-lintproblems
Some fixes for lint
2020-12-21 19:43:08 +01:00
Javi Rueda 9e56a86492 Some fixes for lint 2020-12-18 14:30:48 +01:00
Akinwale Ariwodola e6b83877f1 Merge pull request #1063 from clay53/1042
Removed comment tips
2020-12-18 13:01:49 +01:00
Akinwale Ariwodola b567e39aef Merge pull request #1069 from kekkyojin/add-twitter-instructions
Provide instructions to add dummy Twitter API credentials
2020-12-18 12:22:03 +01:00
Akinwale Ariwodola ae62dba0a6 Merge pull request #1071 from kekkyojin/sha256-unittest
Add unit test for Helper.SHA256(String)
2020-12-18 12:21:39 +01:00
Akinwale Ariwodola df1e8abf50 Merge pull request #1067 from kekkyojin/use-apache-hex
Replace Hex class from GMS with the one from Apache
2020-12-18 12:20:42 +01:00
Javi Rueda 31cfb26c3b Add unit test for Helper.SHA256(String) 2020-12-15 13:45:32 +01:00
Javi Rueda e5f34dc464 Provide instructions to add dummy Twitter API credentials 2020-12-14 20:38:57 +01:00
Javi Rueda 601031e55d Replace Hex class from GMS with the one from Apache 2020-12-14 18:17:13 +01:00
Akinwale Ariwodola a9aadbe6a8 bumpversion 0.16.10 --> 0.16.11 2020-12-13 18:08:10 +01:00
Akinwale Ariwodola f9a4b71037 fix crash error when following doesn't exist in shared user state 2020-12-13 18:07:19 +01:00
Clayton Hickey 0f10e9dc1f Removed comment tips 2020-12-12 20:11:00 -05:00
Akinwale Ariwodola 0647deb06c Merge pull request #1061 from kekkyojin/startupstage-listview
Use ListView to show startup stage errors
2020-12-12 23:16:17 +01:00
Akinwale Ariwodola b2f5fec293 make the channel filter name alphabet uppercase 2020-12-10 09:57:27 +01:00
Javi Rueda daf4e5aca2 Use ListView to show startup stage errors 2020-12-09 21:05:21 +01:00
Akinwale Ariwodola c1324efb41 bumpversion 0.16.9 --> 0.16.10 2020-12-09 11:47:58 +01:00
Akinwale Ariwodola 6221de2d3c sync notificationsDisabled states for followed channels 2020-12-09 11:31:13 +01:00
Akinwale Ariwodola 983bc68af2 Merge branch 'master' of https://github.com/lbryio/lbry-android 2020-12-09 11:00:25 +01:00
Akinwale Ariwodola f1b167693d SDK 0.86.1. is_seen vs is_read swap. Fix error condition where wallet sync starts if the wallet is not ready. 2020-12-09 10:59:25 +01:00
Akinwale Ariwodola 68ac64b534 Merge pull request #1057 from kekkyojin/sort-commentreplies
Sort replies from oldest to newest
2020-12-05 04:32:41 +01:00
Javi Rueda 6819ae46f9 Sort replies from oldest to newest 2020-12-01 04:58:48 +01:00
Akinwale Ariwodola 6c406c5a85 share_usage_data setting 2020-11-29 05:07:54 +01:00
Akinwale Ariwodola c179243d22 update dependencies 2020-11-26 00:04:37 +01:00
Akinwale Ariwodola d0f5504c80 LbryUri parsing improvements. Remove duplicate code. 2020-11-15 09:11:50 +01:00
Akinwale Ariwodola 896c566a02 Merge pull request #1045 from kekkyojin/open-file-external
Offer opening unsupported filetypes with external app
2020-11-13 15:42:59 +01:00
Javi Rueda da9352cc68 Offer opening unsupported filetypes with external app 2020-10-27 14:28:15 +01:00
Akinwale Ariwodola b8d2375e20 Merge pull request #1044 from ycohen-dev/fix_issue_1043
Fix floating wallet/rewards bar for RTL layout
2020-10-23 13:25:07 +01:00
Akinwale Ariwodola dd52ff9d07 Merge pull request #1033 from kekkyojin/md-text-rendering
Fix for text not rendering after # in markdown
2020-10-23 13:23:15 +01:00
yuval d9891f8a8a Floating wallet balance/rewards now visible in RTL layout
(Fix issue #1043)
2020-10-22 22:22:44 +03:00
Akinwale Ariwodola ea5fe6842d Merge pull request #1041 from ycohen-dev/fix_issue_1040
fix issue 1040
2020-10-21 00:15:36 +01:00
Akinwale Ariwodola fc649187df Merge pull request #1039 from ycohen-dev/fix_issue_1038
fix issue 1038
2020-10-21 00:14:15 +01:00
yuval b0f7c41885 fix issue 1040
Transaction amount text Direction changed to LTR.
Transaction amount pinned to end of view
2020-10-17 22:18:14 +03:00
yuval 45935717c8 fix issue 1038
Replaced gravity pinning to "end" instead of "right"
Pinned claim id which could be in rtl and ltr scripts to the start of the layout
2020-10-16 23:40:28 +03:00
Akinwale Ariwodola ac5e666369 bumpversion 0.16.8 --> 0.16.9 2020-10-16 06:58:57 +01:00
Akinwale Ariwodola ffeb72a383 Publish mature tags. String resource updates. 2020-10-16 06:53:08 +01:00
Akinwale Ariwodola 0ec09d751c Merge pull request #1036 from ycohen-dev/fix_issue_1034
Fix issue #1034
2020-10-16 06:39:45 +01:00
Akinwale Ariwodola b8e4fcff92 Merge pull request #1037 from lbryio/follow-text
add follow text beside follow icon
2020-10-16 06:37:50 +01:00
Akinwale Ariwodola b79f0f4820 add follow text beside follow icon 2020-10-16 06:36:36 +01:00
yuval a1cd58a214 Fix issue #1034
Hide notifications when entering PiP mode
2020-10-16 00:11:08 +03:00
Javi Rueda cfca8facbe Use '%23' instead of '#' when rendering #hashtag style text from markdown 2020-10-15 01:49:53 +02:00
Akinwale Ariwodola 066a0a099c Merge pull request #1032 from lbryio/wallet-balance-page
use credits icon on wallet balance page
2020-10-14 15:33:25 +01:00
Akinwale Ariwodola afeee2e5df use credits icon on wallet balance page 2020-10-14 15:30:59 +01:00
Akinwale Ariwodola 76036acfc7 Merge branch 'master' of https://github.com/lbryio/lbry-android 2020-10-14 15:17:35 +01:00
Akinwale Ariwodola 897bfdaffd fix build error 2020-10-14 15:16:45 +01:00
Akinwale Ariwodola 7475ae323c Merge pull request #1031 from ycohen-dev/fix_issue_1030
Fix issue #1030
2020-10-14 15:12:34 +01:00
Akinwale Ariwodola faf7f3ccbf make credits translatable 2020-10-14 15:11:36 +01:00
Akinwale Ariwodola 4940d1ca33 Merge branch 'master' of https://github.com/lbryio/lbry-android 2020-10-14 15:10:25 +01:00
Akinwale Ariwodola 3d48fa5741 also check pending when checking if item is a placeholder 2020-10-14 15:09:59 +01:00
yuval f9887cffae Fix issue #1030
Dismiss all active dialog fragment when entering PiP mode
So that PiP window contain the video only
2020-10-13 23:17:58 +03:00
Akinwale Ariwodola 6644907665 Merge pull request #1027 from ycohen-dev/fix_issue_1025
Fix issue #1025
2020-10-12 19:25:48 +01:00
Akinwale Ariwodola 5f850685d6 bumpversion 0.16.7 --> 0.16.8 2020-10-12 11:48:24 +01:00
Akinwale Ariwodola 5f9674e49c do not open lbry.*/$/verify links in the app 2020-10-12 11:47:45 +01:00
yuval 0d185c6db3 Fix issue #1025
Increased size of currency selection spinner in publish form fragment
Now spinner is in proper size to display "LBRY Credits" default value
2020-10-10 16:58:29 +03:00
Akinwale Ariwodola 53d22dd22d remove debug logs 2020-10-09 07:43:38 +01:00
Akinwale Ariwodola ff8ffda3c6 bumpversion 0.16.6 --> 0.16.7 2020-10-09 07:39:46 +01:00
Akinwale Ariwodola 64bd540322 In-app notification options (#1023)
* pull-down to refresh in-app notifications
* support deleting notifications
2020-10-09 07:38:47 +01:00
Akinwale Ariwodola 919f9a48f3 Merge pull request #1022 from lbryio/bell-icon
per-channel subscribe notification toggle
2020-10-09 06:58:08 +01:00
Akinwale Ariwodola 746d442051 per-channel subscribe notification toggle 2020-10-09 06:56:13 +01:00
Akinwale Ariwodola 1877b75188 fix strings.xml 2020-10-06 07:14:42 +01:00
Akinwale Ariwodola 6e8c38cace update module versions 2020-10-05 16:56:17 +01:00
Akinwale Ariwodola eab7bab267 Credits icon (#1021)
* new credits icon
* remove references to LBC
2020-10-05 16:50:39 +01:00
Akinwale Ariwodola aab648c3cf Fix errors with deep link handling (#1019) 2020-10-02 12:39:37 +01:00
Javi Rueda f79ff509bd Support some lbry hosts to deep links. Add unit tests (#1008)
* Support lbry.tv and other supported hosts for deep links. Add unit tests for LbryUri parse() method
* add unit test for lbry protocol schema
* Add unit test for lbry.tv deep-link with only channel
2020-10-02 12:34:38 +01:00
Akinwale Ariwodola 1197e990ca cleanup debug logging 2020-10-02 12:09:33 +01:00
Akinwale Ariwodola dce1c0715e move Unpublish button 2020-10-02 12:08:33 +01:00
Akinwale Ariwodola 6a0263c5bc Merge pull request #1013 from clay53/987
Add ability to download & delete your own videos and move unpublish button to description
2020-10-02 11:05:44 +01:00
Akinwale Ariwodola ca64db0499 sdk 0.82.0 2020-10-01 12:42:48 +01:00
Akinwale Ariwodola a5d4eda4d1 bumpversion 0.16.5 --> 0.16.6 2020-09-25 14:45:48 +01:00
Akinwale Ariwodola 5d210961c1 apply mature filter to Editor's Choice 2020-09-25 14:41:40 +01:00
Akinwale Ariwodola 1b88f565af bumpversion 0.16.4 --> 0.16.5 2020-09-23 16:37:41 +01:00
Akinwale Ariwodola 991a98b571 fix shuffle mode player getting stuck 2020-09-23 16:35:59 +01:00
Akinwale Ariwodola 0073277d6e Merge pull request #1017 from lbryio/shuffle-random
keep track of watched content for subsequent shuffle sessions
2020-09-23 16:23:57 +01:00
Akinwale Ariwodola eeca602f7a keep track of watched content for subsequent shuffle sessions 2020-09-23 15:31:34 +01:00
Akinwale Ariwodola 6c171560fd remove Finnish strings 2020-09-18 14:56:35 +01:00
Akinwale Ariwodola 66c4c00215 bumpversion 0.16.3 --> 0.16.4 2020-09-18 14:54:59 +01:00
Akinwale Ariwodola 9b9ef9ab74 Surf mode experiment (#1003)
* surf mode implementation
* occupy entire vertical area
* fix onResume logic
* shuffle mode with selected channel ids
2020-09-18 14:53:19 +01:00
Clayton Hickey 39a289e7f1 Add ability to download & delete your own videos and move unpublish button to description 2020-09-16 14:31:03 -04:00
Akinwale Ariwodola 722c829502 fix paid content stream source 2020-09-14 18:21:31 +01:00
Akinwale Ariwodola 7ecb80d136 Merge pull request #1009 from lbryio/mini-player-margin
add setting for mini-player bottom spacing
2020-09-14 18:05:09 +01:00
Akinwale Ariwodola ea19af04d4 add setting for mini-player bottom spacing 2020-09-14 18:01:38 +01:00
121 changed files with 4495 additions and 2164 deletions

No files matched your search

+11 -1
View File
@@ -18,7 +18,17 @@ The minimum supported Android version is 5.0 Lollipop. There are two ways to ins
The app can be launched by opening **LBRY** from the device's app drawer or via the shortcut on the home screen if that was created upon installation.
## Running from Source
Clone the repository and open the project in Android Studio. Android Studio will automatically run the initial build process. Click the Run button to launch the app on your simulator or connected debugging device after the build process is complete.
Clone the repository and open the project in Android Studio. Android Studio will automatically run the initial build process.
Create file 'twitter.properties' in app/ folder with the following content:
```
twitterConsumerKey=XXXXXX
twitterConsumerSecret=XXXXXX
```
Click the Sync button and when process finishes, the Run button to launch the app on your simulator or connected debugging device after the build process is complete.
## Contributing
Contributions to this project are welcome, encouraged, and compensated. For more details, see https://lbry.io/faq/contributing
+24 -20
View File
@@ -16,13 +16,13 @@ android {
applicationId "io.lbry.browser"
minSdkVersion 21
targetSdkVersion 29
versionCode 1603
versionName "0.16.3"
versionCode 1614
versionName "0.16.14"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
packagingOptions {
packagingOptions {
exclude 'META-INF/DEPENDENCIES'
exclude 'lib/x86_64/darwin/libscrypt.dylib'
}
@@ -80,34 +80,35 @@ dependencies {
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'com.google.android.material:material:1.3.0-alpha01'
implementation "androidx.cardview:cardview:1.0.0"
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation 'androidx.navigation:navigation-fragment:2.2.2'
implementation 'androidx.navigation:navigation-ui:2.2.2'
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
implementation 'androidx.navigation:navigation-fragment:2.3.1'
implementation 'androidx.navigation:navigation-ui:2.3.1'
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
implementation 'androidx.preference:preference:1.1.1'
implementation 'androidx.webkit:webkit:1.3.0-alpha03'
implementation 'androidx.webkit:webkit:1.4.0-rc01'
implementation 'androidx.camera:camera-core:1.0.0-beta03'
implementation 'androidx.camera:camera-camera2:1.0.0-beta03'
implementation 'androidx.camera:camera-lifecycle:1.0.0-beta03'
implementation 'androidx.camera:camera-view:1.0.0-alpha10'
implementation 'androidx.browser:browser:1.2.0'
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
implementation 'com.github.bumptech.glide:glide:4.11.0'
implementation 'com.squareup.okhttp3:okhttp:4.4.1'
implementation 'com.google.firebase:firebase-analytics:17.4.2'
implementation 'com.google.android.gms:play-services-base:17.2.1'
implementation 'com.google.firebase:firebase-messaging:20.2.0'
implementation 'com.google.firebase:firebase-analytics:18.0.0'
implementation 'com.google.android.gms:play-services-base:17.5.0'
implementation 'com.google.firebase:firebase-messaging:21.0.0'
implementation 'com.google.oauth-client:google-oauth-client:1.30.4'
implementation 'com.android.billingclient:billing:3.0.0'
implementation 'com.android.billingclient:billing:3.0.2'
implementation 'com.google.code.gson:gson:2.8.6'
implementation 'com.google.android.exoplayer:exoplayer-core:2.11.4'
implementation 'com.google.android.exoplayer:exoplayer-dash:2.11.4'
implementation 'com.google.android.exoplayer:exoplayer-ui:2.11.4'
implementation 'com.google.android.exoplayer:extension-cast:2.11.4'
implementation 'com.google.android.exoplayer:extension-mediasession:2.11.4'
implementation 'com.google.android.exoplayer:exoplayer-core:2.12.2'
implementation 'com.google.android.exoplayer:exoplayer-dash:2.12.2'
implementation 'com.google.android.exoplayer:exoplayer-ui:2.12.2'
implementation 'com.google.android.exoplayer:extension-cast:2.12.2'
implementation 'com.google.android.exoplayer:extension-mediasession:2.12.2'
implementation 'com.google.android:flexbox:2.0.1'
@@ -118,6 +119,7 @@ dependencies {
implementation 'com.arthenica:mobile-ffmpeg-full-gpl:4.3.1.LTS'
implementation 'commons-codec:commons-codec:1.15'
implementation 'org.bitcoinj:bitcoinj-tools:0.14.7'
implementation 'org.java-websocket:Java-WebSocket:1.5.1'
@@ -126,11 +128,13 @@ dependencies {
annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
androidTestImplementation 'androidx.test:runner:1.3.0'
androidTestImplementation 'androidx.test:rules:1.3.0'
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
__32bitImplementation 'io.lbry:lbrysdk32:0.81.0'
__64bitImplementation 'io.lbry:lbrysdk64:0.81.0'
__32bitImplementation 'io.lbry:lbrysdk32:0.88.0'
__64bitImplementation 'io.lbry:lbrysdk64:0.88.0'
}
apply plugin: 'com.google.gms.google-services'
@@ -0,0 +1,12 @@
package io.lbry.browser.utils;
import androidx.test.filters.SmallTest;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@SmallTest
public class HelperTest {
}
+13
View File
@@ -11,6 +11,7 @@
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="com.android.vending.BILLING" />
<uses-permission android:name="android.permission.WAKE_LOCK"/>
<application
android:allowBackup="true"
@@ -68,6 +69,18 @@
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<data android:scheme="https" android:host="open.lbry.com"/>
<data android:scheme="https" android:host="lbry.tv" android:pathPattern="/..*/*" />
<data android:scheme="https" android:host="lbry.tv" android:pathPattern="/.*:.*" />
<data android:scheme="https" android:host="lbry.tv" android:pathPattern="/.*#.*" />
<data android:scheme="https" android:host="lbry.lat" android:pathPattern="/..*/*" />
<data android:scheme="https" android:host="lbry.lat" android:pathPattern="/.*:.*" />
<data android:scheme="https" android:host="lbry.lat" android:pathPattern="/.*#.*" />
<data android:scheme="https" android:host="lbry.fr" android:pathPattern="/..*/*" />
<data android:scheme="https" android:host="lbry.fr" android:pathPattern="/.*:.*" />
<data android:scheme="https" android:host="lbry.fr" android:pathPattern="/.*#.*" />
<data android:scheme="https" android:host="lbry.in" android:pathPattern="/..*/*" />
<data android:scheme="https" android:host="lbry.in" android:pathPattern="/.*:.*" />
<data android:scheme="https" android:host="lbry.in" android:pathPattern="/.*#.*" />
<category android:name="android.intent.category.BROWSABLE" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
@@ -201,7 +201,6 @@ public class FirstRunActivity extends AppCompatActivity {
try {
writer = new BufferedWriter(new FileWriter(file));
writer.write(installId);
android.util.Log.d("LbryMain", "Generated install ID=" + installId);
} catch (IOException ex) {
return false;
} finally {
@@ -100,7 +100,7 @@ public class LbrynetMessagingService extends FirebaseMessagingService {
@Override
public void onNewToken(String token) {
Log.d(TAG, "Refreshed token: " + token);
//Log.d(TAG, "Refreshed token: " + token);
// If you want to send messages to this application instance or
// manage this apps subscriptions on the server side, send the
@@ -11,6 +11,7 @@ import android.content.BroadcastReceiver;
import android.content.ClipData;
import android.content.ComponentName;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.SharedPreferences;
@@ -36,14 +37,17 @@ import android.text.style.TypefaceSpan;
import android.util.Base64;
import android.util.Log;
import android.view.KeyEvent;
import android.view.MenuItem;
import android.view.View;
import android.view.Menu;
import android.view.ViewGroup;
import android.view.WindowManager;
import android.view.inputmethod.EditorInfo;
import android.view.inputmethod.InputMethodManager;
import android.webkit.WebView;
import android.widget.EditText;
import android.widget.ImageView;
import android.widget.ListView;
import android.widget.TextView;
import android.widget.Toast;
@@ -68,14 +72,16 @@ import com.google.android.gms.cast.framework.CastContext;
import com.google.android.gms.tasks.OnCompleteListener;
import com.google.android.gms.tasks.Task;
import com.google.android.material.snackbar.Snackbar;
import com.google.firebase.iid.FirebaseInstanceId;
import com.google.firebase.iid.InstanceIdResult;
import com.google.firebase.messaging.FirebaseMessaging;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.app.ActionBarDrawerToggle;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.app.AppCompatDelegate;
import androidx.appcompat.view.ActionMode;
import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.core.app.ActivityCompat;
import androidx.core.app.NotificationCompat;
import androidx.core.app.NotificationManagerCompat;
@@ -87,6 +93,7 @@ import androidx.core.view.GravityCompat;
import androidx.core.view.OnApplyWindowInsetsListener;
import androidx.core.view.ViewCompat;
import androidx.core.view.WindowInsetsCompat;
import androidx.fragment.app.DialogFragment;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
@@ -97,9 +104,11 @@ import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import org.java_websocket.client.WebSocketClient;
import org.java_websocket.handshake.ServerHandshake;
import org.jetbrains.annotations.NotNull;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
@@ -107,7 +116,9 @@ import org.json.JSONObject;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.InputStreamReader;
import java.io.PrintStream;
import java.net.ConnectException;
import java.net.URI;
import java.text.DecimalFormat;
@@ -128,6 +139,7 @@ import javax.net.ssl.SSLParameters;
import io.lbry.browser.adapter.NavigationMenuAdapter;
import io.lbry.browser.adapter.NotificationListAdapter;
import io.lbry.browser.adapter.StartupStageAdapter;
import io.lbry.browser.adapter.UrlSuggestionListAdapter;
import io.lbry.browser.data.DatabaseHelper;
import io.lbry.browser.dialog.ContentScopeDialogFragment;
@@ -141,11 +153,13 @@ import io.lbry.browser.listener.FilePickerListener;
import io.lbry.browser.listener.PIPModeListener;
import io.lbry.browser.listener.ScreenOrientationListener;
import io.lbry.browser.listener.SdkStatusListener;
import io.lbry.browser.listener.SelectionModeListener;
import io.lbry.browser.listener.StoragePermissionListener;
import io.lbry.browser.listener.WalletBalanceListener;
import io.lbry.browser.model.Claim;
import io.lbry.browser.model.ClaimCacheKey;
import io.lbry.browser.model.NavMenuItem;
import io.lbry.browser.model.StartupStage;
import io.lbry.browser.model.Tag;
import io.lbry.browser.model.UrlSuggestion;
import io.lbry.browser.model.WalletBalance;
@@ -164,6 +178,7 @@ import io.lbry.browser.tasks.lbryinc.FetchRewardsTask;
import io.lbry.browser.tasks.LighthouseAutoCompleteTask;
import io.lbry.browser.tasks.MergeSubscriptionsTask;
import io.lbry.browser.tasks.claim.ResolveTask;
import io.lbry.browser.tasks.lbryinc.NotificationDeleteTask;
import io.lbry.browser.tasks.lbryinc.NotificationListTask;
import io.lbry.browser.tasks.lbryinc.NotificationUpdateTask;
import io.lbry.browser.tasks.localdata.FetchRecentUrlHistoryTask;
@@ -187,9 +202,10 @@ import io.lbry.browser.ui.other.AboutFragment;
import io.lbry.browser.ui.publish.PublishFormFragment;
import io.lbry.browser.ui.publish.PublishFragment;
import io.lbry.browser.ui.publish.PublishesFragment;
import io.lbry.browser.ui.findcontent.SearchFragment;
import io.lbry.browser.ui.other.SettingsFragment;
import io.lbry.browser.ui.findcontent.AllContentFragment;
import io.lbry.browser.ui.findcontent.SearchFragment;
import io.lbry.browser.ui.findcontent.ShuffleFragment;
import io.lbry.browser.ui.other.SettingsFragment;
import io.lbry.browser.ui.wallet.InvitesFragment;
import io.lbry.browser.ui.wallet.RewardsFragment;
import io.lbry.browser.ui.wallet.WalletFragment;
@@ -207,12 +223,19 @@ import lombok.Setter;
import lombok.SneakyThrows;
import okhttp3.OkHttpClient;
public class MainActivity extends AppCompatActivity implements SdkStatusListener {
import static android.os.Build.VERSION_CODES.M;
public class MainActivity extends AppCompatActivity implements SdkStatusListener,
SharedPreferences.OnSharedPreferenceChangeListener,
ActionMode.Callback, SelectionModeListener {
private static final String CHANNEL_ID_PLAYBACK = "io.lbry.browser.LBRY_PLAYBACK_CHANNEL";
private static final int PLAYBACK_NOTIFICATION_ID = 3;
private static final String SPECIAL_URL_PREFIX = "lbry://?";
private static final int REMOTE_NOTIFICATION_REFRESH_TTL = 300000; // 5 minutes
public static final String SKU_SKIP = "lbryskip";
public static final int SOURCE_NOW_PLAYING_FILE = 1;
public static final int SOURCE_NOW_PLAYING_SHUFFLE = 2;
public static MainActivity instance;
private boolean shuttingDown;
@@ -231,6 +254,7 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
public static boolean playerReassigned;
public CastContext castContext;
public static CastPlayer castPlayer;
public static int nowPlayingSource;
public static Claim nowPlayingClaim;
public static String nowPlayingClaimUrl;
public static boolean startingFilePickerActivity = false;
@@ -238,6 +262,7 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
public static boolean startingPermissionRequest = false;
public static boolean startingSignInFlowActivity = false;
private ActionMode actionMode;
private BillingClient billingClient;
@Getter
private boolean enteringPIPMode = false;
@@ -263,6 +288,7 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
fragmentClassNavIdMap.put(FollowingFragment.class, NavMenuItem.ID_ITEM_FOLLOWING);
fragmentClassNavIdMap.put(EditorsChoiceFragment.class, NavMenuItem.ID_ITEM_EDITORS_CHOICE);
fragmentClassNavIdMap.put(AllContentFragment.class, NavMenuItem.ID_ITEM_ALL_CONTENT);
fragmentClassNavIdMap.put(ShuffleFragment.class, NavMenuItem.ID_ITEM_SHUFFLE);
fragmentClassNavIdMap.put(PublishFragment.class, NavMenuItem.ID_ITEM_NEW_PUBLISH);
fragmentClassNavIdMap.put(ChannelManagerFragment.class, NavMenuItem.ID_ITEM_CHANNELS);
@@ -313,6 +339,7 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
public static final String PREFERENCE_KEY_DARK_MODE = "io.lbry.browser.preference.userinterface.DarkMode";
public static final String PREFERENCE_KEY_SHOW_MATURE_CONTENT = "io.lbry.browser.preference.userinterface.ShowMatureContent";
public static final String PREFERENCE_KEY_SHOW_URL_SUGGESTIONS = "io.lbry.browser.preference.userinterface.UrlSuggestions";
public static final String PREFERENCE_KEY_MINI_PLAYER_BOTTOM_MARGIN = "io.lbry.browser.preference.userinterface.MiniPlayerBottomMargin";
public static final String PREFERENCE_KEY_NOTIFICATION_COMMENTS = "io.lbry.browser.preference.notifications.Comments";
public static final String PREFERENCE_KEY_NOTIFICATION_SUBSCRIPTIONS = "io.lbry.browser.preference.notifications.Subscriptions";
public static final String PREFERENCE_KEY_NOTIFICATION_REWARDS = "io.lbry.browser.preference.notifications.Rewards";
@@ -321,6 +348,7 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
public static final String PREFERENCE_KEY_KEEP_SDK_BACKGROUND = "io.lbry.browser.preference.other.KeepSdkInBackground";
public static final String PREFERENCE_KEY_PARTICIPATE_DATA_NETWORK = "io.lbry.browser.preference.other.ParticipateInDataNetwork";
public static final String PREFERENCE_KEY_SEND_BUFFERING_EVENTS = "io.lbry.browser.preference.other.SendBufferingEvents";
public static final String PREFERENCE_KEY_SHARE_USAGE_DATA = "io.lbry.browser.preference.other.ShareUsageData";
// Internal flags / setting preferences
public static final String PREFERENCE_KEY_INTERNAL_SKIP_WALLET_ACCOUNT = "io.lbry.browser.preference.internal.WalletSkipAccount";
@@ -358,6 +386,7 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
private MediaSessionCompat mediaSession;
private boolean receivedStopService;
private ActionBarDrawerToggle toggle;
private SwipeRefreshLayout notificationsSwipeContainer;
private SyncSetTask syncSetTask = null;
private List<WalletSync> pendingSyncSetQueue;
@Getter
@@ -393,6 +422,9 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
private static final int STARTUP_STAGE_NEW_INSTALL_DONE = 5;
private static final int STARTUP_STAGE_SUBSCRIPTIONS_LOADED = 6;
private static final int STARTUP_STAGE_SUBSCRIPTIONS_RESOLVED = 7;
private static final int STARTUP_STAGE_BLOCK_LIST_LOADED = 8;
private static final int STARTUP_STAGE_FILTER_LIST_LOADED = 9;
private static final int DEFAULT_MINI_PLAYER_MARGIN = 4;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -408,21 +440,20 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
initKeyStore();
loadAuthToken();
if (!isDarkMode()) {
if (Build.VERSION.SDK_INT >= M && !isDarkMode()) {
getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
}
initSpecialRouteMap();
LbryAnalytics.init(this);
try {
FirebaseInstanceId.getInstance().getInstanceId().addOnCompleteListener(new OnCompleteListener<InstanceIdResult>() {
FirebaseMessaging.getInstance().getToken().addOnCompleteListener(new OnCompleteListener<String>() {
@Override
public void onComplete(Task<InstanceIdResult> task) {
public void onComplete(@NonNull Task<String> task) {
if (!task.isSuccessful()) {
return;
}
// Get new Instance ID token
firebaseMessagingToken = task.getResult().getToken();
firebaseMessagingToken = task.getResult();
}
});
} catch (IllegalStateException ex) {
@@ -436,6 +467,8 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
Toolbar toolbar = findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
updateMiniPlayerMargins();
// setup the billing client in main activity (to handle cases where the verification purchase flow may have been interrupted)
billingClient = BillingClient.newBuilder(this)
.setListener(new PurchasesUpdatedListener() {
@@ -492,7 +525,7 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
// setup uri bar
setupUriBar();
initNotificationsPage();
loadUnreadNotificationsCount();
loadUnseenNotificationsCount();
// other
pendingSyncSetQueue = new ArrayList<>();
@@ -570,12 +603,26 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
}
});
notificationsSwipeContainer = findViewById(R.id.notifications_list_swipe_container);
notificationsSwipeContainer.setColorSchemeResources(R.color.nextLbryGreen);
notificationsSwipeContainer.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
@Override
public void onRefresh() {
notificationsSwipeContainer.setRefreshing(true);
loadRemoteNotifications(false);
}
});
findViewById(R.id.global_now_playing_card).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
if (nowPlayingClaim != null && !Helper.isNullOrEmpty(nowPlayingClaimUrl)) {
hideNotifications();
openFileUrl(nowPlayingClaimUrl);
if (nowPlayingSource == SOURCE_NOW_PLAYING_SHUFFLE) {
openFragment(ShuffleFragment.class, true, NavMenuItem.ID_ITEM_SHUFFLE);
} else {
openFileUrl(nowPlayingClaimUrl);
}
}
}
});
@@ -612,6 +659,17 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
});
}
private void updateMiniPlayerMargins() {
// mini-player bottom margin setting
SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this);
int miniPlayerBottomMargin = Helper.parseInt(
sp.getString(PREFERENCE_KEY_MINI_PLAYER_BOTTOM_MARGIN, String.valueOf(DEFAULT_MINI_PLAYER_MARGIN)), DEFAULT_MINI_PLAYER_MARGIN);
ConstraintLayout.LayoutParams lp = (ConstraintLayout.LayoutParams) findViewById(R.id.global_now_playing_card).getLayoutParams();
int scaledMiniPlayerMargin = getScaledValue(DEFAULT_MINI_PLAYER_MARGIN);
int scaledMiniPlayerBottomMargin = getScaledValue(miniPlayerBottomMargin);
lp.setMargins(scaledMiniPlayerMargin, 0, scaledMiniPlayerMargin, scaledMiniPlayerBottomMargin);
}
public boolean isDarkMode() {
SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this);
return sp.getBoolean(PREFERENCE_KEY_DARK_MODE, false);
@@ -642,6 +700,7 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
specialRouteFragmentClassMap.put("settings", SettingsFragment.class);
specialRouteFragmentClassMap.put("subscription", FollowingFragment.class);
specialRouteFragmentClassMap.put("subscriptions", FollowingFragment.class);
specialRouteFragmentClassMap.put("surf", ShuffleFragment.class);
specialRouteFragmentClassMap.put("wallet", WalletFragment.class);
specialRouteFragmentClassMap.put("discover", FollowingFragment.class);
}
@@ -797,6 +856,9 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
case NavMenuItem.ID_ITEM_ALL_CONTENT:
openFragment(AllContentFragment.class, true, NavMenuItem.ID_ITEM_ALL_CONTENT);
break;
case NavMenuItem.ID_ITEM_SHUFFLE:
openFragment(ShuffleFragment.class, true, NavMenuItem.ID_ITEM_SHUFFLE);
break;
case NavMenuItem.ID_ITEM_NEW_PUBLISH:
openFragment(PublishFragment.class, true, NavMenuItem.ID_ITEM_NEW_PUBLISH);
@@ -980,7 +1042,9 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
findViewById(R.id.global_now_playing_card).setVisibility(View.GONE);
//findViewById(R.id.global_sdk_initializing_status).setVisibility(View.GONE);
findViewById(R.id.app_bar_main_container).setFitsSystemWindows(true);
hideNotifications();
hideActionBar();
dismissActiveDialogs();
for (PIPModeListener listener : pipModeListeners) {
listener.onEnterPIPMode();
@@ -993,6 +1057,15 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
pipPlayerContainer.setVisibility(View.VISIBLE);
playerReassigned = true;
}
private void dismissActiveDialogs() {
for( Fragment fragment: getSupportFragmentManager().getFragments() ){
if (fragment instanceof DialogFragment){
((DialogFragment) fragment).dismiss();
}
}
}
private void renderFullMode() {
if (!inFullscreenMode) {
showActionBar();
@@ -1011,7 +1084,7 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
fragment instanceof LibraryFragment ||
fragment instanceof SearchFragment;
findViewById(R.id.floating_balance_main_container).setVisibility(!canShowFloatingBalance || inFullscreenMode ? View.INVISIBLE : View.VISIBLE);
if (!(fragment instanceof FileViewFragment) && !inFullscreenMode) {
if (!(fragment instanceof FileViewFragment) && !(fragment instanceof ShuffleFragment) && !inFullscreenMode && nowPlayingClaim != null) {
findViewById(R.id.global_now_playing_card).setVisibility(View.VISIBLE);
}
/*if (!Lbry.SDK_READY && !inFullscreenMode) {
@@ -1143,8 +1216,11 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
@Override
protected void onResume() {
super.onResume();
PreferenceManager.getDefaultSharedPreferences(this).registerOnSharedPreferenceChangeListener(this);
checkPurchases();
checkWebSocketClient();
updateMiniPlayerMargins();
enteringPIPMode = false;
applyNavbarSigninPadding();
@@ -1221,6 +1297,7 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
@Override
protected void onPause() {
PreferenceManager.getDefaultSharedPreferences(this).unregisterOnSharedPreferenceChangeListener(this);
if (!enteringPIPMode && !inPictureInPictureMode && appPlayer != null && !isBackgroundPlaybackEnabled()) {
appPlayer.setPlayWhenReady(false);
}
@@ -1244,7 +1321,7 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
private void toggleUrlSuggestions(boolean visible) {
View container = findViewById(R.id.url_suggestions_container);
View closeIcon = findViewById(R.id.wunderbar_close);
EditText wunderbar = findViewById(R.id.wunderbar);
//EditText wunderbar = findViewById(R.id.wunderbar);
//wunderbar.setPadding(0, 0, visible ? getScaledValue(36) : 0, 0);
container.setVisibility(visible ? View.VISIBLE : View.GONE);
@@ -1757,6 +1834,7 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
}
//findViewById(R.id.global_sdk_initializing_status).setVisibility(View.GONE);
checkAndEnableShareUsageData();
scheduleWalletBalanceUpdate();
scheduleWalletSyncTask();
@@ -1791,17 +1869,13 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
new DecimalFormat(Helper.LBC_CURRENCY_FORMAT_PATTERN).format(amountClaimed));
}
Snackbar.make(findViewById(R.id.content_main), message, Snackbar.LENGTH_LONG).show();
if (sp != null) {
sp.edit().putBoolean(PREFERENCE_KEY_INTERNAL_NEW_ANDROID_REWARD_CLAIMED, true).apply();
}
sp.edit().putBoolean(PREFERENCE_KEY_INTERNAL_NEW_ANDROID_REWARD_CLAIMED, true).apply();
}
@Override
public void onError(Exception error) {
// pass. fail silently
if (sp != null) {
sp.edit().putBoolean(PREFERENCE_KEY_INTERNAL_NEW_ANDROID_REWARD_CLAIMED, true).apply();
}
sp.edit().putBoolean(PREFERENCE_KEY_INTERNAL_NEW_ANDROID_REWARD_CLAIMED, true).apply();
}
});
task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
@@ -1833,6 +1907,110 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
}
}
@Override
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
if (PREFERENCE_KEY_MINI_PLAYER_BOTTOM_MARGIN.equalsIgnoreCase(key)) {
updateMiniPlayerMargins();
}
}
@Override
public boolean onCreateActionMode(ActionMode mode, Menu menu) {
this.actionMode = mode;
if (isDarkMode()) {
getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_VISIBLE);
}
actionMode.getMenuInflater().inflate(R.menu.menu_notification, menu);
return true;
}
@Override
public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
return true;
}
@Override
public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
if (R.id.action_delete == item.getItemId()) {
if (notificationListAdapter != null && notificationListAdapter.getSelectedCount() > 0) {
final List<LbryNotification> selectedNotifications = new ArrayList<>(notificationListAdapter.getSelectedItems());
String message = getResources().getQuantityString(R.plurals.confirm_delete_notifications, selectedNotifications.size());
AlertDialog.Builder builder = new AlertDialog.Builder(this).
setTitle(R.string.delete_selection).
setMessage(message)
.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
handleDeleteSelectedNotifications(selectedNotifications);
}
}).setNegativeButton(R.string.no, null);
builder.show();
return true;
}
}
return false;
}
@Override
public void onDestroyActionMode(ActionMode mode) {
if (notificationListAdapter != null) {
notificationListAdapter.clearSelectedItems();
notificationListAdapter.setInSelectionMode(false);
notificationListAdapter.notifyDataSetChanged();
}
if (Build.VERSION.SDK_INT >= M && isDarkMode()) {
getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
}
this.actionMode = null;
}
@Override
public void onEnterSelectionMode() {
startSupportActionMode(this);
}
@Override
public void onExitSelectionMode() {
if (actionMode != null) {
actionMode.finish();
}
}
@Override
public void onItemSelectionToggled() {
if (actionMode != null) {
actionMode.setTitle(notificationListAdapter != null ? String.valueOf(notificationListAdapter.getSelectedCount()) : "");
actionMode.invalidate();
}
}
private void handleDeleteSelectedNotifications(List<LbryNotification> notifications) {
List<Long> remoteIds = new ArrayList<>();
for (LbryNotification notification : notifications) {
remoteIds.add(notification.getRemoteId());
}
(new AsyncTask<Void, Void, Void>() {
protected Void doInBackground(Void... params) {
try {
SQLiteDatabase db = dbHelper.getWritableDatabase();
DatabaseHelper.deleteNotifications(notifications, db);
} catch (Exception ex) {
// pass
}
return null;
}
}).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
new NotificationDeleteTask(remoteIds).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
if (notificationListAdapter != null) {
notificationListAdapter.removeNotifications(notifications);
}
if (actionMode != null) {
actionMode.finish();
}
}
private class PlayerNotificationDescriptionAdapter implements PlayerNotificationManager.MediaDescriptionAdapter {
@Override
@@ -1846,8 +2024,7 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
if (nowPlayingClaimUrl != null) {
Intent launchIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(nowPlayingClaimUrl));
launchIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
PendingIntent intent = PendingIntent.getActivity(MainActivity.this, 0, launchIntent, 0);
return intent;
return PendingIntent.getActivity(MainActivity.this, 0, launchIntent, 0);
}
return null;
}
@@ -2060,8 +2237,7 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
@Override
public void onSyncSetSuccess(String hash) {
Lbryio.lastRemoteHash = hash;
WalletSync walletSync = new WalletSync(hash, data);
Lbryio.lastWalletSync = walletSync;
Lbryio.lastWalletSync = new WalletSync(hash, data);
if (pendingSyncSetQueue.size() > 0) {
fullSyncInProgress = true;
@@ -2241,8 +2417,7 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
pendingFollowingReload = true;
}
private void handleOpenChannelUrl(Intent intent) {
String url = intent.getStringExtra("url");
pendingChannelUrl = url;
pendingChannelUrl = intent.getStringExtra("url");
}
};
registerReceiver(requestsReceiver, intentFilter);
@@ -2276,7 +2451,7 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
}
if (notificationListAdapter != null) {
markNotificationsRead();
markNotificationsSeen();
}
}
@@ -2285,17 +2460,17 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
findViewById(R.id.notifications_container).setVisibility(View.GONE);
}
private void markNotificationsRead() {
private void markNotificationsSeen() {
List<LbryNotification> all = notificationListAdapter != null ? notificationListAdapter.getItems() : null;
if (all != null) {
List<Long> unreadIds = new ArrayList<>();
List<Long> unseenIds = new ArrayList<>();
for (LbryNotification notification : all) {
if (!notification.isRead() && notification.getRemoteId() > 0) {
unreadIds.add(notification.getRemoteId());
if (!notification.isSeen() && notification.getRemoteId() > 0) {
unseenIds.add(notification.getRemoteId());
}
}
if (unreadIds.size() > 0) {
NotificationUpdateTask task = new NotificationUpdateTask(unreadIds, true);
if (unseenIds.size() > 0) {
NotificationUpdateTask task = new NotificationUpdateTask(unseenIds, true);
task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
}
}
@@ -2305,14 +2480,14 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
protected Void doInBackground(Void... params) {
try {
SQLiteDatabase db = dbHelper.getWritableDatabase();
DatabaseHelper.markNotificationsRead(db);
DatabaseHelper.markNotificationsSeen(db);
} catch (Exception ex) {
// pass
}
return null;
}
protected void onPostExecute(Void result) {
loadUnreadNotificationsCount();
loadUnseenNotificationsCount();
}
}).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
}
@@ -2402,7 +2577,7 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
}
@Override
public void onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults) {
public void onRequestPermissionsResult(int requestCode, @NotNull String[] permissions, @NotNull int[] grantResults) {
switch (requestCode) {
case REQUEST_STORAGE_PERMISSION:
if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
@@ -2437,7 +2612,7 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
super.onActivityResult(requestCode, resultCode, data);
if (requestCode == REQUEST_FILE_PICKER) {
startingFilePickerActivity = false;
if (resultCode == RESULT_OK) {
if (resultCode == RESULT_OK && data != null) {
Uri fileUri = data.getData();
String filePath = Helper.getRealPathFromURI_API19(this, fileUri);
for (FilePickerListener listener : filePickerListeners) {
@@ -2548,8 +2723,7 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
int backCount = getSupportFragmentManager().getBackStackEntryCount();
if (backCount > 0) {
try {
Fragment fragment = getSupportFragmentManager().getFragments().get(backCount - 1);
return fragment;
return getSupportFragmentManager().getFragments().get(backCount - 1);
} catch (IndexOutOfBoundsException ex) {
return null;
}
@@ -2569,23 +2743,28 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
actionBar.show();
}
}
private void renderStartupFailed(Map<Integer, Boolean> startupStages) {
Map<Integer, Integer> startupStageIconIds = new HashMap<>();
startupStageIconIds.put(STARTUP_STAGE_INSTALL_ID_LOADED, R.id.startup_stage_icon_install_id);
startupStageIconIds.put(STARTUP_STAGE_KNOWN_TAGS_LOADED, R.id.startup_stage_icon_known_tags);
startupStageIconIds.put(STARTUP_STAGE_EXCHANGE_RATE_LOADED, R.id.startup_stage_icon_exchange_rate);
startupStageIconIds.put(STARTUP_STAGE_USER_AUTHENTICATED, R.id.startup_stage_icon_user_authenticated);
startupStageIconIds.put(STARTUP_STAGE_NEW_INSTALL_DONE, R.id.startup_stage_icon_install_new);
startupStageIconIds.put(STARTUP_STAGE_SUBSCRIPTIONS_LOADED, R.id.startup_stage_icon_subscriptions_loaded);
startupStageIconIds.put(STARTUP_STAGE_SUBSCRIPTIONS_RESOLVED, R.id.startup_stage_icon_subscriptions_resolved);
private void renderStartupFailed(List<StartupStage> startupStages) {
ListView listView = findViewById(R.id.startup_stage_error_listview);
StartupStageAdapter adapter = new StartupStageAdapter(this, startupStages);
listView.setAdapter(adapter);
for (Integer key : startupStages.keySet()) {
boolean stageDone = startupStages.get(key);
ImageView icon = findViewById(startupStageIconIds.get(key));
icon.setImageResource(stageDone ? R.drawable.ic_check : R.drawable.ic_close);
icon.setColorFilter(stageDone ? Color.WHITE : Color.RED);
// Add 1 pixel to listview height
int listHeight = Math.round(getResources().getDisplayMetrics().density);
for (int i = 0; i < startupStages.size(); i++) {
View item = adapter.getView(i, null, listView);
item.measure(0, 0);
listHeight += item.getMeasuredHeight();
}
// Properly set listview height by adding all seven items and the divider heights
// and the additional 1 pixel so no vertical scroll bar is shown
ViewGroup.LayoutParams params = listView.getLayoutParams();
params.height = listHeight + (listView.getCount() + 1) * listView.getDividerHeight();
listView.setLayoutParams(params);
listView.invalidate();
listView.requestLayout();
findViewById(R.id.splash_view_loading_container).setVisibility(View.GONE);
findViewById(R.id.splash_view_error_container).setVisibility(View.VISIBLE);
}
@@ -2597,16 +2776,18 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
// perform some tasks before launching
(new AsyncTask<Void, Void, Boolean>() {
private Map<Integer, Boolean> startupStages = new HashMap<>();
private final List<StartupStage> startupStages = new ArrayList<>(7);
private void initStartupStages() {
startupStages.put(STARTUP_STAGE_INSTALL_ID_LOADED, false);
startupStages.put(STARTUP_STAGE_KNOWN_TAGS_LOADED, false);
startupStages.put(STARTUP_STAGE_EXCHANGE_RATE_LOADED, false);
startupStages.put(STARTUP_STAGE_USER_AUTHENTICATED, false);
startupStages.put(STARTUP_STAGE_NEW_INSTALL_DONE, false);
startupStages.put(STARTUP_STAGE_SUBSCRIPTIONS_LOADED, false);
startupStages.put(STARTUP_STAGE_SUBSCRIPTIONS_RESOLVED, false);
startupStages.add(new StartupStage(STARTUP_STAGE_INSTALL_ID_LOADED, false));
startupStages.add(new StartupStage(STARTUP_STAGE_KNOWN_TAGS_LOADED, false));
startupStages.add(new StartupStage(STARTUP_STAGE_EXCHANGE_RATE_LOADED, false));
startupStages.add(new StartupStage(STARTUP_STAGE_USER_AUTHENTICATED, false));
startupStages.add(new StartupStage(STARTUP_STAGE_NEW_INSTALL_DONE, false));
startupStages.add(new StartupStage(STARTUP_STAGE_SUBSCRIPTIONS_LOADED, false));
startupStages.add(new StartupStage(STARTUP_STAGE_SUBSCRIPTIONS_RESOLVED, false));
startupStages.add(new StartupStage(STARTUP_STAGE_BLOCK_LIST_LOADED, false));
startupStages.add(new StartupStage(STARTUP_STAGE_FILTER_LIST_LOADED, false));
}
protected void onPreExecute() {
hideActionBar();
@@ -2626,26 +2807,26 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
String installId = reader.readLine();
if (Helper.isNullOrEmpty(installId)) {
// no install_id found (first run didn't start the sdk successfully?)
startupStages.put(STARTUP_STAGE_INSTALL_ID_LOADED, false);
startupStages.set(STARTUP_STAGE_INSTALL_ID_LOADED - 1, new StartupStage(STARTUP_STAGE_INSTALL_ID_LOADED, false));
return false;
}
Lbry.INSTALLATION_ID = installId;
startupStages.put(STARTUP_STAGE_INSTALL_ID_LOADED, true);
startupStages.set(STARTUP_STAGE_INSTALL_ID_LOADED - 1, new StartupStage(STARTUP_STAGE_INSTALL_ID_LOADED, true));
SQLiteDatabase db = dbHelper.getReadableDatabase();
List<Tag> fetchedTags = DatabaseHelper.getTags(db);
Lbry.knownTags = Helper.mergeKnownTags(fetchedTags);
Collections.sort(Lbry.knownTags, new Tag());
Lbry.followedTags = Helper.filterFollowedTags(Lbry.knownTags);
startupStages.put(STARTUP_STAGE_KNOWN_TAGS_LOADED, true);
startupStages.set(STARTUP_STAGE_KNOWN_TAGS_LOADED - 1, new StartupStage(STARTUP_STAGE_KNOWN_TAGS_LOADED, true));
// load the exchange rate
Lbryio.loadExchangeRate();
if (Lbryio.LBCUSDRate == 0) {
return false;
}
startupStages.put(STARTUP_STAGE_EXCHANGE_RATE_LOADED, true);
startupStages.set(STARTUP_STAGE_EXCHANGE_RATE_LOADED - 1, new StartupStage(STARTUP_STAGE_EXCHANGE_RATE_LOADED, true));
try {
Lbryio.authenticate(context);
@@ -2657,10 +2838,10 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
if (Lbryio.currentUser == null) {
throw new Exception("Did not retrieve authenticated user.");
}
startupStages.put(STARTUP_STAGE_USER_AUTHENTICATED, true);
startupStages.set(STARTUP_STAGE_USER_AUTHENTICATED - 1, new StartupStage(STARTUP_STAGE_USER_AUTHENTICATED, true));
Lbryio.newInstall(context);
startupStages.put(STARTUP_STAGE_NEW_INSTALL_DONE, true);
startupStages.set(STARTUP_STAGE_NEW_INSTALL_DONE - 1, new StartupStage(STARTUP_STAGE_NEW_INSTALL_DONE, true));
// (light) fetch subscriptions
if (Lbryio.subscriptions.size() == 0) {
@@ -2672,34 +2853,44 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
JSONObject item = array.getJSONObject(i);
String claimId = item.getString("claim_id");
String channelName = item.getString("channel_name");
boolean isNotificationsDisabled = item.getBoolean("is_notifications_disabled");
LbryUri url = new LbryUri();
url.setChannelName(channelName);
url.setClaimId(claimId);
subscriptions.add(new Subscription(channelName, url.toString()));
subscriptions.add(new Subscription(channelName, url.toString(), isNotificationsDisabled));
subUrls.add(url.toString());
}
Lbryio.subscriptions = subscriptions;
startupStages.put(STARTUP_STAGE_SUBSCRIPTIONS_LOADED, true);
startupStages.set(STARTUP_STAGE_SUBSCRIPTIONS_LOADED - 1, new StartupStage(STARTUP_STAGE_SUBSCRIPTIONS_LOADED, true));
// resolve subscriptions
if (subUrls.size() > 0 && Lbryio.cacheResolvedSubscriptions.size() != Lbryio.subscriptions.size()) {
List<Claim> resolvedSubs = Lbry.resolve(subUrls, Lbry.LBRY_TV_CONNECTION_STRING);
Lbryio.cacheResolvedSubscriptions = resolvedSubs;
Lbryio.cacheResolvedSubscriptions = Lbry.resolve(subUrls, Lbry.LBRY_TV_CONNECTION_STRING);
}
// if no exceptions occurred here, subscriptions have been loaded and resolved
startupStages.put(STARTUP_STAGE_SUBSCRIPTIONS_RESOLVED, true);
startupStages.set(STARTUP_STAGE_SUBSCRIPTIONS_RESOLVED - 1, new StartupStage(STARTUP_STAGE_SUBSCRIPTIONS_RESOLVED, true));
} else {
// user has not subscribed to anything
startupStages.put(STARTUP_STAGE_SUBSCRIPTIONS_LOADED, true);
startupStages.put(STARTUP_STAGE_SUBSCRIPTIONS_RESOLVED, true);
startupStages.set(STARTUP_STAGE_SUBSCRIPTIONS_LOADED - 1, new StartupStage(STARTUP_STAGE_SUBSCRIPTIONS_LOADED, true));
startupStages.set(STARTUP_STAGE_SUBSCRIPTIONS_RESOLVED - 1, new StartupStage(STARTUP_STAGE_SUBSCRIPTIONS_RESOLVED, true));
}
} else {
startupStages.put(STARTUP_STAGE_SUBSCRIPTIONS_LOADED, true);
startupStages.put(STARTUP_STAGE_SUBSCRIPTIONS_RESOLVED, true);
startupStages.set(STARTUP_STAGE_SUBSCRIPTIONS_LOADED - 1, new StartupStage(STARTUP_STAGE_SUBSCRIPTIONS_LOADED, true));
startupStages.set(STARTUP_STAGE_SUBSCRIPTIONS_RESOLVED - 1, new StartupStage(STARTUP_STAGE_SUBSCRIPTIONS_RESOLVED, true));
}
JSONObject blockedObject = (JSONObject) Lbryio.parseResponse(Lbryio.call("file", "list_blocked", context));
JSONArray blockedArray = blockedObject.getJSONArray("outpoints");
Lbryio.populateOutpointList(Lbryio.blockedOutpoints, blockedArray);
startupStages.set(STARTUP_STAGE_BLOCK_LIST_LOADED - 1, new StartupStage(STARTUP_STAGE_BLOCK_LIST_LOADED, true));
JSONObject filteredObject = (JSONObject) Lbryio.parseResponse(Lbryio.call("file", "list_filtered", context));
JSONArray filteredArray = filteredObject.getJSONArray("outpoints");
Lbryio.populateOutpointList(Lbryio.filteredOutpoints, filteredArray);
startupStages.set(STARTUP_STAGE_FILTER_LIST_LOADED - 1, new StartupStage(STARTUP_STAGE_FILTER_LIST_LOADED, true));
} catch (Exception ex) {
// nopecd
// nope
Log.e(TAG, String.format("App startup failed: %s", ex.getMessage()), ex);
return false;
} finally {
@@ -2813,9 +3004,9 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
try {
LbryUri uri = LbryUri.parse(url);
if (uri.isChannel()) {
openChannelUrl(url);
openChannelUrl(url.startsWith(LbryUri.PROTO_DEFAULT) ? url : uri.toString());
} else {
openFileUrl(url);
openFileUrl(url.startsWith(LbryUri.PROTO_DEFAULT) ? url : uri.toString());
}
} catch (LbryUriException ex) {
// pass
@@ -2932,6 +3123,17 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
String action = intent.getAction();
if (LbrynetService.ACTION_STOP_SERVICE.equals(action)) {
MainActivity.this.receivedStopService = true;
// STOP is meant to close everything,
// So destroy the player at this point (even with background play enabled)
if (appPlayer != null) {
playerNotificationManager.setPlayer(null);
stopExoplayer();
nowPlayingClaim = null;
nowPlayingClaimUrl = null;
nowPlayingClaimBitmap = null;
}
MainActivity.this.finish();
} else if (LbrynetService.LBRY_SDK_SERVICE_STARTED.equals(action)) {
// Rebuild the service notification
@@ -2998,7 +3200,8 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
findContentGroup.setItems(Arrays.asList(
new NavMenuItem(NavMenuItem.ID_ITEM_FOLLOWING, R.string.fa_heart, R.string.following, "Following", context),
new NavMenuItem(NavMenuItem.ID_ITEM_EDITORS_CHOICE, R.string.fa_star, R.string.editors_choice, "EditorsChoice", context),
new NavMenuItem(NavMenuItem.ID_ITEM_ALL_CONTENT, R.string.fa_globe_americas, R.string.all_content, "AllContent", context)
new NavMenuItem(NavMenuItem.ID_ITEM_ALL_CONTENT, R.string.fa_globe_americas, R.string.all_content, "AllContent", context),
new NavMenuItem(NavMenuItem.ID_ITEM_SHUFFLE, R.string.fa_random, R.string.shuffle, "Shuffle",context)
));
yourContentGroup.setItems(Arrays.asList(
@@ -3213,6 +3416,11 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
return String.format("%s-%d", fragmentClass.getName(), navItemId);
}
public void popFragment(Class fragmentClass, int navItemId, Map<String, Object> params) {
String key = buildNavFragmentKey(fragmentClass, navItemId, params);
openNavFragments.remove(key);
}
public void openFragment(Class fragmentClass, boolean allowNavigateBack, int navItemId, Map<String, Object> params) {
try {
String key = buildNavFragmentKey(fragmentClass, navItemId, params);
@@ -3310,7 +3518,7 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
}
private void displayUnreadNotificationCount(int count) {
private void displayUnseenNotificationCount(int count) {
String text = count > 99 ? "99+" : String.valueOf(count);
TextView badge = findViewById(R.id.notifications_badge_count);
@@ -3318,19 +3526,19 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
badge.setText(text);
}
private void loadUnreadNotificationsCount() {
private void loadUnseenNotificationsCount() {
(new AsyncTask<Void, Void, Integer>() {
@Override
protected Integer doInBackground(Void... params) {
try {
SQLiteDatabase db = dbHelper.getReadableDatabase();
return DatabaseHelper.getUnreadNotificationsCount(db);
return DatabaseHelper.getUnseenNotificationsCount(db);
} catch (Exception ex) {
return 0;
}
}
protected void onPostExecute(Integer count) {
displayUnreadNotificationCount(count);
displayUnseenNotificationCount(count);
}
}).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
}
@@ -3342,10 +3550,14 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
public void onSuccess(List<LbryNotification> notifications) {
remoteNotifcationsLastLoaded = new Date();
loadUnreadNotificationsCount();
loadUnseenNotificationsCount();
loadLocalNotifications();
if (markRead && findViewById(R.id.notifications_container).getVisibility() == View.VISIBLE) {
markNotificationsRead();
markNotificationsSeen();
}
if (notificationsSwipeContainer != null) {
notificationsSwipeContainer.setRefreshing(false);
}
}
@@ -3354,6 +3566,9 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
// pass
Log.e(TAG, "error loading remote notifications", exception);
loadLocalNotifications();
if (notificationsSwipeContainer != null) {
notificationsSwipeContainer.setRefreshing(false);
}
}
});
task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
@@ -3379,10 +3594,11 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
protected void onPostExecute(List<LbryNotification> notifications) {
findViewById(R.id.notification_list_empty_container).setVisibility(notifications.size() == 0 ? View.VISIBLE : View.GONE);
findViewById(R.id.notifications_progress).setVisibility(View.GONE);
loadUnreadNotificationsCount();
loadUnseenNotificationsCount();
if (notificationListAdapter == null) {
notificationListAdapter = new NotificationListAdapter(notifications, MainActivity.this);
notificationListAdapter.setSelectionModeListener(MainActivity.this);
((RecyclerView) findViewById(R.id.notifications_list)).setAdapter(notificationListAdapter);
} else {
notificationListAdapter.addNotifications(notifications);
@@ -3435,7 +3651,7 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
return null;
}
protected void onPostExecute() {
loadUnreadNotificationsCount();
loadUnseenNotificationsCount();
}
}).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
}
@@ -3549,6 +3765,51 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
}
}
private void checkAndEnableShareUsageData() {
final SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this);
boolean shareUsageData = sp.getBoolean(PREFERENCE_KEY_SHARE_USAGE_DATA, false);
if (shareUsageData) {
return;
}
(new AsyncTask<Void, Void, Void>() {
protected Void doInBackground(Void... params) {
PrintStream out = null;
try {
String fileContent = "true";
String path = String.format("%s/sud", Utils.getAppInternalStorageDir(MainActivity.this));
out = new PrintStream(new FileOutputStream(path));
out.print(fileContent);
} catch (Exception ex) {
// pass
} finally {
Helper.closeCloseable(out);
}
return null;
}
protected void onPostExecute(Void result) {
updateSdkSetting("share_usage_data", true);
sp.edit().putBoolean(PREFERENCE_KEY_SHARE_USAGE_DATA, true).apply();
}
}).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
}
public void updateSdkSetting(String key, Object value) {
(new Thread() {
public void run() {
Map<String, Object> params = new HashMap<>();
params.put(key, value);
try {
Lbry.parseResponse(Lbry.apiCall("settings_set", params, Lbry.SDK_CONNECTION_STRING));
} catch (Exception ex) {
// pass
Log.d(TAG, ex.getMessage(), ex);
}
}
}).start();
}
public interface BackPressInterceptor {
boolean onBackPressed();
}
@@ -31,6 +31,7 @@ import java.util.Arrays;
import java.util.List;
import io.lbry.browser.adapter.VerificationPagerAdapter;
import io.lbry.browser.listener.SdkStatusListener;
import io.lbry.browser.listener.SignInListener;
import io.lbry.browser.listener.WalletSyncListener;
import io.lbry.browser.model.lbryinc.RewardVerified;
@@ -48,6 +49,7 @@ public class VerificationActivity extends FragmentActivity implements SignInList
public static final int VERIFICATION_FLOW_REWARDS = 2;
public static final int VERIFICATION_FLOW_WALLET = 3;
private List<SdkStatusListener> sdkStatusListeners;
private BillingClient billingClient;
private BroadcastReceiver sdkReceiver;
private String email;
@@ -105,6 +107,8 @@ public class VerificationActivity extends FragmentActivity implements SignInList
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
sdkStatusListeners = new ArrayList<>();
signedIn = Lbryio.isSignedIn();
Intent intent = getIntent();
if (intent != null) {
@@ -126,11 +130,18 @@ public class VerificationActivity extends FragmentActivity implements SignInList
IntentFilter filter = new IntentFilter();
filter.addAction(LbrynetService.ACTION_STOP_SERVICE);
filter.addAction(MainActivity.ACTION_SDK_READY);
sdkReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
String action = intent.getAction();
if (LbrynetService.ACTION_STOP_SERVICE.equals(action)) {
if (MainActivity.ACTION_SDK_READY.equals(action)) {
for (SdkStatusListener listener : sdkStatusListeners) {
if (listener != null) {
listener.onSdkReady();
}
}
} else if (LbrynetService.ACTION_STOP_SERVICE.equals(action)) {
finish();
}
}
@@ -436,4 +447,14 @@ public class VerificationActivity extends FragmentActivity implements SignInList
Helper.unregisterReceiver(sdkReceiver, this);
super.onDestroy();
}
public void addSdkStatusListener(SdkStatusListener listener) {
if (!sdkStatusListeners.contains(listener)) {
sdkStatusListeners.add(listener);
}
}
public void removeSdkStatusListener(SdkStatusListener listener) {
sdkStatusListeners.remove(listener);
}
}
@@ -101,7 +101,7 @@ public class ChannelFilterListAdapter extends RecyclerView.Adapter<ChannelFilter
}
vh.alphaContainer.setVisibility(claim.isPlaceholder() || Helper.isNullOrEmpty(thumbnailUrl) ? View.VISIBLE : View.GONE);
vh.thumbnailView.setVisibility(claim.isPlaceholder() || Helper.isNullOrEmpty(thumbnailUrl) ? View.GONE : View.VISIBLE);
vh.alphaView.setText(claim.isPlaceholder() ? null : claim.getName() != null ? claim.getName().substring(1, 2) : "");
vh.alphaView.setText(claim.isPlaceholder() ? null : claim.getName() != null ? claim.getName().substring(1, 2).toUpperCase() : "");
int bgColor = Helper.generateRandomColorForValue(claim.getClaimId());
Helper.setIconViewBackgroundColor(vh.alphaContainer, bgColor, claim.isPlaceholder(), context);
@@ -404,7 +404,7 @@ public class ClaimListAdapter extends RecyclerView.Adapter<ClaimListAdapter.View
vh.publishTimeView.setVisibility(!isPending ? View.VISIBLE : View.GONE);
vh.pendingTextView.setVisibility(isPending && !item.isLoadingPlaceholder() ? View.VISIBLE : View.GONE);
vh.repostInfoView.setVisibility(isRepost && type != VIEW_TYPE_FEATURED ? View.VISIBLE : View.GONE);
vh.repostChannelView.setText(isRepost ? original.getSigningChannel().getName() : null);
vh.repostChannelView.setText(isRepost && original.getSigningChannel() != null ? original.getSigningChannel().getName() : null);
vh.repostChannelView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
@@ -430,7 +430,7 @@ public class ClaimListAdapter extends RecyclerView.Adapter<ClaimListAdapter.View
Helper.setViewVisibility(vh.loadingTextPlaceholder2, item.isLoadingPlaceholder() ? View.VISIBLE : View.GONE);
Helper.setViewVisibility(vh.titleView, !item.isLoadingPlaceholder() ? View.VISIBLE : View.GONE);
Helper.setViewVisibility(vh.publisherView, !item.isLoadingPlaceholder() ? View.VISIBLE : View.GONE);
Helper.setViewVisibility(vh.publishTimeView, !item.isLoadingPlaceholder() ? View.VISIBLE : View.GONE);
Helper.setViewVisibility(vh.publishTimeView, !item.isLoadingPlaceholder() && !isPending ? View.VISIBLE : View.GONE);
if (type == VIEW_TYPE_FEATURED && item.isUnresolved()) {
vh.durationView.setVisibility(View.GONE);
@@ -14,6 +14,7 @@ import androidx.recyclerview.widget.RecyclerView;
import com.bumptech.glide.Glide;
import com.bumptech.glide.request.RequestOptions;
import com.google.android.material.snackbar.Snackbar;
import java.util.ArrayList;
import java.util.Calendar;
@@ -24,6 +25,7 @@ import java.util.List;
import java.util.TimeZone;
import io.lbry.browser.R;
import io.lbry.browser.listener.SelectionModeListener;
import io.lbry.browser.model.Claim;
import io.lbry.browser.model.lbryinc.LbryNotification;
import io.lbry.browser.ui.controls.SolidIconView;
@@ -43,15 +45,19 @@ public class NotificationListAdapter extends RecyclerView.Adapter<NotificationLi
private Context context;
private List<LbryNotification> items;
private List<LbryNotification> selectedItems;
@Setter
private NotificationClickListener clickListener;
@Getter
@Setter
private int customizeMode;
private boolean inSelectionMode;
@Setter
private SelectionModeListener selectionModeListener;
public NotificationListAdapter(List<LbryNotification> notifications, Context context) {
this.context = context;
this.items = new ArrayList<>(notifications);
this.selectedItems = new ArrayList<>();
Collections.sort(items, Collections.reverseOrder(new LbryNotification()));
}
@@ -62,6 +68,7 @@ public class NotificationListAdapter extends RecyclerView.Adapter<NotificationLi
protected TextView timeView;
protected SolidIconView iconView;
protected ImageView thumbnailView;
protected View selectedOverlayView;
public ViewHolder(View v) {
super(v);
layoutView = v.findViewById(R.id.notification_layout);
@@ -70,12 +77,25 @@ public class NotificationListAdapter extends RecyclerView.Adapter<NotificationLi
timeView = v.findViewById(R.id.notification_time);
iconView = v.findViewById(R.id.notification_icon);
thumbnailView = v.findViewById(R.id.notification_author_thumbnail);
selectedOverlayView = v.findViewById(R.id.notification_selected_overlay);
}
}
public int getItemCount() {
return items != null ? items.size() : 0;
}
public List<LbryNotification> getSelectedItems() {
return this.selectedItems;
}
public int getSelectedCount() {
return selectedItems != null ? selectedItems.size() : 0;
}
public void clearSelectedItems() {
this.selectedItems.clear();
}
public boolean isNotificationSelected(LbryNotification notification) {
return selectedItems.contains(notification);
}
public void insertNotification(LbryNotification notification, int index) {
if (!items.contains(notification)) {
@@ -90,6 +110,12 @@ public class NotificationListAdapter extends RecyclerView.Adapter<NotificationLi
}
notifyDataSetChanged();
}
public void removeNotifications(List<LbryNotification> notifications) {
for (LbryNotification notification : notifications) {
items.remove(notification);
}
notifyDataSetChanged();
}
public List<String> getAuthorUrls() {
List<String> urls = new ArrayList<>();
@@ -158,9 +184,8 @@ public class NotificationListAdapter extends RecyclerView.Adapter<NotificationLi
@Override
public void onBindViewHolder(NotificationListAdapter.ViewHolder vh, int position) {
LbryNotification notification = items.get(position);
vh.layoutView.setBackgroundColor(ContextCompat.getColor(context, notification.isSeen() ? android.R.color.transparent : R.color.nextLbryGreenSemiTransparent));
vh.selectedOverlayView.setVisibility(isNotificationSelected(notification) ? View.VISIBLE : View.GONE);
vh.titleView.setVisibility(!Helper.isNullOrEmpty(notification.getTitle()) ? View.VISIBLE : View.GONE);
vh.titleView.setText(notification.getTitle());
@@ -181,11 +206,49 @@ public class NotificationListAdapter extends RecyclerView.Adapter<NotificationLi
vh.itemView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
if (clickListener != null) {
clickListener.onNotificationClicked(notification);
if (inSelectionMode) {
toggleSelectedNotification(notification);
} else {
if (clickListener != null) {
clickListener.onNotificationClicked(notification);
}
}
}
});
vh.itemView.setOnLongClickListener(new View.OnLongClickListener() {
@Override
public boolean onLongClick(View view) {
if (!inSelectionMode) {
inSelectionMode = true;
if (selectionModeListener != null) {
selectionModeListener.onEnterSelectionMode();
}
}
toggleSelectedNotification(notification);
return true;
}
});
}
private void toggleSelectedNotification(LbryNotification notification) {
if (selectedItems.contains(notification)) {
selectedItems.remove(notification);
} else {
selectedItems.add(notification);
}
if (selectionModeListener != null) {
selectionModeListener.onItemSelectionToggled();
}
if (selectedItems.size() == 0) {
inSelectionMode = false;
if (selectionModeListener != null) {
selectionModeListener.onExitSelectionMode();
}
}
notifyDataSetChanged();
}
private long getLocalNotificationTime(LbryNotification notification) {
@@ -0,0 +1,70 @@
package io.lbry.browser.adapter;
import android.content.Context;
import android.graphics.Color;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.BaseAdapter;
import android.widget.ImageView;
import android.widget.TextView;
import java.util.List;
import io.lbry.browser.R;
import io.lbry.browser.model.StartupStage;
public class StartupStageAdapter extends BaseAdapter {
private final List<StartupStage> list;
private final LayoutInflater inflater;
private final String[] stagesString;
public StartupStageAdapter(Context ctx, List<StartupStage> rows) {
this.list = rows;
this.inflater = LayoutInflater.from(ctx);
stagesString = new String[9];
stagesString[0] = ctx.getResources().getString(R.string.installation_id_loaded);
stagesString[1] = ctx.getResources().getString(R.string.known_tags_loaded);
stagesString[2] = ctx.getResources().getString(R.string.exchange_rate_loaded);
stagesString[3] = ctx.getResources().getString(R.string.user_authenticated);
stagesString[4] = ctx.getResources().getString(R.string.installation_registered);
stagesString[5] = ctx.getResources().getString(R.string.subscriptions_loaded);
stagesString[6] = ctx.getResources().getString(R.string.subscriptions_resolved);
stagesString[7] = ctx.getResources().getString(R.string.block_list_loaded);
stagesString[8] = ctx.getResources().getString(R.string.filter_list_loaded);
}
@Override
public int getCount() {
return list.size();
}
@Override
public Object getItem(int i) {
return list.get(i);
}
@Override
public long getItemId(int i) {
return i;
}
@Override
public View getView(int i, View view, ViewGroup viewGroup) {
if (view == null) {
view = inflater.inflate(R.layout.list_item_startupstage, viewGroup, false);
ImageView iconView = view.findViewById(R.id.startup_stage_icon);
TextView textView = view.findViewById(R.id.startup_stage_text);
StartupStage item = (StartupStage) getItem(i);
iconView.setImageResource(item.stageDone ? R.drawable.ic_check : R.drawable.ic_close);
iconView.setColorFilter(item.stageDone ? Color.WHITE : Color.RED);
textView.setText(stagesString[item.stage - 1]);
}
return view;
}
}
@@ -6,6 +6,7 @@ import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteOpenHelper;
import java.math.BigDecimal;
import java.sql.SQLInput;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -21,13 +22,13 @@ import io.lbry.browser.utils.Helper;
import io.lbry.browser.utils.LbryUri;
public class DatabaseHelper extends SQLiteOpenHelper {
public static final int DATABASE_VERSION = 6;
public static final int DATABASE_VERSION = 8;
public static final String DATABASE_NAME = "LbryApp.db";
private static DatabaseHelper instance;
private static final String[] SQL_CREATE_TABLES = {
// local subscription store
"CREATE TABLE subscriptions (url TEXT PRIMARY KEY NOT NULL, channel_name TEXT NOT NULL)",
"CREATE TABLE subscriptions (url TEXT PRIMARY KEY NOT NULL, channel_name TEXT NOT NULL, is_notifications_disabled INTEGER DEFAULT 0 NOT NULL)",
// url entry / suggestion history
"CREATE TABLE url_history (id INTEGER PRIMARY KEY NOT NULL, value TEXT NOT NULL, url TEXT, type INTEGER NOT NULL, timestamp TEXT NOT NULL)",
// tags (known and followed)
@@ -60,6 +61,7 @@ public class DatabaseHelper extends SQLiteOpenHelper {
", is_read INTEGER DEFAULT 0 NOT NULL" +
", is_seen INTEGER DEFAULT 0 NOT NULL " +
", timestamp TEXT NOT NULL)",
"CREATE TABLE shuffle_watched (id INTEGER PRIMARY KEY NOT NULL, claim_id TEXT NOT NULL)"
};
private static final String[] SQL_CREATE_INDEXES = {
"CREATE UNIQUE INDEX idx_subscription_url ON subscriptions (url)",
@@ -69,7 +71,8 @@ public class DatabaseHelper extends SQLiteOpenHelper {
"CREATE UNIQUE INDEX idx_view_history_url_device ON view_history (url, device)",
"CREATE INDEX idx_view_history_device ON view_history (device)",
"CREATE UNIQUE INDEX idx_notification_remote_id ON notifications (remote_id)",
"CREATE INDEX idx_notification_timestamp ON notifications (timestamp)"
"CREATE INDEX idx_notification_timestamp ON notifications (timestamp)",
"CREATE UNIQUE INDEX idx_shuffle_watched_claim ON shuffle_watched (claim_id)",
};
private static final String[] SQL_V1_V2_UPGRADE = {
@@ -99,11 +102,19 @@ public class DatabaseHelper extends SQLiteOpenHelper {
private static final String[] SQL_V5_V6_UPGRADE = {
"ALTER TABLE notifications ADD COLUMN author_url TEXT"
};
private static final String[] SQL_V6_V7_UPGRADE = {
"CREATE TABLE shuffle_watched (id INTEGER PRIMARY KEY NOT NULL, claim_id TEXT NOT NULL)",
"CREATE UNIQUE INDEX idx_shuffle_watched_claim ON shuffle_watched (claim_id)"
};
private static final String[] SQL_V7_V8_UPGRADE = {
"AlTER TABLE subscriptions ADD COLUMN is_notifications_disabled INTEGER DEFAULT 0 NOT NULL"
};
private static final String SQL_INSERT_SUBSCRIPTION = "REPLACE INTO subscriptions (channel_name, url) VALUES (?, ?)";
private static final String SQL_INSERT_SUBSCRIPTION = "REPLACE INTO subscriptions (channel_name, url, is_notifications_disabled) VALUES (?, ?, ?)";
private static final String SQL_UPDATE_SUBSCRIPTION_NOTIFICATION = "UPDATE subscriptions SET is_notification_disabled = ? WHERE url = ?";
private static final String SQL_CLEAR_SUBSCRIPTIONS = "DELETE FROM subscriptions";
private static final String SQL_DELETE_SUBSCRIPTION = "DELETE FROM subscriptions WHERE url = ?";
private static final String SQL_GET_SUBSCRIPTIONS = "SELECT channel_name, url FROM subscriptions";
private static final String SQL_GET_SUBSCRIPTIONS = "SELECT channel_name, url, is_notifications_disabled FROM subscriptions";
private static final String SQL_INSERT_URL_HISTORY = "REPLACE INTO url_history (value, url, type, timestamp) VALUES (?, ?, ?, ?)";
private static final String SQL_CLEAR_URL_HISTORY = "DELETE FROM url_history";
@@ -113,9 +124,14 @@ public class DatabaseHelper extends SQLiteOpenHelper {
private static final String SQL_INSERT_NOTIFICATION = "REPLACE INTO notifications (remote_id, author_url, title, description, rule, target_url, is_read, is_seen, timestamp) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)";
private static final String SQL_GET_NOTIFICATIONS = "SELECT id, remote_id, author_url, title, description, rule, target_url, is_read, is_seen, timestamp FROM notifications ORDER BY timestamp DESC LIMIT 500";
private static final String SQL_GET_UNREAD_NOTIFICATIONS_COUNT = "SELECT COUNT(id) FROM notifications WHERE is_read <> 1";
private static final String SQL_GET_UNSEEN_NOTIFICATIONS_COUNT = "SELECT COUNT(id) FROM notifications WHERE is_seen <> 1";
private static final String SQL_MARK_NOTIFICATIONS_READ = "UPDATE notifications SET is_read = 1 WHERE is_read = 0";
private static final String SQL_MARK_NOTIFICATIONS_SEEN = "UPDATE notifications SET is_seen = 1 WHERE is_seen = 0";
private static final String SQL_MARK_NOTIFICATION_READ_AND_SEEN = "UPDATE notifications SET is_read = 1, is_seen = 1 WHERE id = ?";
private static final String SQL_INSERT_SHUFFLE_WATCHED = "REPLACE INTO shuffle_watched (claim_id) VALUES (?)";
private static final String SQL_GET_SHUFFLE_WATCHED_CLAIMS = "SELECT claim_id FROM shuffle_watched";
private static final String SQL_INSERT_VIEW_HISTORY =
"REPLACE INTO view_history (url, claim_id, claim_name, cost, currency, title, publisher_claim_id, publisher_name, publisher_title, thumbnail_url, device, release_time, timestamp) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
private static final String SQL_GET_VIEW_HISTORY =
@@ -174,6 +190,16 @@ public class DatabaseHelper extends SQLiteOpenHelper {
db.execSQL(sql);
}
}
if (oldVersion < 7) {
for (String sql : SQL_V6_V7_UPGRADE) {
db.execSQL(sql);
}
}
if (oldVersion < 8) {
for (String sql : SQL_V7_V8_UPGRADE) {
db.execSQL(sql);
}
}
}
public void onDowngrade(SQLiteDatabase db, int oldVersion, int newVersion) {
@@ -190,6 +216,7 @@ public class DatabaseHelper extends SQLiteOpenHelper {
public static void clearUrlHistoryBefore(Date date, SQLiteDatabase db) {
db.execSQL(SQL_CLEAR_URL_HISTORY_BEFORE_TIME, new Object[] { new SimpleDateFormat(Helper.ISO_DATE_FORMAT_PATTERN).format(new Date()) });
}
// History items are essentially url suggestions
public static List<UrlSuggestion> getRecentHistory(SQLiteDatabase db) {
List<UrlSuggestion> suggestions = new ArrayList<>();
@@ -289,7 +316,14 @@ public class DatabaseHelper extends SQLiteOpenHelper {
}
public static void createOrUpdateSubscription(Subscription subscription, SQLiteDatabase db) {
db.execSQL(SQL_INSERT_SUBSCRIPTION, new Object[] { subscription.getChannelName(), subscription.getUrl() });
db.execSQL(SQL_INSERT_SUBSCRIPTION, new Object[] {
subscription.getChannelName(),
subscription.getUrl(),
subscription.isNotificationsDisabled() ? 1 : 0
});
}
public static void setSubscriptionNotificationDisabled(boolean flag, String url, SQLiteDatabase db) {
db.execSQL(SQL_UPDATE_SUBSCRIPTION_NOTIFICATION, new Object[] { flag ? 1 : 0, url });
}
public static void deleteSubscription(Subscription subscription, SQLiteDatabase db) {
db.execSQL(SQL_DELETE_SUBSCRIPTION, new Object[] { subscription.getUrl() });
@@ -306,6 +340,7 @@ public class DatabaseHelper extends SQLiteOpenHelper {
Subscription subscription = new Subscription();
subscription.setChannelName(cursor.getString(0));
subscription.setUrl(cursor.getString(1));
subscription.setNotificationsDisabled(cursor.getInt(2) == 1);
subscriptions.add(subscription);
}
} finally {
@@ -357,6 +392,20 @@ public class DatabaseHelper extends SQLiteOpenHelper {
}
return notifications;
}
public static void deleteNotifications(List<LbryNotification> notifications, SQLiteDatabase db) {
StringBuilder sb = new StringBuilder("DELETE FROM notifications WHERE remote_id IN (");
List<Object> remoteIds = new ArrayList<>();
String delim = "";
for (int i = 0; i < notifications.size(); i++) {
remoteIds.add(String.valueOf(notifications.get(i).getRemoteId()));
sb.append(delim).append("?");
delim = ",";
}
sb.append(")");
String sql = sb.toString();
db.execSQL(sql, remoteIds.toArray());
}
public static int getUnreadNotificationsCount(SQLiteDatabase db) {
int count = 0;
Cursor cursor = null;
@@ -370,10 +419,42 @@ public class DatabaseHelper extends SQLiteOpenHelper {
}
return count;
}
public static int getUnseenNotificationsCount(SQLiteDatabase db) {
int count = 0;
Cursor cursor = null;
try {
cursor = db.rawQuery(SQL_GET_UNSEEN_NOTIFICATIONS_COUNT, null);
if (cursor.moveToNext()) {
count = cursor.getInt(0);
}
} finally {
Helper.closeCursor(cursor);
}
return count;
}
public static void markNotificationsSeen(SQLiteDatabase db) {
db.execSQL(SQL_MARK_NOTIFICATIONS_SEEN);
}
public static void markNotificationsRead(SQLiteDatabase db) {
db.execSQL(SQL_MARK_NOTIFICATIONS_READ);
}
public static void markNotificationReadAndSeen(long notificationId, SQLiteDatabase db) {
db.execSQL(SQL_MARK_NOTIFICATION_READ_AND_SEEN, new Object[] { notificationId });
}
public static void createOrUpdateShuffleWatched(String claimId, SQLiteDatabase db) {
db.execSQL(SQL_INSERT_SHUFFLE_WATCHED, new Object[] { claimId });
}
public static List<String> getShuffleWatchedClaims(SQLiteDatabase db) {
List<String> claimIds = new ArrayList<>();
Cursor cursor = null;
try {
cursor = db.rawQuery(SQL_GET_SHUFFLE_WATCHED_CLAIMS, null);
while (cursor.moveToNext()) {
claimIds.add(cursor.getString(0));
}
} finally {
Helper.closeCursor(cursor);
}
return claimIds;
}
}
@@ -225,9 +225,10 @@ public class CreateSupportDialogFragment extends BottomSheetDialogFragment imple
if (!isTip) {
sendButton.setText(R.string.send_revocable_support);
} else {
String amountString = Helper.getValue(inputAmount.getText());
String amountString = Helper.getValue(inputAmount.getText(), "0");
double parsedAmount = Helper.parseDouble(amountString, 0);
sendButton.setText(parsedAmount == 0 ? getString(R.string.send_a_tip) : getString(R.string.send_lbc_tip, amountString));
String text = getResources().getQuantityString(R.plurals.send_lbc_tip, parsedAmount == 1.0 ? 1 : 2, amountString);
sendButton.setText(text);
}
}
@@ -11,8 +11,7 @@ import io.lbry.browser.utils.Helper;
import lombok.Data;
@Data
public class Comment {
public static final double LBC_COST = 1;
public class Comment implements Comparable<Comment> {
public static final int MAX_LENGTH = 2000;
private Claim poster;
@@ -66,4 +65,9 @@ public class Comment {
return null;
}
}
@Override
public int compareTo(Comment comment) {
return (int)(this.getTimestamp() - comment.getTimestamp());
}
}
@@ -20,6 +20,7 @@ public class NavMenuItem {
public static final int ID_ITEM_FOLLOWING = 101;
public static final int ID_ITEM_EDITORS_CHOICE = 102;
public static final int ID_ITEM_ALL_CONTENT = 103;
public static final int ID_ITEM_SHUFFLE = 104;
// Your Content
public static final int ID_ITEM_CHANNELS = 201;
@@ -0,0 +1,11 @@
package io.lbry.browser.model;
public class StartupStage {
public Integer stage;
public Boolean stageDone;
public StartupStage(Integer stage, Boolean stageDone) {
this.stage = stage;
this.stageDone = stageDone;
}
}
@@ -11,17 +11,21 @@ public class Subscription {
@Getter
@Setter
private String url;
@Getter
@Setter
private boolean isNotificationsDisabled;
public Subscription() {
}
public Subscription(String channelName, String url) {
public Subscription(String channelName, String url, boolean isNotificationsDisabled) {
this.channelName = channelName;
this.url = url;
this.isNotificationsDisabled = isNotificationsDisabled;
}
public static Subscription fromClaim(Claim claim) {
return new Subscription(claim.getName(), claim.getPermanentUrl());
return new Subscription(claim.getName(), claim.getPermanentUrl(), false);
}
public String toString() {
return url;
@@ -24,18 +24,16 @@ import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.Response;
public class CommentCreateWithTipTask extends AsyncTask<Void, Void, Comment> {
public class CommentCreateTask extends AsyncTask<Void, Void, Comment> {
private static final String STATUS_ENDPOINT = "https://comments.lbry.com";
private Comment comment;
private BigDecimal amount;
private View progressView;
private CommentCreateWithTipHandler handler;
private Exception error;
public CommentCreateWithTipTask(Comment comment, BigDecimal amount, View progressView, CommentCreateWithTipHandler handler) {
public CommentCreateTask(Comment comment, View progressView, CommentCreateWithTipHandler handler) {
this.comment = comment;
this.amount = amount;
this.progressView = progressView;
this.handler = handler;
}
@@ -62,13 +60,6 @@ public class CommentCreateWithTipTask extends AsyncTask<Void, Void, Comment> {
}
Map<String, Object> options = new HashMap<>();
options.put("blocking", true);
options.put("claim_id", comment.getClaimId());
options.put("amount", new DecimalFormat(Helper.SDK_AMOUNT_FORMAT, new DecimalFormatSymbols(Locale.US)).format(amount.doubleValue()));
options.put("tip", true);
Lbry.genericApiCall(Lbry.METHOD_SUPPORT_CREATE, options);
options = new HashMap<>();
options.put("comment", comment.getText());
options.put("claim_id", comment.getClaimId());
options.put("channel_id", comment.getChannelId());
@@ -8,6 +8,7 @@ import org.json.JSONArray;
import org.json.JSONObject;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -51,7 +52,6 @@ public class CommentListTask extends AsyncTask<Void, Void, List<Comment>> {
options.put("skip_validation", true);
options.put("visible", true);
JSONObject result = (JSONObject) Lbry.genericApiCall(Lbry.METHOD_COMMENT_LIST, options);
JSONArray items = result.getJSONArray("items");
@@ -68,6 +68,9 @@ public class CommentListTask extends AsyncTask<Void, Void, List<Comment>> {
}
}
// Sort all replies from oldest to newest at once
Collections.sort(children);
for (Comment child : children) {
for (Comment parent : comments) {
if (parent.getId().equalsIgnoreCase(child.getParentId())) {
@@ -76,13 +76,15 @@ public class MergeSubscriptionsTask extends AsyncTask<Void, Void, List<Subscript
// check for any remote subs that may have been removed, and unsubscribe from them
for (int i = 0; i < array.length(); i++) {
JSONObject item = array.getJSONObject(i);
// TODO: Refactor by creating static Subscription.fromJSON method
String claimId = item.getString("claim_id");
String channelName = item.getString("channel_name");
boolean isNotificationsDisabled = item.getBoolean("is_notifications_disabled");
LbryUri url = new LbryUri();
url.setChannelName(channelName);
url.setClaimId(claimId);
Subscription subscription = new Subscription(channelName, url.toString());
Subscription subscription = new Subscription(channelName, url.toString(), isNotificationsDisabled);
remoteSubs.add(subscription);
}
}
@@ -51,11 +51,11 @@ public class ChannelSubscribeTask extends AsyncTask<Void, Void, Boolean> {
options.put("claim_id", channelClaimId);
if (!isUnsubscribing) {
options.put("channel_name", subscription.getChannelName());
options.put("notifications_disabled", String.valueOf(subscription.isNotificationsDisabled()).toLowerCase());
}
String action = isUnsubscribing ? "delete" : "new";
Lbryio.call("subscription", action, options, context);
Object response = Lbryio.parseResponse(Lbryio.call("subscription", action, options, context));
if (!isUnsubscribing) {
Lbryio.addSubscription(subscription);
} else {
@@ -49,11 +49,12 @@ public class FetchSubscriptionsTask extends AsyncTask<Void, Void, List<Subscript
JSONObject item = array.getJSONObject(i);
String claimId = item.getString("claim_id");
String channelName = item.getString("channel_name");
boolean isNotificationsDisabled = item.getBoolean("is_notifications_disabled");
LbryUri url = new LbryUri();
url.setChannelName(channelName);
url.setClaimId(claimId);
Subscription subscription = new Subscription(channelName, url.toString());
Subscription subscription = new Subscription(channelName, url.toString(), isNotificationsDisabled);
subscriptions.add(subscription);
// Persist the subscription locally if it doesn't exist
if (db != null) {
@@ -0,0 +1,33 @@
package io.lbry.browser.tasks.lbryinc;
import android.os.AsyncTask;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import io.lbry.browser.exceptions.LbryioRequestException;
import io.lbry.browser.exceptions.LbryioResponseException;
import io.lbry.browser.utils.Helper;
import io.lbry.browser.utils.Lbryio;
public class NotificationDeleteTask extends AsyncTask<Void, Void, Boolean> {
private List<Long> ids;
public NotificationDeleteTask(List<Long> ids) {
this.ids = ids;
}
protected Boolean doInBackground(Void... params) {
Map<String, String> options = new HashMap<>();
options.put("notification_ids", Helper.joinL(ids, ","));
try {
Object result = Lbryio.parseResponse(Lbryio.call("notification", "delete", options, null));
return "ok".equalsIgnoreCase(result.toString());
} catch (LbryioResponseException | LbryioRequestException ex) {
// pass
}
return false;
}
}
@@ -15,25 +15,25 @@ public class NotificationUpdateTask extends AsyncTask<Void, Void, Boolean> {
private List<Long> ids;
private boolean seen;
private boolean read;
private boolean updateSeen;
private boolean updateRead;
public NotificationUpdateTask(List<Long> ids, boolean read) {
this(ids, read, false, false);
public NotificationUpdateTask(List<Long> ids, boolean seen) {
this(ids, false, true, false);
}
public NotificationUpdateTask(List<Long> ids, boolean read, boolean seen, boolean updateSeen) {
public NotificationUpdateTask(List<Long> ids, boolean read, boolean seen, boolean updateRead) {
this.ids = ids;
this.read = read;
this.seen = seen;
this.updateSeen = updateSeen;
this.updateRead = updateRead;
}
protected Boolean doInBackground(Void... params) {
Map<String, String> options = new HashMap<>();
options.put("notification_ids", Helper.joinL(ids, ","));
options.put("is_read", String.valueOf(read));
if (updateSeen) {
options.put("is_seen", String.valueOf(seen));
options.put("is_seen", String.valueOf(seen));
if (updateRead) {
options.put("is_read", String.valueOf(read));
}
try {
@@ -18,6 +18,7 @@ import io.lbry.browser.exceptions.ApiCallException;
import io.lbry.browser.exceptions.LbryUriException;
import io.lbry.browser.model.Tag;
import io.lbry.browser.model.lbryinc.Subscription;
import io.lbry.browser.utils.Helper;
import io.lbry.browser.utils.Lbry;
import io.lbry.browser.utils.LbryUri;
@@ -69,6 +70,8 @@ public class LoadSharedUserStateTask extends AsyncTask<Void, Void, Boolean> {
value.has("subscriptions") && !value.isNull("subscriptions") ? value.getJSONArray("subscriptions") : null;
JSONArray tags =
value.has("tags") && !value.isNull("tags") ? value.getJSONArray("tags") : null;
JSONArray following =
value.has("following") && !value.isNull("following") ? value.getJSONArray("following") : null;
if (subscriptionUrls != null) {
subscriptions = new ArrayList<>();
@@ -78,7 +81,8 @@ public class LoadSharedUserStateTask extends AsyncTask<Void, Void, Boolean> {
LbryUri uri = LbryUri.parse(LbryUri.normalize(url));
Subscription subscription = new Subscription();
subscription.setChannelName(uri.getChannelName());
subscription.setUrl(url);
subscription.setUrl(uri.toString());
subscription.setNotificationsDisabled(isNotificationsDisabledForSubUrl(uri.toString(), following));
subscriptions.add(subscription);
if (db != null) {
DatabaseHelper.createOrUpdateSubscription(subscription, db);
@@ -125,6 +129,28 @@ public class LoadSharedUserStateTask extends AsyncTask<Void, Void, Boolean> {
return false;
}
protected boolean isNotificationsDisabledForSubUrl(String url, JSONArray following) {
if (following == null) {
return true;
}
try {
for (int i = 0; i < following.length(); i++) {
JSONObject item = following.getJSONObject(i);
String itemUrl = Helper.getJSONString("url", null, item);
boolean notificationsDisabled = Helper.getJSONBoolean("notificationsDisabled", true, item);
if (url.equalsIgnoreCase(itemUrl)) {
return notificationsDisabled;
}
}
} catch (JSONException ex) {
// pass
}
// always default notifications disabled to true
return true;
}
protected void onPostExecute(Boolean result) {
if (handler != null) {
if (result) {
@@ -2,6 +2,7 @@ package io.lbry.browser.tasks.wallet;
import android.os.AsyncTask;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
@@ -11,9 +12,11 @@ import java.util.List;
import java.util.Map;
import io.lbry.browser.exceptions.ApiCallException;
import io.lbry.browser.exceptions.LbryUriException;
import io.lbry.browser.model.lbryinc.Subscription;
import io.lbry.browser.utils.Helper;
import io.lbry.browser.utils.Lbry;
import io.lbry.browser.utils.LbryUri;
import io.lbry.browser.utils.Lbryio;
/*
@@ -40,9 +43,16 @@ public class SaveSharedUserStateTask extends AsyncTask<Void, Void, Boolean> {
protected Boolean doInBackground(Void... params) {
// data to save
// current subscriptions
List<Subscription> subs = new ArrayList<>(Lbryio.subscriptions);
List<String> subscriptionUrls = new ArrayList<>();
for (Subscription subscription : Lbryio.subscriptions) {
subscriptionUrls.add(subscription.getUrl());
try {
for (Subscription subscription : subs) {
LbryUri uri = LbryUri.parse(LbryUri.normalize(subscription.getUrl()));
subscriptionUrls.add(uri.toString());
}
} catch (LbryUriException ex) {
error = ex;
return false;
}
// followed tags
@@ -62,6 +72,7 @@ public class SaveSharedUserStateTask extends AsyncTask<Void, Void, Boolean> {
JSONObject value = shared.getJSONObject("value");
value.put("subscriptions", Helper.jsonArrayFromList(subscriptionUrls));
value.put("tags", Helper.jsonArrayFromList(followedTags));
value.put("following", buildUpdatedNotificationsDisabledStates(subs));
sharedObject = shared;
}
}
@@ -71,6 +82,7 @@ public class SaveSharedUserStateTask extends AsyncTask<Void, Void, Boolean> {
JSONObject value = new JSONObject();
value.put("subscriptions", Helper.jsonArrayFromList(subscriptionUrls));
value.put("tags", Helper.jsonArrayFromList(followedTags));
value.put("following", buildUpdatedNotificationsDisabledStates(subs));
sharedObject = new JSONObject();
sharedObject.put("type", "object");
@@ -91,6 +103,26 @@ public class SaveSharedUserStateTask extends AsyncTask<Void, Void, Boolean> {
return false;
}
private static JSONArray buildUpdatedNotificationsDisabledStates(List<Subscription> subscriptions) {
JSONArray states = new JSONArray();
for (Subscription subscription : subscriptions) {
if (!Helper.isNullOrEmpty(subscription.getUrl())) {
try {
JSONObject item = new JSONObject();
LbryUri uri = LbryUri.parse(LbryUri.normalize(subscription.getUrl()));
item.put("uri", uri.toString());
item.put("notificationsDisabled", subscription.isNotificationsDisabled());
states.put(item);
} catch (JSONException | LbryUriException ex) {
// pass
}
}
}
return states;
}
protected void onPostExecute(Boolean result) {
if (handler != null) {
if (result) {
@@ -33,6 +33,7 @@ public class WalletSendTask extends AsyncTask<Void, Void, Boolean> {
Map<String, Object> options = new HashMap<>();
options.put("addresses", Arrays.asList(recipientAddress));
options.put("amount", amount);
options.put("blocking", true);
Lbry.genericApiCall(Lbry.METHOD_WALLET_SEND, options);
} catch (ApiCallException ex) {
error = ex;
@@ -30,7 +30,6 @@ import com.google.android.material.snackbar.Snackbar;
import com.google.android.material.textfield.TextInputEditText;
import java.math.BigDecimal;
import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.List;
@@ -45,7 +44,7 @@ import io.lbry.browser.listener.WalletBalanceListener;
import io.lbry.browser.model.Claim;
import io.lbry.browser.model.Comment;
import io.lbry.browser.model.WalletBalance;
import io.lbry.browser.tasks.CommentCreateWithTipTask;
import io.lbry.browser.tasks.CommentCreateTask;
import io.lbry.browser.tasks.CommentListHandler;
import io.lbry.browser.tasks.CommentListTask;
import io.lbry.browser.tasks.claim.ChannelCreateUpdateTask;
@@ -58,7 +57,6 @@ import io.lbry.browser.utils.Helper;
import io.lbry.browser.utils.Lbry;
import io.lbry.browser.utils.LbryAnalytics;
import io.lbry.browser.utils.LbryUri;
import io.lbry.browser.utils.Lbryio;
import lombok.Setter;
public class ChannelCommentsFragment extends Fragment implements SdkStatusListener, WalletBalanceListener {
@@ -367,9 +365,6 @@ public class ChannelCommentsFragment extends Fragment implements SdkStatusListen
}
private void initCommentForm(View root) {
double amount = Comment.LBC_COST;
String buttonText = getResources().getQuantityString(R.plurals.post_for_credits, amount == 1 ? 1 : 2, Helper.LBC_CURRENCY_FORMAT.format(amount));
buttonPostComment.setText(buttonText);
textCommentLimit.setText(String.format("%d / %d", Helper.getValue(inputComment.getText()).length(), Comment.MAX_LENGTH));
buttonClearReplyToComment.setOnClickListener(new View.OnClickListener() {
@@ -387,7 +382,7 @@ public class ChannelCommentsFragment extends Fragment implements SdkStatusListen
return;
}
validateAndCheckPostComment(amount);
validateAndCheckPostComment();
}
});
@@ -433,7 +428,7 @@ public class ChannelCommentsFragment extends Fragment implements SdkStatusListen
});
}
private void validateAndCheckPostComment(double amount) {
private void validateAndCheckPostComment() {
String comment = Helper.getValue(inputComment.getText());
Claim channel = (Claim) commentChannelSpinner.getSelectedItem();
@@ -445,33 +440,8 @@ public class ChannelCommentsFragment extends Fragment implements SdkStatusListen
showError(getString(R.string.please_select_channel));
return;
}
if (Lbry.walletBalance == null || amount > Lbry.walletBalance.getAvailable().doubleValue()) {
showError(getString(R.string.insufficient_balance));
return;
}
Context context = getContext();
if (context != null) {
String titleText = getResources().getQuantityString(
R.plurals.post_and_tip,
amount == 1 ? 1 : 2,
Helper.LBC_CURRENCY_FORMAT.format(amount));
String confirmText = getResources().getQuantityString(
R.plurals.confirm_post_comment,
amount == 1 ? 1 : 2,
Helper.LBC_CURRENCY_FORMAT.format(amount),
claim.getTitleOrName());
AlertDialog.Builder builder = new AlertDialog.Builder(context).
setTitle(titleText).
setMessage(confirmText)
.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
postComment(amount);
}
}).setNegativeButton(R.string.no, null);
builder.show();
}
postComment();
}
private void updatePostAsChannel(Claim channel) {
@@ -545,17 +515,15 @@ public class ChannelCommentsFragment extends Fragment implements SdkStatusListen
replyToComment = null;
}
private void postComment(double tipAmount) {
private void postComment() {
if (postingComment) {
return;
}
Comment comment = buildPostComment();
// only use 2 decimal places
BigDecimal amount = new BigDecimal(String.valueOf(tipAmount));
beforePostComment();
CommentCreateWithTipTask task = new CommentCreateWithTipTask(comment, amount, progressPostComment, new CommentCreateWithTipTask.CommentCreateWithTipHandler() {
CommentCreateTask task = new CommentCreateTask(comment, progressPostComment, new CommentCreateTask.CommentCreateWithTipHandler() {
@Override
public void onSuccess(Comment createdComment) {
inputComment.setText(null);
@@ -573,7 +541,6 @@ public class ChannelCommentsFragment extends Fragment implements SdkStatusListen
checkNoComments();
Bundle bundle = new Bundle();
bundle.putDouble("amount", amount.doubleValue());
bundle.putString("claim_id", claim != null ? claim.getClaimId() : null);
bundle.putString("claim_name", claim != null ? claim.getName() : null);
LbryAnalytics.logEvent(LbryAnalytics.EVENT_COMMENT_CREATE, bundle);
@@ -227,6 +227,8 @@ public class ChannelContentFragment extends Fragment implements DownloadActionLi
null,
getContentSortOrder(),
contentReleaseTime,
0,
0,
currentClaimSearchPage == 0 ? 1 : currentClaimSearchPage,
Helper.CONTENT_PAGE_SIZE);
}
@@ -258,6 +260,8 @@ public class ChannelContentFragment extends Fragment implements DownloadActionLi
contentClaimSearchTask = new ClaimSearchTask(claimSearchOptions, Lbry.LBRY_TV_CONNECTION_STRING, getLoadingView(), new ClaimSearchResultHandler() {
@Override
public void onSuccess(List<Claim> claims, boolean hasReachedEnd) {
claims = Helper.filterClaimsByOutpoint(claims);
if (contentListAdapter == null) {
Context context = getContext();
if (context != null) {
@@ -80,7 +80,10 @@ public class ChannelFragment extends BaseFragment implements FetchChannelsListen
private View buttonShare;
private View buttonTip;
private View buttonFollowUnfollow;
private View buttonBell;
private SolidIconView iconBell;
private int subCount;
private TextView textFollow;
private OutlineIconView iconFollow;
private SolidIconView iconUnfollow;
private View layoutNothingAtLocation;
@@ -110,8 +113,11 @@ public class ChannelFragment extends BaseFragment implements FetchChannelsListen
buttonShare = root.findViewById(R.id.channel_view_share);
buttonTip = root.findViewById(R.id.channel_view_tip);
buttonFollowUnfollow = root.findViewById(R.id.channel_view_follow_unfollow);
textFollow = root.findViewById(R.id.channel_view_text_follow);
iconFollow = root.findViewById(R.id.channel_view_icon_follow);
iconUnfollow = root.findViewById(R.id.channel_view_icon_unfollow);
buttonBell = root.findViewById(R.id.channel_view_subscribe_notify);
iconBell = root.findViewById(R.id.channel_view_icon_bell);
tabPager = root.findViewById(R.id.channel_view_pager);
tabLayout = root.findViewById(R.id.channel_view_tabs);
@@ -202,6 +208,42 @@ public class ChannelFragment extends BaseFragment implements FetchChannelsListen
}
});
buttonBell.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
if (claim != null) {
boolean isNotificationsDisabled = Lbryio.isNotificationsDisabled(claim);
final Subscription subscription = Subscription.fromClaim(claim);
subscription.setNotificationsDisabled(!isNotificationsDisabled);
view.setEnabled(false);
Context context = getContext();
new ChannelSubscribeTask(context, claim.getClaimId(), subscription, false, new ChannelSubscribeTask.ChannelSubscribeHandler() {
@Override
public void onSuccess() {
view.setEnabled(true);
Lbryio.updateSubscriptionNotificationsDisabled(subscription);
Context context = getContext();
if (context instanceof MainActivity) {
((MainActivity) context).showMessage(subscription.isNotificationsDisabled() ?
R.string.receive_no_notifications : R.string.receive_all_notifications);
}
checkIsFollowing();
if (context != null) {
context.sendBroadcast(new Intent(MainActivity.ACTION_SAVE_SHARED_USER_STATE));
}
}
@Override
public void onError(Exception exception) {
view.setEnabled(true);
}
}).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
}
}
});
buttonFollowUnfollow.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
@@ -210,39 +252,22 @@ public class ChannelFragment extends BaseFragment implements FetchChannelsListen
return;
}
subscribing = true;
boolean isFollowing = Lbryio.isFollowing(claim);
Subscription subscription = Subscription.fromClaim(claim);
buttonFollowUnfollow.setEnabled(false);
new ChannelSubscribeTask(getContext(), claim.getClaimId(), subscription, isFollowing, new ChannelSubscribeTask.ChannelSubscribeHandler() {
@Override
public void onSuccess() {
if (isFollowing) {
Lbryio.removeSubscription(subscription);
Lbryio.removeCachedResolvedSubscription(claim);
} else {
Lbryio.addSubscription(subscription);
Lbryio.addCachedResolvedSubscription(claim);
}
buttonFollowUnfollow.setEnabled(true);
subscribing = false;
checkIsFollowing();
FollowingFragment.resetClaimSearchContent = true;
if (Lbry.SDK_READY) {
Context context = getContext();
if (context instanceof MainActivity) {
((MainActivity) context).saveSharedUserState();
}
}
}
@Override
public void onError(Exception exception) {
buttonFollowUnfollow.setEnabled(true);
subscribing = false;
}
}).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
if (isFollowing) {
Context context = getContext();
AlertDialog.Builder builder = new AlertDialog.Builder(context).
setTitle(R.string.confirm_unfollow).
setMessage(R.string.confirm_unfollow_message)
.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
doFollowUnfollow(isFollowing, view);
}
}).setNegativeButton(R.string.no, null);
builder.show();
} else {
doFollowUnfollow(isFollowing, view);
}
}
}
});
@@ -250,6 +275,39 @@ public class ChannelFragment extends BaseFragment implements FetchChannelsListen
return root;
}
private void doFollowUnfollow(boolean isFollowing, View view) {
subscribing = true;
Subscription subscription = Subscription.fromClaim(claim);
view.setEnabled(false);
new ChannelSubscribeTask(getContext(), claim.getClaimId(), subscription, isFollowing, new ChannelSubscribeTask.ChannelSubscribeHandler() {
@Override
public void onSuccess() {
if (isFollowing) {
Lbryio.removeSubscription(subscription);
Lbryio.removeCachedResolvedSubscription(claim);
} else {
Lbryio.addSubscription(subscription);
Lbryio.addCachedResolvedSubscription(claim);
}
buttonFollowUnfollow.setEnabled(true);
subscribing = false;
checkIsFollowing();
FollowingFragment.resetClaimSearchContent = true;
Context context = getContext();
if (context != null) {
context.sendBroadcast(new Intent(MainActivity.ACTION_SAVE_SHARED_USER_STATE));
}
}
@Override
public void onError(Exception exception) {
buttonFollowUnfollow.setEnabled(true);
subscribing = false;
}
}).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
}
private void deleteCurrentClaim() {
if (claim != null) {
Helper.setViewVisibility(layoutDisplayArea, View.GONE);
@@ -280,8 +338,15 @@ public class ChannelFragment extends BaseFragment implements FetchChannelsListen
private void checkIsFollowing() {
if (claim != null) {
boolean isFollowing = Lbryio.isFollowing(claim);
boolean notificationsDisabled = Lbryio.isNotificationsDisabled(claim);
Helper.setViewVisibility(iconFollow, !isFollowing ? View.VISIBLE : View.GONE);
Helper.setViewVisibility(textFollow, !isFollowing ? View.VISIBLE : View.GONE);
Helper.setViewVisibility(iconUnfollow, isFollowing ? View.VISIBLE : View.GONE);
Helper.setViewVisibility(buttonBell, isFollowing ? View.VISIBLE : View.GONE);
if (iconBell != null) {
iconBell.setText(notificationsDisabled ? R.string.fa_bell : R.string.fa_bell_slash);
}
}
}
@@ -414,6 +414,8 @@ public class AllContentFragment extends BaseFragment implements DownloadActionLi
null,
getContentSortOrder(),
contentReleaseTime,
0,
0,
currentClaimSearchPage == 0 ? 1 : currentClaimSearchPage,
Helper.CONTENT_PAGE_SIZE);
}
@@ -445,6 +447,8 @@ public class AllContentFragment extends BaseFragment implements DownloadActionLi
contentClaimSearchTask = new ClaimSearchTask(claimSearchOptions, Lbry.LBRY_TV_CONNECTION_STRING, getLoadingView(), new ClaimSearchResultHandler() {
@Override
public void onSuccess(List<Claim> claims, boolean hasReachedEnd) {
claims = Helper.filterClaimsByOutpoint(claims);
if (contentListAdapter == null) {
Context context = getContext();
if (context != null) {
@@ -32,6 +32,7 @@ import io.lbry.browser.ui.BaseFragment;
import io.lbry.browser.utils.Helper;
import io.lbry.browser.utils.Lbry;
import io.lbry.browser.utils.LbryAnalytics;
import io.lbry.browser.utils.Predefined;
public class EditorsChoiceFragment extends BaseFragment {
@@ -72,7 +73,7 @@ public class EditorsChoiceFragment extends BaseFragment {
return Lbry.buildClaimSearchOptions(
Claim.TYPE_REPOST,
null,
null, /*canShowMatureContent ? null : new ArrayList<>(Predefined.MATURE_TAGS),*/
canShowMatureContent ? null : new ArrayList<>(Predefined.MATURE_TAGS),
new ArrayList<>(titleChannelIdsMap.values()),
null,
Arrays.asList(Claim.ORDER_BY_RELEASE_TIME),
@@ -9,13 +9,15 @@ import android.content.Intent;
import android.content.SharedPreferences;
import android.content.pm.ActivityInfo;
import android.graphics.Color;
import android.graphics.Outline;
import android.net.Uri;
import android.os.AsyncTask;
import android.os.Bundle;
import android.os.Handler;
import android.text.Editable;
import android.text.TextWatcher;
import android.text.format.DateUtils;
import android.text.method.LinkMovementMethod;
import android.util.Base64;
import android.view.ContextMenu;
import android.view.LayoutInflater;
import android.view.MenuItem;
@@ -29,6 +31,7 @@ import android.webkit.WebView;
import android.webkit.WebViewClient;
import android.widget.AdapterView;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.ProgressBar;
import android.widget.RelativeLayout;
import android.widget.TextView;
@@ -37,7 +40,7 @@ import androidx.annotation.NonNull;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.widget.AppCompatSpinner;
import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.core.content.ContextCompat;
import androidx.core.text.HtmlCompat;
import androidx.core.widget.NestedScrollView;
import androidx.preference.PreferenceManager;
import androidx.recyclerview.widget.LinearLayoutManager;
@@ -122,7 +125,7 @@ import io.lbry.browser.model.WalletBalance;
import io.lbry.browser.model.lbryinc.Reward;
import io.lbry.browser.model.lbryinc.Subscription;
import io.lbry.browser.tasks.BufferEventTask;
import io.lbry.browser.tasks.CommentCreateWithTipTask;
import io.lbry.browser.tasks.CommentCreateTask;
import io.lbry.browser.tasks.CommentListHandler;
import io.lbry.browser.tasks.CommentListTask;
import io.lbry.browser.tasks.GenericTaskHandler;
@@ -144,7 +147,6 @@ import io.lbry.browser.tasks.lbryinc.ClaimRewardTask;
import io.lbry.browser.tasks.lbryinc.FetchStatCountTask;
import io.lbry.browser.tasks.lbryinc.LogFileViewTask;
import io.lbry.browser.ui.BaseFragment;
import io.lbry.browser.ui.controls.OutlineIconView;
import io.lbry.browser.ui.controls.SolidIconView;
import io.lbry.browser.ui.publish.PublishFragment;
import io.lbry.browser.utils.Helper;
@@ -167,7 +169,7 @@ public class FileViewFragment extends BaseFragment implements
WalletBalanceListener {
private static final int RELATED_CONTENT_SIZE = 16;
private static final String DEFAULT_PLAYBACK_SPEED = "1x";
private static final String CDN_PREFIX = "https://cdn.lbryplayer.xyz";
public static final String CDN_PREFIX = "https://cdn.lbryplayer.xyz";
private PlayerControlView castControlView;
private Player currentPlayer;
@@ -211,6 +213,7 @@ public class FileViewFragment extends BaseFragment implements
private TextView textReplyingTo;
private TextView textReplyToBody;
private View buttonClearReplyToComment;
private TextView textNothingAtLocation;
private boolean postingComment;
private boolean fetchingChannels;
@@ -261,6 +264,7 @@ public class FileViewFragment extends BaseFragment implements
commentPostAsThumbnail = root.findViewById(R.id.comment_form_thumbnail);
commentPostAsNoThumbnail = root.findViewById(R.id.comment_form_no_thumbnail);
commentPostAsAlpha = root.findViewById(R.id.comment_form_thumbnail_alpha);
textNothingAtLocation = root.findViewById(R.id.nothing_at_location_text);
inlineChannelCreator = root.findViewById(R.id.container_inline_channel_form_create);
inlineChannelCreatorInputName = root.findViewById(R.id.inline_channel_form_input_name);
@@ -311,8 +315,7 @@ public class FileViewFragment extends BaseFragment implements
String mediaSourceUrl = getStreamingUrl();
long duration = MainActivity.appPlayer.getDuration();
long position = MainActivity.appPlayer.getCurrentPosition();
// TODO: Determine a hash for the userId
String userIdHash = Helper.SHA256(Lbryio.currentUser != null ? String.valueOf(Lbryio.currentUser.getId()) : "0");
String userIdHash = Lbryio.currentUser != null ? String.valueOf(Lbryio.currentUser.getId()) : "0";
if (mediaSourceUrl.startsWith(CDN_PREFIX)) {
BufferEventTask bufferEvent = new BufferEventTask(claim.getPermanentUrl(), duration, position, 1, userIdHash);
bufferEvent.executeOnExecutor(AsyncTask.SERIAL_EXECUTOR);
@@ -430,8 +433,11 @@ public class FileViewFragment extends BaseFragment implements
renderNothingAtLocation();
} else if (claim.getName().startsWith("@")) {
// this is a reposted channel, so launch the channel url
if (context instanceof MainActivity) {
((MainActivity) context).openChannelUrl(!Helper.isNullOrEmpty(claim.getShortUrl()) ? claim.getShortUrl() : claim.getPermanentUrl());
if (context instanceof MainActivity) {
MainActivity activity = (MainActivity) context;
//activity.onBackPressed(); // remove the reposted url page from the back stack
activity.getSupportFragmentManager().popBackStack();
activity.openChannelUrl(!Helper.isNullOrEmpty(claim.getShortUrl()) ? claim.getShortUrl() : claim.getPermanentUrl());
}
return;
}
@@ -453,13 +459,17 @@ public class FileViewFragment extends BaseFragment implements
if (claim != null && !invalidRepost) {
Helper.saveViewHistory(currentUrl, claim);
checkAndLoadRelatedContent();
checkAndLoadComments();
renderClaim();
if (claim.getFile() == null) {
loadFile();
if (Helper.isClaimBlocked(claim)) {
renderClaimBlocked();
} else {
initialFileLoadDone = true;
checkAndLoadRelatedContent();
checkAndLoadComments();
renderClaim();
if (claim.getFile() == null) {
loadFile();
} else {
initialFileLoadDone = true;
}
}
}
@@ -472,6 +482,21 @@ public class FileViewFragment extends BaseFragment implements
Helper.setViewVisibility(buttonPublishSomething, View.VISIBLE);
Helper.setViewVisibility(layoutResolving, View.GONE);
Helper.setViewVisibility(layoutDisplayArea, View.INVISIBLE);
if (textNothingAtLocation != null) {
textNothingAtLocation.setText(R.string.nothing_at_this_location);
}
}
private void renderClaimBlocked() {
Helper.setViewVisibility(layoutLoadingState, View.VISIBLE);
Helper.setViewVisibility(layoutNothingAtLocation, View.VISIBLE);
Helper.setViewVisibility(buttonPublishSomething, View.INVISIBLE);
Helper.setViewVisibility(layoutResolving, View.GONE);
Helper.setViewVisibility(layoutDisplayArea, View.INVISIBLE);
if (textNothingAtLocation != null) {
textNothingAtLocation.setMovementMethod(LinkMovementMethod.getInstance());
textNothingAtLocation.setText(HtmlCompat.fromHtml(getString(R.string.dmca_complaint_blocked), HtmlCompat.FROM_HTML_MODE_LEGACY));
}
}
private void checkNewClaimAndUrl(Claim newClaim, String newUrl) {
@@ -609,7 +634,7 @@ public class FileViewFragment extends BaseFragment implements
}
}
if (!Helper.isNullOrEmpty(lbryFile.getStreamingUrl()) && !Lbryio.isSignedIn()) {
if (!Helper.isNullOrEmpty(lbryFile.getStreamingUrl()) && (!claim.isFree() || !Lbryio.isSignedIn())) {
return lbryFile.getStreamingUrl();
}
}
@@ -681,9 +706,13 @@ public class FileViewFragment extends BaseFragment implements
if (claim != null) {
Helper.saveViewHistory(url, claim);
checkAndLoadRelatedContent();
checkAndLoadComments();
renderClaim();
if (Helper.isClaimBlocked(claim)) {
renderClaimBlocked();
} else {
checkAndLoadRelatedContent();
checkAndLoadComments();
renderClaim();
}
}
}
@@ -741,6 +770,13 @@ public class FileViewFragment extends BaseFragment implements
}
}
public void onPause() {
if (MainActivity.appPlayer != null) {
MainActivity.nowPlayingSource = MainActivity.SOURCE_NOW_PLAYING_FILE;
}
super.onPause();
}
public void onStop() {
super.onStop();
Context context = getContext();
@@ -779,30 +815,28 @@ public class FileViewFragment extends BaseFragment implements
}
}
private View.OnClickListener followUnfollowListener = new View.OnClickListener() {
private View.OnClickListener bellIconListener = new View.OnClickListener() {
@Override
public void onClick(View view) {
if (claim != null && claim.getSigningChannel() != null) {
Claim publisher = claim.getSigningChannel();
boolean isFollowing = Lbryio.isFollowing(publisher);
Subscription subscription = Subscription.fromClaim(publisher);
boolean isNotificationsDisabled = Lbryio.isNotificationsDisabled(publisher);
final Subscription subscription = Subscription.fromClaim(publisher);
subscription.setNotificationsDisabled(!isNotificationsDisabled);
view.setEnabled(false);
Context context = getContext();
new ChannelSubscribeTask(context, publisher.getClaimId(), subscription, isFollowing, new ChannelSubscribeTask.ChannelSubscribeHandler() {
new ChannelSubscribeTask(context, publisher.getClaimId(), subscription, false, new ChannelSubscribeTask.ChannelSubscribeHandler() {
@Override
public void onSuccess() {
if (isFollowing) {
Lbryio.removeSubscription(subscription);
Lbryio.removeCachedResolvedSubscription(publisher);
} else {
Lbryio.addSubscription(subscription);
Lbryio.addCachedResolvedSubscription(publisher);
}
view.setEnabled(true);
Lbryio.updateSubscriptionNotificationsDisabled(subscription);
Context context = getContext();
if (context instanceof MainActivity) {
((MainActivity) context).showMessage(subscription.isNotificationsDisabled() ?
R.string.receive_no_notifications : R.string.receive_all_notifications);
}
checkIsFollowing();
FollowingFragment.resetClaimSearchContent = true;
// Save shared user state
if (context != null) {
context.sendBroadcast(new Intent(MainActivity.ACTION_SAVE_SHARED_USER_STATE));
}
@@ -817,6 +851,66 @@ public class FileViewFragment extends BaseFragment implements
}
};
private View.OnClickListener followUnfollowListener = new View.OnClickListener() {
@Override
public void onClick(final View view) {
if (claim != null && claim.getSigningChannel() != null) {
Claim publisher = claim.getSigningChannel();
boolean isFollowing = Lbryio.isFollowing(publisher);
if (isFollowing) {
// show unfollow confirmation
Context context = getContext();
AlertDialog.Builder builder = new AlertDialog.Builder(context).
setTitle(R.string.confirm_unfollow).
setMessage(R.string.confirm_unfollow_message)
.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
doFollowUnfollow(isFollowing, view);
}
}).setNegativeButton(R.string.no, null);
builder.show();
} else {
doFollowUnfollow(isFollowing, view);
}
}
}
};
private void doFollowUnfollow(boolean isFollowing, View view) {
if (claim != null && claim.getSigningChannel() != null) {
Claim publisher = claim.getSigningChannel();
Subscription subscription = Subscription.fromClaim(publisher);
view.setEnabled(false);
Context context = getContext();
new ChannelSubscribeTask(context, publisher.getClaimId(), subscription, isFollowing, new ChannelSubscribeTask.ChannelSubscribeHandler() {
@Override
public void onSuccess() {
if (isFollowing) {
Lbryio.removeSubscription(subscription);
Lbryio.removeCachedResolvedSubscription(publisher);
} else {
Lbryio.addSubscription(subscription);
Lbryio.addCachedResolvedSubscription(publisher);
}
view.setEnabled(true);
checkIsFollowing();
FollowingFragment.resetClaimSearchContent = true;
// Save shared user state
if (context != null) {
context.sendBroadcast(new Intent(MainActivity.ACTION_SAVE_SHARED_USER_STATE));
}
}
@Override
public void onError(Exception exception) {
view.setEnabled(true);
}
}).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
}
}
private void resolveUrl(String url) {
resolving = true;
Helper.setViewVisibility(layoutDisplayArea, View.INVISIBLE);
@@ -835,7 +929,9 @@ public class FileViewFragment extends BaseFragment implements
// this is a reposted channel, so finish this activity and launch the channel url
Context context = getContext();
if (context instanceof MainActivity) {
((MainActivity) context).openChannelUrl(!Helper.isNullOrEmpty(claim.getShortUrl()) ? claim.getShortUrl() : claim.getPermanentUrl());
MainActivity activity = (MainActivity) context;
activity.getSupportFragmentManager().popBackStack();
activity.openChannelUrl(!Helper.isNullOrEmpty(claim.getShortUrl()) ? claim.getShortUrl() : claim.getPermanentUrl());
}
return;
}
@@ -849,11 +945,15 @@ public class FileViewFragment extends BaseFragment implements
Helper.saveViewHistory(url, claim);
checkAndResetNowPlayingClaim();
loadFile();
checkAndLoadRelatedContent();
checkAndLoadComments();
renderClaim();
if (Helper.isClaimBlocked(claim)) {
renderClaimBlocked();
} else {
loadFile();
checkAndLoadRelatedContent();
checkAndLoadComments();
renderClaim();
}
} else {
// render nothing at location
renderNothingAtLocation();
@@ -1010,30 +1110,39 @@ public class FileViewFragment extends BaseFragment implements
}
if (claim != null) {
boolean isOwnClaim = Lbry.ownClaims.contains(claim);
if (isOwnClaim) {
AlertDialog.Builder builder = new AlertDialog.Builder(getContext()).
setTitle(R.string.delete_content).
setMessage(R.string.confirm_delete_content_message)
.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
deleteCurrentClaim();
}
}).setNegativeButton(R.string.no, null);
builder.show();
} else {
AlertDialog.Builder builder = new AlertDialog.Builder(getContext()).
setTitle(R.string.delete_file).
setMessage(R.string.confirm_delete_file_message)
.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
deleteClaimFile();
}
}).setNegativeButton(R.string.no, null);
builder.show();
}
AlertDialog.Builder builder = new AlertDialog.Builder(getContext()).
setTitle(R.string.delete_file).
setMessage(R.string.confirm_delete_file_message)
.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
deleteClaimFile();
}
}).setNegativeButton(R.string.no, null);
builder.show();
}
}
});
root.findViewById(R.id.file_view_action_unpublish).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
if (!Lbry.SDK_READY) {
Snackbar.make(root.findViewById(R.id.file_view_claim_display_area), R.string.sdk_initializing_functionality, Snackbar.LENGTH_LONG).show();
return;
}
if (claim != null) {
AlertDialog.Builder builder = new AlertDialog.Builder(getContext()).
setTitle(R.string.delete_content).
setMessage(R.string.confirm_delete_content_message)
.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
deleteCurrentClaim();
}
}).setNegativeButton(R.string.no, null);
builder.show();
}
}
});
@@ -1155,8 +1264,10 @@ public class FileViewFragment extends BaseFragment implements
View buttonFollow = root.findViewById(R.id.file_view_icon_follow);
View buttonUnfollow = root.findViewById(R.id.file_view_icon_unfollow);
View buttonBell = root.findViewById(R.id.file_view_icon_bell);
buttonFollow.setOnClickListener(followUnfollowListener);
buttonUnfollow.setOnClickListener(followUnfollowListener);
buttonBell.setOnClickListener(bellIconListener);
commentChannelSpinnerAdapter = new InlineChannelSpinnerAdapter(getContext(), R.layout.spinner_item_channel, new ArrayList<>());
commentChannelSpinnerAdapter.addPlaceholder(false);
@@ -1472,6 +1583,12 @@ public class FileViewFragment extends BaseFragment implements
onMainActionButtonClicked();
}
});
root.findViewById(R.id.file_view_open_external_button).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
openClaimExternally(claim, claim.getMediaType());
}
});
if (metadata instanceof Claim.StreamMetadata) {
Claim.StreamMetadata streamMetadata = (Claim.StreamMetadata) metadata;
@@ -1594,6 +1711,8 @@ public class FileViewFragment extends BaseFragment implements
.build();
MainActivity.appPlayer = new SimpleExoPlayer.Builder(context).build();
MainActivity.appPlayer.setWakeMode(C.WAKE_MODE_NETWORK);
MainActivity.appPlayer.setAudioAttributes(audioAttributes, true);
MainActivity.playerCache =
new SimpleCache(context.getCacheDir(),
@@ -1874,7 +1993,7 @@ public class FileViewFragment extends BaseFragment implements
}
private void handleMainActionForClaim() {
if (claim.isPlayable() && Lbryio.isSignedIn()) {
if (claim.isPlayable() && claim.isFree() && Lbryio.isSignedIn()) {
// always use lbry.tv streaming when signed in and playabble
startTimeMillis = System.currentTimeMillis();
showExoplayerView();
@@ -2019,6 +2138,8 @@ public class FileViewFragment extends BaseFragment implements
}
handled = true;
}
} else {
openClaimExternally(claim, mediaType);
}
}
@@ -2056,9 +2177,9 @@ public class FileViewFragment extends BaseFragment implements
ReadTextFileTask task = new ReadTextFileTask(filePath, new ReadTextFileTask.ReadTextFileHandler() {
@Override
public void onSuccess(String text) {
String html = buildMarkdownHtml(text);
if (webView != null) {
webView.loadData(html, "text/html", "utf-8");
String html = buildMarkdownHtml(text);
webView.loadData(Base64.encodeToString(html.getBytes(), Base64.NO_PADDING), "text/html", "base64");
}
}
@@ -2095,6 +2216,17 @@ public class FileViewFragment extends BaseFragment implements
" </html>";
}
private void openClaimExternally(Claim claim, String mediaType) {
Uri fileUri = Uri.parse(claim.getFile().getDownloadPath());
Intent intent = new Intent();
intent.setAction(Intent.ACTION_VIEW);
intent.setDataAndType(fileUri, mediaType.toLowerCase());
intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
Intent chooser = Intent.createChooser(intent, getString(R.string.choose_app));
startActivityForResult(chooser, 419);
}
public void showError(String message) {
View root = getView();
if (root != null) {
@@ -2509,13 +2641,18 @@ public class FileViewFragment extends BaseFragment implements
private void checkIsFollowing() {
if (claim != null && claim.getSigningChannel() != null) {
boolean isFollowing = Lbryio.isFollowing(claim.getSigningChannel());
boolean notificationsDisabled = Lbryio.isNotificationsDisabled(claim.getSigningChannel());
Context context = getContext();
View root = getView();
if (context != null && root != null) {
OutlineIconView iconFollow = root.findViewById(R.id.file_view_icon_follow);
View iconFollow = root.findViewById(R.id.file_view_icon_follow);
SolidIconView iconUnfollow = root.findViewById(R.id.file_view_icon_unfollow);
Helper.setViewVisibility(iconFollow, !isFollowing ? View.VISIBLE: View.INVISIBLE);
Helper.setViewVisibility(iconUnfollow, isFollowing ? View.VISIBLE : View.INVISIBLE);
SolidIconView iconBell = root.findViewById(R.id.file_view_icon_bell);
Helper.setViewVisibility(iconFollow, !isFollowing ? View.VISIBLE: View.GONE);
Helper.setViewVisibility(iconUnfollow, isFollowing ? View.VISIBLE : View.GONE);
Helper.setViewVisibility(iconBell, isFollowing ? View.VISIBLE : View.GONE);
iconBell.setText(notificationsDisabled ? R.string.fa_bell : R.string.fa_bell_slash);
}
}
}
@@ -2773,15 +2910,18 @@ public class FileViewFragment extends BaseFragment implements
boolean isOwnClaim = Lbry.ownClaims.contains(claim);
View root = getView();
if (root != null) {
Helper.setViewVisibility(root.findViewById(R.id.file_view_action_download), isOwnClaim ? View.GONE : View.VISIBLE);
Helper.setViewVisibility(root.findViewById(R.id.file_view_action_report), isOwnClaim ? View.GONE : View.VISIBLE);
Helper.setViewVisibility(root.findViewById(R.id.file_view_action_edit), isOwnClaim ? View.VISIBLE : View.GONE);
Helper.setViewVisibility(root.findViewById(R.id.file_view_action_delete), isOwnClaim ? View.VISIBLE : View.GONE);
Helper.setViewVisibility(root.findViewById(R.id.file_view_action_unpublish), isOwnClaim ? View.VISIBLE : View.GONE);
LinearLayout fileViewActionsArea = root.findViewById(R.id.file_view_actions_area);
fileViewActionsArea.setWeightSum(isOwnClaim ? 6 : 5);
}
}
}
private static class StreamLoadErrorPolicy extends DefaultLoadErrorHandlingPolicy {
public static class StreamLoadErrorPolicy extends DefaultLoadErrorHandlingPolicy {
@Override
public long getRetryDelayMsFor(int dataType, long loadDurationMs, IOException exception, int errorCount) {
return exception instanceof ParserException
@@ -2897,9 +3037,6 @@ public class FileViewFragment extends BaseFragment implements
}
private void initCommentForm(View root) {
double amount = Comment.LBC_COST;
String buttonText = getResources().getQuantityString(R.plurals.post_for_credits, amount == 1 ? 1 : 2, Helper.LBC_CURRENCY_FORMAT.format(amount));
buttonPostComment.setText(buttonText);
textCommentLimit.setText(String.format("%d / %d", Helper.getValue(inputComment.getText()).length(), Comment.MAX_LENGTH));
buttonClearReplyToComment.setOnClickListener(new View.OnClickListener() {
@@ -2917,7 +3054,7 @@ public class FileViewFragment extends BaseFragment implements
return;
}
validateAndCheckPostComment(amount);
validateAndCheckPostComment();
}
});
@@ -2963,7 +3100,7 @@ public class FileViewFragment extends BaseFragment implements
});
}
private void validateAndCheckPostComment(double amount) {
private void validateAndCheckPostComment() {
String comment = Helper.getValue(inputComment.getText());
Claim channel = (Claim) commentChannelSpinner.getSelectedItem();
@@ -2975,33 +3112,8 @@ public class FileViewFragment extends BaseFragment implements
showError(getString(R.string.please_select_channel));
return;
}
if (Lbry.walletBalance == null || amount > Lbry.walletBalance.getAvailable().doubleValue()) {
showError(getString(R.string.insufficient_balance));
return;
}
Context context = getContext();
if (context != null) {
String titleText = getResources().getQuantityString(
R.plurals.post_and_tip,
amount == 1 ? 1 : 2,
Helper.LBC_CURRENCY_FORMAT.format(amount));
String confirmText = getResources().getQuantityString(
R.plurals.confirm_post_comment,
amount == 1 ? 1 : 2,
Helper.LBC_CURRENCY_FORMAT.format(amount),
claim.getTitleOrName());
AlertDialog.Builder builder = new AlertDialog.Builder(context).
setTitle(titleText).
setMessage(confirmText)
.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
postComment(amount);
}
}).setNegativeButton(R.string.no, null);
builder.show();
}
postComment();
}
private void updatePostAsChannel(Claim channel) {
@@ -3075,17 +3187,15 @@ public class FileViewFragment extends BaseFragment implements
replyToComment = null;
}
private void postComment(double tipAmount) {
private void postComment() {
if (postingComment) {
return;
}
Comment comment = buildPostComment();
// only use 2 decimal places
BigDecimal amount = new BigDecimal(String.valueOf(tipAmount));
beforePostComment();
CommentCreateWithTipTask task = new CommentCreateWithTipTask(comment, amount, progressPostComment, new CommentCreateWithTipTask.CommentCreateWithTipHandler() {
CommentCreateTask task = new CommentCreateTask(comment, progressPostComment, new CommentCreateTask.CommentCreateWithTipHandler() {
@Override
public void onSuccess(Comment createdComment) {
inputComment.setText(null);
@@ -3103,7 +3213,6 @@ public class FileViewFragment extends BaseFragment implements
checkNoComments();
Bundle bundle = new Bundle();
bundle.putDouble("amount", amount.doubleValue());
bundle.putString("claim_id", claim != null ? claim.getClaimId() : null);
bundle.putString("claim_name", claim != null ? claim.getName() : null);
LbryAnalytics.logEvent(LbryAnalytics.EVENT_COMMENT_CREATE, bundle);
@@ -434,6 +434,8 @@ public class FollowingFragment extends BaseFragment implements
null,
getContentSortOrder(),
contentReleaseTime,
0,
0,
currentClaimSearchPage == 0 ? 1 : currentClaimSearchPage,
Helper.CONTENT_PAGE_SIZE);
}
@@ -597,6 +599,8 @@ public class FollowingFragment extends BaseFragment implements
contentClaimSearchTask = new ClaimSearchTask(claimSearchOptions, Lbry.LBRY_TV_CONNECTION_STRING, getLoadingView(), new ClaimSearchResultHandler() {
@Override
public void onSuccess(List<Claim> claims, boolean hasReachedEnd) {
claims = Helper.filterClaimsByOutpoint(claims);
if (contentListAdapter == null) {
Context context = getContext();
if (context != null) {
@@ -0,0 +1,837 @@
package io.lbry.browser.ui.findcontent;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.database.sqlite.SQLiteDatabase;
import android.graphics.Color;
import android.net.Uri;
import android.os.AsyncTask;
import android.os.Bundle;
import android.view.GestureDetector;
import android.view.LayoutInflater;
import android.view.MotionEvent;
import android.view.View;
import android.view.ViewGroup;
import android.view.WindowManager;
import android.widget.ProgressBar;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.preference.PreferenceManager;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.PlaybackParameters;
import com.google.android.exoplayer2.Player;
import com.google.android.exoplayer2.SimpleExoPlayer;
import com.google.android.exoplayer2.audio.AudioAttributes;
import com.google.android.exoplayer2.database.ExoDatabaseProvider;
import com.google.android.exoplayer2.extractor.DefaultExtractorsFactory;
import com.google.android.exoplayer2.source.MediaSource;
import com.google.android.exoplayer2.source.ProgressiveMediaSource;
import com.google.android.exoplayer2.ui.PlayerView;
import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;
import com.google.android.exoplayer2.upstream.cache.CacheDataSourceFactory;
import com.google.android.exoplayer2.upstream.cache.LeastRecentlyUsedCacheEvictor;
import com.google.android.exoplayer2.upstream.cache.SimpleCache;
import com.google.android.exoplayer2.util.Util;
import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import io.lbry.browser.MainActivity;
import io.lbry.browser.R;
import io.lbry.browser.data.DatabaseHelper;
import io.lbry.browser.exceptions.LbryUriException;
import io.lbry.browser.model.Claim;
import io.lbry.browser.model.lbryinc.Reward;
import io.lbry.browser.tasks.BufferEventTask;
import io.lbry.browser.tasks.GenericTaskHandler;
import io.lbry.browser.tasks.claim.ClaimSearchResultHandler;
import io.lbry.browser.tasks.claim.ClaimSearchTask;
import io.lbry.browser.tasks.lbryinc.ClaimRewardTask;
import io.lbry.browser.tasks.lbryinc.LogFileViewTask;
import io.lbry.browser.ui.BaseFragment;
import io.lbry.browser.utils.Helper;
import io.lbry.browser.utils.Lbry;
import io.lbry.browser.utils.LbryAnalytics;
import io.lbry.browser.utils.LbryUri;
import io.lbry.browser.utils.Lbryio;
import io.lbry.browser.utils.Predefined;
public class ShuffleFragment extends BaseFragment {
private static final int PAGE_SIZE = 50;
private int currentClaimSearchPage;
private int playlistIndex;
private Claim current;
private List<Claim> playlist;
private List<String> watchedContentClaimIds;
private long sessionStart;
private ProgressBar surfModeLoading;
private TextView textTitle;
private TextView textPublisher;
private Player player;
private long elapsedDuration = 0;
private long totalDuration = 0;
private boolean elapsedPlaybackScheduled;
private ScheduledExecutorService elapsedPlaybackScheduler;
private boolean playbackStarted;
private long startTimeMillis;
private boolean isPlaying;
private boolean newPlayerCreated;
private String currentUrl;
private Player.EventListener playerListener;
public View onCreateView(@NonNull LayoutInflater inflater,
ViewGroup container, Bundle savedInstanceState) {
View root = inflater.inflate(R.layout.fragment_shuffle, container, false);
surfModeLoading = root.findViewById(R.id.shuffle_loading);
textTitle = root.findViewById(R.id.shuffle_content_title);
textPublisher = root.findViewById(R.id.shuffle_content_publisher);
playerListener = new Player.EventListener() {
@Override
public void onPlayerStateChanged(boolean playWhenReady, int playbackState) {
if (playbackState == Player.STATE_READY) {
elapsedDuration = MainActivity.appPlayer.getCurrentPosition();
totalDuration = MainActivity.appPlayer.getDuration() < 0 ? 0 : MainActivity.appPlayer.getDuration();
if (!playbackStarted) {
logPlay(currentUrl, startTimeMillis);
playbackStarted = true;
isPlaying = true;
if (current != null) {
saveWatchedContent(current.getClaimId());
}
}
renderTotalDuration();
scheduleElapsedPlayback();
hideBuffering();
} else if (playbackState == Player.STATE_BUFFERING) {
Context ctx = getContext();
boolean sendBufferingEvents = true;
if (ctx != null) {
SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(ctx);
sendBufferingEvents = sp.getBoolean(MainActivity.PREFERENCE_KEY_SEND_BUFFERING_EVENTS, true);
}
if (MainActivity.appPlayer != null && MainActivity.appPlayer.getCurrentPosition() > 0 && sendBufferingEvents) {
// we only want to log a buffer event after the media has already started playing
String mediaSourceUrl = getStreamingUrl();
long duration = MainActivity.appPlayer.getDuration();
long position = MainActivity.appPlayer.getCurrentPosition();
String userIdHash = Lbryio.currentUser != null ? String.valueOf(Lbryio.currentUser.getId()) : "0";
if (mediaSourceUrl.startsWith(FileViewFragment.CDN_PREFIX)) {
BufferEventTask bufferEvent = new BufferEventTask(current.getPermanentUrl(), duration, position, 1, userIdHash);
bufferEvent.executeOnExecutor(AsyncTask.SERIAL_EXECUTOR);
}
}
showBuffering();
} else if (playbackState == Player.STATE_ENDED) {
playNextClaim();
} else {
hideBuffering();
}
}
};
Context context = getContext();
PlayerView playerView = root.findViewById(R.id.shuffle_exoplayer_view);
playerView.setOnTouchListener(new SwipeListener(playerView, context) {
@Override
public void onSwipeLeft() { playNextClaim(); }
@Override
public void onSwipeRight() { playPreviousClaim(); }
});
root.findViewById(R.id.shuffle_share_button).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
if (current != null) {
try {
String shareUrl = LbryUri.parse(
!Helper.isNullOrEmpty(current.getCanonicalUrl()) ? current.getCanonicalUrl() :
(!Helper.isNullOrEmpty(current.getShortUrl()) ? current.getShortUrl() : current.getPermanentUrl())).toTvString();
Intent shareIntent = new Intent();
shareIntent.setAction(Intent.ACTION_SEND);
shareIntent.setType("text/plain");
shareIntent.putExtra(Intent.EXTRA_TEXT, shareUrl);
MainActivity.startingShareActivity = true;
Intent shareUrlIntent = Intent.createChooser(shareIntent, getString(R.string.share_lbry_content));
shareUrlIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
startActivity(shareUrlIntent);
} catch (LbryUriException ex) {
// pass
}
}
}
});
root.setOnTouchListener(new SwipeListener(root, context) {
@Override
public void onSwipeLeft() { playNextClaim(); }
@Override
public void onSwipeRight() { playPreviousClaim(); }
});
return root;
}
private String getStreamingUrl() {
return current != null ? String.format("https://cdn.lbryplayer.xyz/content/claims/%s/%s/stream", current.getName(), current.getClaimId()) : "";
}
private Map<String, Object> buildContentOptions() {
Context context = getContext();
boolean canShowMatureContent = false;
if (context != null) {
SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getContext());
canShowMatureContent = sp.getBoolean(MainActivity.PREFERENCE_KEY_SHOW_MATURE_CONTENT, false);
}
return Lbry.buildClaimSearchOptions(
Claim.TYPE_STREAM,
canShowMatureContent ? null : new ArrayList<>(Predefined.MATURE_TAGS),
null/*contentChannelIds*/,
Arrays.asList(Claim.ORDER_BY_TRENDING_GROUP),
121, // 2 minutes or less
1,
currentClaimSearchPage == 0 ? 1 : currentClaimSearchPage,
PAGE_SIZE);
}
public void onStart() {
super.onStart();
MainActivity activity = (MainActivity) getContext();
if (activity != null) {
activity.hideFloatingWalletBalance();
}
}
public void onResume() {
super.onResume();
sessionStart = System.currentTimeMillis();
MainActivity activity = (MainActivity) getContext();
if (activity != null) {
LbryAnalytics.setCurrentScreen(activity, "Shuffle", "Shuffle");
}
if (MainActivity.appPlayer != null && MainActivity.nowPlayingSource != MainActivity.SOURCE_NOW_PLAYING_SHUFFLE) {
MainActivity.appPlayer.setPlayWhenReady(false);
}
if (playlist == null) {
loadWatchedContentList();
} else {
if (current != null) {
playbackCurrentClaim();
} else {
startPlaylist();
}
loadAndScheduleDurations();
}
if (MainActivity.appPlayer != null) {
if (MainActivity.playerReassigned) {
setPlayerForPlayerView();
MainActivity.playerReassigned = false;
}
}
}
private void setPlayerForPlayerView() {
View root = getView();
if (root != null) {
PlayerView view = root.findViewById(R.id.shuffle_exoplayer_view);
view.setVisibility(View.VISIBLE);
view.setPlayer(null);
view.setPlayer(MainActivity.appPlayer);
}
}
public void onPause() {
if (MainActivity.appPlayer != null && MainActivity.appPlayer.isPlaying()) {
MainActivity.nowPlayingSource = MainActivity.SOURCE_NOW_PLAYING_SHUFFLE;
}
super.onPause();
}
public void onStop() {
long sessionDuration = System.currentTimeMillis() - sessionStart;
if (sessionStart > 0 && sessionDuration > 0) {
Bundle bundle = new Bundle();
bundle.putLong("duration_ms", sessionDuration);
bundle.putInt("duration", Double.valueOf(Math.ceil(sessionDuration / 1000.0)).intValue());
LbryAnalytics.logEvent(LbryAnalytics.EVENT_SHUFFLE_SESSION, bundle);
}
sessionStart = 0;
MainActivity activity = (MainActivity) getContext();
if (activity != null) {
activity.hideFloatingWalletBalance();
}
super.onStop();
}
private void loadWatchedContentList() {
(new AsyncTask<Void, Void, List<String>>() {
protected List<String> doInBackground(Void... params) {
MainActivity activity = (MainActivity) getContext();
if (activity != null) {
try {
SQLiteDatabase db = activity.getDbHelper().getReadableDatabase();
return DatabaseHelper.getShuffleWatchedClaims(db);
} catch (Exception ex) {
// pass
}
}
return null;
}
protected void onPostExecute(List<String> claimIds) {
watchedContentClaimIds = new ArrayList<>(claimIds);
if (playlist == null) {
loadContent();
}
}
}).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
}
private void saveWatchedContent(final String claimId) {
(new AsyncTask<Void, Void, Void>() {
protected Void doInBackground(Void... params) {
MainActivity activity = (MainActivity) getContext();
if (activity != null) {
try {
SQLiteDatabase db = activity.getDbHelper().getWritableDatabase();
DatabaseHelper.createOrUpdateShuffleWatched(claimId, db);
} catch (Exception ex) {
// pass
}
}
return null;
}
}).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
}
private void loadContent() {
if (playlist == null || playlist.size() == 0) {
Helper.setViewVisibility(surfModeLoading, View.VISIBLE);
}
Map<String, Object> claimSearchOptions = buildContentOptions();
ClaimSearchTask task = new ClaimSearchTask(claimSearchOptions, Lbry.LBRY_TV_CONNECTION_STRING, null, new ClaimSearchResultHandler() {
@Override
public void onSuccess(List<Claim> claims, boolean hasReachedEnd) {
claims = Helper.filterClaimsByOutpoint(claims);
if (playlist == null) {
playlist = new ArrayList<>(claims);
startPlaylist();
} else {
for (Claim claim : claims) {
if (!playlist.contains(claim)) {
playlist.add(claim);
}
}
}
Helper.setViewVisibility(surfModeLoading, View.GONE);
}
@Override
public void onError(Exception error) {
Helper.setViewVisibility(surfModeLoading, View.GONE);
}
});
task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
}
private void startPlaylist() {
if (playlist == null || playlist.size() == 0) {
return;
}
playlistIndex = 0;
current = playlist.get(playlistIndex);
checkCurrentClaimIsVideo(false);
checkCurrentClaimWatched(false);
playbackCurrentClaim();
}
private void checkCurrentClaimIsVideo(boolean previous) {
while (current == null || current.getMediaType() == null || !current.getMediaType().startsWith("video")) {
// only play videos
if (previous) {
playlistIndex--;
} else {
playlistIndex++;
checkPlaylistSize();
}
current = playlist.get(playlistIndex);
}
}
private void checkCurrentClaimWatched(boolean previous) {
if (current != null && watchedContentClaimIds != null) {
while (watchedContentClaimIds.contains(current.getClaimId())) {
if (previous) {
playlistIndex--;
} else {
playlistIndex++;
checkPlaylistSize();
}
current = playlist.get(playlistIndex);
}
}
}
private void playPreviousClaim() {
if (playlist == null || playlist.size() == 0) {
return;
}
if (playlistIndex > 0) {
playlistIndex--;
}
current = playlist.get(playlistIndex);
checkCurrentClaimIsVideo(true);
checkCurrentClaimWatched(true);
playbackCurrentClaim();
}
private void playNextClaim() {
if (playlist == null || playlist.size() == 0) {
return;
}
if (playlistIndex < playlist.size() - 1) {
playlistIndex++;
}
checkPlaylistSize();
current = playlist.get(playlistIndex);
checkCurrentClaimIsVideo(false);
checkCurrentClaimWatched(false);
playbackCurrentClaim();
}
private void checkPlaylistSize() {
if (playlist.size() - playlistIndex < 10) {
currentClaimSearchPage++;
loadContent();
}
}
private void playbackCurrentClaim() {
resetPlayer();
String publisherText = !Helper.isNullOrEmpty(current.getPublisherTitle()) ?
String.format("%s (%s)", current.getPublisherTitle(), current.getPublisherName()) :
!Helper.isNullOrEmpty(current.getPublisherName()) ? current.getPublisherName() : getString(R.string.anonymous);
textTitle.setText(current.getTitle());
textPublisher.setText(publisherText);
Context context = getContext();
if (MainActivity.appPlayer == null && context != null) {
AudioAttributes audioAttributes = new AudioAttributes.Builder()
.setUsage(C.USAGE_MEDIA)
.setContentType(C.CONTENT_TYPE_MOVIE)
.build();
MainActivity.appPlayer = new SimpleExoPlayer.Builder(context).build();
MainActivity.appPlayer.setWakeMode(C.WAKE_MODE_NETWORK);
MainActivity.appPlayer.setAudioAttributes(audioAttributes, true);
MainActivity.playerCache =
new SimpleCache(context.getCacheDir(),
new LeastRecentlyUsedCacheEvictor(1024 * 1024 * 256), new ExoDatabaseProvider(context));
if (context instanceof MainActivity) {
MainActivity activity = (MainActivity) context;
activity.initMediaSession();
activity.initPlaybackNotification();
}
if (playerListener != null) {
MainActivity.appPlayer.addListener(playerListener);
}
newPlayerCreated = true;
}
if (context instanceof MainActivity) {
MainActivity activity = (MainActivity) context;
activity.initPlaybackNotification();
}
View root = getView();
if (root != null) {
PlayerView view = root.findViewById(R.id.shuffle_exoplayer_view);
view.setShutterBackgroundColor(Color.TRANSPARENT);
view.setPlayer(MainActivity.appPlayer);
view.setUseController(true);
if (context instanceof MainActivity) {
((MainActivity) context).getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
}
if (MainActivity.nowPlayingClaim != null &&
MainActivity.nowPlayingClaim.getClaimId().equalsIgnoreCase(current.getClaimId()) &&
!newPlayerCreated) {
// if the claim is already playing, we don't need to reload the media source
return;
}
if (MainActivity.appPlayer != null) {
showBuffering();
if (context instanceof MainActivity) {
((MainActivity) context).setNowPlayingClaim(current, current.getPermanentUrl());
}
MainActivity.appPlayer.setPlayWhenReady(true);
String userAgent = Util.getUserAgent(context, getString(R.string.app_name));
String mediaSourceUrl = getStreamingUrl();
MediaSource mediaSource = new ProgressiveMediaSource.Factory(
new CacheDataSourceFactory(MainActivity.playerCache, new DefaultDataSourceFactory(context, userAgent)),
new DefaultExtractorsFactory()
).setLoadErrorHandlingPolicy(new FileViewFragment.StreamLoadErrorPolicy()).createMediaSource(Uri.parse(mediaSourceUrl));
MainActivity.appPlayer.prepare(mediaSource, true, true);
}
}
}
private void resetPlayer() {
elapsedDuration = 0;
totalDuration = 0;
renderElapsedDuration();
renderTotalDuration();
elapsedPlaybackScheduled = false;
if (elapsedPlaybackScheduler != null) {
elapsedPlaybackScheduler.shutdownNow();
elapsedPlaybackScheduler = null;
}
playbackStarted = false;
startTimeMillis = 0;
/*if (MainActivity.appPlayer != null) {
MainActivity.appPlayer.stop(true);
MainActivity.appPlayer.removeListener(fileViewPlayerListener);
PlaybackParameters params = new PlaybackParameters(1.0f);
MainActivity.appPlayer.setPlaybackParameters(params);
}*/
}
private void logPlay(String url, long startTimeMillis) {
long timeToStartMillis = startTimeMillis > 0 ? System.currentTimeMillis() - startTimeMillis : 0;
Bundle bundle = new Bundle();
bundle.putString("uri", url);
bundle.putLong("time_to_start_ms", timeToStartMillis);
bundle.putLong("time_to_start_seconds", Double.valueOf(timeToStartMillis / 1000.0).longValue());
LbryAnalytics.logEvent(LbryAnalytics.EVENT_PLAY, bundle);
logFileView(current.getPermanentUrl(), timeToStartMillis);
}
private void logFileView(String url, long timeToStart) {
if (current != null) {
LogFileViewTask task = new LogFileViewTask(url, current, timeToStart, new GenericTaskHandler() {
@Override
public void beforeStart() { }
@Override
public void onSuccess() {
claimEligibleRewards();
}
@Override
public void onError(Exception error) { }
});
task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
}
}
private void showBuffering() {
View root = getView();
if (root != null) {
root.findViewById(R.id.player_buffering_progress).setVisibility(View.VISIBLE);
PlayerView playerView = root.findViewById(R.id.shuffle_exoplayer_view);
playerView.findViewById(R.id.player_skip_back_10).setVisibility(View.INVISIBLE);
playerView.findViewById(R.id.player_skip_forward_10).setVisibility(View.INVISIBLE);
}
}
private void hideBuffering() {
View root = getView();
if (root != null) {
root.findViewById(R.id.player_buffering_progress).setVisibility(View.INVISIBLE);
PlayerView playerView = root.findViewById(R.id.shuffle_exoplayer_view);
playerView.findViewById(R.id.player_skip_back_10).setVisibility(View.VISIBLE);
playerView.findViewById(R.id.player_skip_forward_10).setVisibility(View.VISIBLE);
}
}
private void renderElapsedDuration() {
View view = getView();
if (view != null) {
Helper.setViewText(view.findViewById(R.id.player_duration_elapsed), Helper.formatDuration(Double.valueOf(elapsedDuration / 1000.0).longValue()));
}
}
private void renderTotalDuration() {
View view = getView();
if (view != null) {
Helper.setViewText(view.findViewById(R.id.player_duration_total), Helper.formatDuration(Double.valueOf(totalDuration / 1000.0).longValue()));
}
}
private void loadAndScheduleDurations() {
if (MainActivity.appPlayer != null && playbackStarted) {
elapsedDuration = MainActivity.appPlayer.getCurrentPosition() < 0 ? 0 : MainActivity.appPlayer.getCurrentPosition();
totalDuration = MainActivity.appPlayer.getDuration() < 0 ? 0 : MainActivity.appPlayer.getDuration();
renderElapsedDuration();
renderTotalDuration();
scheduleElapsedPlayback();
}
}
private void scheduleElapsedPlayback() {
if (!elapsedPlaybackScheduled) {
elapsedPlaybackScheduler = Executors.newSingleThreadScheduledExecutor();
elapsedPlaybackScheduler.scheduleAtFixedRate(new Runnable() {
@Override
public void run() {
Context context = getContext();
if (context instanceof MainActivity) {
((MainActivity) context).runOnUiThread(new Runnable() {
@Override
public void run() {
if (MainActivity.appPlayer != null) {
elapsedDuration = MainActivity.appPlayer.getCurrentPosition();
int elapsedSeconds = Double.valueOf(elapsedDuration / 1000.0).intValue();
renderElapsedDuration();
}
}
});
}
}
}, 0, 500, TimeUnit.MILLISECONDS);
elapsedPlaybackScheduled = true;
}
}
// TODO: Move this call to MainActivity?
private void claimEligibleRewards() {
// attempt to claim eligible rewards after viewing or playing a file (fail silently)
Context context = getContext();
ClaimRewardTask firstStreamTask = new ClaimRewardTask(Reward.TYPE_FIRST_STREAM, null, null, context, eligibleRewardHandler);
ClaimRewardTask dailyViewTask = new ClaimRewardTask(Reward.TYPE_DAILY_VIEW, null, null, context, eligibleRewardHandler);
firstStreamTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
dailyViewTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
}
private ClaimRewardTask.ClaimRewardHandler eligibleRewardHandler = new ClaimRewardTask.ClaimRewardHandler() {
@Override
public void onSuccess(double amountClaimed, String message) {
if (Helper.isNullOrEmpty(message)) {
message = getResources().getQuantityString(
R.plurals.claim_reward_message,
amountClaimed == 1 ? 1 : 2,
new DecimalFormat(Helper.LBC_CURRENCY_FORMAT_PATTERN).format(amountClaimed));
}
Context context = getContext();
if (context instanceof MainActivity) {
((MainActivity) context).showMessage(message);
}
}
@Override
public void onError(Exception error) {
// pass
}
};
private static class SwipeListener implements View.OnTouchListener {
private final GestureDetector gestureDetector;
private final View control;
public SwipeListener(View control, Context context) {
this.control = control;
gestureDetector = new GestureDetector(context, new SwipeGestureListener());
}
@Override
public boolean onTouch(View view, MotionEvent motionEvent) {
return gestureDetector.onTouchEvent(motionEvent);
}
public void onSwipeLeft() { }
public void onSwipeRight() { }
public void onSwipeTop() { }
public void onSwipeBottom() { }
private final class SwipeGestureListener extends GestureDetector.SimpleOnGestureListener {
private static final int SWIPE_THRESHOLD = 100;
private static final int SWIPE_VELOCITY_THRESHOLD = 100;
@Override
public boolean onDown(MotionEvent e) {
if (control instanceof PlayerView) {
return false;
}
return true;
}
@Override
public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
boolean result = false;
try {
float diffY = e2.getY() - e1.getY();
float diffX = e2.getX() - e1.getX();
if (Math.abs(diffX) > Math.abs(diffY)) {
if (Math.abs(diffX) > SWIPE_THRESHOLD && Math.abs(velocityX) > SWIPE_VELOCITY_THRESHOLD) {
if (diffX > 0) {
onSwipeRight();
} else {
onSwipeLeft();
}
result = true;
}
}
else if (Math.abs(diffY) > SWIPE_THRESHOLD && Math.abs(velocityY) > SWIPE_VELOCITY_THRESHOLD) {
if (diffY > 0) {
onSwipeBottom();
} else {
onSwipeTop();
}
result = true;
}
} catch (Exception ex) {
// pass
}
return result;
}
}
}
@Override
public boolean shouldHideGlobalPlayer() {
return true;
}
private static final List<String> contentChannelIds = Arrays.asList(
"3fec094c5937e9eb4e8f5e71e4ca430e8a993d03",
"6184648aab0431c4c95c649072d1f9ff08b9bb7c",
"b5d31cde873073718c033076656a27471e392afc",
"7317cdf6f62be93b22295062e191f6ba59a5db26",
"1cdb5d0bdcb484907d0a2fea4efdfe0153838642",
"b516294f541a18ce00b71a60b2c82ad2f87ff78d",
"91e42cc450075f2c4c245bac7617bf903f16b4ce",
"b6e207c5f8c58e7c8362cd05a1501bf2f5b694f2",
"25f384bd95e218f6ac37fcaca99ed40f36760d8c",
"f33657a2fcbab2dc3ce555d5d6728f8758af7bc7",
"294f5c164da5ac9735658b2d58d8fee6745dfc45",
"119a2e8c0b50f78d3861636d37c3b44ba8e689b5",
"7b23cca3f49059f005e812be03931c81272eaac4",
"fb0efeaa3788d1292bb49a94d77622503fe08129",
"797a528c49b6535560f7fd8222b121b0223287c8",
"bc490776f367b8afccf0ea7349d657431ba1ded6",
"48c7ea8bc2c4adba09bf21a29689e3b8c2967522",
"bf7490f905904e79de5c90e472bb9e6f26e634a0",
"df961194a798cc76306b9290701130c592530fb6",
"cf0be9078d76951e2e228df68b5b0bbf71313aaa",
"d746ac8d782f94d12d176c7a591f5bf8365bef3d",
"1f30267438257020f08abf452746a48e53a71ad5",
"4ad942982e43326c7700b1b6443049b3cfd82161",
"1cdb5d0bdcb484907d0a2fea4efdfe0153838642",
"6616707e1109aaa1c11b9f399f914d0cfb4f5303",
"4ee7cfaf1fc50a6df858ed0b99c278d633bccca9",
"b7d02b4a0036114732c072269adb891dc5e34ca4",
"9c51c1a119137cd17ed5ae09daa80c1cab6ac01d",
"5f2a5c14b971a6f5eed0a67dc7af3a3fe5c0b6a4",
"0e2b5b4cf59e859860000ff123dc12a317ad416b",
"3fe68ad3da93065e35c37b14fbeef88b4b7785ed",
"fd7ffcbafb74412a8812df4720feaf11fe70fe12",
"b4c30fe36b79870a79c55e1e909adb5ad23f323f",
"92c0f2f3239f1f61496997bd2cdc197ec51bd423",
"29193e9240a71a735639c66ee954e68414f11236",
"25f384bd95e218f6ac37fcaca99ed40f36760d8c",
"87b13b074936b1f42a7c6758c7c2995f58c602e7",
"8d935c6c30510e1dfc10f803a9646fa8aa128b07",
"8f4fecfc836ea33798ee3e5cef56926fa54e2cf9",
"9a5dfcb1a4b29c3a1598392d039744b9938b5a26",
"c5724e280283cd985186af9a62494aae377daabd",
"b39833be3032bbe1005f4f719f379a4621faeb13",
"589276465a23c589801d874f484cc39f307d7ec7",
"fb364ef587872515f545a5b4b3182b58073f230f",
"6c0bf1fed2705d675da950a94e4af004ec975a06",
"b924ac36b7499591f7929d9c4903de79b07b1cb9",
"113515e893b8186595595e594ecc410bae50c026",
"72f9815b087b6d346745e3de71a6ce5fe73a8677",
"b0198a465290f065378f3535666bee0653d6a9bb",
"020ebeb40642bfb4bc3d9f6d28c098afc0a47481",
"5c15e604c4207f52c8cf58fe21e63164c230e257",
"273a2fa759f1a9f56b078633ea2f08fc2406002a",
"930fc43ca7bae20d4706543e97175d1872b0671f",
"0cb2ec46f06ba85520a1c1a56706acf35d5176dd",
"057053dfb657aaa98553e2c544b06e1a2371557e",
"64e091964a611a48424d254a3de2b952d0d6565a",
"50ebba2b06908f93d7963b1c6826cc0fd6104477",
"374ff82251a384601da73f30485c3ac8d7f4176b",
"1487afc813124abbeb0629d2172be0f01ccec3bf",
"6a4fa1a68b92336e64006a4310cb160b07854329",
"15f986a262fc6eff5774050c94d174c0533d505d",
"6184648aab0431c4c95c649072d1f9ff08b9bb7c",
"1efa9b640ad980b2ec53834d60e9cff9554979cd",
"064d4999ea15e433e06f16f391922390acab01cb",
"4884e30b93b3c4c123a83154516196095f9e831e",
"2827bfc459c12d7c6d280cbacee750811291d4ba",
"9626816275585ac3443e7cddd1272c8652c23f1d",
"a2e1bb1fed32c6a6290b679785dd31ca5c59cb5f",
"d9535951222dd7a1ff7f763872cb0df44f7962bf",
"243b6f18093ff97c861d0568c7d3379606201a4b",
"1ce5ac7bab7f2e82af02305ced3c095e320b52e5",
"3e63119a8503a6f666b0a736c8fdeb9e79d11eb4",
"e33372c0d8b2cdd3e12252962ee1671d66143075",
"7364ba2ac9090e468855ce9074bb50c306196f4c",
"d6350f9158825662b99e4b5e0442bcc94d39bc11",
"2a294ea41312c6da8de5ebd0f18dbfb2963bb1a4",
"44c49bbab8a3e9999f3ba9dee0186288b1d960a7",
"2305db36455aa0d18571015b9e9bd0950262aa0f",
"82f1d8c257d3e76b711a5cecd1e49bd3fa6a9de9",
"faed2b028a9b5a712d5180eaa6fd2aa619f941bc",
"39ac239b5687f7d1c2ba74cd020b3547545dfdaf",
"5737eb22f6119f27c9afccfe73ba710afd885371",
"5f22b6daf7204d73cf79d3ff0b46fc4fe237c7f7",
"3583f5a570af6870504eea5a5f7afad6e1508508",
"b0e489f986c345aef23c4a48d91cbcf5a6fdb9ac",
"ba79c80788a9e1751e49ad401f5692d86f73a2db",
"c54323436f50c633c870298bb374ac8e7560e6cd",
"83725c7ee23bd4a8ca28a4fab0e313409def1dc7",
"61c4e8636704f2f38bbe88b1f30ef0d74d6c0f49",
"87ef9ba36019f7f3bf217cf47511645893b13f2e",
"1bd0adfcf1c75bafc1ba3fc9b65a1a0470df6a91",
"1be15348c51955179b7bf9aa90230a9425927ef6",
"1f45ab3495df2c3be7d9c882bca9966305115cbb",
"7317777e3751efa66218f6da5ef0d01dda69af48",
"3346a4ff80b70ee7eea8a79fc79f19c43bb4464a",
"452916a904030d2ce4ea2440fad2d0774e7296d9",
"2675ef3adf52ebf8a44ff5da4306c293dfa6f901",
"e2a76643735f8611a561794509c6bb2aac70eb04",
"dc577db3caf5ff83a3b573ba92f2d447f067eee1",
"89c4cf244099918b1d3ed413df27d4216e97b499",
"4b2b5822c8af3074c6ef9b789a8142d0ef623402",
"3c5794f775975669745c412b0c30f48991d9e455",
"1df464dbb302ced815c61431a5548a273e6de8e1"
);
}
@@ -4,9 +4,13 @@ import android.content.Context;
import android.content.SharedPreferences;
import android.os.AsyncTask;
import android.os.Bundle;
import android.text.InputType;
import android.widget.EditText;
import androidx.annotation.NonNull;
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.app.AppCompatDelegate;
import androidx.preference.EditTextPreference;
import androidx.preference.PreferenceFragmentCompat;
import androidx.preference.PreferenceManager;
@@ -23,6 +27,15 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Shared
@Override
public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
setPreferencesFromResource(R.xml.settings, rootKey);
PreferenceManager manager = getPreferenceManager();
EditTextPreference miniPlayerBottomMarginPreference = manager.findPreference(MainActivity.PREFERENCE_KEY_MINI_PLAYER_BOTTOM_MARGIN);
miniPlayerBottomMarginPreference.setOnBindEditTextListener(new EditTextPreference.OnBindEditTextListener() {
@Override
public void onBindEditText(@NonNull EditText editText) {
editText.setInputType(InputType.TYPE_CLASS_NUMBER);
}
});
}
@Override
@@ -257,7 +257,7 @@ public class PublishFormFragment extends BaseFragment implements
suggestedTagsAdapter.setClickListener(this);
suggestedTagsList.setAdapter(suggestedTagsAdapter);
matureTagsAdapter = new TagListAdapter(Helper.getTagObjectsForTags(Predefined.MATURE_TAGS), context);
matureTagsAdapter = new TagListAdapter(Helper.getTagObjectsForTags(Predefined.PUBLISH_MATURE_TAGS), context);
matureTagsAdapter.setCustomizeMode(TagListAdapter.CUSTOMIZE_MODE_ADD);
matureTagsAdapter.setClickListener(this);
matureTagsList.setAdapter(matureTagsAdapter);
@@ -21,6 +21,8 @@ import com.google.android.material.textfield.TextInputEditText;
import io.lbry.browser.MainActivity;
import io.lbry.browser.R;
import io.lbry.browser.VerificationActivity;
import io.lbry.browser.listener.SdkStatusListener;
import io.lbry.browser.listener.WalletSyncListener;
import io.lbry.browser.model.WalletSync;
import io.lbry.browser.tasks.wallet.DefaultSyncTaskHandler;
@@ -33,7 +35,7 @@ import io.lbry.browser.utils.Lbryio;
import io.lbry.lbrysdk.Utils;
import lombok.Setter;
public class WalletVerificationFragment extends Fragment {
public class WalletVerificationFragment extends Fragment implements SdkStatusListener {
@Setter
private WalletSyncListener listener = null;
@@ -86,6 +88,30 @@ public class WalletVerificationFragment extends Fragment {
@Override
public void onResume() {
super.onResume();
if (!Lbry.SDK_READY) {
Context context = getContext();
if (context instanceof VerificationActivity) {
VerificationActivity activity = (VerificationActivity) context;
activity.addSdkStatusListener(this);
}
Helper.setViewVisibility(loading, View.VISIBLE);
Helper.setViewVisibility(textLoading, View.VISIBLE);
} else {
onSdkReady();
}
}
@Override
public void onStop() {
Context context = getContext();
if (context instanceof VerificationActivity) {
VerificationActivity activity = (VerificationActivity) context;
activity.removeSdkStatusListener(this);
}
super.onStop();
}
public void onSdkReady() {
start();
}
@@ -463,7 +463,7 @@ public class WalletFragment extends BaseFragment implements SdkStatusListener, W
double sentAmount = actualSendAmount;
String message = getResources().getQuantityString(
R.plurals.you_sent_credits, sentAmount == 1.0 ? 1 : 2,
new DecimalFormat("#,###.##").format(sentAmount));
new DecimalFormat("#,###.####").format(sentAmount));
Helper.setViewText(inputSendAddress, null);
Helper.setViewText(inputSendAmount, null);
if (view != null) {
@@ -6,9 +6,13 @@ import android.os.Handler;
import androidx.annotation.Nullable;
import com.google.android.exoplayer2.DefaultRenderersFactory;
import com.google.android.exoplayer2.PlaybackParameters;
import com.google.android.exoplayer2.Renderer;
import com.google.android.exoplayer2.audio.AudioCapabilities;
import com.google.android.exoplayer2.audio.AudioProcessor;
import com.google.android.exoplayer2.audio.AudioRendererEventListener;
import com.google.android.exoplayer2.audio.AudioSink;
import com.google.android.exoplayer2.audio.DefaultAudioSink;
import com.google.android.exoplayer2.audio.TeeAudioProcessor;
import com.google.android.exoplayer2.drm.DrmSessionManager;
import com.google.android.exoplayer2.drm.FrameworkMediaCrypto;
@@ -30,22 +34,18 @@ public class ExoplayerAudioRenderer extends DefaultRenderersFactory {
Context context,
int extensionRendererMode,
MediaCodecSelector mediaCodecSelector,
@Nullable DrmSessionManager<FrameworkMediaCrypto> drmSessionManager,
boolean playClearSamplesWithoutKeys,
boolean enableDecoderFallback,
AudioProcessor[] audioProcessors,
AudioSink audioSink,
Handler eventHandler,
AudioRendererEventListener eventListener,
ArrayList<Renderer> out) {
AudioProcessor[] audioProcessorList = { new TeeAudioProcessor(audioBufferSink) };
super.buildAudioRenderers(
context,
extensionRendererMode,
mediaCodecSelector,
drmSessionManager,
playClearSamplesWithoutKeys,
enableDecoderFallback,
audioProcessorList,
audioSink,
eventHandler,
eventListener,
out);
@@ -29,9 +29,7 @@ import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.google.android.gms.common.util.Hex;
import org.bitcoinj.core.Base58;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
@@ -39,9 +37,6 @@ import org.json.JSONObject;
import java.io.Closeable;
import java.io.File;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -348,6 +343,10 @@ public final class Helper {
return cs != null ? cs.toString().trim() : "";
}
public static String getValue(CharSequence cs, String defaultValue) {
return cs != null && !Helper.isNullOrEmpty(cs.toString()) ? cs.toString().trim() : defaultValue;
}
public static List<String> buildContentSortOrder(int sortBy) {
List<String> sortOrder = new ArrayList<>();
switch (sortBy) {
@@ -788,13 +787,38 @@ public final class Helper {
return id.toString();
}
public static String SHA256(String value) {
try {
MessageDigest digest = MessageDigest.getInstance("SHA-256");
byte[] hash = digest.digest(value.getBytes("UTF-8"));
return Hex.bytesToStringLowercase(hash);
} catch (NoSuchAlgorithmException | UnsupportedEncodingException ex) {
return null;
public static List<Claim> filterClaimsByOutpoint(List<Claim> claims) {
List<Claim> filtered = new ArrayList<>();
for (Claim claim : claims) {
String outpoint = String.format("%s:%d", claim.getTxid(), claim.getNout());
if (Lbryio.blockedOutpoints.contains(outpoint) || Lbryio.filteredOutpoints.contains(outpoint)) {
continue;
}
if (claim.getSigningChannel() != null) {
Claim signingChannel = claim.getSigningChannel();
String channelOutpoint = String.format("%s:%d", signingChannel.getTxid(), signingChannel.getNout());
if (Lbryio.blockedOutpoints.contains(channelOutpoint) || Lbryio.filteredOutpoints.contains(channelOutpoint)) {
continue;
}
}
filtered.add(claim);
}
return filtered;
}
public static boolean isClaimBlocked(Claim claim) {
if (claim.getSigningChannel() != null) {
Claim signingChannel = claim.getSigningChannel();
String channelOutpoint = String.format("%s:%d", signingChannel.getTxid(), signingChannel.getNout());
if (Lbryio.blockedOutpoints.contains(channelOutpoint)) {
return true;
}
}
String outpoint = String.format("%s:%d", claim.getTxid(), claim.getNout());
return Lbryio.blockedOutpoints.contains(outpoint);
}
}
@@ -375,6 +375,23 @@ public final class Lbry {
"any_tags", "channel_ids", "order_by", "not_tags", "not_channel_ids", "urls"
};
// build claim search for surf mode
public static Map<String, Object> buildClaimSearchOptions(
String claimType, List<String> notTags, List<String> channelIds, List<String> orderBy, long maxDuration, int limitClaimsPerChannel, int page, int pageSize) {
return buildClaimSearchOptions(
Collections.singletonList(claimType),
null,
notTags,
channelIds,
null,
orderBy,
null,
maxDuration,
limitClaimsPerChannel,
page,
pageSize);
}
public static Map<String, Object> buildClaimSearchOptions(
String claimType,
List<String> anyTags,
@@ -393,6 +410,8 @@ public final class Lbry {
notChannelIds,
orderBy,
releaseTime,
0,
0,
page,
pageSize);
}
@@ -405,6 +424,8 @@ public final class Lbry {
List<String> notChannelIds,
List<String> orderBy,
String releaseTime,
long maxDuration,
int limitClaimsPerChannel,
int page,
int pageSize) {
Map<String, Object> options = new HashMap<>();
@@ -417,6 +438,12 @@ public final class Lbry {
if (!Helper.isNullOrEmpty(releaseTime)) {
options.put("release_time", releaseTime);
}
if (maxDuration > 0) {
options.put("duration", String.format("<%d", maxDuration));
}
if (limitClaimsPerChannel > 0) {
options.put("limit_claims_per_channel", limitClaimsPerChannel);
}
addClaimSearchListOption("any_tags", anyTags, options);
addClaimSearchListOption("not_tags", notTags, options);
@@ -28,6 +28,7 @@ public class LbryAnalytics {
public static final String EVENT_PUBLISH_UPDATE = "publish_update";
public static final String EVENT_CHANNEL_CREATE = "channel_create";
public static final String EVENT_SEARCH = "search";
public static final String EVENT_SHUFFLE_SESSION = "shuffle_session";
private static FirebaseAnalytics analytics;
@@ -10,7 +10,7 @@ import lombok.Data;
@Data
public class LbryUri {
public static final String LBRY_TV_BASE_URL = "https://lbry.tv";
public static final String LBRY_TV_BASE_URL = "https://lbry.tv/";
public static final String PROTO_DEFAULT = "lbry://";
public static final String REGEX_INVALID_URI = "[ =&#:$@%?;/\\\\\"<>%\\{\\}|^~\\[\\]`\u0000-\u0008\u000b-\u000c\u000e-\u001F\uD800-\uDFFF\uFFFE-\uFFFF]";
public static final String REGEX_ADDRESS = "^(b)(?=[^0OIl]{32,33})[0-9A-Za-z]{32,33}$";
@@ -18,7 +18,7 @@ public class LbryUri {
public static final int CLAIM_ID_MAX_LENGTH = 40;
private static final String REGEX_PART_PROTOCOL = "^((?:lbry://|https://)?)";
private static final String REGEX_PART_HOST = "((?:open.lbry.com/)?)";
private static final String REGEX_PART_HOST = "((?:open.lbry.com/|lbry.tv/|lbry.lat/|lbry.fr/|lbry.in/)?)";
private static final String REGEX_PART_STREAM_OR_CHANNEL_NAME = "([^:$#/]*)";
private static final String REGEX_PART_MODIFIER_SEPARATOR = "([:$#]?)([^/]*)";
private static final String QUERY_STRING_BREAKER = "^([\\S]+)([?][\\S]*)";
@@ -128,9 +128,14 @@ public class LbryUri {
boolean isChannel = includesChannel && Helper.isNullOrEmpty(possibleStreamName);
String channelName = includesChannel && streamOrChannelName.length() > 1 ? streamOrChannelName.substring(1) : null;
// It would have thrown already on the RegEx parser if protocol value was incorrect
// open.lbry.com uses ':' as ModSeparators while lbry:// expects '#'
if (components.get(1).equals("open.lbry.com/")) {
/*
* It would have thrown already on the RegEx parser if protocol value was incorrect
* or HTTPS host was unknown to us.
*
* [https://] hosts use ':' as ModSeparators while [lbry://] protocol expects '#'
*/
if (!components.get(1).isEmpty()) {
if (primaryModSeparator.equals(":"))
primaryModSeparator = "#";
if (secondaryModSeparator.equals(":"))
@@ -178,7 +183,7 @@ public class LbryUri {
return uri;
}
public String build(boolean includeProto, String protoDefault, boolean vanity) {
public String build(boolean includeProto, String protocol, boolean vanity) {
String formattedChannelName = null;
if (channelName != null) {
formattedChannelName = channelName.startsWith("@") ? channelName : String.format("@%s", channelName);
@@ -201,7 +206,7 @@ public class LbryUri {
StringBuilder sb = new StringBuilder();
if (includeProto) {
sb.append(protoDefault);
sb.append(protocol);
}
sb.append(primaryClaimName);
if (vanity) {
@@ -219,79 +224,34 @@ public class LbryUri {
if (!Helper.isNullOrEmpty(primaryClaimId)) {
sb.append('#').append(primaryClaimId);
}
if (primaryClaimSequence > 0) {
} else if (primaryClaimSequence > 0) {
sb.append(':').append(primaryClaimSequence);
}
if (primaryBidPosition > 0) {
} else if (primaryBidPosition > 0) {
sb.append('$').append(primaryBidPosition);
}
if (!Helper.isNullOrEmpty(secondaryClaimName)) {
sb.append('/').append(secondaryClaimName);
}
if (!Helper.isNullOrEmpty(secondaryClaimId)) {
sb.append('#').append(secondaryClaimId);
}
if (secondaryClaimSequence > 0) {
} else if (secondaryClaimSequence > 0) {
sb.append(':').append(secondaryClaimSequence);
}
if (secondaryBidPosition > 0) {
} else if (secondaryBidPosition > 0) {
sb.append('$').append(secondaryBidPosition);
}
return sb.toString();
}
public String toTvString() {
String formattedChannelName = null;
if (channelName != null) {
formattedChannelName = channelName.startsWith("@") ? channelName : String.format("@%s", channelName);
}
String primaryClaimName = claimName;
if (Helper.isNullOrEmpty(primaryClaimName)) {
primaryClaimName = contentName;
}
if (Helper.isNullOrEmpty(primaryClaimName)) {
primaryClaimName = formattedChannelName;
}
if (Helper.isNullOrEmpty(primaryClaimName)) {
primaryClaimName = streamName;
}
String primaryClaimId = claimId;
if (Helper.isNullOrEmpty(primaryClaimId)) {
primaryClaimId = !Helper.isNullOrEmpty(formattedChannelName) ? channelClaimId : streamClaimId;
}
StringBuilder sb = new StringBuilder();
sb.append(LBRY_TV_BASE_URL).append('/');
sb.append(primaryClaimName);
String secondaryClaimName = null;
if (Helper.isNullOrEmpty(claimName) && !Helper.isNullOrEmpty(contentName)) {
secondaryClaimName = contentName;
}
if (Helper.isNullOrEmpty(secondaryClaimName)) {
secondaryClaimName = !Helper.isNullOrEmpty(formattedChannelName) ? streamName : null;
}
String secondaryClaimId = !Helper.isNullOrEmpty(secondaryClaimName) ? streamClaimId : null;
if (!Helper.isNullOrEmpty(primaryClaimId)) {
sb.append(':').append(primaryClaimId);
}
if (!Helper.isNullOrEmpty(secondaryClaimName)) {
sb.append('/').append(secondaryClaimName);
}
if (!Helper.isNullOrEmpty(secondaryClaimId)) {
sb.append(':').append(secondaryClaimId);
}
return sb.toString();
}
public static String normalize(String url) throws LbryUriException {
return parse(url).toString();
}
public String toTvString() {
return build(true, LBRY_TV_BASE_URL, false);
}
public String toVanityString() {
return build(true, PROTO_DEFAULT, true);
}
@@ -15,6 +15,7 @@ import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
@@ -61,6 +62,8 @@ public final class Lbryio {
public static final String AUTH_TOKEN_PARAM = "auth_token";
public static List<Subscription> subscriptions = new ArrayList<>();
public static List<Claim> cacheResolvedSubscriptions = new ArrayList<>();
public static List<String> blockedOutpoints = new ArrayList<>();
public static List<String> filteredOutpoints = new ArrayList<>();
public static double LBCUSDRate = 0;
public static String AUTH_TOKEN;
private static boolean generatingAuthToken = false;
@@ -206,6 +209,15 @@ public final class Lbryio {
}
}
public static void populateOutpointList(List<String> outpoints, JSONArray source) throws JSONException {
outpoints.clear();
if (source != null) {
for (int i = 0; i < source.length(); i++) {
outpoints.add(source.getString(i));
}
}
}
public static User fetchCurrentUser(Context context) throws AuthTokenInvalidatedException {
try {
Response response = Lbryio.call("user", "me", context);
@@ -333,6 +345,15 @@ public final class Lbryio {
}
}
public static void updateSubscriptionNotificationsDisabled(Subscription subscription) {
synchronized (lock) {
int index = subscriptions.indexOf(subscription);
if (index > -1) {
subscriptions.get(index).setNotificationsDisabled(subscription.isNotificationsDisabled());
}
}
}
public static void addSubscription(Subscription subscription) {
synchronized (lock) {
if (!subscriptions.contains(subscription)) {
@@ -364,6 +385,15 @@ public final class Lbryio {
public static boolean isFollowing(Claim claim) {
return subscriptions.contains(Subscription.fromClaim(claim));
}
public static boolean isNotificationsDisabled(Claim claim) {
Subscription sub = Subscription.fromClaim(claim);
int index = subscriptions.indexOf(sub);
if (index > -1) {
Subscription actual = subscriptions.get(subscriptions.indexOf(sub));
return actual.isNotificationsDisabled();
}
return false;
}
public static void updateRewardsLists(List<Reward> rewards) {
synchronized (lock) {
@@ -493,7 +493,35 @@ public final class Predefined {
"covidcuts",
"covid-19"
);
public static final List<String> MATURE_TAGS = Arrays.asList("mature", "nsfw", "porn", "xxx");
public static final List<String> MATURE_TAGS = Arrays.asList(
"porn",
"porno",
"nsfw",
"mature",
"xxx",
"sex",
"creampie",
"blowjob",
"handjob",
"vagina",
"boobs",
"big boobs",
"big dick",
"pussy",
"cumshot",
"anal",
"hard fucking",
"ass",
"fuck",
"hentai"
);
// Subset of mature tags to be displayed on the publish page
public static final List<String> PUBLISH_MATURE_TAGS = Arrays.asList(
"porn",
"nsfw",
"mature",
"xxx"
);
public static final List<String> ADJECTIVES = Arrays.asList(
"aback",
"abaft",
@@ -0,0 +1,11 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="#FFFFFF"
android:alpha="0.8">
<path
android:fillColor="@android:color/white"
android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM17,13L7,13v-2h10v2z"/>
</vector>
Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 302 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 208 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 388 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 504 B

@@ -31,7 +31,7 @@
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@drawable/ic_close"
android:tint="@color/white" />
app:tint="@color/white" />
</RelativeLayout>
<ProgressBar
+10 -166
View File
@@ -62,7 +62,7 @@
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@drawable/ic_close"
android:tint="@color/actionBarForeground" />
app:tint="@color/actionBarForeground" />
</LinearLayout>
<RelativeLayout
@@ -79,7 +79,7 @@
android:layout_height="24dp"
android:layout_centerInParent="true"
android:src="@drawable/ic_notifications"
android:tint="@color/actionBarForeground" />
app:tint="@color/actionBarForeground" />
<TextView
android:id="@+id/notifications_badge_count"
android:layout_width="wrap_content"
@@ -156,173 +156,17 @@
android:textColor="@color/white"
android:textFontWeight="300"
android:textSize="14sp" />
<LinearLayout
<ListView
android:id="@+id/startup_stage_error_listview"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="0dp"
android:layout_marginTop="12dp"
android:orientation="horizontal">
<ImageView
android:id="@+id/startup_stage_icon_install_id"
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_gravity="center_vertical"
android:tint="@color/white"
android:src="@drawable/ic_check" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_gravity="center_vertical"
android:fontFamily="@font/inter"
android:text="@string/installation_id_loaded"
android:textColor="@color/white"
android:textFontWeight="300"
android:textSize="14sp" />
</LinearLayout>
android:divider="@android:color/transparent"
android:dividerHeight="8dp"
android:scrollbars="none"
tools:listitem="@layout/list_item_startupstage">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:orientation="horizontal">
<ImageView
android:id="@+id/startup_stage_icon_known_tags"
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_gravity="center_vertical"
android:tint="@color/white"
android:src="@drawable/ic_check" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_gravity="center_vertical"
android:fontFamily="@font/inter"
android:text="@string/known_tags_loaded"
android:textColor="@color/white"
android:textFontWeight="300"
android:textSize="14sp" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:orientation="horizontal">
<ImageView
android:id="@+id/startup_stage_icon_exchange_rate"
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_gravity="center_vertical"
android:tint="@color/white"
android:src="@drawable/ic_check" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_gravity="center_vertical"
android:fontFamily="@font/inter"
android:text="@string/exchange_rate_loaded"
android:textColor="@color/white"
android:textFontWeight="300"
android:textSize="14sp" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:orientation="horizontal">
<ImageView
android:id="@+id/startup_stage_icon_user_authenticated"
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_gravity="center_vertical"
android:tint="@color/white"
android:src="@drawable/ic_check" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_gravity="center_vertical"
android:fontFamily="@font/inter"
android:text="@string/user_authenticated"
android:textColor="@color/white"
android:textFontWeight="300"
android:textSize="14sp" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:orientation="horizontal">
<ImageView
android:id="@+id/startup_stage_icon_install_new"
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_gravity="center_vertical"
android:tint="@color/white"
android:src="@drawable/ic_check" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_gravity="center_vertical"
android:fontFamily="@font/inter"
android:text="@string/installation_registered"
android:textColor="@color/white"
android:textFontWeight="300"
android:textSize="14sp" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:orientation="horizontal">
<ImageView
android:id="@+id/startup_stage_icon_subscriptions_loaded"
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_gravity="center_vertical"
android:tint="@color/white"
android:src="@drawable/ic_check" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_gravity="center_vertical"
android:fontFamily="@font/inter"
android:text="@string/subscriptions_loaded"
android:textColor="@color/white"
android:textFontWeight="300"
android:textSize="14sp" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:orientation="horizontal">
<ImageView
android:id="@+id/startup_stage_icon_subscriptions_resolved"
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_gravity="center_vertical"
android:tint="@color/white"
android:src="@drawable/ic_check" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_gravity="center_vertical"
android:fontFamily="@font/inter"
android:text="@string/subscriptions_resolved"
android:textColor="@color/white"
android:textFontWeight="300"
android:textSize="14sp" />
</LinearLayout>
</ListView>
</LinearLayout>
</RelativeLayout>
+24 -36
View File
@@ -38,6 +38,12 @@
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_above="@id/wallet_balance_usd_value">
<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_gravity="center_vertical"
android:layout_marginEnd="4dp"
android:src="@drawable/ic_credits" />
<TextView
android:id="@+id/wallet_balance_value"
android:layout_width="wrap_content"
@@ -48,15 +54,6 @@
android:textSize="36sp"
android:textFontWeight="300"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:fontFamily="@font/inter"
android:text="@string/lbc"
android:textColor="@color/white"
android:textSize="16sp"
android:textFontWeight="300" />
</LinearLayout>
<TextView
android:id="@+id/wallet_balance_usd_value"
@@ -145,6 +142,12 @@
android:orientation="horizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<ImageView
android:layout_width="14dp"
android:layout_height="14dp"
android:layout_gravity="center_vertical"
android:src="@drawable/ic_credits"
android:layout_marginEnd="4dp" />
<TextView
android:id="@+id/wallet_balance_tips"
android:layout_width="wrap_content"
@@ -152,15 +155,6 @@
android:fontFamily="@font/inter"
android:text="0"
android:textSize="24sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="2dp"
android:fontFamily="@font/inter"
android:text="@string/lbc"
android:textAllCaps="true"
android:textSize="10sp"
android:textFontWeight="300" />
</LinearLayout>
<TextView
@@ -248,6 +242,12 @@
android:orientation="horizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<ImageView
android:layout_width="14dp"
android:layout_height="14dp"
android:layout_gravity="center_vertical"
android:src="@drawable/ic_credits"
android:layout_marginEnd="4dp" />
<TextView
android:id="@+id/wallet_balance_staked_publishes"
android:layout_width="wrap_content"
@@ -255,15 +255,6 @@
android:fontFamily="@font/inter"
android:text="0"
android:textSize="24sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="2dp"
android:fontFamily="@font/inter"
android:text="@string/lbc"
android:textAllCaps="true"
android:textSize="10sp"
android:textFontWeight="300" />
</LinearLayout>
<TextView
@@ -278,6 +269,12 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp">
<ImageView
android:layout_width="14dp"
android:layout_height="14dp"
android:layout_gravity="center_vertical"
android:src="@drawable/ic_credits"
android:layout_marginEnd="4dp" />
<TextView
android:id="@+id/wallet_balance_staked_supports"
android:layout_width="wrap_content"
@@ -285,15 +282,6 @@
android:fontFamily="@font/inter"
android:text="0"
android:textSize="24sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="2dp"
android:fontFamily="@font/inter"
android:text="@string/lbc"
android:textAllCaps="true"
android:textSize="10sp"
android:textFontWeight="300" />
</LinearLayout>
<TextView
@@ -72,10 +72,11 @@
android:layout_height="wrap_content"
android:orientation="horizontal"
android:visibility="invisible">
<io.lbry.browser.ui.controls.SolidIconView
android:layout_width="18dp"
android:layout_height="18dp"
android:text="@string/fa_coins" />
<ImageView
android:layout_width="12dp"
android:layout_height="12dp"
android:layout_gravity="center_vertical"
android:src="@drawable/ic_credits" />
<TextView
android:id="@+id/wallet_inline_balance_value"
android:layout_width="wrap_content"
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.cardview.widget.CardView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/comment_form_card"
android:orientation="vertical"
android:layout_width="match_parent"
@@ -47,22 +48,25 @@
android:layout_marginBottom="8dp"
android:orientation="horizontal"
android:visibility="gone">
<View
android:id="@+id/comment_form_reply_to_vertical_bar"
android:layout_width="3dp"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="@color/nextLbryGreen" />
android:background="@color/nextLbryGreen"
android:orientation="vertical" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="8dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_marginEnd="40dp">
android:layout_marginEnd="40dp"
android:orientation="vertical">
<TextView
android:id="@+id/comment_form_replying_to_text"
android:layout_width="wrap_content"
@@ -77,25 +81,26 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:lineSpacingMultiplier="1.05"
android:fontFamily="@font/inter"
android:lineSpacingMultiplier="1.05"
android:textFontWeight="300"
android:textSize="14sp" />
</LinearLayout>
<RelativeLayout
android:id="@+id/comment_form_clear_reply_to"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:layout_alignParentEnd="true"
android:layout_width="36dp"
android:layout_height="36dp">
android:layout_height="36dp"
android:layout_alignParentEnd="true"
android:background="?attr/selectableItemBackground"
android:clickable="true">
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_centerInParent="true"
android:src="@drawable/ic_close"
android:tint="@color/foreground" />
app:tint="@color/foreground" />
</RelativeLayout>
</RelativeLayout>
</LinearLayout>
@@ -168,12 +173,14 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp">
<com.google.android.material.button.MaterialButton
android:id="@+id/comment_form_post"
android:layout_centerVertical="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/inter" />
android:layout_centerVertical="true"
android:fontFamily="@font/inter"
android:text="@string/comment_form_post" />
<ProgressBar
android:id="@+id/comment_form_post_progress"
android:layout_width="20dp"
@@ -62,10 +62,11 @@
android:layout_height="wrap_content"
android:orientation="horizontal"
android:visibility="invisible">
<io.lbry.browser.ui.controls.SolidIconView
android:layout_width="18dp"
android:layout_height="18dp"
android:text="@string/fa_coins" />
<ImageView
android:layout_width="12dp"
android:layout_height="12dp"
android:layout_gravity="center_vertical"
android:src="@drawable/ic_credits" />
<TextView
android:id="@+id/inline_channel_form_inline_balance_value"
android:layout_width="wrap_content"
@@ -18,6 +18,7 @@
android:adjustViewBounds="true"
android:src="@drawable/gerbil_happy" />
<TextView
android:id="@+id/nothing_at_location_text"
android:text="@string/nothing_at_this_location"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+13 -8
View File
@@ -71,13 +71,18 @@
android:textSize="16sp"
android:textAlignment="center" />
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/notifications_list"
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@+id/notifications_list_swipe_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="8dp"
android:clipToPadding="false"
/>
android:layout_height="match_parent">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/notifications_list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="8dp"
android:clipToPadding="false"
/>
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
</RelativeLayout>
<include layout="@layout/floating_wallet_balance" />
@@ -169,9 +174,9 @@
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
android:tint="@color/foreground"
android:src="@drawable/ic_close"
android:layout_centerInParent="true"/>
android:layout_centerInParent="true"
app:tint="@color/foreground" />
</RelativeLayout>
</RelativeLayout>
</androidx.cardview.widget.CardView>
+11 -10
View File
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
@@ -44,8 +45,8 @@
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:src="@drawable/ic_check"
android:tint="@color/lbryGreen"
android:visibility="gone" />
android:visibility="gone"
app:tint="@color/lbryGreen" />
</RelativeLayout>
<RelativeLayout
@@ -70,8 +71,8 @@
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:src="@drawable/ic_check"
android:tint="@color/lbryGreen"
android:visibility="gone" />
android:visibility="gone"
app:tint="@color/lbryGreen" />
</RelativeLayout>
<RelativeLayout
@@ -96,8 +97,8 @@
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:src="@drawable/ic_check"
android:tint="@color/lbryGreen"
android:visibility="gone" />
android:visibility="gone"
app:tint="@color/lbryGreen" />
</RelativeLayout>
<RelativeLayout
@@ -122,8 +123,8 @@
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:src="@drawable/ic_check"
android:tint="@color/lbryGreen"
android:visibility="gone" />
android:visibility="gone"
app:tint="@color/lbryGreen" />
</RelativeLayout>
<RelativeLayout
@@ -148,7 +149,7 @@
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:src="@drawable/ic_check"
android:tint="@color/lbryGreen"
android:visibility="gone" />
android:visibility="gone"
app:tint="@color/lbryGreen" />
</RelativeLayout>
</LinearLayout>
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
@@ -53,8 +54,8 @@
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:src="@drawable/ic_check"
android:tint="@color/lbryGreen"
android:visibility="gone" />
android:visibility="gone"
app:tint="@color/lbryGreen" />
</RelativeLayout>
<RelativeLayout
@@ -88,7 +89,7 @@
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:src="@drawable/ic_check"
android:tint="@color/lbryGreen"
android:visibility="gone" />
android:visibility="gone"
app:tint="@color/lbryGreen" />
</RelativeLayout>
</LinearLayout>
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
@@ -35,7 +36,7 @@
android:layout_height="18dp"
android:layout_centerVertical="true"
android:src="@drawable/ic_trending"
android:tint="@color/foreground" />
app:tint="@color/foreground" />
<TextView
android:layout_toEndOf="@+id/sort_by_trending_item_icon"
android:layout_width="wrap_content"
@@ -53,8 +54,8 @@
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:src="@drawable/ic_check"
android:tint="@color/lbryGreen"
android:visibility="gone" />
android:visibility="gone"
app:tint="@color/lbryGreen" />
</RelativeLayout>
<RelativeLayout
@@ -70,7 +71,7 @@
android:layout_height="18dp"
android:layout_centerVertical="true"
android:src="@drawable/ic_new"
android:tint="@color/foreground" />
app:tint="@color/foreground" />
<TextView
android:layout_toEndOf="@+id/sort_by_new_item_icon"
android:layout_width="wrap_content"
@@ -88,8 +89,8 @@
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:src="@drawable/ic_check"
android:tint="@color/lbryGreen"
android:visibility="gone" />
android:visibility="gone"
app:tint="@color/lbryGreen" />
</RelativeLayout>
<RelativeLayout
@@ -105,7 +106,7 @@
android:layout_height="18dp"
android:layout_centerVertical="true"
android:src="@drawable/ic_top"
android:tint="@color/foreground" />
app:tint="@color/foreground" />
<TextView
android:layout_toEndOf="@+id/sort_by_top_item_icon"
android:layout_width="wrap_content"
@@ -123,7 +124,7 @@
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:src="@drawable/ic_check"
android:tint="@color/lbryGreen"
android:visibility="gone" />
android:visibility="gone"
app:tint="@color/lbryGreen" />
</RelativeLayout>
</LinearLayout>
@@ -103,10 +103,11 @@
android:layout_height="wrap_content"
android:orientation="horizontal"
android:visibility="invisible">
<io.lbry.browser.ui.controls.SolidIconView
android:layout_width="18dp"
android:layout_height="18dp"
android:text="@string/fa_coins" />
<ImageView
android:layout_width="12dp"
android:layout_height="12dp"
android:layout_gravity="center_vertical"
android:src="@drawable/ic_credits" />
<TextView
android:id="@+id/create_support_inline_balance_value"
android:layout_width="wrap_content"
@@ -158,7 +159,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/inter"
android:text="@string/send_lbc_tip"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true" />
</RelativeLayout>
@@ -127,10 +127,11 @@
android:layout_height="wrap_content"
android:orientation="horizontal"
android:visibility="invisible">
<io.lbry.browser.ui.controls.SolidIconView
android:layout_width="18dp"
android:layout_height="18dp"
android:text="@string/fa_coins" />
<ImageView
android:layout_width="12dp"
android:layout_height="12dp"
android:layout_gravity="center_vertical"
android:src="@drawable/ic_credits" />
<TextView
android:id="@+id/repost_inline_balance_value"
android:layout_width="wrap_content"
@@ -22,7 +22,7 @@
android:layout_alignParentBottom="true"
android:layout_marginBottom="16dp"
android:src="@drawable/ic_replay_10"
android:tint="@color/white" />
app:tint="@color/white" />
</RelativeLayout>
<RelativeLayout
@@ -74,7 +74,7 @@
android:layout_alignParentBottom="true"
android:layout_marginBottom="16dp"
android:src="@drawable/ic_forward_10"
android:tint="@color/white" />
app:tint="@color/white" />
</RelativeLayout>
<RelativeLayout
@@ -92,7 +92,7 @@
android:layout_height="24dp"
android:layout_centerInParent="true"
android:src="@drawable/ic_cast"
android:tint="@color/white" />
app:tint="@color/white" />
</RelativeLayout>
<RelativeLayout
@@ -133,7 +133,7 @@
android:layout_height="24dp"
android:layout_centerInParent="true"
android:src="@drawable/ic_fullscreen"
android:tint="@color/white" />
app:tint="@color/white" />
</RelativeLayout>
<RelativeLayout
@@ -8,7 +8,7 @@
android:layout_marginBottom="8dp"
android:layout_marginEnd="8dp"
android:elevation="4dp"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent">
<LinearLayout
android:id="@+id/floating_reward_container"
@@ -50,19 +50,17 @@
android:foreground="?attr/selectableItemBackground"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toRightOf="@id/floating_reward_container"
android:layout_toEndOf="@id/floating_reward_container"
android:layout_marginStart="-36dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:paddingStart="12dp"
android:paddingEnd="16dp">
<io.lbry.browser.ui.controls.SolidIconView
android:layout_width="16dp"
android:layout_height="16dp"
android:textSize="10dp"
<ImageView
android:layout_width="12dp"
android:layout_height="12dp"
android:layout_gravity="center_vertical"
android:textColor="@color/white"
android:text="@string/fa_coins" />
android:src="@drawable/ic_credits" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -79,7 +79,7 @@
android:layout_marginStart="2dp"
android:layout_gravity="center_vertical"
android:src="@drawable/ic_arrow_dropdown"
android:tint="@color/foreground" />
app:tint="@color/foreground" />
</LinearLayout>
<TextView
@@ -120,7 +120,7 @@
android:layout_marginStart="2dp"
android:layout_gravity="center_vertical"
android:src="@drawable/ic_arrow_dropdown"
android:tint="@color/foreground" />
app:tint="@color/foreground" />
</LinearLayout>
<TextView
@@ -161,7 +161,7 @@
android:layout_marginStart="2dp"
android:layout_gravity="center_vertical"
android:src="@drawable/ic_arrow_dropdown"
android:tint="@color/foreground" />
app:tint="@color/foreground" />
</LinearLayout>
</LinearLayout>
+40 -8
View File
@@ -157,8 +157,8 @@
android:layout_centerInParent="true"
android:layout_width="24dp"
android:layout_height="24dp"
android:tint="@color/foreground"
android:src="@drawable/ic_edit" />
android:src="@drawable/ic_edit"
app:tint="@color/foreground" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/channel_view_delete"
@@ -172,8 +172,8 @@
android:layout_centerInParent="true"
android:layout_width="24dp"
android:layout_height="24dp"
android:tint="@color/foreground"
android:src="@drawable/ic_delete" />
android:src="@drawable/ic_delete"
app:tint="@color/foreground" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/channel_view_share"
@@ -186,8 +186,8 @@
android:layout_centerInParent="true"
android:layout_width="22dp"
android:layout_height="22dp"
android:tint="@color/foreground"
android:src="@drawable/ic_share" />
android:src="@drawable/ic_share"
app:tint="@color/foreground" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/channel_view_tip"
@@ -208,13 +208,27 @@
android:id="@+id/channel_view_follow_unfollow"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:layout_width="36dp"
android:layout_width="wrap_content"
android:layout_height="36dp">
<TextView
android:id="@+id/channel_view_text_follow"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginStart="6dp"
android:layout_marginEnd="6dp"
android:fontFamily="@font/inter"
android:text="@string/follow"
android:textSize="12sp"
android:textStyle="bold"
android:textAllCaps="true" />
<io.lbry.browser.ui.controls.OutlineIconView
android:id="@+id/channel_view_icon_follow"
android:layout_centerInParent="true"
android:layout_toRightOf="@id/channel_view_text_follow"
android:layout_centerVertical="true"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginEnd="6dp"
android:text="@string/fa_heart"
android:textColor="@color/red"
android:textSize="20dp" />
@@ -224,9 +238,27 @@
android:layout_width="24dp"
android:layout_height="24dp"
android:text="@string/fa_heart_broken"
android:textColor="@color/foreground"
android:textSize="20dp"
android:visibility="invisible"/>
</RelativeLayout>
<RelativeLayout
android:id="@+id/channel_view_subscribe_notify"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_marginStart="8dp"
android:visibility="gone">
<io.lbry.browser.ui.controls.SolidIconView
android:id="@+id/channel_view_icon_bell"
android:layout_centerInParent="true"
android:layout_width="24dp"
android:layout_height="24dp"
android:text="@string/fa_bell_slash"
android:textColor="@color/foreground"
android:textSize="20dp"/>
</RelativeLayout>
</LinearLayout>
</RelativeLayout>
</LinearLayout>
@@ -56,7 +56,7 @@
android:layout_marginStart="2dp"
android:layout_gravity="center_vertical"
android:src="@drawable/ic_arrow_dropdown"
android:tint="@color/foreground" />
app:tint="@color/foreground" />
</LinearLayout>
<LinearLayout
@@ -85,7 +85,7 @@
android:layout_marginStart="2dp"
android:layout_gravity="center_vertical"
android:src="@drawable/ic_arrow_dropdown"
android:tint="@color/foreground" />
app:tint="@color/foreground" />
</LinearLayout>
</LinearLayout>
@@ -38,7 +38,7 @@
android:layout_height="16dp"
android:layout_centerInParent="true"
android:src="@drawable/ic_edit"
android:tint="@color/white" />
app:tint="@color/white" />
</RelativeLayout>
@@ -112,7 +112,7 @@
android:layout_height="16dp"
android:layout_centerInParent="true"
android:src="@drawable/ic_edit"
android:tint="@color/white" />
app:tint="@color/white" />
</RelativeLayout>
</RelativeLayout>
</RelativeLayout>
@@ -215,10 +215,11 @@
android:layout_height="wrap_content"
android:orientation="horizontal"
android:visibility="invisible">
<io.lbry.browser.ui.controls.SolidIconView
android:layout_width="18dp"
android:layout_height="18dp"
android:text="@string/fa_coins" />
<ImageView
android:layout_width="12dp"
android:layout_height="12dp"
android:layout_gravity="center_vertical"
android:src="@drawable/ic_credits" />
<TextView
android:id="@+id/channel_form_inline_balance_value"
android:layout_width="wrap_content"
+331 -191
View File
@@ -2,6 +2,7 @@
<androidx.constraintlayout.widget.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:id="@+id/file_view_global_layout"
android:layout_width="match_parent"
android:layout_height="match_parent">
@@ -36,60 +37,66 @@
<LinearLayout
android:id="@+id/file_view_claim_display_area"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:visibility="visible">
<RelativeLayout
android:id="@+id/file_view_media_container"
android:background="@color/mediaContainerBackground"
android:layout_width="match_parent"
android:layout_height="246dp">
android:layout_height="246dp"
android:background="@color/mediaContainerBackground">
<RelativeLayout
android:id="@+id/file_view_media_meta_container"
android:clickable="true"
android:foreground="?attr/selectableItemBackground"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:clickable="true"
android:foreground="?attr/selectableItemBackground">
<ImageView
android:id="@+id/file_view_thumbnail"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<ProgressBar
android:id="@+id/file_view_main_action_loading"
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_centerInParent="true" />
<com.google.android.material.button.MaterialButton
android:id="@+id/file_view_main_action_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:fontFamily="@font/inter"
android:text="@string/play"
android:textSize="14sp"
android:visibility="invisible"
android:text="@string/play" />
android:visibility="invisible" />
<LinearLayout
android:id="@+id/file_view_fee_container"
android:background="@drawable/bg_stream_cost"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_alignParentEnd="true"
android:layout_marginTop="4dp"
android:layout_marginEnd="4dp"
android:paddingTop="2dp"
android:paddingBottom="2dp"
android:background="@drawable/bg_stream_cost"
android:orientation="horizontal"
android:paddingStart="6dp"
android:paddingTop="2dp"
android:paddingEnd="7dp"
android:paddingBottom="2dp"
android:visibility="gone">
<io.lbry.browser.ui.controls.SolidIconView
<ImageView
android:layout_width="12dp"
android:layout_height="12dp"
android:layout_gravity="center_vertical"
android:textSize="8dp"
android:text="@string/fa_coins"
android:textColor="@android:color/black" />
android:src="@drawable/ic_credits" />
<TextView
android:id="@+id/file_view_fee"
android:layout_width="wrap_content"
@@ -98,22 +105,24 @@
android:layout_marginStart="1dp"
android:fontFamily="@font/inter"
android:textColor="@android:color/black"
android:textSize="14sp"
android:textFontWeight="300" />
android:textFontWeight="300"
android:textSize="14sp" />
</LinearLayout>
</RelativeLayout>
<RelativeLayout
android:id="@+id/file_view_exoplayer_container"
android:background="@android:color/black"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/black"
android:visibility="gone">
<com.google.android.exoplayer2.ui.PlayerView
android:id="@+id/file_view_exoplayer_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:controller_layout_id="@layout/exo_playback_control_view"/>
app:controller_layout_id="@layout/exo_playback_control_view" />
<ProgressBar
android:id="@+id/player_buffering_progress"
android:layout_width="36dp"
@@ -124,40 +133,52 @@
<RelativeLayout
android:id="@+id/file_view_unsupported_container"
android:background="@color/mediaContainerBackground"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/mediaContainerBackground"
android:padding="36dp"
android:visibility="gone">
<ImageView
android:id="@+id/file_view_unsupported_gerbil"
android:src="@drawable/gerbil_happy"
android:layout_width="64dp"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_height="wrap_content" />
android:src="@drawable/gerbil_happy" />
<LinearLayout
android:layout_toEndOf="@id/file_view_unsupported_gerbil"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginStart="24dp"
android:layout_centerVertical="true">
android:layout_toEndOf="@id/file_view_unsupported_gerbil"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/inter"
android:text="@string/unsupported_content"
android:textColor="@color/white"
android:textSize="18sp"
android:text="@string/unsupported_content" />
android:textSize="18sp" />
<TextView
android:id="@+id/file_view_unsupported_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/inter"
android:text="@string/unsupported_content_desc"
android:textColor="@color/white"
android:textSize="14sp"
android:textFontWeight="300"
android:textSize="14sp" />
<com.google.android.material.button.MaterialButton
android:id="@+id/file_view_open_external_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
android:layout_height="wrap_content"
android:fontFamily="@font/inter"
android:text="@string/open"
android:textSize="14sp" />
</LinearLayout>
</RelativeLayout>
</RelativeLayout>
@@ -167,31 +188,37 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false">
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<include layout="@layout/card_reward_driver"
android:visibility="gone"
android:layout_height="wrap_content"
android:orientation="vertical">
<include
layout="@layout/card_reward_driver"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
android:layout_height="wrap_content"
android:visibility="gone" />
<RelativeLayout
android:id="@+id/file_view_title_area"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clickable="true"
android:background="?attr/selectableItemBackground"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:clickable="true"
android:paddingStart="16dp"
android:paddingEnd="4dp">
android:paddingTop="8dp"
android:paddingEnd="4dp"
android:paddingBottom="8dp">
<LinearLayout
android:id="@+id/file_view_title_layout"
android:orientation="vertical"
android:layout_centerVertical="true"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="48dp">
android:layout_centerVertical="true"
android:layout_marginEnd="48dp"
android:orientation="vertical">
<TextView
android:id="@+id/file_view_title"
android:layout_width="wrap_content"
@@ -199,39 +226,42 @@
android:fontFamily="@font/inter"
android:textSize="16sp"
android:textStyle="bold" />
<LinearLayout
android:layout_marginTop="4dp"
android:orientation="horizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:orientation="horizontal">
<TextView
android:id="@+id/file_view_view_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:fontFamily="@font/inter"
android:textSize="12sp"
android:textFontWeight="300"
android:textSize="12sp"
android:visibility="gone" />
<TextView
android:id="@+id/file_view_publish_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/inter"
android:textSize="12sp"
android:textFontWeight="300" />
android:textFontWeight="300"
android:textSize="12sp" />
</LinearLayout>
</LinearLayout>
<ImageView
android:id="@+id/file_view_desc_toggle_arrow"
android:src="@drawable/ic_arrow_dropdown"
android:layout_toStartOf="@+id/file_view_title_layout"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_width="24dp"
android:layout_height="24dp"
android:tint="@color/foreground" />
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_toStartOf="@+id/file_view_title_layout"
android:src="@drawable/ic_arrow_dropdown"
app:tint="@color/foreground" />
</RelativeLayout>
<LinearLayout
@@ -240,235 +270,291 @@
android:layout_height="wrap_content"
android:orientation="horizontal"
android:weightSum="5">
<LinearLayout
android:id="@+id/file_view_action_share"
android:clickable="true"
android:background="?attr/selectableItemBackground"
android:layout_weight="1"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:orientation="vertical"
android:paddingTop="8dp"
android:paddingBottom="8dp">
<RelativeLayout
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_gravity="center_horizontal">
<ImageView
android:tint="@color/foreground"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_centerInParent="true"
android:src="@drawable/ic_share" />
android:src="@drawable/ic_share"
app:tint="@color/foreground" />
</RelativeLayout>
<TextView
android:fontFamily="@font/inter"
android:textSize="12sp"
android:text="@string/share"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" />
android:layout_gravity="center_horizontal"
android:fontFamily="@font/inter"
android:text="@string/share"
android:textSize="12sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/file_view_action_tip"
android:clickable="true"
android:background="?attr/selectableItemBackground"
android:layout_weight="1"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:orientation="vertical"
android:paddingTop="8dp"
android:paddingBottom="8dp">
<RelativeLayout
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_gravity="center_horizontal">
<io.lbry.browser.ui.controls.SolidIconView
android:textColor="@color/foreground"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_centerInParent="true"
android:textSize="20dp"
android:text="@string/fa_gift"/>
android:text="@string/fa_gift"
android:textColor="@color/foreground"
android:textSize="20dp" />
</RelativeLayout>
<TextView
android:fontFamily="@font/inter"
android:textSize="12sp"
android:text="@string/support"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" />
android:layout_gravity="center_horizontal"
android:fontFamily="@font/inter"
android:text="@string/support"
android:textSize="12sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/file_view_action_repost"
android:clickable="true"
android:background="?attr/selectableItemBackground"
android:layout_weight="1"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:orientation="vertical"
android:paddingTop="8dp"
android:paddingBottom="8dp">
<RelativeLayout
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_gravity="center_horizontal">
<io.lbry.browser.ui.controls.SolidIconView
android:textColor="@color/foreground"
android:layout_centerInParent="true"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_centerInParent="true"
android:layout_gravity="center_horizontal"
android:textSize="20dp"
android:text="@string/fa_repost"/>
android:text="@string/fa_repost"
android:textColor="@color/foreground"
android:textSize="20dp" />
</RelativeLayout>
<TextView
android:fontFamily="@font/inter"
android:textSize="12sp"
android:text="@string/repost"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" />
android:layout_gravity="center_horizontal"
android:fontFamily="@font/inter"
android:text="@string/repost"
android:textSize="12sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/file_view_action_edit"
android:clickable="true"
android:background="?attr/selectableItemBackground"
android:layout_weight="1"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:orientation="vertical"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:visibility="gone">
<RelativeLayout
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_gravity="center_horizontal">
<ImageView
android:tint="@color/foreground"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_centerInParent="true"
android:src="@drawable/ic_edit" />
android:src="@drawable/ic_edit"
app:tint="@color/foreground" />
</RelativeLayout>
<TextView
android:fontFamily="@font/inter"
android:textSize="12sp"
android:text="@string/edit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" />
android:layout_gravity="center_horizontal"
android:fontFamily="@font/inter"
android:text="@string/edit"
android:textSize="12sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/file_view_action_download"
android:clickable="true"
android:background="?attr/selectableItemBackground"
android:layout_weight="1"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:orientation="vertical"
android:paddingTop="8dp"
android:paddingBottom="8dp">
<RelativeLayout
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_gravity="center_horizontal">
<ProgressBar
android:id="@+id/file_view_download_progress"
style="?android:progressBarStyleHorizontal"
android:layout_width="36dp"
android:layout_height="36dp"
style="?android:progressBarStyleHorizontal"
android:progressDrawable="@drawable/determinate_progress_circle"
android:visibility="gone" />
<ImageView
android:id="@+id/file_view_action_download_icon"
android:tint="@color/foreground"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_centerInParent="true"
android:src="@drawable/ic_download" />
android:src="@drawable/ic_download"
app:tint="@color/foreground" />
</RelativeLayout>
<TextView
android:fontFamily="@font/inter"
android:textSize="12sp"
android:text="@string/download"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" />
android:layout_gravity="center_horizontal"
android:fontFamily="@font/inter"
android:text="@string/download"
android:textSize="12sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/file_view_action_delete"
android:clickable="true"
android:background="?attr/selectableItemBackground"
android:layout_weight="1"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:orientation="vertical"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:visibility="gone">
<RelativeLayout
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_gravity="center_horizontal">
<ImageView
android:tint="@color/foreground"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_centerInParent="true"
android:src="@drawable/ic_delete" />
android:src="@drawable/ic_delete"
app:tint="@color/foreground" />
</RelativeLayout>
<TextView
android:fontFamily="@font/inter"
android:textSize="12sp"
android:text="@string/delete"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" />
android:layout_gravity="center_horizontal"
android:fontFamily="@font/inter"
android:text="@string/delete"
android:textSize="12sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/file_view_action_unpublish"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:orientation="vertical"
android:paddingTop="8dp"
android:paddingBottom="8dp">
<RelativeLayout
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_gravity="center_horizontal">
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_centerInParent="true"
android:src="@drawable/ic_unpublish"
app:tint="@color/foreground" />
</RelativeLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:fontFamily="@font/inter"
android:text="@string/unpublish"
android:textSize="12sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/file_view_action_report"
android:clickable="true"
android:background="?attr/selectableItemBackground"
android:layout_weight="1"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:orientation="vertical"
android:paddingTop="8dp"
android:paddingBottom="8dp">
<RelativeLayout
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_gravity="center_horizontal">
<ImageView
android:tint="@color/foreground"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_centerInParent="true"
android:src="@drawable/ic_report" />
android:src="@drawable/ic_report"
app:tint="@color/foreground" />
</RelativeLayout>
<TextView
android:fontFamily="@font/inter"
android:textSize="12sp"
android:text="@string/report"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" />
android:layout_gravity="center_horizontal"
android:fontFamily="@font/inter"
android:text="@string/report"
android:textSize="12sp" />
</LinearLayout>
</LinearLayout>
<View
android:background="@color/divider"
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_marginTop="12dp"
android:layout_height="0.5dp" />
android:background="@color/divider" />
<RelativeLayout
android:id="@+id/file_view_publisher_area"
@@ -477,14 +563,15 @@
<LinearLayout
android:id="@+id/file_view_publisher_info_area"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="12dp"
android:layout_toStartOf="@id/file_view_publisher_area_actions"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:paddingStart="16dp"
android:paddingBottom="12dp"
android:layout_toStartOf="@id/file_view_icon_follow">
android:paddingTop="12dp"
android:paddingBottom="12dp">
<RelativeLayout
android:id="@+id/file_view_publisher_avatar"
android:layout_width="50dp"
@@ -492,28 +579,31 @@
android:layout_gravity="center_vertical"
android:layout_marginEnd="16dp"
android:visibility="gone">
<RelativeLayout
android:layout_centerHorizontal="true"
android:background="@drawable/bg_channel_icon"
android:id="@+id/file_view_publisher_no_thumbnail"
android:layout_width="50dp"
android:layout_height="50dp">
android:layout_height="50dp"
android:layout_centerHorizontal="true"
android:background="@drawable/bg_channel_icon">
<TextView
android:id="@+id/file_view_publisher_thumbnail_alpha"
android:layout_centerInParent="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:fontFamily="@font/inter"
android:textAllCaps="true"
android:textSize="24sp"
android:textColor="@color/white"
android:textFontWeight="300" />
android:textFontWeight="300"
android:textSize="24sp" />
</RelativeLayout>
<ImageView
android:layout_centerHorizontal="true"
android:id="@+id/file_view_publisher_thumbnail"
android:layout_width="50dp"
android:layout_height="50dp" />
android:layout_height="50dp"
android:layout_centerHorizontal="true" />
</RelativeLayout>
<LinearLayout
@@ -522,6 +612,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:orientation="vertical">
<TextView
android:id="@+id/file_view_publisher_title"
android:layout_width="wrap_content"
@@ -530,6 +621,7 @@
android:textFontWeight="300"
android:textSize="14sp"
android:visibility="gone" />
<TextView
android:id="@+id/file_view_publisher_name"
android:layout_width="wrap_content"
@@ -541,109 +633,153 @@
</LinearLayout>
</LinearLayout>
<io.lbry.browser.ui.controls.OutlineIconView
android:id="@+id/file_view_icon_follow"
android:clickable="true"
android:background="?attr/selectableItemBackground"
<LinearLayout
android:id="@+id/file_view_publisher_area_actions"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:text="@string/fa_heart"
android:textColor="@color/red"
android:textSize="20dp" />
android:orientation="horizontal">
<io.lbry.browser.ui.controls.SolidIconView
android:id="@+id/file_view_icon_unfollow"
android:clickable="true"
android:background="?attr/selectableItemBackground"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:text="@string/fa_heart_broken"
android:textSize="20dp"
android:visibility="invisible" />
<LinearLayout
android:id="@+id/file_view_icon_follow"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:orientation="horizontal"
android:paddingTop="8dp"
android:paddingBottom="8dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="16dp"
android:fontFamily="@font/inter"
android:text="@string/follow"
android:textAllCaps="true"
android:textSize="12sp"
android:textStyle="bold" />
<io.lbry.browser.ui.controls.OutlineIconView
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:text="@string/fa_heart"
android:textColor="@color/red"
android:textSize="20dp" />
</LinearLayout>
<io.lbry.browser.ui.controls.SolidIconView
android:id="@+id/file_view_icon_unfollow"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:text="@string/fa_heart_broken"
android:textColor="@color/foreground"
android:textSize="20dp"
android:visibility="gone" />
<io.lbry.browser.ui.controls.SolidIconView
android:id="@+id/file_view_icon_bell"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginEnd="16dp"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:text="@string/fa_bell_slash"
android:textColor="@color/foreground"
android:textSize="20dp"
android:visibility="gone" />
</LinearLayout>
</RelativeLayout>
<View
android:background="@color/divider"
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_marginBottom="12dp"
android:layout_height="0.5dp" />
android:background="@color/divider" />
<LinearLayout
android:id="@+id/file_view_description_area"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:visibility="gone">
<TextView
android:id="@+id/file_view_description"
android:textSize="12sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/inter"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:autoLink="all"
android:fontFamily="@font/inter"
android:textColorLink="@color/lbryGreen"
android:textFontWeight="300"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp" />
android:textSize="12sp" />
<LinearLayout
android:id="@+id/file_view_tag_area"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="10"
android:paddingTop="36dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp">
android:layout_marginEnd="16dp"
android:layout_weight="10"
android:orientation="horizontal"
android:paddingTop="36dp">
<TextView
android:layout_weight="2"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:fontFamily="@font/inter"
android:text="@string/tags"
android:textSize="12sp"
android:textFontWeight="600" />
android:textFontWeight="600"
android:textSize="12sp" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/file_view_tag_list"
android:layout_weight="8"
android:layout_marginStart="8dp"
android:layout_width="0dp"
android:layout_height="wrap_content" />
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_weight="8" />
</LinearLayout>
<View
android:background="@color/divider"
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_marginTop="12dp"
android:layout_marginBottom="12dp"
android:layout_height="0.5dp" />
android:background="@color/divider" />
</LinearLayout>
<LinearLayout
android:id="@+id/file_view_related_content_area"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp">
android:layout_marginBottom="8dp"
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/related_content"
android:layout_centerVertical="true"
android:fontFamily="@font/inter"
android:textSize="16sp"
android:layout_centerVertical="true" />
android:text="@string/related_content"
android:textSize="16sp" />
<ProgressBar
android:id="@+id/file_view_related_content_progress"
android:layout_width="16dp"
@@ -652,23 +788,25 @@
android:layout_centerVertical="true"
android:visibility="gone" />
</RelativeLayout>
<TextView
android:id="@+id/file_view_no_related_content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="16dp"
android:fontFamily="@font/inter"
android:text="@string/no_related_content"
android:textSize="14sp"
android:textFontWeight="300"
android:textSize="14sp"
android:visibility="gone" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/file_view_related_content_list"
android:overScrollMode="never"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
android:layout_height="wrap_content"
android:overScrollMode="never" />
</LinearLayout>
<View
@@ -681,14 +819,15 @@
android:id="@+id/file_view_comments_area"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingBottom="16dp"
android:orientation="vertical">
android:orientation="vertical"
android:paddingBottom="16dp">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp">
<ProgressBar
android:id="@+id/file_view_comments_progress"
android:layout_width="16dp"
@@ -713,8 +852,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="16dp"
android:fontFamily="@font/inter"
android:text="@string/no_comments"
android:textFontWeight="300"
@@ -751,4 +890,5 @@
android:visibility="gone">
</RelativeLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
@@ -82,7 +82,7 @@
android:layout_marginStart="2dp"
android:layout_gravity="center_vertical"
android:src="@drawable/ic_arrow_dropdown"
android:tint="@color/foreground" />
app:tint="@color/foreground" />
</LinearLayout>
<LinearLayout
@@ -110,7 +110,7 @@
android:layout_marginStart="2dp"
android:layout_gravity="center_vertical"
android:src="@drawable/ic_arrow_dropdown"
android:tint="@color/foreground" />
app:tint="@color/foreground" />
</LinearLayout>
<TextView
+1 -2
View File
@@ -3,8 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".ui.gallery.GalleryFragment">
android:layout_height="match_parent">
<TextView
android:id="@+id/text_gallery"
+1 -2
View File
@@ -3,8 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".ui.home.HomeFragment">
android:layout_height="match_parent">
<TextView
android:id="@+id/text_home"
+6 -6
View File
@@ -36,8 +36,8 @@
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_gravity="center_horizontal"
android:tint="@color/white"
android:src="@drawable/ic_record" />
android:src="@drawable/ic_record"
app:tint="@color/white" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -76,8 +76,8 @@
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_gravity="center_horizontal"
android:tint="@color/white"
android:src="@drawable/ic_photo" />
android:src="@drawable/ic_photo"
app:tint="@color/white" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -116,8 +116,8 @@
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_gravity="center_horizontal"
android:tint="@color/white"
android:src="@drawable/ic_upload" />
android:src="@drawable/ic_upload"
app:tint="@color/white" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/pageBackground">
@@ -48,7 +49,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:fontFamily="@font/inter"
android:text="@string/uploading"
android:text="@string/uploading_thumbnail"
android:textColor="@color/white"
android:textFontWeight="300"
android:textSize="12sp" />
@@ -67,7 +68,7 @@
android:layout_height="16dp"
android:layout_centerInParent="true"
android:src="@drawable/ic_edit"
android:tint="@color/white" />
app:tint="@color/white" />
</RelativeLayout>
</RelativeLayout>
@@ -316,7 +317,7 @@
<androidx.appcompat.widget.AppCompatSpinner
android:id="@+id/publish_form_currency_spinner"
android:entries="@array/publish_currencies"
android:layout_width="110dp"
android:layout_width="160dp"
android:layout_height="wrap_content"
android:layout_toEndOf="@+id/publish_form_price_layout"
android:layout_marginStart="4dp"
@@ -436,10 +437,11 @@
android:layout_height="wrap_content"
android:orientation="horizontal"
android:visibility="invisible">
<io.lbry.browser.ui.controls.SolidIconView
android:layout_width="18dp"
android:layout_height="18dp"
android:text="@string/fa_coins" />
<ImageView
android:layout_width="12dp"
android:layout_height="12dp"
android:layout_gravity="center_vertical"
android:src="@drawable/ic_credits" />
<TextView
android:id="@+id/publish_form_inline_balance_value"
android:layout_width="wrap_content"
@@ -0,0 +1,87 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent">
<RelativeLayout
android:background="@android:color/black"
android:layout_width="match_parent"
android:layout_height="match_parent">
<RelativeLayout
android:id="@+id/shuffle_exoplayer_container"
android:background="@android:color/black"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@id/shuffle_content_details">
<com.google.android.exoplayer2.ui.PlayerView
android:id="@+id/shuffle_exoplayer_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:controller_layout_id="@layout/exo_playback_control_view"/>
<ProgressBar
android:id="@+id/player_buffering_progress"
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_centerInParent="true"
android:visibility="gone" />
</RelativeLayout>
<LinearLayout
android:id="@+id/shuffle_content_details"
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginBottom="8dp"
android:layout_alignParentBottom="true">
<TextView
android:id="@+id/shuffle_content_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/inter"
android:textColor="@color/white"
android:textFontWeight="300"
android:minLines="1"
android:maxLines="3"
android:textSize="20sp"
/>
<TextView
android:id="@+id/shuffle_content_publisher"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/inter"
android:textColor="@color/white"
android:textFontWeight="300"
android:minLines="1"
android:maxLines="1"
android:textSize="14sp" />
</LinearLayout>
<ProgressBar
android:id="@+id/shuffle_loading"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_centerInParent="true"
android:visibility="gone" />
<RelativeLayout
android:id="@+id/shuffle_share_button"
android:layout_width="72dp"
android:layout_height="72dp"
android:layout_alignParentTop="true"
android:layout_alignParentRight="true"
android:clickable="true"
android:background="?attr/selectableItemBackground">
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_centerInParent="true"
android:src="@drawable/ic_share"
app:tint="@color/white" />
</RelativeLayout>
</RelativeLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
@@ -1,22 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".ui.slideshow.SlideshowFragment">
<TextView
android:id="@+id/text_slideshow"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:textAlignment="center"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="16dp"
@@ -91,12 +92,11 @@
android:paddingStart="2dp"
android:paddingEnd="2dp"
android:visibility="gone">
<io.lbry.browser.ui.controls.SolidIconView
android:layout_width="16dp"
android:layout_height="16dp"
<ImageView
android:layout_width="12dp"
android:layout_height="12dp"
android:layout_gravity="center_vertical"
android:textSize="12dp"
android:text="@string/fa_coins" />
android:src="@drawable/ic_credits" />
<TextView
android:id="@+id/claim_fee"
android:layout_width="wrap_content"
@@ -119,7 +119,7 @@
android:layout_height="36dp"
android:layout_centerInParent="true"
android:src="@drawable/ic_check"
android:tint="@color/nextLbryGreen" />
app:tint="@color/nextLbryGreen" />
</RelativeLayout>
</RelativeLayout>
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="16dp"
@@ -101,13 +102,11 @@
android:paddingStart="6dp"
android:paddingEnd="7dp"
android:visibility="gone">
<io.lbry.browser.ui.controls.SolidIconView
<ImageView
android:layout_width="12dp"
android:layout_height="12dp"
android:layout_gravity="center_vertical"
android:textSize="8dp"
android:text="@string/fa_coins"
android:textColor="@android:color/black"/>
android:src="@drawable/ic_credits" />
<TextView
android:id="@+id/claim_fee"
android:layout_width="wrap_content"
@@ -131,7 +130,7 @@
android:layout_height="36dp"
android:layout_centerInParent="true"
android:src="@drawable/ic_check"
android:tint="@color/nextLbryGreen" />
app:tint="@color/nextLbryGreen" />
</RelativeLayout>
</RelativeLayout>
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.cardview.widget.CardView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:layout_width="match_parent"
@@ -28,6 +29,20 @@
android:layout_width="48dp"
android:layout_height="48dp"
android:visibility="invisible" />
<RelativeLayout
android:layout_centerHorizontal="true"
android:background="@drawable/bg_channel_overlay_icon"
android:id="@+id/notification_selected_overlay"
android:layout_width="48dp"
android:layout_height="48dp"
android:visibility="gone">
<ImageView
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_centerInParent="true"
android:src="@drawable/ic_check"
app:tint="@color/nextLbryGreen" />
</RelativeLayout>
</RelativeLayout>
<LinearLayout
android:orientation="vertical"
+3 -2
View File
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.cardview.widget.CardView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:clickable="true"
android:foreground="?attr/selectableItemBackground"
android:layout_width="match_parent"
@@ -23,9 +24,9 @@
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_centerInParent="true"
android:tint="@color/lbryGreen"
android:src="@drawable/ic_check_circle"
android:visibility="invisible" />
android:visibility="invisible"
app:tint="@color/lbryGreen" />
<ProgressBar
android:id="@+id/reward_item_loading"
android:layout_centerInParent="true"
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:tools="http://schemas.android.com/tools">
<ImageView
android:id="@+id/startup_stage_icon"
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_gravity="center_vertical"
android:src="@drawable/ic_check"
app:tint="@color/white" />
<TextView
android:id="@+id/startup_stage_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_gravity="center_vertical"
android:fontFamily="@font/inter"
tools:text="@string/installation_id_loaded"
android:textColor="@color/white"
android:textFontWeight="300"
android:textSize="14sp" />
</LinearLayout>
+4 -5
View File
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
@@ -106,13 +107,11 @@
android:paddingStart="6dp"
android:paddingEnd="7dp"
android:visibility="gone">
<io.lbry.browser.ui.controls.SolidIconView
<ImageView
android:layout_width="12dp"
android:layout_height="12dp"
android:layout_gravity="center_vertical"
android:textSize="8dp"
android:text="@string/fa_coins"
android:textColor="@android:color/black"/>
android:src="@drawable/ic_credits" />
<TextView
android:id="@+id/claim_fee"
android:layout_width="wrap_content"
@@ -136,7 +135,7 @@
android:layout_height="36dp"
android:layout_centerInParent="true"
android:src="@drawable/ic_check"
android:tint="@color/nextLbryGreen" />
app:tint="@color/nextLbryGreen" />
</RelativeLayout>
<LinearLayout
android:id="@+id/claim_thumbnail_placeholder"
+2 -1
View File
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:clickable="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -18,7 +19,7 @@
android:layout_height="16dp"
android:layout_gravity="center_vertical"
android:layout_marginEnd="4dp"
android:tint="@color/darkForeground" />
app:tint="@color/darkForeground" />
<TextView
android:id="@+id/tag_name"
android:layout_width="wrap_content"
@@ -26,7 +26,7 @@
/>
<TextView
android:id="@+id/transaction_amount"
android:gravity="right"
android:gravity="end"
android:layout_weight="4"
android:layout_width="0dp"
android:layout_height="wrap_content"
@@ -34,7 +34,9 @@
android:fontFamily="@font/inter"
android:singleLine="true"
android:textSize="14sp"
android:textFontWeight="300" />
android:textFontWeight="300"
android:textAlignment="viewEnd"
android:textDirection="ltr"/>
</LinearLayout>
<LinearLayout
@@ -60,7 +62,7 @@
/>
<TextView
android:id="@+id/transaction_fee"
android:gravity="right"
android:gravity="end"
android:layout_weight="4"
android:layout_width="0dp"
android:layout_height="wrap_content"
@@ -90,10 +92,11 @@
android:textColor="@color/lbryGreen"
android:textSize="12sp"
android:textFontWeight="300"
android:textAlignment="viewStart"
/>
<TextView
android:id="@+id/transaction_date"
android:gravity="right"
android:gravity="end"
android:layout_weight="4"
android:layout_width="0dp"
android:layout_height="wrap_content"
@@ -106,7 +109,7 @@
android:visibility="gone" />
<TextView
android:id="@+id/transaction_pending_text"
android:gravity="right"
android:gravity="end"
android:layout_weight="4"
android:layout_width="0dp"
android:layout_height="wrap_content"
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/action_delete"
android:icon="@drawable/ic_delete"
android:title="@string/delete"
app:iconTint="@color/actionBarForeground"
app:showAsAction="always" />
</menu>
+8 -31
View File
@@ -27,7 +27,6 @@
<string name="welcome_to_lbry">Welkom tot LBRY.</string>
<string name="welcome_paragraph">LBRY is \'n gemeenskapsgebaseerde contentsplatform waar je video\'s, musiek, boeke en meer kan vind en publiseer</string>
<string name="welcome_tos">Deur voort te gaan, stem ek in tot die &lt;a href=\"https://lbry.com/termsofservice\"&gt;TDiensvoorwaardes&lt;/a&gt; en bevestig dat ek ouer as 13 is.</string>
<string name="welcome_please_wait">Wag asseblief terwyl ons \'n paar dinge gereed maak...</string>
<string name="use_lbry">Gebruik LBRY »</string>
<!-- URI bar -->
@@ -39,7 +38,6 @@
<string name="discover">Vind</string>
<string name="lbry_works_better">LBRY werk beter as u ten minste 5 skeppers volg waarvan u hou. Meld aan om skeppers wat u volg te wys as u reeds \'n account het.</string>
<string name="select_five_subscriptions">Kies tot 5 skeppers om voort te gaan.</string>
<string name="n_remaining">%1$d oorblywende...</string>
<string name="done">Gedoen</string>
<string name="all">Almal</string>
<string name="discover_channels">Ontdek nuwe kanale</string>
@@ -57,7 +55,6 @@
<string name="download">Aflaai</string>
<string name="open">Oop</string>
<string name="report">Rapporteer</string>
<string name="loading_decentralized_data">Laai gedesentraliseerde data...</string>
<string name="related_content">Verwante Content</string>
<string name="comments">Kommentaar</string>
<string name="no_comments">Op die oomblik is daar geen kommentaar om te vertoon nie.</string>
@@ -90,6 +87,14 @@
<string name="please_select_repost_channel">Kies \'n kanaal om weer op te plaas.</string>
<string name="reply">Antwoord</string>
<string name="replying_to">Antwoord op %1$s</string>
<plurals name="view_count">
<item quantity="one">%1$s uitsig</item>
<item quantity="other">%1$s uitsig</item>
</plurals>
<plurals name="confirm_purchase_message">
<item quantity="one">Dit sal \"%1$s\" vir %2$s krediete koop</item>
<item quantity="other">Dit sal \"%1$s\" vir %2$s krediete koop</item>
</plurals>
<plurals name="post_and_tip">
<item quantity="one">Post en fooi %1$s krediete?</item>
<item quantity="other">Post en fooi %1$s krediete?</item>
@@ -102,14 +107,6 @@
<item quantity="one">Dit lewer u kommentaar met \'n fooi van %1$s krediete vir %2$s</item>
<item quantity="other">Dit lewer u kommentaar met \'n fooi van %1$s krediete vir %2$s</item>
</plurals>
<plurals name="view_count">
<item quantity="one">%1$s uitsig</item>
<item quantity="other">%1$s uitsig</item>
</plurals>
<plurals name="confirm_purchase_message">
<item quantity="one">Dit sal \"%1$s\" vir %2$s krediete koop</item>
<item quantity="other">Dit sal \"%1$s\" vir %2$s krediete koop</item>
</plurals>
<!-- Channel view -->
<string name="no_channel_info">Daar is nog niks hier nie.\nProbeer asseblief later weer.</string>
@@ -127,7 +124,6 @@
<string name="take_photo">Neem \'n Foto</string>
<string name="upload_file">Laai \'n lêer op</string>
<string name="no_videos_found">Ons kon geen video\'s op u toestel vind nie. Neem \'n foto of neem \'n video op om aan die gang te kom.</string>
<string name="loading_videos">Wag asseblief terwyl ons u video\'s laai ...</string>
<string name="storage_permission_rationale_videos">LBRY benodig toegang om u video\'s, beelde en ander lêers vanaf u toestel te kan vertoon en publiseer.</string>
<string name="camera_permission_rationale_record">LBRY benodig toegang tot u kamera om video\'s op te neem.</string>
<string name="camera_permission_rationale_photo">LBRY benodig toegang tot u kamera om foto\'s te neem.</string>
@@ -207,7 +203,6 @@
<string name="cca_nc_nd_4_0_international">Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International</string>
<string-array name="publish_currencies">
<item>LBC</item>
<item>USD</item>
</string-array>
@@ -226,12 +221,10 @@
<string name="oops_something_went_wrong">Oeps! Iets het verkeerd geloop.</string>
<string name="installation_id_loaded">Laai installasie-ID.</string>
<string name="known_tags_loaded">Laai plaaslike bekende en volg merkers.</string>
<string name="exchange_rate_loaded">Laai LBC/USD wisselkoers.</string>
<string name="user_authenticated">Gebruiker geverifieer.</string>
<string name="installation_registered">Installasie geregistreer.</string>
<string name="subscriptions_loaded">Gelaaide intekeninge.</string>
<string name="subscriptions_resolved">Ontbinde intekeninge.</string>
<!-- Settings -->
<string name="user_interface">Inhoud &amp; Gebruikerskoppelvlak</string>
<string name="other">Ander</string>
@@ -242,10 +235,8 @@
<string name="notifications">Kennisgewings</string>
<string name="subscriptions">Abonnementen</string>
<string name="content_interests">Contentsbelangstellings</string>
<string name="keep_sdk_in_background">Hou die LBRY-diens op die agtergrond vir verbeterde beursie- en netwerkprestasie</string>
<string name="participate_in_data_network">Neem deel aan die datanetwerk (benodig weer app en agtergronddiens)</string>
<!-- URL suggestions -->
<string name="search_url_title">%1$s - Soek</string>
<string name="tag_url_title">%1$s - Etikette</string>
@@ -270,7 +261,6 @@
<string name="in_your_publishes">in u publikasies</string>
<string name="in_your_supports">in u steun</string>
<string name="earn_more_tips">Verdien meer wenke deur cool video\'s op te laai</string>
<string name="sdk_initializing">Die agtergronddiens initialiseer...</string>
<string name="sdk_still_initializing">Die agtergronddiens word steeds geïnitialiseer. U kan die inhoud intussen verken en kyk.</string>
<string name="sdk_initializing_functionality">U kan dit nie nou doen nie, want die agtergronddiens is nog besig om te initialiseer.</string>
@@ -310,8 +300,6 @@
<string name="manual_backup">&lt;a href=\"https://lbry.com/faq/how-to-backup-wallet#android\"&gt;Handmatige rugsteun&lt;/a&gt;</string>
<string name="sync_faq">&lt;a href=\"https://lbry.com/faq/how-to-backup-wallet#sync\"&gt;Sinkroniseer FAQ&lt;/a&gt;</string>
<string name="zero">0</string>
<string name="lbc">LBC</string>
<string name="account_recommended">Account Aanbeveel</string>
<string name="wallet_account_desc">Met \'n lbry.tv-account kan je belonings verdien, je beursie rugsteun en alles sinchroniseer.</string>
<string name="wallet_without_account">Sonder u account aanvaar u alle verantwoordelikheid om u beursie- en LBRY-data te beveilig.</string>
@@ -323,7 +311,6 @@
<string name="insufficient_balance">Onvoldoende balans</string>
<string name="invalid_amount">Voer \'n geldige bedrag in</string>
<string name="send_credit_error">U krediete kon tans nie gestuur word nie. Probeer asseblief weer later.</string>
<string name="loading_transactions">Laai tans transaksies...</string>
<string name="no_recent_transactions">Daar is geen onlangse transaksies wat vertoon kan word nie.</string>
<string name="no_transactions">Daar is tans geen transaksies wat vertoon kan word nie.</string>
<string name="tx_list_fee">belasting %1$s</string>
@@ -334,7 +321,6 @@
<string name="confirm_unlock_tips">Is u seker dat u al u wenke wil ontsluit?</string>
<string name="min_spend_required">Voer \'n bedrag van meer as 0,0001 krediete in.</string>
<string name="buy_lbc">Koop LBC</string>
<string name="hash_not_supported">U toestel ondersteun nie die minimum vereistes vir die beveiliging van u aankoopversoek nie.</string>
<string name="receive_address_not_set">U het nie \'n beursie-adres opgestel nie. Genereer \'n nuwe adres en probeer weer.</string>
@@ -378,7 +364,6 @@
<string name="channel_to_show_support_as">Kanaal om ondersteuning te wys as</string>
<string name="make_this_a_tip">Maak dit \'n wenk</string>
<string name="send_revocable_support">Stuur Herroepbare Ondersteuning</string>
<string name="send_lbc_tip">Stuur \'n Wenk van %1$s LBC</string>
<string name="send_tip_info_content">Dit sal verskyn as \'n wenk vir %1$s, wat die vermoë verhoog om ontdek te word terwyl dit aktief is. &lt;a href=\"https://lbry.com/faq/tipping\"&gt;Learn more&lt;/a&gt;.</string>
<string name="send_tip_info_channel">Dit sal verskyn as \'n wenk vir %1$s, wat die vermoë verhoog om ontdek te word terwyl dit aktief is. &lt;a href=\"https://lbry.com/faq/tipping\"&gt;Learn more&lt;/a&gt;.</string>
<string name="cancel">Kanselleer</string>
@@ -410,8 +395,6 @@
<string name="provide_valid_email">Voer \'n geldige e-pos adres in</string>
<string name="please_follow_instructions">Volg die aanwysings in die e-pos wat na u adres gestuur word om voort te gaan.</string>
<string name="sign_in_successful">U het suksesvol by lbry.tv aangemeld</string>
<string name="retrieving_account_information">Haal accountinligting op...</string>
<string name="apply_wallet_data">Pas beursie-data toe...</string>
<string name="please_enter_your_password">Voer die wagwoord in wat u gebruik het om u beursie te beveilig.</string>
<string name="please_enter_a_password">Voer \'n wagwoord in om u beursie te beveilig.</string>
<string name="wallet_security_purposes">Opmerking: vir beursie-beveiligingsdoeleindes kan LBRY nie u wagwoord terugstel nie.</string>
@@ -438,7 +421,6 @@
<!-- Channels -->
<string name="no_channel_created">U het nie \'n kanaal geskep nie.\nBegin nou deur \'n nuwe kanaal te skep!</string>
<string name="create_a_channel">Skep \'n kanaal</string>
<string name="create_a_channel_item">Skep \'n kanaal...</string>
<string name="edit_channel">Wysig kanaal</string>
<string name="delete_selection">Vee seleksie uit?</string>
<string name="delete_channel">Vee kanaal uit?</string>
@@ -455,7 +437,6 @@
<string name="title">Titel</string>
<string name="at">\@</string>
<string name="deposit">Deposito</string>
<string name="deposit_remains_yours">Hierdie LBC bly uwe. Dit is \'n deposito om die naam te bespreek en kan te eniger tyd ongedaan gemaak word.</string>
<string name="storage_permission_rationale_download">LBRY benodig toegang om inhoud op u toestel af te laai.</string>
<string name="storage_permission_rationale_images">LBRY benodig toegang om prente vanaf u toestelberging te laai.</string>
<string name="select_thumbnail">Kies kleinkiekie</string>
@@ -463,7 +444,6 @@
<string name="undetermined_image_filepath">Die lêerpad kon nie vir die geselekteerde prent bepaal word nie. Kies \'n prent op \'n ander plek.</string>
<string name="wait_for_upload">Wag tot die huidige oplaai voltooi is.</string>
<string name="image_upload_failed">Die beeldoplaai-versoek het misluk. Probeer asseblief weer.</string>
<string name="uploading">Oplaai...</string>
<string name="please_enter_channel_name">Voer \'n kanaalnaam in.</string>
<string name="channel_name_invalid_characters">U kanaalnaam bevat ongeldige karakters.</string>
<string name="channel_name_already_created">U het reeds \'n kanaal met dieselfde naam geskep.</string>
@@ -488,8 +468,6 @@
<item quantity="other">Die kanale is suksesvol uitgevee.</item>
</plurals>
<!-- Rewards -->
<string name="lbry_credits_allow">Met LBRY-krediete kan u inhoud publiseer of koop.</string>
<string name="free_credits_worth">U kan gratis krediete ter waarde van $%1$s verwerf nadat u \'n e-posadres verstrek het.</string>
<string name="rewards_learn_more">&lt;a href=\"https://lbry.com/faq/earn-credits\"&gt;Leer meer&lt;/a&gt;.</string>
<string name="get_started">Begin</string>
@@ -578,7 +556,6 @@
<string name="get_social">Word Sosiaal</string>
<string name="social_paragraph">U kan interaksie met die LBRY-span en lede van die gemeenskap op Discord, Facebook, Instagram, Twitter of Reddit.</string>
<string name="app_info">Programinligting</string>
<string name="loading">Laai...</string>
<string name="about_link_what_is_lbry">&lt;a href=\"https://lbry.com/faq/what-is-lbry\"&gt;Wat is LBRY?&lt;/a&gt;</string>
<string name="about_link_android_basics">&lt;a href=\"https://lbry.com/faq/android-basics\"&gt;Android Basics&lt;/a&gt;</string>
<string name="about_link_faq">&lt;a href=\"https://lbry.com/faq\"&gt;FAQ&lt;/a&gt;</string>
+35 -17
View File
@@ -20,6 +20,7 @@
<string name="settings">Configuració</string>
<string name="about">Quant a</string>
<string name="sign_in">Inicia sessió</string>
<string name="shuffle">Mescla</string>
<string name="startup_failed">Error en iniciar l\'aplicació. Sisplau, comprova la teva connexió i torna a intentar-ho. Si el problema persisteix, sisplau envia un correu a hello@lbry.com</string>
<string name="no_claim_search_content">No hi ha contingut per mostrar en aquest moment. Sisplau, canvia la teva selecció o comprova-ho més tard.</string>
@@ -39,7 +40,7 @@
<string name="discover">Descobreix</string>
<string name="lbry_works_better">LBRY funciona millor si segueixes almenys 5 creadors que t\'agradin. Inicia la sessió per mostrar els creadors que segueixes si ja tens un compte.</string>
<string name="select_five_subscriptions">Sisplau, selecciona fins a 5 creadors per continuar.</string>
<string name="n_remaining">%1$d restant...</string>
<string name="n_remaining">Falten %1$d...</string>
<string name="done">Fet</string>
<string name="all">Tot</string>
<string name="discover_channels">Descobreix canals nous</string>
@@ -90,6 +91,14 @@
<string name="please_select_repost_channel">Sisplau, selecciona un canal on republicar.</string>
<string name="reply">Respon</string>
<string name="replying_to">Responent a %1$s</string>
<plurals name="view_count">
<item quantity="one">%1$s visualització</item>
<item quantity="other">%1$s visualitzacions</item>
</plurals>
<plurals name="confirm_purchase_message">
<item quantity="one">Així es comprarà \"%1$s\" per %2$s crèdit</item>
<item quantity="other">Així es comprarà \"%1$s\" per %2$s crèdits</item>
</plurals>
<plurals name="post_and_tip">
<item quantity="one">Publicar i donar %1$s crèdit en propina?</item>
<item quantity="other">Publicar i donar %1$s crèdits en propina?</item>
@@ -102,20 +111,14 @@
<item quantity="one">Així es publicarà el teu comentari amb una propina de %1$s crèdits per %2$s</item>
<item quantity="other">Així es publicarà el teu comentari amb una propina de %1$s crèdits per %2$s</item>
</plurals>
<plurals name="view_count">
<item quantity="one">%1$s visualització</item>
<item quantity="other">%1$s visualitzacions</item>
</plurals>
<plurals name="confirm_purchase_message">
<item quantity="one">Així es comprarà \"%1$s\" per %2$s crèdit</item>
<item quantity="other">Així es comprarà \"%1$s\" per %2$s crèdits</item>
</plurals>
<!-- Channel view -->
<string name="no_channel_info">Encara no hi ha res aquí.\nSisplau, mira-ho més tard.</string>
<string name="content">Contingut</string>
<string name="website">Lloc web</string>
<string name="reposted">republicat</string>
<string name="receive_all_notifications">Rebràs totes les notificacions</string>
<string name="receive_no_notifications">No rebràs notificacions per aquest canal</string>
<plurals name="follower_count">
<item quantity="one">%1$s seguidor</item>
<item quantity="other">%1$s seguidors</item>
@@ -207,7 +210,7 @@
<string name="cca_nc_nd_4_0_international">Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International</string>
<string-array name="publish_currencies">
<item>LBC</item>
<item>Crèdits de LBRY</item>
<item>USD</item>
</string-array>
@@ -226,12 +229,11 @@
<string name="oops_something_went_wrong">Ups! Alguna cosa ha anat malament.</string>
<string name="installation_id_loaded">ID d\'instal·lació carregada.</string>
<string name="known_tags_loaded">S\'han carregat les etiquetes conegudes i seguides.</string>
<string name="exchange_rate_loaded">S\'ha carregat la taxa d\'intercanvi LBC/USD.</string>
<string name="exchange_rate_loaded">S\'ha carregat la taxa d\'intercanvi crèdits de LBRY/USD.</string>
<string name="user_authenticated">Usuari autenticat.</string>
<string name="installation_registered">Instal·lació registrada.</string>
<string name="subscriptions_loaded">Subscripcions carregades.</string>
<string name="subscriptions_resolved">Subscripcions resoltes.</string>
<!-- Settings -->
<string name="user_interface">Contingut i interfície d\'usuari</string>
<string name="other">Altres</string>
@@ -242,9 +244,11 @@
<string name="notifications">Notificacions</string>
<string name="subscriptions">Subscripcions</string>
<string name="content_interests">Contingut interessant</string>
<string name="mini_player_bottom_spacing">Marge pel mini-reproductor inferior</string>
<string name="keep_sdk_in_background">Deixa el servei de LBRY executant-se en segon pla per millorar el rendiment de la cartera i de la xarxa</string>
<string name="participate_in_data_network">Participa en la xarxa de dades (requereix reiniciar l\'aplicació i el servei en segon pla)</string>
<string name="send_buffering_events">Envia esdeveniments de \"buffering\" als servidors de LBRY</string>
<!-- URL suggestions -->
<string name="search_url_title">%1$s - Cercar</string>
@@ -295,6 +299,7 @@
<string name="receive">Rep</string>
<string name="spend">Gasta</string>
<string name="publish">Publica</string>
<string name="unpublish">Retira publicació</string>
<string name="support">Suport</string>
<string name="abandon">Abandona</string>
<string name="channel">Canal</string>
@@ -310,7 +315,7 @@
<string name="manual_backup">&lt;a href=\"https://lbry.com/faq/how-to-backup-wallet#android\"&gt;Còpia manual&lt;/a&gt;</string>
<string name="sync_faq">&lt;a href=\"https://lbry.com/faq/how-to-backup-wallet#sync\"&gt;FAQs de sincronització&lt;/a&gt;</string>
<string name="zero">0</string>
<string name="lbc">LBC</string>
<string name="lbc">Crèdits</string>
<string name="account_recommended">Quantitat recomanada</string>
<string name="wallet_account_desc">Un compte de lbry.tv et permet obtenir recompenses, fer còpies de seguretat de la teva cartera, i tenir-ho tot sincronitzat.</string>
@@ -334,7 +339,7 @@
<string name="confirm_unlock_tips">Segur que vols desblocar totes les teves propines?</string>
<string name="min_spend_required">Sisplau, introdueix una quantitat mínima de 0.0001 crèdits.</string>
<string name="buy_lbc">Compra LBC</string>
<string name="buy_lbc">Compra crèdits de LBRY</string>
<string name="hash_not_supported">El teu dispositiu no té suport pels requeriments mínims per assegurar la teva petició de compra.</string>
<string name="receive_address_not_set">No has especificat cap adreça de cartera. Sisplau, genera\'n una de nova i torna a intentar-ho.</string>
@@ -378,7 +383,11 @@
<string name="channel_to_show_support_as">Canal des del qual dones suport</string>
<string name="make_this_a_tip">Fes-ne una propina</string>
<string name="send_revocable_support">Envia suport revocable</string>
<string name="send_lbc_tip">Envia una propina de %1$s LBC</string>
<string name="send_lbc_tip">Envia propina de %1$s</string>
<plurals name="send_lbc_tip">
<item quantity="one">Envia propina de %1$s Crèdits</item>
<item quantity="other">Envia propina d\'%1$s Crèdit</item>
</plurals>
<string name="send_tip_info_content">Això apareixerà com una propina per %1$s, i n\'augmentarà l\'habilitat de ser descobert mentre estigui activa. &lt;a href=\"https://lbry.com/faq/tipping\"&gt;Aprèn-ne més&lt;/a&gt;.</string>
<string name="send_tip_info_channel">Això apareixerà com una propina per %1$s, i augmentarà l\'habilitat del canal de ser descobert mentre estigui activa. &lt;a href=\"https://lbry.com/faq/tipping\"&gt;Aprèn-ne més&lt;/a&gt;.</string>
<string name="cancel">Cancel·la</string>
@@ -410,7 +419,7 @@
<string name="provide_valid_email">Sisplau, introdueix una direcció de correu electrònic vàlida</string>
<string name="please_follow_instructions">Sisplau, segueix les instruccions al correu que hem enviat a la teva direcció per continuar.</string>
<string name="sign_in_successful">Has iniciat sessió a lbry.tv correctament</string>
<string name="retrieving_account_information">Obtenint la informació del teu compte...</string>
<string name="retrieving_account_information">Obtenint la informació del compte...</string>
<string name="apply_wallet_data">Aplicant dades de la cartera...</string>
<string name="please_enter_your_password">Sisplau, introdueix la contrasenya que has emprat per protegir la teva cartera.</string>
<string name="please_enter_a_password">Sisplau, introdueix una contrasenya per protegir la teva cartera.</string>
@@ -464,6 +473,7 @@
<string name="channel_deleted">El canal s\'ha eliminat correctament.</string>
<string name="channel_failed_delete">No s\'ha pogut eliminar el canal en aquest moment. Sisplau, torna a intentar-ho més tard.</string>
<string name="description">Descripció</string>
<string name="follow">Segueix</string>
<string name="yes">Sí</string>
<string name="no">No</string>
<string name="show_optional_fields">Mostra camps opcionals</string>
@@ -473,7 +483,7 @@
<string name="title">Títol</string>
<string name="at">\@</string>
<string name="deposit">Dipòsit</string>
<string name="deposit_remains_yours">Aquests LBC seguiran sent teus. Això és un dipòsit per reservar el nom i pots revertir-lo en qualsevol moment.</string>
<string name="deposit_remains_yours">Aquests crèdits seguiran sent teus. Això és un dipòsit per reservar el nom i pots revertir-lo en qualsevol moment.</string>
<string name="storage_permission_rationale_download">LBRY necessita accés per descarregar contingut al teu dispositiu.</string>
<string name="storage_permission_rationale_images">LBRY necessita accés per carregar imatges des de l\'emmagatzemament del teu dispositiu.</string>
<string name="select_thumbnail">Selecciona miniatura</string>
@@ -482,6 +492,7 @@
<string name="wait_for_upload">Sisplau, espera que la pujada actual acabi.</string>
<string name="image_upload_failed">La petició per pujar la imatge ha fallat. Sisplau, torna a intentar-ho.</string>
<string name="uploading">Pujant...</string>
<string name="uploading_thumbnail">Pujant miniatura...</string>
<string name="please_enter_channel_name">Sisplau, introdueix un nom de canal.</string>
<string name="channel_name_invalid_characters">El nom del teu canal conté caràcters invàlids.</string>
<string name="channel_name_already_created">Ja has creat un canal amb el mateix nom.</string>
@@ -619,4 +630,11 @@
<string name="cannot_find_lbrynet_log">No s\'ha pogut trobar el fitxer lbrynet.log.</string>
<string name="cannot_share_lbrynet_log">El fitxer lbrynet.log no s\'ha pogut compartir per manca de permisos.</string>
<!-- Notifications -->
<string name="no_notifications">Tot tranquil per aquí! Les noves notificacions es mostraran quan les rebis.</string>
<plurals name="confirm_delete_notifications">
<item quantity="one">Segur que vols eliminar la notificació seleccionada?</item>
<item quantity="other">Segur que vols eliminar les notificacions seleccionades?</item>
</plurals>
</resources>
+13 -30
View File
@@ -20,6 +20,7 @@
<string name="settings">Einstellungen</string>
<string name="about">Über</string>
<string name="sign_in">Anmelden</string>
<string name="shuffle">Zufällig</string>
<string name="startup_failed">App-Start fehlgeschlagen. Bitte überprüfe Deine Datenverbindung und versuche es erneut. Wenn dieses Problem weiterhin bestehen sollte, sende bitte einen E-Mail an hello@lbry.com</string>
<string name="no_claim_search_content">Derzeit sind keine Inhalte verfügbar. Bitte verfeinere Deine Auswahl oder versuche es später erneut.</string>
@@ -27,7 +28,6 @@
<string name="welcome_to_lbry">Willkommen zu LBRY.</string>
<string name="welcome_paragraph">LBRY ist eine von der Community kontrollierte Plattform, bei welcher Sie Videos, Musik, Bücher und weiteres finden und veröffentlichen kannst.</string>
<string name="welcome_tos">Indem ich fortfahre, stimme ich den &lt;a href=\"https://lbry.com/termsofservice\"&gt;Terms of Service&lt;/a&gt; zu und bestätige, dass ich über 13 Jahre alt bin.</string>
<string name="welcome_please_wait">Bitte warte, während wir noch ein paar Sachen einrichten...</string>
<string name="use_lbry">Verwende LBRY »</string>
<!-- URI bar -->
@@ -39,7 +39,6 @@
<string name="discover">Entdecke</string>
<string name="lbry_works_better">LBRY funktioniert besser, wenn Sie mindestens 5 Erstellern folgen, die Sie mögen. Melden Sie sich an, um den Erstellern zu zeigen, denen Sie folgen, wenn Sie bereits ein Account haben.</string>
<string name="select_five_subscriptions">Bitte wähle bis zu 5 Kanäle aus, um fortzufahren.</string>
<string name="n_remaining">%1$d verbleibend...</string>
<string name="done">Fertig</string>
<string name="all">Alle</string>
<string name="discover_channels">Entdecke neue Kanäle</string>
@@ -90,6 +89,14 @@
<string name="please_select_repost_channel">Bitte wählen Sie einen Kanal aus, auf dem Sie erneut posten möchten.</string>
<string name="reply">Antworten</string>
<string name="replying_to">Antworten auf %1$s</string>
<plurals name="view_count">
<item quantity="one">%1$sAnsichten</item>
<item quantity="other">%1$sAnsichten</item>
</plurals>
<plurals name="confirm_purchase_message">
<item quantity="one">Dies wird \"%1$s\" gegen %2$s Gutschrift kaufen</item>
<item quantity="other">Dies wird \"%1$s\" für %2$s Credits kaufen</item>
</plurals>
<plurals name="post_and_tip">
<item quantity="one">Posten und %1$s Credits Trinkgeld geben?</item>
<item quantity="other">Posten und %1$s Credits Trinkgeld geben?</item>
@@ -102,14 +109,6 @@
<item quantity="one">Dies wird Ihren Kommentar mit einem Tipp von %1$s Credits für %2$s posten</item>
<item quantity="other">Dies wird Deinen Kommentar mit einem Trinkgeld von %1$s Credits für %2$s posten</item>
</plurals>
<plurals name="view_count">
<item quantity="one">%1$sAnsichten</item>
<item quantity="other">%1$sAnsichten</item>
</plurals>
<plurals name="confirm_purchase_message">
<item quantity="one">Dies wird \"%1$s\" gegen %2$s Gutschrift kaufen</item>
<item quantity="other">Dies wird \"%1$s\" für %2$s Credits kaufen</item>
</plurals>
<!-- Channel view -->
<string name="no_channel_info">Hier ist noch nichts.
@@ -128,7 +127,6 @@ Bitte versuche es später erneut.</string>
<string name="take_photo">Mach ein Foto</string>
<string name="upload_file">Datei hochladen</string>
<string name="no_videos_found">Wir konnten keine Videos auf Deinem Gerät finden. Mache ein Foto oder nimm ein Video auf, um loszulegen.</string>
<string name="loading_videos">Bitte warte während Deine Videos laden...</string>
<string name="storage_permission_rationale_videos">LBRY benötigt Zugriff, um Deine Videos, Bilder und anderen Dateien von Deinem Gerät aus anzeigen und veröffentlichen zu können.</string>
<string name="camera_permission_rationale_record">LBRY benötigt Zugriff auf Deine Kamera, um Videos aufzunehmen.</string>
<string name="camera_permission_rationale_photo">LBRY benötigt Zugriff auf Deine Kamera, um Fotos aufzunehmen.</string>
@@ -208,7 +206,7 @@ Bitte versuche es später erneut.</string>
<string name="cca_nc_nd_4_0_international">Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International</string>
<string-array name="publish_currencies">
<item>LBC</item>
<item>LBRY-Guthaben</item>
<item>USD</item>
</string-array>
@@ -227,12 +225,10 @@ Bitte versuche es später erneut.</string>
<string name="oops_something_went_wrong">Hoppla! Etwas ist schief gelaufen.</string>
<string name="installation_id_loaded">Geladene Installations-ID.</string>
<string name="known_tags_loaded">Geladene lokale bekannte und verfolgte Themen.</string>
<string name="exchange_rate_loaded">Geladener LBC/USD Wechselkurs.</string>
<string name="user_authenticated">Benutzer authentifiziert.</string>
<string name="installation_registered">Installation registriert.</string>
<string name="subscriptions_loaded">Geladene Abonnements.</string>
<string name="subscriptions_resolved">Abgelöste Abonnements.</string>
<!-- Settings -->
<string name="user_interface">Inhalt &amp; Benutzeroberfläche</string>
<string name="other">Andere</string>
@@ -243,10 +239,8 @@ Bitte versuche es später erneut.</string>
<string name="notifications">Benachrichtigungen</string>
<string name="subscriptions">Abonnements</string>
<string name="content_interests">Inhaltsinteressen</string>
<string name="keep_sdk_in_background">Lasse den LBRY-Dienst im Hintergrund laufen, um die Leistung des Portemonnaie und des Netzwerks zu verbessern</string>
<string name="participate_in_data_network">Teilnahme am Datennetzwerk (Neustart der App und des Hintergrunddienstes erforderlich)</string>
<!-- URL suggestions -->
<string name="search_url_title">%1$s - Suchen</string>
<string name="tag_url_title">%1$s - Schlagwort</string>
@@ -271,7 +265,6 @@ Bitte versuche es später erneut.</string>
<string name="in_your_publishes">in Deinen Veröffentlichungen</string>
<string name="in_your_supports">in Deinen Unterstützungen</string>
<string name="earn_more_tips">Verdienen Sie weitere Tipps, indem Sie coole Videos hochladen</string>
<string name="sdk_initializing">Der Hintergrunddienst wird initialisiert...</string>
<string name="sdk_still_initializing">Der Hintergrunddienst wird noch initialisiert. In der Zwischenzeit können Sie Inhalte erkunden und ansehen.</string>
<string name="sdk_initializing_functionality">Sie können dies derzeit nicht tun, da der Hintergrunddienst noch initialisiert wird.</string>
@@ -311,8 +304,6 @@ Bitte versuche es später erneut.</string>
<string name="manual_backup">&lt;a href=\"https://lbry.com/faq/how-to-backup-wallet#android\"&gt;Manual backup&lt;/a&gt;</string>
<string name="sync_faq">&lt;a href=\"https://lbry.com/faq/how-to-backup-wallet#sync\"&gt;Sync FAQ&lt;/a&gt;</string>
<string name="zero">0</string>
<string name="lbc">LBC</string>
<string name="account_recommended">Account vorgeschlagen</string>
<string name="wallet_account_desc">Mit einem lbry.tv-Konto können Sie Belohnungen verdienen, Ihre Portemonnaie sichern und alles synchron halten.</string>
<string name="wallet_without_account">Ohne Account übernimmst Sie die gesamte Verantwortung für die Sicherung Ihrer Portemonnaie- und LBRY-Daten.</string>
@@ -324,7 +315,6 @@ Bitte versuche es später erneut.</string>
<string name="insufficient_balance">Mangelhaftes Gleichgewicht</string>
<string name="invalid_amount">Bitte gib einen gültigen Betrag ein</string>
<string name="send_credit_error">Deine Credits konnten zu diesem Zeitpunkt nicht gesendet werden. Bitte versuche es später erneut.</string>
<string name="loading_transactions">Lade Transaktionen...</string>
<string name="no_recent_transactions">Es gibt keine aktuellen anzuzeigenden Transaktionen.</string>
<string name="no_transactions">Derzeit sind keine Transaktionen anzuzeigen.</string>
<string name="tx_list_fee">Gebühr %1$s</string>
@@ -335,7 +325,6 @@ Bitte versuche es später erneut.</string>
<string name="confirm_unlock_tips">Möchten Sie wirklich alle Ihre Trinkgelder freischalten?</string>
<string name="min_spend_required">Bitte geben Sie einen Betrag von mehr als 0,0001 Credits ein.</string>
<string name="buy_lbc">Kaufen Sie LBC</string>
<string name="hash_not_supported">Ihr Gerät unterstützt nicht die Mindestanforderungen zum Sichern Ihrer Kaufanfrage.</string>
<string name="receive_address_not_set">Sie haben keine Portemonnaie Adresse festgelegt. Bitte generieren Sie eine neue Adresse und versuchen Sie es erneut.</string>
@@ -379,7 +368,6 @@ Bitte versuche es später erneut.</string>
<string name="channel_to_show_support_as">Kanal, um Unterstützung als anzuzeigen</string>
<string name="make_this_a_tip">Machen Sie dies zu einem Tipp</string>
<string name="send_revocable_support">Widerruflichen Support Senden</string>
<string name="send_lbc_tip">Spendieren Sie ein %1$s LBC Trinkgeld</string>
<string name="send_tip_info_content">Dies wird als Trinkgeld für %1$s\' angezeigt, wodurch die Fähigkeit erhöht wird, im aktiven Zustand entdeckt zu werden. &lt;a href=\"https://lbry.com/faq/tipping\"&gt;Learn more&lt;/a&gt;.</string>
<string name="send_tip_info_channel">Dies wird als Tipp für %1$s\' angezeigt, wodurch die Fähigkeit erhöht wird, im aktiven Zustand entdeckt zu werden . &lt;a href=\"https://lbry.com/faq/tipping\"&gt;Learn more&lt;/a&gt;.</string>
<string name="cancel">Abbrechen</string>
@@ -411,8 +399,6 @@ Bitte versuche es später erneut.</string>
<string name="provide_valid_email">Bitte gib eine gültige E-Mail-Adresse ein</string>
<string name="please_follow_instructions">Bitte folge den Anweisungen in der E-Mail an, die Dir geschickt wurde, um fortzufahren.</string>
<string name="sign_in_successful">Sie haben sich erfolgreich bei lbry.tv angemeldet</string>
<string name="retrieving_account_information">Kontoinformationen abrufen...</string>
<string name="apply_wallet_data">Portemonnaiedaten anwenden...</string>
<string name="please_enter_your_password">Bitte geben Sie Ihr Passwort ein, mit dem sie Ihren Portemonnaie gesichert haben.</string>
<string name="please_enter_a_password">Bitte geben Sie Ihr Passwort ein, um Ihren Portemonnaie
  zu sichern.</string>
@@ -443,7 +429,6 @@ Bitte versuche es später erneut.</string>
<!-- Channels -->
<string name="no_channel_created">Sie haben keinen Kanal erstellt.\nStarten Sie jetzt, indem Sie einen neuen Kanal erstellen!</string>
<string name="create_a_channel">Kanal erstellen</string>
<string name="create_a_channel_item">Kanal erstellen...</string>
<string name="edit_channel">Kanal bearbeiten</string>
<string name="delete_selection">Auswahl löschen?</string>
<string name="delete_channel">Kanal löschen?</string>
@@ -451,6 +436,7 @@ Bitte versuche es später erneut.</string>
<string name="channel_deleted">Der Kanal wurde erfolgreich gelöscht.</string>
<string name="channel_failed_delete">Der Kanal konnte zu diesem Zeitpunkt nicht gelöscht werden. Bitte versuche es später erneut.</string>
<string name="description">Beschreibung</string>
<string name="follow">Folgen</string>
<string name="yes">Ja</string>
<string name="no">Nein</string>
<string name="show_optional_fields">Zeige optionale Felder</string>
@@ -460,7 +446,6 @@ Bitte versuche es später erneut.</string>
<string name="title">Titel</string>
<string name="at">\@</string>
<string name="deposit">Einzahlen</string>
<string name="deposit_remains_yours">Die LBC bleiben Deine. Sie dienen lediglich als Pfand für die Reservierung Deines Namens und können zu jederzeit zurückgeholt werden.</string>
<string name="storage_permission_rationale_download">LBRY benötigt Zugriff, um Inhalte auf Dein Gerät herunterzuladen.</string>
<string name="storage_permission_rationale_images">LBRY benötigt Zugriff zum Laden von Bildern aus Deinem Gerätespeicher.</string>
<string name="select_thumbnail">Wähle ein Thumbnail</string>
@@ -468,7 +453,6 @@ Bitte versuche es später erneut.</string>
<string name="undetermined_image_filepath">Der Dateipfad konnte für das ausgewählte Bild nicht ermittelt werden. Bitte wähle ein Bild an einem anderen Ort.</string>
<string name="wait_for_upload">Bitte warte, bis der aktuelle Upload abgeschlossen ist.</string>
<string name="image_upload_failed">Die Aufforderung zum hochladen von Bildern ist fehlgeschlagen. Bitte versuche es erneut.</string>
<string name="uploading">Hochladen...</string>
<string name="please_enter_channel_name">Bitte gib einen Kanalnamen ein.</string>
<string name="channel_name_invalid_characters">Dein Kanalname enthält ungültige Zeichen.</string>
<string name="channel_name_already_created">Sie haben bereits einen Kanal mit demselben Namen erstellt.</string>
@@ -493,8 +477,6 @@ Bitte versuche es später erneut.</string>
<item quantity="other">Die Kanäle wurden erfolgreich gelöscht.</item>
</plurals>
<!-- Rewards -->
<string name="lbry_credits_allow">Mit LBRY Credits können Sie Inhalte veröffentlichen oder kaufen.</string>
<string name="free_credits_worth">Sie können kostenlose Credits im Wert von $%1$s erhalten, nachdem Sie eine E-Mail-Adresse angegeben haben.</string>
<string name="rewards_learn_more">&lt;a href=\"https://lbry.com/faq/earn-credits\"&gt;Learn more&lt;/a&gt;.</string>
<string name="get_started">Jetzt starten</string>
@@ -583,7 +565,6 @@ Bitte versuche es später erneut.</string>
<string name="get_social">Vernetze Dich</string>
<string name="social_paragraph">Sie können mit dem LBRY Team und anderen Nutzern über Discord, Facebook, Instagram, Twitter oder Reddit kontakt aufnehmen.</string>
<string name="app_info">Anwendungsinformation</string>
<string name="loading">Lade...</string>
<string name="about_link_what_is_lbry">&lt;a href=\"https://lbry.com/faq/what-is-lbry\"&gt;What is LBRY?&lt;/a&gt;</string>
<string name="about_link_android_basics">&lt;a href=\"https://lbry.com/faq/android-basics\"&gt;Android Grundlagen&lt;/a&gt;</string>
<string name="about_link_faq">&lt;a href=\"https://lbry.com/faq\"&gt;FAQ&lt;/a&gt;</string>
@@ -606,4 +587,6 @@ Bitte versuche es später erneut.</string>
<string name="cannot_find_lbrynet_log">Die Datei lbrynet.log wurde nicht gefunden.</string>
<string name="cannot_share_lbrynet_log">Die Datei lbrynet.log kann aufgrund von Berechtigungsbeschränkungen nicht freigegeben werden.</string>
<!-- Notifications -->
<string name="no_notifications">So ruhig hier! Benachrichtigungen werden hier angezeigt, sobald du neue erhalten hast.</string>
</resources>
+57 -21
View File
@@ -20,6 +20,7 @@
<string name="settings">Ajustes</string>
<string name="about">Acerca de</string>
<string name="sign_in">Registrarse</string>
<string name="shuffle">Aleatorio</string>
<string name="startup_failed">Error al iniciar la aplicación. Verifique su conexión de datos e inténtelo nuevamente. Si este problema persiste, por favor envíe un correo electrónico a hello@lbry.com</string>
<string name="no_claim_search_content">No hay contenido para mostrar en este momento. Por favor, cambie su selección o realice la consulta más tarde.</string>
@@ -90,18 +91,6 @@
<string name="please_select_repost_channel">Por favor seleccione el canal donde sera reposteado</string>
<string name="reply">contestar</string>
<string name="replying_to">Contestando a %1$s</string>
<plurals name="post_and_tip">
<item quantity="one">¿Publicar y realizar propina de %1$s crédito?</item>
<item quantity="other">¿Publicar y realizar propina de %1$s créditos?</item>
</plurals>
<plurals name="post_for_credits">
<item quantity="one">Publicar para %1$s crédito</item>
<item quantity="other">Publicar para %1$s créditos</item>
</plurals>
<plurals name="confirm_post_comment">
<item quantity="one">Esto publicara tu comentario con una propina de %1$s crédito para %2$s</item>
<item quantity="other">Esto publicara tu comentario con una propina de %1$s créditos para %2$s</item>
</plurals>
<plurals name="view_count">
<item quantity="one">%1$svista</item>
<item quantity="other">%1$s vistas</item>
@@ -110,12 +99,26 @@
<item quantity="one">Esto comprará \"%1$s\" para %2$s crédito</item>
<item quantity="other">Esto comprará \"%1$s\" para %2$s créditos</item>
</plurals>
<plurals name="post_and_tip">
<item quantity="one">¿Publicar y realizar propina de %1$s crédito?</item>
<item quantity="other">¿Publicar y realizar propina de %1$s créditos?</item>
</plurals>
<plurals name="post_for_credits">
<item quantity="one">Publicar por %1$s crédito</item>
<item quantity="other">Publicar por %1$s créditos</item>
</plurals>
<plurals name="confirm_post_comment">
<item quantity="one">Esto publicara tu comentario con una propina de %1$s crédito para %2$s</item>
<item quantity="other">Esto publicara tu comentario con una propina de %1$s créditos para %2$s</item>
</plurals>
<!-- Channel view -->
<string name="no_channel_info">Todavía no hay nada aquí. \ Por favor, vuelva más tarde.</string>
<string name="content">Contenido</string>
<string name="website">Página web</string>
<string name="reposted">repostear</string>
<string name="receive_all_notifications">Recibirás todas las notificaciones</string>
<string name="receive_no_notifications">No recibirás notificaciones de este canal</string>
<plurals name="follower_count">
<item quantity="one">%1$s seguidor</item>
<item quantity="other">%1$s seguidores</item>
@@ -127,7 +130,7 @@
<string name="take_photo">Toma una foto</string>
<string name="upload_file">Cargar un archivo</string>
<string name="no_videos_found">No pudimos encontrar ningún video en su dispositivo. Tome una foto o grabe un video para comenzar.</string>
<string name="loading_videos">Espera mientras cargamos tus videos ...</string>
<string name="loading_videos">Espera mientras cargamos tus videos...</string>
<string name="storage_permission_rationale_videos">LBRY requiere acceso para poder mostrar y publicar sus videos, imágenes y otros archivos desde su dispositivo.</string>
<string name="camera_permission_rationale_record">LBRY requiere acceso a su cámara para grabar videos.</string>
<string name="camera_permission_rationale_photo">LBRY requiere acceso a su cámara para tomar fotos.</string>
@@ -207,7 +210,7 @@
<string name="cca_nc_nd_4_0_international">Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International</string>
<string-array name="publish_currencies">
<item>LBC</item>
<item>Créditos LBRY</item>
<item>USD</item>
</string-array>
@@ -226,12 +229,11 @@
<string name="oops_something_went_wrong">¡Uy! Algo salió mal.</string>
<string name="installation_id_loaded">ID de instalación cargada.</string>
<string name="known_tags_loaded">Etiquetas locales cargadas conocidas y seguidas.</string>
<string name="exchange_rate_loaded">Tipo de cambio LBC/USD cargado.</string>
<string name="exchange_rate_loaded">Cargado el tipo de cambio para Créditos LBRY / USD.</string>
<string name="user_authenticated">Usuario autenticado.</string>
<string name="installation_registered">Instalación registrada.</string>
<string name="subscriptions_loaded">Suscripciones cargadas.</string>
<string name="subscriptions_resolved">Suscripciones resueltas.</string>
<!-- Settings -->
<string name="user_interface">Contenido &amp; interfaz de usuario</string>
<string name="other">Otro</string>
@@ -242,9 +244,11 @@
<string name="notifications">Notificaciones</string>
<string name="subscriptions">Suscripciones</string>
<string name="content_interests">Contenido Interesante</string>
<string name="mini_player_bottom_spacing">Espaciado inferior del mini-reproductor</string>
<string name="keep_sdk_in_background">Mantenga el servicio LBRY ejecutándose en segundo plano para mejorar el rendimiento de la billetera y la red</string>
<string name="participate_in_data_network">Participar en la red de datos (requiere reiniciar la aplicación y el servicio en segundo plano)</string>
<string name="send_buffering_events">Enviar eventos de almacenamiento en búfer a los servidores LBRY</string>
<!-- URL suggestions -->
<string name="search_url_title">%1$s - Buscar</string>
@@ -295,6 +299,7 @@
<string name="receive">Recibir</string>
<string name="spend">Gastar</string>
<string name="publish">Publicar</string>
<string name="unpublish">Anular la publicación.</string>
<string name="support">Soporte</string>
<string name="abandon">Abandonar</string>
<string name="channel">Canal</string>
@@ -310,7 +315,7 @@
<string name="manual_backup">&lt;a href=\"https://lbry.com/faq/how-to-backup-wallet#android\"&gt;Copia de seguridad manual&lt;/a&gt;</string>
<string name="sync_faq">&lt;a href=\"https://lbry.com/faq/how-to-backup-wallet#sync\"&gt;Preguntas frecuentes sobre sincronización&lt;/a&gt;</string>
<string name="zero">0</string>
<string name="lbc">LBC</string>
<string name="lbc">Créditos</string>
<string name="account_recommended">Cuenta recomendada</string>
<string name="wallet_account_desc">Una cuenta de lbry.tv te permite el ganar recompensas, realizar un respaldo de tu billetera y mantener todo sincronizado.</string>
@@ -334,7 +339,7 @@
<string name="confirm_unlock_tips">¿Seguro que quieres desbloquear todos tus propinas?</string>
<string name="min_spend_required">Por favor introduce una cantidad mayor que 0.0001 créditos.</string>
<string name="buy_lbc">Comprar LBC</string>
<string name="buy_lbc">Comprar Créditos LBRY</string>
<string name="hash_not_supported">Tu dispositivo no cumple con los requerimientos mínimos para realizar una compra segura.</string>
<string name="receive_address_not_set">No tienes establecida una dirección de billetera. Por favor genera una nueva dirección e intenta de nuevo.</string>
@@ -378,7 +383,11 @@
<string name="channel_to_show_support_as">Canal para mostrar apoyo enviado</string>
<string name="make_this_a_tip">Convertir a propina</string>
<string name="send_revocable_support">Enviar apoyo revocable</string>
<string name="send_lbc_tip">Enviar una propina de %1$s</string>
<string name="send_lbc_tip">Dar propina %1$s</string>
<plurals name="send_lbc_tip">
<item quantity="one">Dar propina de %1$s Crédito</item>
<item quantity="other">Dar propina de %1$s Créditos</item>
</plurals>
<string name="send_tip_info_content">Esto aparecerá como una propina para %1$s,lo que aumentará su capacidad de ser descubierto mientras está activo. &lt;a href=\"https://lbry.com/faq/tipping\"&gt;Aprender más&lt;/a&gt;.</string>
<string name="send_tip_info_channel">Esto aparecerá como una propina para %1$s, lo que aumentará la capacidad del canal para ser descubierto mientras está activo. &lt;a href=\"https://lbry.com/faq/tipping\"&gt;Aprender más&lt;/a&gt;.</string>
<string name="cancel">Cancelar</string>
@@ -422,7 +431,18 @@
<string name="enter_phone_number">Por favor, introduzca su número de teléfono.</string>
<string name="not_interested">No estoy interesado</string>
<string name="manual_reward_verification">Verificación manual de recompensas</string>
<string name="reward_verification">Verificación para recompensas</string>
<string name="social_media_verification">Verificación de redes sociales</string>
<string name="skip_the_queue">Evitar la cola de espera</string>
<string name="skip_queue_button_text">Evitar por $%1$s</string>
<string name="account_undergo_review">Esta cuenta debe someterse a revisión antes de poder participar en el programa de recompensas. Esto puede llevar desde varios minutos hasta varios días.</string>
<string name="get_instantly_verified">Puedes ser verificado instantáneamente para poder participar en el programa de recompensas usando tu cuenta de Twitter u omitiendo la cola de verificación manual.</string>
<string name="twitter_verification">Verificación de Twitter</string>
<string name="twitter_verification_desc">Obtén una verificación instantánea con tu cuenta de Twitter. Su dirección de correo electrónico de Twitter debe coincidir con el correo electrónico que proporcionó y su cuenta debe estar activa.</string>
<string name="twitter_verify">Verificar con Twitter</string>
<string name="skip_queue_verification">Evitar la cola de espera</string>
<string name="skip_queue_verification_desc">Omite la cola de verificación manual pagando una tarifa para comenzar a participar en el programa de recompensas de inmediato.</string>
<string name="request_to_be_verified">Por favor solicita ser verificado en el &lt;a href=\"https://discordapp.com/invite/Z3bERWA\"&gt;Servidor LBRY de Discord&lt;/a&gt;.</string>
<string name="enjoy_free_content">¡Mientras tanto, disfruta de contenido gratuito!</string>
<string name="verify_phone_number">Verificar número de teléfono</string>
<string name="enter_phone_verify_code">Ingrese el código de verificación enviado a %1$s</string>
@@ -431,6 +451,13 @@
<string name="please_enter_valid_phone">Por favor ingrese un número de teléfono válido.</string>
<string name="please_enter_verification_code">Ingrese el código de verificación enviado a su número de teléfono.</string>
<string name="fetch_current_user_error">La cuenta de usuario no pudo ser obtenida. Por favor, inténtelo de nuevo más tarde.</string>
<string name="purchase_request_pending">Su solicitud de compra aún está siendo procesada. Por favor envía un correo electrónico a support@lbry.com</string>
<string name="purchase_request_failed_error">Su solicitud de compra no pudo ser completada en este momento. Por favor envía un correo electrónico a support@lbry.com</string>
<string name="twitter_account_ineligible">Su cuenta de Twitter no es elegible en este momento: %1$s</string>
<string name="twitter_verification_not_approved">Su cuenta no fue aprobada para el programa de recompensas. Por favor, inténtelo de nuevo más tarde.</string>
<string name="twitter_verification_failed">Falló la verificación de Twitter. Por favor, inténtelo de nuevo más tarde.</string>
<string name="reward_verification_successful">¡Ahora eres elegible para participar en el programa de recompensas!</string>
<!-- Forms -->
<string name="no_added_tags">Aún no ha agregado ninguna etiqueta. Agregue etiquetas para mejorar el alcance.</string>
<string name="form_no_tag_results">No pudimos encontrar nuevas etiquetas que aún no se hayan agregado.</string>
@@ -446,6 +473,7 @@
<string name="channel_deleted">El canal se eliminó correctamente.</string>
<string name="channel_failed_delete">El canal no se pudo eliminar en este momento. Por favor, inténtelo de nuevo más tarde.</string>
<string name="description">Descripción</string>
<string name="follow">Seguir</string>
<string name="yes">Sí</string>
<string name="no">No</string>
<string name="show_optional_fields">Mostrar campos adicionales</string>
@@ -455,7 +483,7 @@
<string name="title">Titulo</string>
<string name="at">\@</string>
<string name="deposit">Depositar</string>
<string name="deposit_remains_yours">Estos LBC siguen siendo tuyos, Este es un deposito para reservar el nombre y puede ser deshecho en cualquier momento.</string>
<string name="deposit_remains_yours">Estos créditos siguen siendo tuyos, Este es un depósito para reservar el nombre y puedes deshacerlo en cualquier momento.</string>
<string name="storage_permission_rationale_download">LBRY requiere acceso para descargar contenido a su dispositivo.</string>
<string name="storage_permission_rationale_images">LBRY requiere acceso para cargar imágenes desde el almacenamiento de su dispositivo.</string>
<string name="select_thumbnail">Seleccionar miniatura</string>
@@ -464,6 +492,7 @@
<string name="wait_for_upload">Espera a que finalice la carga actual.</string>
<string name="image_upload_failed">La solicitud de carga de la imagen ha fallado. Inténtalo de nuevo.</string>
<string name="uploading">Subiendo...</string>
<string name="uploading_thumbnail">Subiendo miniatura...</string>
<string name="please_enter_channel_name">Por favor ingrese un nombre de canal.</string>
<string name="channel_name_invalid_characters">El nombre de tu canal contiene caracteres no válidos.</string>
<string name="channel_name_already_created">Ya has creado un canal con el mismo nombre.</string>
@@ -489,7 +518,7 @@
</plurals>
<!-- Rewards -->
<string name="lbry_credits_allow">Los créditos LBRY le permiten publicar o comprar contenido.</string>
<string name="lbry_credits_allow">Los Créditos LBRY le permiten publicar o comprar contenido.</string>
<string name="free_credits_worth">Puede obtener créditos gratuitos por valor de $%1$s después de proporcionar una dirección de correo electrónico.</string>
<string name="rewards_learn_more">&lt;a href=\"https://lbry.com/faq/earn-credits\"&gt;Aprender más&lt;/a&gt;.</string>
<string name="get_started">Empezar</string>
@@ -601,4 +630,11 @@
<string name="cannot_find_lbrynet_log">No se pudo encontrar el archivo lbrynet.log.</string>
<string name="cannot_share_lbrynet_log">El archivo lbrynet.log no se puede compartir debido a restricciones de permisos.</string>
<!-- Notifications -->
<string name="no_notifications">¡Está tranquilo por aquí! Las nuevas notificaciones se mostrarán cuando las reciba.</string>
<plurals name="confirm_delete_notifications">
<item quantity="one">¿Estás seguro que deseas eliminar la notificación seleccionada?</item>
<item quantity="other">¿Estás seguro que deseas eliminar las notificaciones seleccionadas?</item>
</plurals>
</resources>
-22
View File
@@ -27,7 +27,6 @@
<string name="welcome_to_lbry">Tere tulemast LBRY -sse.</string>
<string name="welcome_paragraph">LBRY on kasutajate kontrolli all olev avaldamisplatvorm, kust võib leida ja kus saab ise avaldada videoid, muusikat, raamatuid ja palju muud.</string>
<string name="welcome_tos">Jätkates nõustute &lt;a href=\"https://lbry.com/termsofservice\"&gt;kasutustingimustega&lt;/a&gt; ja kinnitate, et olete vanem kui 13.</string>
<string name="welcome_please_wait">Palun oota, seame esiteks mõned asjad joonde...</string>
<string name="use_lbry">LBRYt kasutama</string>
<!-- URI bar -->
@@ -39,7 +38,6 @@
<string name="discover">Avasta</string>
<string name="lbry_works_better">LBRY töötab paremini, kui sul on jälgimises vähemalt 5 kanalit. Sisse logides näed kanaleid mis sul juba on jälgimisel.</string>
<string name="select_five_subscriptions">Jätkamiseks vali kuni 5 autorit.</string>
<string name="n_remaining">%1$d jäänud...</string>
<string name="done">Tehtud</string>
<string name="all">Kõik</string>
<string name="discover_channels">Avasta uusi kanaleid</string>
@@ -57,7 +55,6 @@
<string name="download">Lae alla</string>
<string name="open">Ava</string>
<string name="report">Raporteeri</string>
<string name="loading_decentralized_data">Laen detsentraliseeritud andmeid...</string>
<string name="related_content">Seotud materjalid</string>
<string name="share_lbry_content">Jaga LBRY materjale</string>
<string name="view">Kuva</string>
@@ -86,7 +83,6 @@
<item quantity="one">Sellega ostad \"%1$s\" hinnaga %2$s LBC</item>
<item quantity="other">Sellega ostad \"%1$s\" hinnaga %2$s LBC</item>
</plurals>
<!-- Channel view -->
<string name="no_channel_info">Siin pole praegu midagi.\nPalun proovi hiljem uuesti.</string>
<string name="content">Sisu</string>
@@ -101,7 +97,6 @@
<string name="take_photo">Tee foto</string>
<string name="upload_file">Lae fail üles</string>
<string name="no_videos_found">Sinu seadmes ei leidunud videosid. Alustamiseks tee foto või salvesta video.</string>
<string name="loading_videos">Laen sinu videosid...</string>
<string name="storage_permission_rationale_videos">Failide postitamiseks ja näitamiseks vajab LBRY ligipääsu sinu failidele.</string>
<string name="camera_permission_rationale_record">Videosalvestuse võimaldamiseks vajab LBRY ligipääsu kaamerale.</string>
<string name="camera_permission_rationale_photo">Fotode tegemiseks vajab LBRY ligipääsu sinu kaamerale.</string>
@@ -178,7 +173,6 @@
<string name="cca_nc_nd_4_0_international">Creative Commons Autorile viitamine, mitteäriline eesmärk, tuletatud teoste keeld 4.0 International</string>
<string-array name="publish_currencies">
<item>LBC</item>
<item>USD</item>
</string-array>
@@ -197,12 +191,10 @@
<string name="oops_something_went_wrong">Vabandust, midagi läks valesti.</string>
<string name="installation_id_loaded">Installi ID laetud.</string>
<string name="known_tags_loaded">Laadisin kasutuselolevad sildid.</string>
<string name="exchange_rate_loaded">Laadisin LBC/USD vahetuskursi.</string>
<string name="user_authenticated">Kasutaja autenditud.</string>
<string name="installation_registered">Install registreeritud.</string>
<string name="subscriptions_loaded">Tellimused laetud.</string>
<string name="subscriptions_resolved">Tellimusaadressid lahendatud.</string>
<!-- Settings -->
<string name="user_interface">Sisu &amp; Kasutajaliides</string>
<string name="other">Muud</string>
@@ -212,10 +204,8 @@
<string name="notifications">Teavitused</string>
<string name="subscriptions">Tellimused</string>
<string name="content_interests">Sisuhuvid</string>
<string name="keep_sdk_in_background">Hoia LBRY taustateenus käimas peale rakenduse sulgemist, abistamaks parandada LBRY võrgu jõudlust.</string>
<string name="participate_in_data_network">Osale LBRY andmeside võrgus (vajab rakenduse ja taustateenuste restarti)</string>
<!-- URL suggestions -->
<string name="search_url_title">%1$s - otsing</string>
<string name="tag_url_title">%1$s - silt</string>
@@ -240,7 +230,6 @@
<string name="in_your_publishes">sinu postitustes</string>
<string name="in_your_supports">sinu toetustes</string>
<string name="earn_more_tips">Teeni lisapreemiaid laadides üles huvitavaid videosid</string>
<string name="sdk_initializing">Taustateenus käivitub...</string>
<string name="sdk_still_initializing">Taustateenus veel stardib. Võid seniks postitusi sirvida.</string>
<string name="sdk_initializing_functionality">Seda ei saa hetkel teha, kuna taustateenus pole veel käivitunud.</string>
@@ -280,8 +269,6 @@
<string name="manual_backup">&lt;a href=\"https://lbry.com/faq/how-to-backup-wallet#android\"&gt;Käsitsi varukoopia&lt;/a&gt;</string>
<string name="sync_faq">&lt;a href=\"https://lbry.com/faq/how-to-backup-wallet#sync\"&gt;Sync KKK&lt;/a&gt;</string>
<string name="zero">0</string>
<string name="lbc">LBC</string>
<string name="account_recommended">Soovitame konto loomist</string>
<string name="wallet_account_desc">Konto lbry.tv saidil võimaldab sul teenida preemiaid, teha varukoopiat oma rahakotist ja rakenduse seadeid sünkroniseerida.</string>
<string name="wallet_without_account">Ilma kontota jääb sinu vastutusele rahakoti varukoopia tegemine.</string>
@@ -293,7 +280,6 @@
<string name="insufficient_balance">Ebapiisav saldo</string>
<string name="invalid_amount">Palun sisesta summa</string>
<string name="send_credit_error">Raha ei õnnestunud hetkel saata. Palun proovi hiljem uuesti.</string>
<string name="loading_transactions">Laen tehinguid...</string>
<string name="no_recent_transactions">Viimatiseid kandeid pole.</string>
<string name="no_transactions">Kandeid pole.</string>
<string name="tx_list_fee">teenustasu %1$s</string>
@@ -363,8 +349,6 @@
<string name="provide_valid_email">Sisesta kehtiv emailiaadress</string>
<string name="please_follow_instructions">Jätkamiseks järgi juhiseid, mis me sinu emailile saatsime.</string>
<string name="sign_in_successful">Oled edukalt lbry.tv saidile sisse loginud.</string>
<string name="retrieving_account_information">Laen konto infot...</string>
<string name="apply_wallet_data">Töötlen rahakoti andmeid...</string>
<string name="please_enter_your_password">Sisesta salasõna oma rahakoti dekrüptimiseks.</string>
<string name="please_enter_a_password">Sisesta salasõna oma rahakoti enkrüptimiseks.</string>
<string name="wallet_security_purposes">Infoks: rahakoti turvalisuse huvides ei saa LBRY sinu salasõna muuta ega tühistada.</string>
@@ -390,7 +374,6 @@
<!-- Channels -->
<string name="no_channel_created">Sa pole veel kanalit loonud.\nAlustuseks tekita uus kanal.</string>
<string name="create_a_channel">Tekita kanal</string>
<string name="create_a_channel_item">Tekita kanal...</string>
<string name="edit_channel">Muuda kanalit</string>
<string name="delete_selection">Kustutan valitud?</string>
<string name="delete_channel">Kustutan kanali?</string>
@@ -407,7 +390,6 @@
<string name="title">Pealkiri</string>
<string name="at">\@</string>
<string name="deposit">Deposiit</string>
<string name="deposit_remains_yours">LBC jääb sinu omaks. See on hoiustatud nime reserveerimiseks ja seda saab igal ajal tühistada.</string>
<string name="storage_permission_rationale_download">Failide allalaadimiseks vajab LBRY ligipääsu sinu failidele.</string>
<string name="storage_permission_rationale_images">Piltide laadimiseks vajab LBRY rakendus ligipääsu salvestusseadmele.</string>
<string name="select_thumbnail">Vali pisipilt</string>
@@ -415,7 +397,6 @@
<string name="undetermined_image_filepath">Valitud pildi teekonda ei suudetud tuvastada. Palun vali pilt mõnes muus asukohas.</string>
<string name="wait_for_upload">Palun oota kuni käimasolev üleslaadimine lõpetab.</string>
<string name="image_upload_failed">Pildi üleslaadimine ebaõnnestus. Palun proovi uuesti.</string>
<string name="uploading">Laen üles...</string>
<string name="please_enter_channel_name">Sisesta kanalinimi.</string>
<string name="channel_name_invalid_characters">Kanalinimi sisaldab ebasobivaid tähemärke.</string>
<string name="channel_name_already_created">Oled sellenimelise kanali juba tekitanud.</string>
@@ -440,8 +421,6 @@
<item quantity="other">Kanalid edukalt kustutatud.</item>
</plurals>
<!-- Rewards -->
<string name="lbry_credits_allow">LBRY raha LBC võimaldab sul avaldada või osta avaldatud materjale.</string>
<string name="free_credits_worth">Pakume sulle %1$s LBC kui registreerid oma emailiaadressi.</string>
<string name="rewards_learn_more">&lt;a href=\"https://lbry.com/faq/earn-credits\"&gt;Loe lisa&lt;/a&gt;.</string>
<string name="get_started">Alusta siit</string>
@@ -529,7 +508,6 @@
<string name="get_social">Sotsiaalmeedia</string>
<string name="social_paragraph">LBRY meeskonna ja LBRY kasutajatega saab suhelda Discordis, Facebookis, Instagramis, Twitteris või Redditis.</string>
<string name="app_info">Rakenduse info</string>
<string name="loading">Laadin...</string>
<string name="about_link_what_is_lbry">&lt;a href=\"https://lbry.com/faq/what-is-lbry\"&gt;Mis on LBRY?&lt;/a&gt;</string>
<string name="about_link_android_basics">&lt;a href=\"https://lbry.com/faq/android-basics\"&gt;Androidi põhiteadmised&lt;/a&gt;</string>
<string name="about_link_faq">&lt;a href=\"https://lbry.com/faq\"&gt;KKK&lt;/a&gt;</string>
-605
View File
@@ -1,605 +0,0 @@
<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
<string name="app_name">LBRY</string>
<string name="navigation_drawer_open">Avaa navigointilaatikko</string>
<string name="navigation_drawer_close">Sulje navigointilaatikko</string>
<!-- Nav menu -->
<string name="find_content">Etsi sisältöä</string>
<string name="your_content">Sinun sisältö</string>
<string name="wallet">Lompakko</string>
<string name="following">Seuraamassa</string>
<string name="editors_choice">Toimittajan valinta</string>
<string name="your_tags">Sinun Tunnisteet</string>
<string name="all_content">Kaikki sisältö</string>
<string name="channels">Kanavat</string>
<string name="library">Kirjasto</string>
<string name="publishes">Julkaisut</string>
<string name="new_publish">Uusi julkaisu</string>
<string name="rewards">Palkinnot</string>
<string name="invites">Kutsut</string>
<string name="settings">Asetukset</string>
<string name="about">Noin</string>
<string name="sign_in">Kirjaudu sisään</string>
<string name="startup_failed">Sovelluksen käynnistys epäonnistui. Tarkista datayhteys ja yritä uudelleen. Jos tämä ongelma jatkuu, lähetä sähköpostia osoitteeseen hello@lbry.com</string>
<string name="no_claim_search_content">Ei näytettävää sisältöä tällä hetkellä. Tarkenna valintaasi tai tarkista myöhemmin uudelleen.</string>
<!-- Welcome Page -->
<string name="welcome_to_lbry">Tervetuloa LBRY:lle</string>
<string name="welcome_paragraph">LBRY on yhteisön ohjaama sisältöalusta, josta voit löytää ja julkaista videoita, musiikkia, kirjoja ja paljon muuta.</string>
<string name="welcome_tos">Jatkamalla, hyväksyn &lt;a href=\"https://lbry.com/termsofservice\"&gt;Terms of Service&lt;/a&gt; ja vahvistan että olen yli 13vuotias.</string>
<string name="welcome_please_wait">Odota, kunnes saamme asiat valmiiksi ...</string>
<string name="use_lbry">Käytä LBRY »</string>
<!-- URI bar -->
<string name="uri_placeholder">Etsi videoita, musiikkia ja muuta</string>
<!-- Following page -->
<string name="find_channels_to_follow">Etsi seurattavat kanavat</string>
<string name="channels_you_follow">Kanavat joita seuraat</string>
<string name="discover">Tutustu</string>
<string name="lbry_works_better">LBRY toimii paremmin, jos seuraat vähintään 5 haluamaasi tekijää. Kirjaudu sisään näyttääksesi seuraamasi tekijät, jos sinulla on jo tili.</string>
<string name="select_five_subscriptions">Valitse enintään 5 tekijää jatkaaksesi.</string>
<string name="n_remaining">%1$djäljellä...</string>
<string name="done">Tehty</string>
<string name="all">Kaikki</string>
<string name="discover_channels">Löydä uusia kanavia</string>
<!-- Claim lists -->
<string name="anonymous">Anonyymi</string>
<!-- File view -->
<string name="tags">Tunnisteet</string>
<string name="share">Jaa</string>
<string name="repost">Repost</string>
<string name="tip">Tippi</string>
<string name="edit">Muokkaa</string>
<string name="delete">Poista</string>
<string name="download">Lataa</string>
<string name="open">Avoin</string>
<string name="report">Ilmianna</string>
<string name="loading_decentralized_data">Ladataan hajautettua tietoa ...</string>
<string name="related_content">Samankaltaista sisältöä</string>
<string name="comments">Kommentit</string>
<string name="no_comments">Ei kommentteja näytettäväksi tällä hetkellä.</string>
<string name="sdk_initializing_comments">Kommentit tulevat näkyviin, kun taustapalvelu on alustettu.</string>
<string name="comment_error">Kommenttiasi ei voitu lähettää tällä hetkellä. Yritä uudelleen myöhemmin.</string>
<string name="share_lbry_content">Jaa LBRY-sisältö</string>
<string name="view">Näytä</string>
<string name="play">Toista</string>
<string name="unsupported_content">Ei tuettu sisältö</string>
<string name="unsupported_content_desc">Valitettavasti emme pysty näyttämään tätä sisältöä sovelluksessa. Löydät tiedoston %1$s latauskansiostasi.</string>
<string name="nothing_at_this_location">Tässä paikassa ei ole mitään.</string>
<string name="publish_something_here">Julkaise jotain täällä</string>
<string name="cannot_view_claim">Tätä sisältöä ei voida käyttää tällä hetkellä. Yritä uudelleen myöhemmin.</string>
<string name="zero_duration">0:00</string>
<string name="claim_file_not_found">Tiedostoa kohteessa \"%1$s\" ei ole.</string>
<string name="confirm_purchase">Vahvista ostos</string>
<string name="delete_file">Poista tiedosto</string>
<string name="confirm_delete_file_message">Haluatko varmasti poistaa tämän tiedoston laitteestasi?</string>
<string name="unable_to_view_url">Lataus epäonnistui %1$s.Yritä uudelleen myöhemmin.</string>
<string name="no_cast_session_available">Tällä hetkellä ei ole saatavana suoratoistoistuntoa.</string>
<string name="delete_content">Poistetaanko sisältö?</string>
<string name="confirm_delete_content_message">Haluatko varmasti poistaa tämän sisällön julkaisun? Laitteistasi ei poisteta tiedostoja.</string>
<string name="content_deleted">Sisältö poistettiin onnistuneesti lohkoketjusta.</string>
<string name="content_failed_delete">Sisältöä ei voitu poistaa tällä hetkellä. Yritä uudelleen myöhemmin.</string>
<string name="comment">Kommentti</string>
<string name="comment_as">Kommentoi nimellä</string>
<string name="please_enter_comment">Kirjoita kommentti lähettääksesi viestin.</string>
<string name="please_select_channel">Valitse kanava, johon haluat lähettää kommenttisi.</string>
<string name="comment_posted">Kommenttisi lähetetty onnistuneesti.</string>
<string name="please_select_repost_channel">Valitse kanava, johon haluat lähettää uudelleen.</string>
<string name="reply">Vastaa</string>
<string name="replying_to">Vastaa käyttäjille %1$s</string>
<plurals name="post_and_tip">
<item quantity="one">Posti- ja tip-l%1$s uottotiedot?</item>
<item quantity="other">Posti- ja tippi %1$s krediitit?</item>
</plurals>
<plurals name="post_for_credits">
<item quantity="one">Lähetä %1$s krediitillä</item>
<item quantity="other">Post for %1$scredits</item>
</plurals>
<plurals name="confirm_post_comment">
<item quantity="one">Tämä lähettää kommenttisi %1$s hyvityksellä %2$s</item>
<item quantity="other">Tämä lähettää kommenttisi %1$s hyvityksellä %2$s</item>
</plurals>
<plurals name="view_count">
<item quantity="one">%1$s Näyttökertaa</item>
<item quantity="other">%1$s Näyttökertaa</item>
</plurals>
<plurals name="confirm_purchase_message">
<item quantity="one">Tämä ostos \"%1$s\" maksaa %2$s Crediittiä</item>
<item quantity="other">Tämä ostos \"%1$s\" maksaa %2$s Crediittiä</item>
</plurals>
<!-- Channel view -->
<string name="no_channel_info">Täällä ei ole vielä mitään.\nTarkista myöhemmin uudelleen.</string>
<string name="content">Sisältö</string>
<string name="website">Nettisivu</string>
<string name="reposted">uudelleen julkaistu</string>
<plurals name="follower_count">
<item quantity="one">%1$s Seuraaja</item>
<item quantity="other">%1$s Seuraajaa</item>
</plurals>
<!-- Publish -->
<string name="no_publishes_created">Näyttää siltä, että et ole vielä julkaissut sisältöä LBRY: lle.</string>
<string name="record">Tallentaa</string>
<string name="take_photo">Ota kuva</string>
<string name="upload_file">Lähetä tiedosto</string>
<string name="no_videos_found">Laitteestasi ei löytynyt videoita. Ota valokuva tai nauhoita video aloittaaksesi.</string>
<string name="loading_videos">Odota, kun lataamme videoitasi ...</string>
<string name="storage_permission_rationale_videos">LBRY vaatii pääsyn voidaksesi näyttää ja julkaista videoitasi, kuvia ja muita tiedostoja laitteeltasi.</string>
<string name="camera_permission_rationale_record">LBRY vaatii pääsyn kameraan videoiden tallentamiseksi.</string>
<string name="camera_permission_rationale_photo">LBRY vaatii pääsyn kameraan valokuvien ottamista varten.</string>
<string name="edit_content">Muokkaa sisältöä</string>
<string name="mature_tags">Kypsät tunnisteet</string>
<string name="price">Hinta</string>
<string name="free_publish">Sisältösi on ilmaista. Aseta hinta painamalla kytkintä.</string>
<string name="content_address">Sisältöosoite</string>
<string name="randomize">Satunnainen</string>
<string name="address">Osoite</string>
<string name="content_address_desc">Osoite, josta ihmiset voivat löytää sisältösi (esim. Lbry://myvideo)</string>
<string name="license">Lisenssi</string>
<string name="license_desc">Kuvaus</string>
<string name="additional_options">Lisävaihtoehtoja</string>
<string name="show_extra_fields">Näytä ylimääräiset kentät</string>
<string name="hide_extra_fields">Piilota ylimääräiset kentät</string>
<string name="no_file_found">Tiedostoa ei löytynyt julkaistavaksi.</string>
<string name="publish_invalid_claim_type">Muokkaamiseen määritetty virheellinen vaatimus.</string>
<string name="video_optimization">Videon optimointi</string>
<string name="thumbnail_creation_failed">Pikkukuvaa ei voitu luoda automaattisesti sisältötiedostostasi.</string>
<string name="video_being_optimized">Videosi on optimoitu paremman tuen tarjoamiseksi monille laitteille. Voit täyttää jäljellä olevat kentät alla, kun tämä on käynnissä.</string>
<string name="video_optimized">Videosi optimoitiin onnistuneesti parempaan toistoon mahdollisimman monissa laitteissa. Jatka julkaisemasi sisältöä.</string>
<string name="video_optimize_failed">Videota ei voitu optimoida. Tiedosto ladataan ilman muutoksia.</string>
<string name="completed_video_duration">Valmistunut videon kesto: %1$s</string>
<string name="sdk_initializing_publish">Et voi julkaista sisältöä tällä hetkellä, koska taustapalvelu on edelleen alustamassa.</string>
<string name="publish_successful">Sisällön julkaiseminen onnistui. Voi kestää hetken, että näyttöön pääsyketju.</string>
<string name="transcode_in_progress">Videon optimointi on käynnissä. Jos haluat peruuttaa, paina Peruuta sivun alaosassa.</string>
<string name="optimization_in_progress">Videon optimointi on käynnissä.</string>
<string name="cannot_capture_video">Tällä laitteella ei ole käytettävissä kamerasovellusta videoiden nauhoittamiseen.</string>
<string name="cannot_take_photo">Tällä laitteella ei ole käytettävissä kamerasovellusta valokuvien ottamiseen.</string>
<string name="please_provide_title">Anna otsikko.</string>
<string name="please_specify_address">Määritä osoite, josta ihmiset voivat löytää sisältösi.</string>
<string name="address_invalid_characters">Sisältöosoitteesi sisältää virheellisiä merkkejä.</string>
<string name="address_already_used">Olet jo julkaissut määritettyyn sisältöosoitteeseen. Anna uusi osoite.</string>
<string name="no_file_selected">Ei tiedostoa valittuna. Valitse video tai ota valokuva tai valitse tiedosto ennen julkaisemista.</string>
<string name="price_amount_not_set">Anna hinta tai kytke kytkin pois päältä, jotta sisältösi on ilmaista.</string>
<string name="publish_no_thumbnail">Valitse ladattava pikkukuva ennen julkaisua.</string>
<string name="publish_thumbnail_in_progress">Odota, että pikkukuva latautuu loppuun ennen julkaisua.</string>
<string name="language">Kieli</string>
<string name="english">Englanti</string>
<string name="chinese">Kiina</string>
<string name="french">Ranska</string>
<string name="german">Saksa</string>
<string name="japanese">Japani</string>
<string name="russian">Venäjä</string>
<string name="spanish">Espanja</string>
<string name="indonesian">Indoneesia</string>
<string name="italian">Italia</string>
<string name="dutch">Hollanti</string>
<string name="turkish">Turkki</string>
<string name="polish">Puola</string>
<string name="malay">Malaiji</string>
<string name="portuguese">Portugali</string>
<string name="vietnamese">Vietnami</string>
<string name="thai">Thaimaa</string>
<string name="arabic">Arabi</string>
<string name="czech">Tshekki</string>
<string name="croatian">Kroatia</string>
<string name="cambodian">Kambodžan</string>
<string name="korean">Korea</string>
<string name="norwegian">Norja</string>
<string name="romanian">Romaania</string>
<string name="hindi">Hindi</string>
<string name="greek">Kreikka</string>
<string name="catalan">Katalaani</string>
<string name="none">Ei mitään</string>
<string name="public_domain">Julkinen</string>
<string name="copyrighted">Tekijänoikeudella suojattuja ...</string>
<string name="cca_4_0_international">Creative Commons Attribution 4.0 International</string>
<string name="cca_sa_4_0_international">Creative Commons Attribution-ShareAlike 4.0 International</string>
<string name="cca_nd_4_0_international">Creative Commons Attribution-NoDerivatives 4.0 International</string>
<string name="cca_nc_4_0_international">Creative Commons Attribution-NonCommercial 4.0 International</string>
<string name="cca_nc_sa_4_0_international">Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International</string>
<string name="cca_nc_nd_4_0_international">Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International</string>
<string-array name="publish_currencies">
<item>LBC</item>
<item>USD</item>
</string-array>
<!-- Publishes -->
<string name="one_or_more_publishes_failed_abandon">Yhtä tai useampaa sisältökohdetta ei voitu poistaa tällä hetkellä. Yritä uudelleen myöhemmin.</string>
<plurals name="confirm_delete_publishes">
<item quantity="one">Haluatko varmasti poistaa valitut sisältökohteet?</item>
<item quantity="other">Haluatko varmasti poistaa valitut sisältökohteet?</item>
</plurals>
<plurals name="publishes_deleted">
<item quantity="one">Sisältökohteet poistettiin onnistuneesti.</item>
<item quantity="other">Sisältökohteet poistettiin onnistuneesti.</item>
</plurals>
<!-- Splash -->
<string name="oops_something_went_wrong">Oho! Jotain meni pieleen.</string>
<string name="installation_id_loaded">Ladattu asennustunnus.</string>
<string name="known_tags_loaded">Ladattu paikalliset tunnetut ja seuratut tunnisteet.</string>
<string name="exchange_rate_loaded">Ladattu LBC / USD-vaihtokurssi.</string>
<string name="user_authenticated">Käyttäjän todennettu.</string>
<string name="installation_registered">Asennus rekisteröity.</string>
<string name="subscriptions_loaded">Ladatut tilaukset.</string>
<string name="subscriptions_resolved">Ratkaistut tilaukset.</string>
<!-- Settings -->
<string name="user_interface">Content &amp; Käyttäjä näkymä</string>
<string name="other">Muu</string>
<string name="enable_background_playback">Ota taustamedian toisto käyttöön</string>
<string name="enable_dark_mode">Ota tumma teema käyttöön</string>
<string name="show_mature_content">Näytä kypsä sisältö</string>
<string name="show_url_suggestions">Näytä URL-ehdotukset</string>
<string name="notifications">Ilmoitukset</string>
<string name="subscriptions">Tilaukset</string>
<string name="content_interests">Sisältö kiinnostaa</string>
<string name="keep_sdk_in_background">Pidä LBRY-palvelu käynnissä taustalla parantaaksesi lompakkoa ja verkon suorituskykyä</string>
<string name="participate_in_data_network">Osallistu tietoverkkoon (vaatii sovelluksen ja taustapalvelun uudelleenkäynnistyksen)</string>
<!-- URL suggestions -->
<string name="search_url_title">%1$s - Etsi</string>
<string name="tag_url_title">%1$s - Tunniste</string>
<string name="search_url_desc">Etsi \'%1$s\'</string>
<string name="explore_tag_url_desc">Tutustu \'%1$s\' Tunnisteeseen</string>
<string name="view_file_url_desc">Näytä sisältöä %1$s</string>
<string name="view_channel_url_desc">Näytä %1$s kanava</string>
<!-- Search -->
<string name="search_no_results">Ei tuloksia, joita näyttää \'%1$s\'. Kokeile toista hakutermiä.</string>
<string name="search_no_query">Voit etsiä mitä tahansa, mukaan lukien elokuvat, musiikki, e-kirjat, ohjelmistot ja paljon muuta.</string>
<string name="no_related_content">Ei liittyvää sisältöä näytettäväksi tällä hetkellä.</string>
<!-- Wallet -->
<string name="balance">Saldo</string>
<string name="you_currently_have">Sinulla on tällä hetkellä</string>
<string name="convert_credits">Voit muuntaa luotosi USD: iin ja nostaa muunnetun summan vaihdon avulla. &lt;a href=\"https://lbry.com/faq/exchanges\"&gt;Learn more&lt;/a&gt;.</string>
<string name="convert_credits_bittrex">&lt;a href=\"https://bittrex.com/Account/Register?referralCode=4M1-P30-BON\"&gt;Convert Muunna hyvitykset USD: ksi Bittrexillä&lt;/a&gt;</string>
<string name="you_also_have">Sinulla on myös</string>
<string name="you_staked">Olet panostanut</string>
<string name="in_tips">Lahjoituksissa</string>
<string name="in_your_publishes">julkaisuissasi</string>
<string name="in_your_supports">tuillasi</string>
<string name="earn_more_tips">Ansaitse lisää vinkkejä lähettämällä hienoja videoita</string>
<string name="sdk_initializing">Taustapalvelu alustetaan ...</string>
<string name="sdk_still_initializing">Taustapalvelu on edelleen alustamassa. Voit tutkia ja katsella sisältöä sillä välin.</string>
<string name="sdk_initializing_functionality">Et voi tehdä tätä nyt, koska taustapalvelu on edelleen käynnistymässä.</string>
<string name="backup_synced">Varmuuskopio lompakostasi synkronoidaan lbry.tv-tiedoston kanssa</string>
<string name="backup_notsynced">Lompakkoasi ei ole tällä hetkellä synkronoitu lbry.tv: n kanssa. Olet vastuussa lompakkosi varmuuskopiosta.</string>
<string name="synced_what_does_this_mean">&lt;a href=\"https://lbry.com/faq/account-sync\"&gt;What Mitä se tarkoittaa?&lt;/a&gt;</string>
<string name="backup_what_does_this_mean">&lt;a href=\"https://lbry.com/faq/how-to-backup-wallet#android\"&gt;What Mitä se tarkoittaa?&lt;/a&gt;</string>
<string name="receive_credits">Saa krediittejä</string>
<string name="use_this_address_hint">Käytä tätä lompakko-osoitetta saadaksesi toisen käyttäjän (tai itsesi) lähettämiä krediittejä.</string>
<string name="get_new_address">Saa uusi osoite</string>
<string name="generate_address_hint">Voit luoda uuden osoitteen milloin tahansa, ja kaikki aiemmat osoitteet toimivat edelleen. Useiden osoitteiden käyttäminen voi olla hyödyllistä seurata useista lähteistä tulevia maksuja.</string>
<string name="send_credits">Lähetä krediittejä</string>
<string name="recipient_address">Vastaanottajan osoite</string>
<string name="recipient_address_placeholder">bbFxRyXXXXXXXXXXXZD8nE7XTLUxYnddTs</string>
<string name="amount">Määrä</string>
<string name="send">Lähetä</string>
<string name="recent_transactions">Viimeaikaiset tapahtumat</string>
<string name="view_all">Näytä kaikki</string>
<string name="receive">Vastaanota</string>
<string name="spend">Tuhlaa</string>
<string name="publish">Julkaise</string>
<string name="support">Tue</string>
<string name="abandon">Hylätä</string>
<string name="channel">Kanava</string>
<string name="channel_update">Kanavan päivitys</string>
<string name="publish_update">Julkaise päivitys</string>
<string name="wallet_sync">Synkronoi lompakko</string>
<string name="sync_status">Synkronoinnin tila</string>
<string name="on">Päällä</string>
<string name="off">Kiinni</string>
<string name="email">Sähköposti</string>
<string name="no_connected_email">Ei yhdistettyjä sähköposteja</string>
<string name="manual_backup">&lt;a href=\"https://lbry.com/faq/how-to-backup-wallet#android\"&gt;Manual Manuaalinen palautus&lt;/a&gt;</string>
<string name="sync_faq">&lt;a href=\"https://lbry.com/faq/how-to-backup-wallet#sync\"&gt;Sync FAQ&lt;/a&gt;</string>
<string name="zero">0</string>
<string name="lbc">LBC</string>
<string name="account_recommended">Suositellut tilit</string>
<string name="wallet_account_desc">Lbry.tv-tilin avulla voit ansaita palkintoja, varmuuskopioida lompakkosi ja pitää kaiken synkronoituna.</string>
<string name="wallet_without_account">Ilman tiliäsi olet vastuussa lompakon ja LBRY-tietojen suojaamisesta.</string>
<string name="skip_account">Ohita tili</string>
<string name="sign_up">Rekisteröidy</string>
<string name="address_copied">Osoite kopioitu</string>
<string name="invalid_recipient_address">Anna kelvollinen osoite, johon haluat lähettää hyvityksiä</string>
<string name="insufficient_balance">Riittämätön tasapaino</string>
<string name="invalid_amount">Anna oikea summa</string>
<string name="send_credit_error">Hyvityksiäsi ei voitu lähettää tällä hetkellä. Yritä uudelleen myöhemmin.</string>
<string name="loading_transactions">Ladataan tapahtumia ...</string>
<string name="no_recent_transactions">Viimeisimmät näytettävät tapahtumat eivät ole.</string>
<string name="no_transactions">Tällä hetkellä ei ole näkyviä tapahtumia.</string>
<string name="tx_list_fee">maksu %1$s</string>
<string name="transaction_history">Tapahtumahistoria</string>
<string name="unlock">Avata</string>
<string name="unlock_tips">Avaako tippejä?</string>
<string name="confirm_unlock_tips">Haluatko varmasti avata kaikki tippisi?</string>
<string name="min_spend_required">Anna summa, joka on enemmän kuin 0,0001 krediittiä.</string>
<string name="buy_lbc">Osta LBC</string>
<string name="hash_not_supported">Laitteesi ei tue vähimmäisvaatimuksia ostopyynnön turvaamiseksi.</string>
<string name="receive_address_not_set">Sinulla ei ole lompakon osoitetta määritetty. Luo uusi osoite ja yritä uudelleen.</string>
<plurals name="you_sent_credits">
<item quantity="one">Sinä lähetät %1$s krediittiä</item>
<item quantity="other">Sinä lähetät %1$s krediittiä</item>
</plurals>
<!-- Dialogs -->
<string name="customize_your_tags">Muokkaa sinun tunnisteita</string>
<string name="sort_content_by">Lajittele sisältö</string>
<string name="content_from">Sisältö</string>
<string name="trending_content">Trendikäs sisältö</string>
<string name="new_content">Uusi sisältö</string>
<string name="top_content">Suosituin sisältö</string>
<string name="trending">Nousussa</string>
<string name="top">Paras</string>
<string name="new_text">Uusi</string>
<string name="past_24_hours">Viimeisen 24 tunnin aikana</string>
<string name="past_week">Mennyt viikko</string>
<string name="past_month">Viime kuukausi</string>
<string name="past_year">Viime vuosi</string>
<string name="all_time">Koko aikana</string>
<string name="from">tullut</string>
<string name="for_text">varten</string>
<string name="filter_for">Suodata</string>
<string name="everyone">Jokaiselle</string>
<string name="tags_you_follow">Tunnisteet mitä sinä seuraat</string>
<string name="customize">Muokkaa</string>
<string name="not_yet_implemented">Valittu näkymä ei ole vielä käytettävissä.</string>
<string name="customize_tags_hint">Näyttää siltä, että et ole vielä seurannut yhtään tunnistetta.</string>
<string name="search_for_more_tags">Etsi lisää tunnisteita</string>
<string name="no_followed_tags">Et ole vielä seurannut yhtään tunnistetta. Aloita lisäämällä kiinnostavia tunnisteita!</string>
<string name="no_tag_results">Emme löytäneet uusia tunnisteita, joita et seuraa.</string>
<string name="tag_already_added">\'%1$s\' tunniste on jo lisätty.</string>
<string name="tag_limit_reached">Et voi lisätä enempää kuin 5 tunnistetta.</string>
<string name="send_a_tip">Lähetä tippi</string>
<string name="send_a_tip_to">Lähetä tippiä %1$s</string>
<string name="support_this_content">Tue tätä sisältöä</string>
<string name="support_info">Tämä nostaa tämän sisällön kokonaishintamäärää, mikä parantaa sen kykyä löytää edelleen aktiivisena. &lt;a href=\"https://lbry.com/faq/tipping\"&gt;Learn more&lt;/a&gt;.</string>
<string name="channel_to_show_support_as">Kanava tuen näyttämiseksi nimellä</string>
<string name="make_this_a_tip">Tee tästä Tippi</string>
<string name="send_revocable_support">Lähetä peruutettava tuki</string>
<string name="send_lbc_tip">Lähetä %1$s LBC tippi</string>
<string name="send_tip_info_content">Tämä näyttää tipille %1$s, mikä parantaa sen kykyä löytää edelleen aktiivisena. &lt;a href=\"https://lbry.com/faq/tipping\"&gt;Learn more&lt;/a&gt;.</string>
<string name="send_tip_info_channel">Tämä näyttää tipille %1$s, mikä parantaa sen kykyä löytää edelleen aktiivisena. &lt;a href=\"https://lbry.com/faq/tipping\"&gt;Learn more&lt;/a&gt;.</string>
<string name="cancel">Peruuta</string>
<string name="repost_title">Repost %1$s</string>
<string name="repost_your_favorite">Lähetä suosikkisisältösi uudelleen, jotta useammat ihmiset löytävät ne!</string>
<string name="channel_to_post_on">Kanava, johon lähettää viesti</string>
<string name="show_advanced">Näytä edistyneet</string>
<string name="hide_advanced">Piilota edistynyt</string>
<string name="name">Nimi</string>
<string name="min_deposit">0.001</string>
<string name="content_successfully_reposted">Sisältö postitettiin onnistuneesti!</string>
<string name="repost_name_invalid_characters">Jälleenlähetys nimi sisältää virheellisiä merkkejä.</string>
<plurals name="you_sent_a_tip">
<item quantity="one">Sinä lähetit %1$s LBC tippinä, Mahtavaa!</item>
<item quantity="other">Sinä lähetit %1$s LBC tippinä, Mahtavaa!</item>
</plurals>
<plurals name="you_sent_a_support">
<item quantity="one">Panosit %1$s hyvityksiä tueksi. Voit peruuttaa tuen milloin tahansa. </item>
<item quantity="other">Panosit %1$s hyvityksiä tueksi. Voit peruuttaa tuen milloin tahansa. </item>
</plurals>
<!-- Verification -->
<string name="provide_email_address">Anna sähköpostiosoite.</string>
<string name="email_placeholder">you@example.com</string>
<string name="email_sent_to">Sähköposti on lähetetty osoitteeseen</string>
<string name="please_click_link">Napsauta viestin linkkiä suorittaaksesi kirjautumisen loppuun.</string>
<string name="resend">Uudelleen lähetä</string>
<string name="continue_text">Jatka</string>
<string name="provide_valid_email">Ole hyvä ja syötä toimiva sähköpostiosoite</string>
<string name="please_follow_instructions">Noudata osoitteeseesi lähetetyn sähköpostin ohjeita jatkaaksesi.</string>
<string name="sign_in_successful">Olet onnistuneesti kirjautunut sisään lbry.tv-sivustoon</string>
<string name="retrieving_account_information">Haetaan tilitietoja ...</string>
<string name="apply_wallet_data">Sovelletaan lompakotietoja ...</string>
<string name="please_enter_your_password">Anna salasana, jolla turvasit lompakon.</string>
<string name="please_enter_a_password">Anna salasana suojataksesi lompakon.</string>
<string name="wallet_security_purposes">Huomaa: LBRY ei pysty uudelleen asettaa salasanaa lompakon suojausta varten.</string>
<string name="password">Salasana</string>
<string name="enable_sync">Ota synkronointi käyttöön</string>
<string name="wallet_sync_op_failed">Lompakon synkronointia ei voitu suorittaa tällä hetkellä. Yritä uudelleen myöhemmin. Jos ongelma jatkuu, lähetä sähköpostia osoitteeseen hello@lbry.com</string>
<string name="phone_number">Puhelinnumero</string>
<string name="enter_phone_number">Ole hyvä ja anna puhelinnumerosi.</string>
<string name="not_interested">Ei kiinnostunut</string>
<string name="manual_reward_verification">Manuaalinen palkkion todentaminen</string>
<string name="account_undergo_review">Tämä tili on tarkistettava ennen kuin voit osallistua palkitsemisohjelmaan. Tämä voi viedä useita minuutteja useisiin päiviin.</string>
<string name="enjoy_free_content">Nauti ilmaisesta sisällöstä sillä välin!</string>
<string name="verify_phone_number">Vahvista puhelinnumero</string>
<string name="enter_phone_verify_code">Anna vahvistuskoodi, joka lähetettiin osoitteeseen %1$s</string>
<string name="code_placeholder">0000</string>
<string name="verify">Vahvista</string>
<string name="please_enter_valid_phone">Ole hyvä ja näppäile voimassaoleva puhelinnumero.</string>
<string name="please_enter_verification_code">Anna puhelinnumeroosi lähetetty vahvistuskoodi.</string>
<string name="fetch_current_user_error">Käyttäjätiliä ei voitu noutaa tällä hetkellä. Yritä uudelleen myöhemmin.</string>
<!-- Forms -->
<string name="no_added_tags">Et ole vielä lisännyt tageja. Lisää tunnisteita etsinnän parantamiseksi.</string>
<string name="form_no_tag_results">Emme löytäneet uusia tunnisteita, joita ei ole vielä lisätty.</string>
<!-- Channels -->
<string name="no_channel_created">Et ole luonut kanavaa.
Aloita nyt luomalla uusi kanava!</string>
<string name="create_a_channel">Tee kanava</string>
<string name="create_a_channel_item">Tee kanava...</string>
<string name="edit_channel">Muokkaa kanavaa</string>
<string name="delete_selection">Poistetaanko valinta?</string>
<string name="delete_channel">Poistetaanko kanava?</string>
<string name="confirm_delete_channel">Haluatko varmasti poistaa tämän kanavan?</string>
<string name="channel_deleted">Kanava poistettiin onnistuneesti.</string>
<string name="channel_failed_delete">Kanavaa ei voitu poistaa tällä hetkellä. Yritä uudelleen myöhemmin.</string>
<string name="description">Kuvaus</string>
<string name="yes">Kyllä</string>
<string name="no">Ei</string>
<string name="show_optional_fields">Näytä valinnaiset kentät</string>
<string name="hide_optional_fields">Näytä valinnaiset kentät</string>
<string name="save">Tallenna</string>
<string name="channel_name">Kanavan nimi</string>
<string name="title">Otsikko</string>
<string name="at">\@</string>
<string name="deposit">Tallettaa</string>
<string name="deposit_remains_yours">Tämä LBC on sinun. Nimen varaaminen on talletus, ja sen voi peruuttaa milloin tahansa.</string>
<string name="storage_permission_rationale_download">LBRY vaatii pääsyn sisällön lataamiseen laitteellesi.</string>
<string name="storage_permission_rationale_images">LBRY vaatii pääsyn kuvien lataamiseen laitteen varastosta.</string>
<string name="select_thumbnail">Valitse pikkukuva</string>
<string name="select_cover">Valitse kannen kuva</string>
<string name="undetermined_image_filepath">Tiedostopolkua ei voitu määrittää valitulle kuvalle. Valitse kuva eri sijainnista.</string>
<string name="wait_for_upload">Odota, että nykyinen lataus on valmis.</string>
<string name="image_upload_failed">Kuvan lähetyspyyntö epäonnistui. Yritä uudelleen.</string>
<string name="uploading">Lataaminen ...</string>
<string name="please_enter_channel_name">Anna kanavan nimi.</string>
<string name="channel_name_invalid_characters">Kanavasi nimi sisältää virheellisiä merkkejä.</string>
<string name="channel_name_already_created">Olet jo luonut kanavan samalla nimellä.</string>
<string name="please_enter_valid_deposit">Anna oikea talletussumma.</string>
<string name="deposit_more_than_balance">Talletus ei voi olla suurempi kuin saldosi.</string>
<string name="channel_save_failed">Kanavan tallennuspyyntö epäonnistui. Yritä uudelleen.</string>
<string name="channel_save_successful">Kanava tallennettiin onnistuneesti.</string>
<string name="item_pending_blockchain">Vaatimus odottaa julkaisua lohkoketjussa. Voit käyttää vaatimusta tai muokata sitä hetkessä.</string>
<string name="pending">vireillä</string>
<string name="create">Luo</string>
<string name="one_or_more_channels_failed_abandon">Yhtä tai useampaa sisältökohdetta ei voitu poistaa tällä hetkellä. Yritä uudelleen myöhemmin.</string>
<plurals name="min_deposit_required">
<item quantity="one">Vaaditaan vähintään %1$s luottojen talletus.</item>
<item quantity="other">Vaaditaan vähintään %1$s luottojen talletus.</item>
</plurals>
<plurals name="confirm_delete_channels">
<item quantity="one">Haluatko varmasti poistaa valitut kanava?</item>
<item quantity="other">Haluatko varmasti poistaa valitut kanavat?</item>
</plurals>
<plurals name="channels_deleted">
<item quantity="one">Kanava poistettiin onnistuneesti.</item>
<item quantity="other">Kanava poistettiin onnistuneesti.</item>
</plurals>
<!-- Rewards -->
<string name="lbry_credits_allow">LBRY-crediitit antavat sinun julkaista tai ostaa sisältöä.</string>
<string name="free_credits_worth">Voit saada ilmaisia hyvityksiä, joiden arvo on %1$s, kun olet antanut sähköpostiosoitteen.</string>
<string name="rewards_learn_more">&lt;a href=\"https://lbry.com/faq/earn-credits\"&gt;Learn more&lt;/a&gt;.</string>
<string name="get_started">Pääse alkuun</string>
<string name="reward_code_placeholder">abc123</string>
<string name="claim">vaatimus</string>
<string name="please_enter_claim_code">Anna mukautettu palkituskoodi vaatiaksesi.</string>
<string name="unclaimed">Lunastamattomat</string>
<string name="custom_reward_title">Kustomoitu koodi</string>
<string name="up_to">aikeissa</string>
<string name="custom_reward_description">Oletko supermalli tai rockstar, joka sai mukautetun palkinnon? Vaadi sitä täältä.</string>
<plurals name="claim_reward_message">
<item quantity="one">Olet vaatinut %1$s hyvitystä palkkiona.</item>
<item quantity="other">Olet vaatinut %1$shyvitystä palkkiona.</item>
</plurals>
<plurals name="available_credits">
<item quantity="one">%1$s käytettävissä olevia krediittejä</item>
<item quantity="other">%1$s käytettävissä olevia krediittejä</item>
</plurals>
<!-- Reward drivers -->
<string name="publishing_requires_credits">Julkaiseminen vaatii krediittejä.</string>
<string name="channel_creation_requires_credits">Kanavien luominen vaatii krediittejä.</string>
<string name="earn_rewards_for_inviting">Ansaitse palkkioita ystävien kutsumisesta.</string>
<string name="earn_some_credits_to_access">Ansaitse joitakin hyvityksiä tämän sisällön käyttämiseksi.</string>
<string name="tap_here_to_get_some">Napauta tätä saadaksesi ilmaiseksi.</string>
<string name="free_credits_available">Ilmaisia hyvityksiä palkkioina.</string>
<plurals name="wallet_signed_in_free_credits">
<item quantity="one"> %1$s Ilmaisia hyvityksiä palkkioina.</item>
<item quantity="other">%1$s Ilmaisia hyvityksiä palkkioina.</item>
</plurals>
<plurals name="wallet_get_free_credits">
<item quantity="one">Hanki %1$s ilmaisia krediittejä tilin luomisen jälkeen.</item>
<item quantity="other">Hanki %1$s ilmaisia krediittejä tilin luomisen jälkeen.</item>
</plurals>
<!-- Invites -->
<string name="lbry_invite_program">LBRY-kutsuohjelma</string>
<string name="earn_extra_credits_invites">Voit ansaita ylimääräisiä krediittejä jokaisesta henkilöstä, jonka kutsut käyttämään LBRY: tä.</string>
<string name="invites_learn_more">&lt;a href=\"https://lbry.com/faq/invites\"&gt;Learn more&lt;/a&gt;.</string>
<string name="invite_link">Kutsu linkki</string>
<string name="share_this_link">Jaa tämä linkki ystävien (tai vihollisten) kanssa ja hanki krediittejä liittyessään lbry.tv.</string>
<string name="your_invite_link">Kutsu-linkkisi</string>
<string name="customize_invite_link">Mukauta kutsulinkki</string>
<string name="invite_by_email">Kutsu sähköpostitse</string>
<string name="invite_someone">Kutsu tuntemaasi henkilö sähköpostilla ja ansaitse krediittejä liittyessään lbry.tv.</string>
<string name="invite_email_placeholder">imaginary@friend.com</string>
<string name="invite">Kutsu</string>
<string name="invite_history">Kutsu historia</string>
<string name="earn_credits_for_inviting">Ansaitse pisteitä ystävän, vihollisen, frenemian tai eneystävän kutsumiseen. Jokainen tarvitsee sisältövapauden.</string>
<string name="reward">Palkinto</string>
<string name="claimed">noutaa</string>
<string name="claimable">lunastettavana</string>
<string name="unclaimable">Ei vaadittavissa</string>
<string name="invite_link_copied">Kutsu linkki kopioitu.</string>
<string name="invite_sent_to">Kutsu lähetetty %1$s</string>
<!-- Library -->
<string name="downloads">Lataukset</string>
<string name="purchases">ostos</string>
<string name="history">Historia</string>
<string name="library_no_downloads">Sinulla ei ole yhtään ladattua sisältöä tälle laitteelle.</string>
<string name="library_no_history">Et ole katsellut mitään sisältöä tällä laitteella.</string>
<string name="library_no_purchases">Et ole ostanut sisältöä tililtäsi.</string>
<string name="hide">Piilota</string>
<string name="stats">Tilastot</string>
<string name="video">Video</string>
<string name="audio">Ääni</string>
<string name="images">Kuvat</string>
<string name="mb">MB</string>
<string name="kb">KB</string>
<string name="gb">GB</string>
<string name="zero_mb">0MB</string>
<plurals name="confirm_delete_files">
<item quantity="one">Haluatko varmasti poistaa valitut tiedostot laitteestasi?</item>
<item quantity="other">Haluatko varmasti poistaa valitut tiedostot laitteestasi?</item>
</plurals>
<plurals name="files_deleted">
<item quantity="one">Tiedostot poistettiin onnistuneesti.</item>
<item quantity="other">Tiedostot poistettiin onnistuneesti.</item>
</plurals>
<!-- About -->
<string name="about_lbry">Tietoa LBRY</string>
<string name="content_freedom">Sisällönvapaus</string>
<string name="about_paragraph">LBRY on ilmainen, avoin ja yhteisömäinen digitaalinen markkinapaikka. Se on hajautettu vertaisverkkosisällön jakelualusta, jonka avulla tekijät voivat ladata ja jakaa sisältöä sekä ansaita LBRY-krediittejä työstään. Käyttäjät voivat löytää laajan valikoiman videoita, musiikkia, e-kirjoja ja muuta kiinnostavaa digitaalista sisältöä.</string>
<string name="get_social">Hanki sosiaalinen</string>
<string name="social_paragraph">Voit olla tekemisissä LBRY-tiimin ja yhteisön jäsenten kanssa Discordissa, Facebookissa, Instagramissa, Twitterissä tai Redditissä.</string>
<string name="app_info">Sovellustiedot</string>
<string name="loading">Latautuu...</string>
<string name="about_link_what_is_lbry">&lt;a href=\"https://lbry.com/faq/what-is-lbry\"&gt;What is LBRY?&lt;/a&gt;</string>
<string name="about_link_android_basics">&lt;a href=\"https://lbry.com/faq/android-basics\"&gt;Android Basics&lt;/a&gt;</string>
<string name="about_link_faq">&lt;a href=\"https://lbry.com/faq\"&gt;FAQ&lt;/a&gt;</string>
<string name="about_link_discord">&lt;a href=\"https://discordapp.com/invite/Z3bERWA\"&gt;Discord&lt;/a&gt;</string>
<string name="about_link_facebook">&lt;a href=\"https://www.facebook.com/LBRYio\"&gt;Facebook&lt;/a&gt;</string>
<string name="about_link_instagram">&lt;a href=\"https://www.instagram.com/LBRYio\"&gt;Instagram&lt;/a&gt;</string>
<string name="about_link_reddit">&lt;a href=\"https://reddit.com/r/lbry\"&gt;Reddit&lt;/a&gt;</string>
<string name="about_link_telegram">&lt;a href=\"https://t.me/lbryofficial\"&gt;Telegram&lt;/a&gt;</string>
<string name="about_link_twitter">&lt;a href=\"https://twitter.com/LBRYio\"&gt;Twitter&lt;/a&gt;</string>
<string name="update_mailing_preferences">Päivitä postitusasetukset</string>
<string name="app_version">Sovellus versio</string>
<string name="lbry_sdk">LBRY SDK</string>
<string name="platform">Alusta</string>
<string name="installation_id">Asennustunnus</string>
<string name="firebase_token">Firebase-tunnus</string>
<string name="logs">Lokit</string>
<string name="send_log">Lähetä loki</string>
<string name="connected_email">Yhdistetty sähköposti</string>
<string name="unknown">Tuntematon</string>
<string name="cannot_find_lbrynet_log">Lbrynet.log-tiedostoa ei löytynyt.</string>
<string name="cannot_share_lbrynet_log">Lbrynet.log-tiedostoa ei voi jakaa luparajoitusten takia.</string>
</resources>
+44 -26
View File
@@ -20,6 +20,7 @@
<string name="settings">Réglages</string>
<string name="about">À propos de</string>
<string name="sign_in">Se connecter</string>
<string name="shuffle">Mélanger</string>
<string name="startup_failed">Démarrage app a échoué. Veuillez vérifier votre connexion de données et réessayer. Si ce problème persiste, veuillez envoyer un courriel hello@lbry.com</string>
<string name="no_claim_search_content">Aucun contenu à afficher pour le moment. S’il vous plaît affiner votre sélection ou vérifier plus tard.</string>
@@ -27,7 +28,7 @@
<string name="welcome_to_lbry">Bienvenue à LBRY.</string>
<string name="welcome_paragraph">LBRY est une plate-forme de contenu contrôlée par la communauté où vous pouvez trouver et publier des vidéos, de la musique, des livres, et plus encore.</string>
<string name="welcome_tos">En continuant, je suis d’accord pour le &lt;a href=\"https://lbry.com/termsofservice\"&gt;Terms of Service&lt;/a&gt; et de confirmer que je suis plus de l’âge de 13 ans.</string>
<string name="welcome_please_wait">S’il vous plaît attendre pendant que nous obtenons certaines choses prêtes ...</string>
<string name="welcome_please_wait">Veuillez patienter pendant que nous préparons certaines choses…</string>
<string name="use_lbry">Utilisez LBRY »</string>
<!-- URI bar -->
@@ -39,7 +40,7 @@
<string name="discover">Découvrir</string>
<string name="lbry_works_better">LBRY fonctionne mieux si vous suivez au moins 5 créateurs que vous aimez. Connectez-vous pour montrer aux créateurs que vous suivez si vous avez déjà un compte.</string>
<string name="select_five_subscriptions">S’il vous plaît sélectionner jusqu’à 5 créateurs pour continuer.</string>
<string name="n_remaining">%1$d restant....</string>
<string name="n_remaining">%1$drestant…</string>
<string name="done">Fini</string>
<string name="all">Tout</string>
<string name="discover_channels">Découvrez de nouvelles chaînes</string>
@@ -57,7 +58,7 @@
<string name="download">Télécharger</string>
<string name="open">Ouvrir</string>
<string name="report">Rapport</string>
<string name="loading_decentralized_data">Chargement de données décentralisées...</string>
<string name="loading_decentralized_data">Chargement des données décentralisées…</string>
<string name="related_content">Contenu connexe</string>
<string name="comments">Commentaires</string>
<string name="no_comments">Aucun commentaire à afficher pour le moment.</string>
@@ -90,6 +91,14 @@
<string name="please_select_repost_channel">Veuillez sélectionner une chaîne sur laquelle republier.</string>
<string name="reply">Répondre</string>
<string name="replying_to">Répondre à%1$s</string>
<plurals name="view_count">
<item quantity="one">%1$svues</item>
<item quantity="other">%1$s vues</item>
</plurals>
<plurals name="confirm_purchase_message">
<item quantity="one">Cela va acheter \"%1$s\" pour %2$s les crédits</item>
<item quantity="other">Cela va acheter \"%1$s\" pour %2$s crédit</item>
</plurals>
<plurals name="post_and_tip">
<item quantity="one">Poster et pointe %1$scrédits?</item>
<item quantity="other">Poster et pointe %1$scrédits</item>
@@ -102,20 +111,14 @@
<item quantity="one">il publiera votre commentaire avec un pourboire de%1$scrédits pour %2$s</item>
<item quantity="other">il publiera votre commentaire avec un pourboire de %1$s crédits pour %2$s</item>
</plurals>
<plurals name="view_count">
<item quantity="one">%1$svues</item>
<item quantity="other">%1$s vues</item>
</plurals>
<plurals name="confirm_purchase_message">
<item quantity="one">Cela va acheter \"%1$s\" pour %2$s les crédits</item>
<item quantity="other">Cela va acheter \"%1$s\" pour %2$s crédit</item>
</plurals>
<!-- Channel view -->
<string name="no_channel_info">Il n\'y a encore rien ici. \ NVeuillez vérifier ultérieurement.</string>
<string name="content">Contenu</string>
<string name="website">Site Internet</string>
<string name="reposted">republié</string>
<string name="receive_all_notifications">Vous recevrez toutes les notifications</string>
<string name="receive_no_notifications">Vous ne recevrez pas de notifications pour cette chaîne</string>
<plurals name="follower_count">
<item quantity="one">%1$s suiveur</item>
<item quantity="other">%1$s suiveurs</item>
@@ -127,7 +130,7 @@
<string name="take_photo">Prendre une photo</string>
<string name="upload_file">Télécharger un fichier</string>
<string name="no_videos_found">Nous n\'avons trouvé aucune vidéo sur votre appareil. Prenez une photo ou enregistrez une vidéo pour commencer.</string>
<string name="loading_videos">Veuillez patienter pendant que nous chargeons vos vidéos...</string>
<string name="loading_videos">Veuillez patienter pendant que nous chargeons vos vidéos…</string>
<string name="storage_permission_rationale_videos">LBRY nécessite un accès pour pouvoir afficher et publier vos vidéos, images et autres fichiers depuis votre appareil.</string>
<string name="camera_permission_rationale_record">LBRY nécessite l\'accès à votre appareil photo pour enregistrer des vidéos.</string>
<string name="camera_permission_rationale_photo">LBRY nécessite l\'accès à votre appareil photo pour prendre des photos.</string>
@@ -207,7 +210,7 @@
<string name="cca_nc_nd_4_0_international">Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International</string>
<string-array name="publish_currencies">
<item>LBC</item>
<item>Crédits LBRY</item>
<item>USD</item>
</string-array>
@@ -226,12 +229,11 @@
<string name="oops_something_went_wrong">Oops! Quelque chose a mal tourné.</string>
<string name="installation_id_loaded">ID d\'installation chargé.</string>
<string name="known_tags_loaded">Les mots clés locales connues et suivies chargées.</string>
<string name="exchange_rate_loaded">Taux de change LBC / USD chargé.</string>
<string name="exchange_rate_loaded">Crédits LBRY chargés / taux de change USD.</string>
<string name="user_authenticated">Utilisateur authentifié.</string>
<string name="installation_registered">Installation enregistrée.</string>
<string name="subscriptions_loaded">Abonnements chargés.</string>
<string name="subscriptions_resolved">Abonnements résolus.</string>
<!-- Settings -->
<string name="user_interface">Interface utilisateur de contenu &amp; </string>
<string name="other">Autre</string>
@@ -242,9 +244,11 @@
<string name="notifications">Notifications</string>
<string name="subscriptions">Abonnements</string>
<string name="content_interests">Intérêts de contenu</string>
<string name="mini_player_bottom_spacing">Espacement inférieur du mini-joueur</string>
<string name="keep_sdk_in_background">Gardez le service LBRY en cours d\'exécution en arrière-plan pour améliorer les performances du portefeuille et du réseau</string>
<string name="participate_in_data_network">Participer au réseau de données (nécessite le redémarrage de l\'application et du service d\'arrière-plan)</string>
<string name="send_buffering_events">Envoyer des événements de mise en mémoire tampon aux serveurs LBRY</string>
<!-- URL suggestions -->
<string name="search_url_title">%1$s - Recherche</string>
@@ -270,7 +274,7 @@
<string name="in_your_publishes">dans vos publications</string>
<string name="in_your_supports">dans vos supports</string>
<string name="earn_more_tips">Obtenez plus de pourboire en téléchargeant des vidéos sympas</string>
<string name="sdk_initializing">Le service d\'arrière-plan s\'initialise ...</string>
<string name="sdk_initializing">Le service d\'arrière-plan est en cours d\'initialisation…</string>
<string name="sdk_still_initializing">Le service d\'arrière-plan est toujours en cours d\'initialisation. Vous pouvez explorer et regarder du contenu en attendant.</string>
<string name="sdk_initializing_functionality">Vous ne pouvez pas le faire pour le moment car le service d\'arrière-plan est toujours en cours d\'initialisation.</string>
@@ -295,6 +299,7 @@
<string name="receive">Recevoir</string>
<string name="spend">Dépenser</string>
<string name="publish">Publier</string>
<string name="unpublish">Annuler la publication</string>
<string name="support">Soutien</string>
<string name="abandon">Abandonner</string>
<string name="channel">Chaîne</string>
@@ -310,7 +315,7 @@
<string name="manual_backup">&lt;a href=\"https://lbry.com/faq/how-to-backup-wallet#android\"&gt;Manual backup&lt;/a&gt;</string>
<string name="sync_faq">&lt;a href=\"https://lbry.com/faq/how-to-backup-wallet#sync\"&gt;Sync FAQ&lt;/a&gt;</string>
<string name="zero">0</string>
<string name="lbc">LBC</string>
<string name="lbc">Crédits</string>
<string name="account_recommended">Compte recommandé</string>
<string name="wallet_account_desc">Un compte lbry.tv vous permet de gagner des récompenses, de sauvegarder votre portefeuille et de garder tout synchronisé.</string>
@@ -323,7 +328,7 @@
<string name="insufficient_balance">Solde insuffisant</string>
<string name="invalid_amount">Veuillez saisir un montant valide</string>
<string name="send_credit_error">Vos crédits n\'ont pas pu être envoyés pour le moment. Veuillez réessayer plus tard.</string>
<string name="loading_transactions">Chargement des transactions...</string>
<string name="loading_transactions">Chargement des transactions</string>
<string name="no_recent_transactions">Il n\'y a aucune transaction récente à afficher.</string>
<string name="no_transactions">Il n\'y a aucune transaction à afficher pour le moment.</string>
<string name="tx_list_fee">frais %1$s</string>
@@ -334,7 +339,7 @@
<string name="confirm_unlock_tips">Voulez-vous vraiment déverrouiller tous vos conseils?</string>
<string name="min_spend_required">Veuillez saisir un montant supérieur à 0,0001 crédit.</string>
<string name="buy_lbc">Acheter LBC</string>
<string name="buy_lbc">Acheter des crédits LBRY</string>
<string name="hash_not_supported">Votre appareil ne prend pas en charge les exigences minimales pour sécuriser votre demande d\'achat.</string>
<string name="receive_address_not_set">Vous n\'avez pas défini d\'adresse de portefeuille. Veuillez générer une nouvelle adresse et réessayer.</string>
@@ -378,7 +383,11 @@
<string name="channel_to_show_support_as">Chaîne pour montrer le soutien comme</string>
<string name="make_this_a_tip">En faire un pourboire</string>
<string name="send_revocable_support">Envoyer un support révocable</string>
<string name="send_lbc_tip">Envoyer un pourboire de %1$s LBC</string>
<string name="send_lbc_tip">Pointe%1$s</string>
<plurals name="send_lbc_tip">
<item quantity="one">Crédits%1$s pourboires</item>
<item quantity="other">Crédits%1$s pourboires</item>
</plurals>
<string name="send_tip_info_content"> ce qui apparaîtra comme %1$s astuce, ce qui augmentera sa capacité à être découvert lorsqu\'il est actif.&lt;a href=\"https://lbry.com/faq/tipping\"&gt;Learn more&lt;/a&gt;.</string>
<string name="send_tip_info_channel">le sien apparaîtra comme %1$s astuce, ce qui augmentera la capacité du canal à être découvert lorsqu\'il est actif &lt;a href=\"https://lbry.com/faq/tipping\"&gt;Learn more&lt;/a&gt;.</string>
<string name="cancel">Annuler</string>
@@ -410,8 +419,8 @@
<string name="provide_valid_email">S\'il vous plaît, mettez une adresse email valide</string>
<string name="please_follow_instructions">Veuillez suivre les instructions dans l\'e-mail envoyé à votre adresse pour continuer.</string>
<string name="sign_in_successful">Vous vous êtes connecté avec succès à lbry.tv</string>
<string name="retrieving_account_information">Récupération des informations de compte ...</string>
<string name="apply_wallet_data">Application des données du portefeuille ...</string>
<string name="retrieving_account_information">Crédits pourboires</string>
<string name="apply_wallet_data">Application des données du portefeuille…</string>
<string name="please_enter_your_password">Veuillez saisir le mot de passe que vous avez utilisé pour sécuriser votre portefeuille.</string>
<string name="please_enter_a_password">Veuillez saisir un mot de passe pour sécuriser votre portefeuille.</string>
<string name="wallet_security_purposes">Remarque: pour des raisons de sécurité du portefeuille, LBRY n\'est pas en mesure de réinitialiser votre mot de passe.</string>
@@ -456,7 +465,7 @@
<!-- Channels -->
<string name="no_channel_created">Vous n\'avez pas créé de chaîne. \ NCommencez maintenant en créant une nouvelle chaîne!</string>
<string name="create_a_channel">Créer une Chaîne</string>
<string name="create_a_channel_item">Créer une Chaîne</string>
<string name="create_a_channel_item">Créer une chaîne…</string>
<string name="edit_channel">Modifier la chaîne </string>
<string name="delete_selection">Supprimer la sélection?</string>
<string name="delete_channel">Supprimer la chaîne?</string>
@@ -464,6 +473,7 @@
<string name="channel_deleted">La chaîne a été supprimée avec succès.</string>
<string name="channel_failed_delete">La chaîne n\'a pas pu être supprimée pour le moment. Veuillez réessayer plus tard.</string>
<string name="description">Description</string>
<string name="follow">Suivre</string>
<string name="yes">Oui</string>
<string name="no">Non</string>
<string name="show_optional_fields">Afficher les champs facultatifs</string>
@@ -473,7 +483,7 @@
<string name="title">Titre</string>
<string name="at">\@</string>
<string name="deposit">Dépôt</string>
<string name="deposit_remains_yours">Cette LBC reste la vôtre. Il s\'agit d\'un dépôt pour réserver le nom et peut être annulé à tout moment.</string>
<string name="deposit_remains_yours">Le crédit reste à vous. Il s\'agit d\'un acompte pour réserver le nom et peut être annulé à tout moment.</string>
<string name="storage_permission_rationale_download">LBRY nécessite un accès pour télécharger du contenu sur votre appareil.</string>
<string name="storage_permission_rationale_images">LBRY nécessite un accès pour charger des images à partir du stockage de votre appareil.</string>
<string name="select_thumbnail">Sélectionnez la miniature</string>
@@ -481,7 +491,8 @@
<string name="undetermined_image_filepath">Le chemin du fichier n\'a pas pu être déterminé pour l\'image sélectionnée. Veuillez sélectionner une image dans un emplacement différent.</string>
<string name="wait_for_upload">Veuillez attendre la fin du téléchargement en cours.</string>
<string name="image_upload_failed">La demande de téléchargement d\'image a échoué. Veuillez réessayer.</string>
<string name="uploading">Téléchargement...</string>
<string name="uploading">Téléchargement…</string>
<string name="uploading_thumbnail">Téléchargement de la vignette…</string>
<string name="please_enter_channel_name">Veuillez saisir un nom de chaîne.</string>
<string name="channel_name_invalid_characters">Le nom de votre chaîne contient des caractères non valides.</string>
<string name="channel_name_already_created">vous avez déjà créé une chaîne du même nom.</string>
@@ -596,7 +607,7 @@
<string name="get_social">Soyez social</string>
<string name="social_paragraph">Vous pouvez interagir avec l\'équipe LBRY et les membres de la communauté sur Discord, Facebook, Instagram, Twitter ou Reddit.</string>
<string name="app_info">Informations sur l\'application</string>
<string name="loading">Chargement...</string>
<string name="loading">Chargement…</string>
<string name="about_link_what_is_lbry">&lt;a href=\"https://lbry.com/faq/what-is-lbry\"&gt;What is LBRY?&lt;/a&gt;</string>
<string name="about_link_android_basics">&lt;a href=\"https://lbry.com/faq/android-basics\"&gt;Android Basics&lt;/a&gt;</string>
<string name="about_link_faq">&lt;a href=\"https://lbry.com/faq\"&gt;FAQ&lt;/a&gt;</string>
@@ -619,4 +630,11 @@
<string name="cannot_find_lbrynet_log">Le fichier lbrynet.log est introuvable.</string>
<string name="cannot_share_lbrynet_log">Le fichier lbrynet.log ne peut pas être partagé en raison de restrictions d\'autorisation.</string>
<!-- Notifications -->
<string name="no_notifications">C\'est calme ici! Les nouvelles notifications seront affichées lorsque vous les recevrez.</string>
<plurals name="confirm_delete_notifications">
<item quantity="one">Voulez-vous vraiment supprimer les notifications sélectionnées?</item>
<item quantity="other">Voulez-vous vraiment supprimer les notifications sélectionnées?</item>
</plurals>
</resources>
+8 -31
View File
@@ -27,7 +27,6 @@
<string name="welcome_to_lbry">LBRY માં આપનું સ્વાગત છે.</string>
<string name="welcome_paragraph">LBRY એ સમુદાય-નિયંત્રિત સામગ્રી પ્લેટફોર્મ છે જ્યાં તમે વિડિઓઝ, સંગીત, પુસ્તકો અને વધુ શોધી અને પ્રકાશિત કરી શકો છો.</string>
<string name="welcome_tos">ચાલુ રાખીને, હું &lt; ને સંમત છું. a href=\"https://lbry.com/termsofservice\"&gt;Terms of Service&lt;/a&gt; અને પુષ્ટિ કરો કે હું 13 વર્ષથી વધુ વયની છું.</string>
<string name="welcome_please_wait">કૃપા કરી રાહ જુઓ જ્યારે અમે કેટલીક વસ્તુઓ તૈયાર કરીએ...</string>
<string name="use_lbry">LBRY વાપરો »</string>
<!-- URI bar -->
@@ -39,7 +38,6 @@
<string name="discover">શોધો</string>
<string name="lbry_works_better">જો તમને ગમે તેવા ઓછામાં ઓછા 5 નિર્માતાઓનું પાલન કરો તો LBRY વધુ સારું કાર્ય કરે છે. જો તમારી પાસે પહેલેથી જ એકાઉન્ટ છે તો તમે અનુસરો છો તે સર્જકોને બતાવવા માટે સાઇન ઇન કરો.</string>
<string name="select_five_subscriptions">કૃપા કરીને ચાલુ રાખવા માટે 5 નિર્માતાઓ પસંદ કરો.</string>
<string name="n_remaining">%1$d બાકી...</string>
<string name="done">થઈ ગયું</string>
<string name="all">બધા</string>
<string name="discover_channels">નવી ચેનલો શોધો</string>
@@ -57,7 +55,6 @@
<string name="download">ડાઉનલોડ કરો</string>
<string name="open">ખોલો</string>
<string name="report">જાણ કરો</string>
<string name="loading_decentralized_data">વિકેન્દ્રિત ડેટા લોડ કરી રહ્યું છે...</string>
<string name="related_content">સંબંધિત સામગ્રી</string>
<string name="comments">ટિપ્પણીઓ</string>
<string name="no_comments">આ સમયે પ્રદર્શિત કરવા માટે કોઈ ટિપ્પણી નથી.</string>
@@ -90,6 +87,14 @@
<string name="please_select_repost_channel">કૃપા કરીને ફરીથી પોસ્ટ કરવા માટે એક ચેનલ પસંદ કરો.</string>
<string name="reply">જવાબ</string>
<string name="replying_to">%1$s ને જવાબ આપવો</string>
<plurals name="view_count">
<item quantity="one">%1$s દૃશ્યો</item>
<item quantity="other">%1$s દૃશ્યો</item>
</plurals>
<plurals name="confirm_purchase_message">
<item quantity="one">આ %2$s ક્રેડિટ માટે \"%1$s\" ખરીદશે</item>
<item quantity="other">આ %2$s ક્રેડિટ માટે \"%1$s\" ખરીદશે</item>
</plurals>
<plurals name="post_and_tip">
<item quantity="one">પોસ્ટ કરો અને %1$s ક્રેડિટ્સ ટીપ આપો?</item>
<item quantity="other">પોસ્ટ કરો અને %1$s ક્રેડિટ્સ ટીપ આપો?</item>
@@ -102,14 +107,6 @@
<item quantity="one">આ તમારી ટિપ્પણી %2$s માટે %1$s ક્રેડિટ્સની મદદ સાથે પોસ્ટ કરશે</item>
<item quantity="other">આ તમારી ટિપ્પણી %2$s માટે %1$s ક્રેડિટ્સની મદદ સાથે પોસ્ટ કરશે</item>
</plurals>
<plurals name="view_count">
<item quantity="one">%1$s દૃશ્યો</item>
<item quantity="other">%1$s દૃશ્યો</item>
</plurals>
<plurals name="confirm_purchase_message">
<item quantity="one">આ %2$s ક્રેડિટ માટે \"%1$s\" ખરીદશે</item>
<item quantity="other">આ %2$s ક્રેડિટ માટે \"%1$s\" ખરીદશે</item>
</plurals>
<!-- Channel view -->
<string name="no_channel_info">અહીં હજી કંઈ નથી.\n કૃપા કરીને પછીથી તપાસો.</string>
@@ -127,7 +124,6 @@
<string name="take_photo">એક ફોટો લો</string>
<string name="upload_file">ફાઇલ અપલોડ કરો</string>
<string name="no_videos_found">અમે તમારા ઉપકરણ પર કોઈ વિડિઓઝ શોધી શક્યા નથી. પ્રારંભ કરવા માટે ફોટો લો અથવા વિડિઓ રેકોર્ડ કરો.</string>
<string name="loading_videos">કૃપા કરી રાહ જુઓ જ્યારે અમે તમારી વિડિઓઝ લોડ કરીએ ...</string>
<string name="storage_permission_rationale_videos">LBRY ને તમારા ઉપકરણમાંથી તમારી વિડિઓઝ, છબીઓ અને અન્ય ફાઇલોને પ્રદર્શિત અને પ્રકાશિત કરવા માટે toક્સેસની જરૂર છે.</string>
<string name="camera_permission_rationale_record">વિડિઓઝ રેકોર્ડ કરવા માટે LBRY ને તમારા કૅમેરાને ઍક્સેસ કરવાની જરૂર છે.</string>
<string name="camera_permission_rationale_photo">ફોટા લેવા માટે એલબીઆરવાયને તમારા કૅમેરાને ઍક્સેસ કરવાની જરૂર છે.</string>
@@ -207,7 +203,6 @@
<string name="cca_nc_nd_4_0_international">ક્રિએટીવ કોમન્સ એટ્રિબ્યુશન-નોન-કમર્શિયલ-નો-ડેરિવેટિવ્ઝ 4.0 આંતરરાષ્ટ્રીય</string>
<string-array name="publish_currencies">
<item>LBC</item>
<item>USD</item>
</string-array>
@@ -226,12 +221,10 @@
<string name="oops_something_went_wrong">અરેરે! કંઈક ખોટું થયું.</string>
<string name="installation_id_loaded">લોડ થયેલ ઇન્સ્ટોલેશન આઈડી.</string>
<string name="known_tags_loaded">સ્થાનિક જાણીતા અને અનુસરતા ટૅગ્સ લોડ કર્યા.</string>
<string name="exchange_rate_loaded">લોડ કરેલ LBC/USD વિનિમય દર.</string>
<string name="user_authenticated">વપરાશકર્તા પ્રમાણિત.</string>
<string name="installation_registered">ઇન્સ્ટોલેશન નોંધાયેલ.</string>
<string name="subscriptions_loaded">લોડ કરેલા સબ્સ્ક્રિપ્શન્સ.</string>
<string name="subscriptions_resolved">ઉકેલી સબ્સ્ક્રિપ્શન્સ.</string>
<!-- Settings -->
<string name="user_interface">સામગ્રી &amp; વપરાશકર્તા ઇન્ટરફેસ</string>
<string name="other">અન્ય</string>
@@ -242,10 +235,8 @@
<string name="notifications">સૂચનાઓ</string>
<string name="subscriptions">સબ્સ્ક્રિપ્શન્સ</string>
<string name="content_interests">સામગ્રી રુચિઓ</string>
<string name="keep_sdk_in_background">સુધારેલ વૉલેટ અને નેટવર્ક પ્રદર્શન માટે પૃષ્ઠભૂમિમાં ચાલતી LBRY સેવાને ચાલુ રાખો</string>
<string name="participate_in_data_network">ડેટા નેટવર્કમાં ભાગ લેવો (એપ્લિકેશન અને પૃષ્ઠભૂમિ સેવા ફરીથી પ્રારંભ કરવાની જરૂર છે)</string>
<!-- URL suggestions -->
<string name="search_url_title">%1$s - શોધો</string>
<string name="tag_url_title">%1$s - ટેગ</string>
@@ -270,7 +261,6 @@
<string name="in_your_publishes">તમારા પ્રકાશનોમાં</string>
<string name="in_your_supports">તમારા સપોર્ટ</string>
<string name="earn_more_tips">કૂલ વિડિઓઝ અપલોડ કરીને વધુ ટીપ્સ કમાઓ</string>
<string name="sdk_initializing">પૃષ્ઠભૂમિ સેવા પ્રારંભ થઈ રહી છે...</string>
<string name="sdk_still_initializing">પૃષ્ઠભૂમિ સેવા હજી પ્રારંભ થઈ રહી છે. તમે સરેરાશ સમયમાં અન્વેષણ કરી શકો છો અને સામગ્રી જોઈ શકો છો.</string>
<string name="sdk_initializing_functionality">તમે હમણાં આ કરી શકતા નથી કારણ કે પૃષ્ઠભૂમિ સેવા હજી પ્રારંભ થઈ રહી છે.</string>
@@ -310,8 +300,6 @@
<string name="manual_backup">&lt;a href=\"https://lbry.com/faq/how-to-backup-wallet#android\"&gt;Manual backup&lt;/a&gt;</string>
<string name="sync_faq">&lt;a href=\"https://lbry.com/faq/how-to-backup-wallet#sync\"&gt;Sync FAQ&lt;/a&gt;</string>
<string name="zero">0</string>
<string name="lbc">LBC</string>
<string name="account_recommended">એકાઉન્ટની ભલામણ</string>
<string name="wallet_account_desc">એક lbry.tv એકાઉન્ટ તમને ઇનામો કમાવવા, તમારા વૉલેટનો બેકઅપ લેવાની અને બધું સુમેળમાં રાખવા માટે પરવાનગી આપે છે.</string>
<string name="wallet_without_account">ખાતું વિના, તમે તમારા વૉલેટ અને LBRY ડેટાને સુરક્ષિત કરવાની બધી જવાબદારી સ્વીકારો છો</string>
@@ -323,7 +311,6 @@
<string name="insufficient_balance">અપૂરતી બેલેન્સ</string>
<string name="invalid_amount">કૃપા કરીને માન્ય રકમ દાખલ કરો</string>
<string name="send_credit_error">તમારી ક્રેડિટ્સ આ સમયે મોકલી શકાતી નથી. પછીથી ફરી પ્રયત્ન કરો.</string>
<string name="loading_transactions">વ્યવહારો લોડ કરી રહ્યું છે ...</string>
<string name="no_recent_transactions">પ્રદર્શિત કરવા માટે કોઈ તાજેતરના વ્યવહારો નથી.</string>
<string name="no_transactions">આ સમયે પ્રદર્શિત કરવા માટે કોઈ વ્યવહાર નથી.</string>
<string name="tx_list_fee">ફી %1$s</string>
@@ -334,7 +321,6 @@
<string name="confirm_unlock_tips">શું તમે ખરેખર તમારી બધી ટીપ્સને અનલૉક કરવા માંગો છો?</string>
<string name="min_spend_required">કૃપા કરી 0.0001 ક્રેડિટથી વધુ રકમ દાખલ કરો.</string>
<string name="buy_lbc">LBC ખરીદો</string>
<string name="hash_not_supported">તમારું ઉપકરણ તમારી ખરીદી વિનંતીને સુરક્ષિત કરવા માટે ન્યૂનતમ આવશ્યકતાઓને ટેકો આપતું નથી.</string>
<string name="receive_address_not_set">તમારે વોલેટ સરનામું સેટ નથી. કૃપા કરીને નવું સરનામું બનાવો અને ફરીથી પ્રયાસ કરો.</string>
@@ -378,7 +364,6 @@
<string name="channel_to_show_support_as">ચેનલ તરીકે આધાર બતાવવા</string>
<string name="make_this_a_tip">આ એક ટિપ બનાવો</string>
<string name="send_revocable_support">રિવોસિએબલ સપોર્ટ મોકલો</string>
<string name="send_lbc_tip">%1$s LBC ટીપ મોકલો</string>
<string name="send_tip_info_content">આ %1$s માટે મદદ તરીકે દેખાશે, જે સક્રિય હોવા પર શોધવાની તેની ક્ષમતામાં વધારો કરશે. &lt;a href=\"https://lbry.com/faq/tipping\"&gt;Learn more&lt;/a&gt;.</string>
<string name="send_tip_info_channel">આ %1$s માટે મદદ તરીકે દેખાશે, જે સક્રિય કરતી વખતે શોધવાની ચેનલની ક્ષમતામાં વધારો કરશે. &lt;a href=\"https://lbry.com/faq/tipping\"&gt;Learn more&lt;/a&gt;.</string>
<string name="cancel">રદ કરો</string>
@@ -410,8 +395,6 @@
<string name="provide_valid_email">કૃપા કરીને માન્ય ઇમેઇલ સરનામું દાખલ કરો</string>
<string name="please_follow_instructions">કૃપા કરીને ચાલુ રાખવા માટે તમારા સરનામાં પર મોકલવામાં આવેલ ઇમેઇલની સૂચનાઓનું અનુસરો.</string>
<string name="sign_in_successful">તમે સફળતાપૂર્વક lbry.tv માં સાઇન ઇન કર્યું છે</string>
<string name="retrieving_account_information">એકાઉન્ટ માહિતી પ્રાપ્ત કરી રહ્યું છે...</string>
<string name="apply_wallet_data"> વૉલેટ ડેટા લાગુ કરી રહ્યું છે ...</string>
<string name="please_enter_your_password">કૃપા કરીને તમે તમારો વૉલેટ સુરક્ષિત કરવા માટે ઉપયોગમાં લીધો પાસવર્ડ દાખલ કરો.</string>
<string name="please_enter_a_password">કૃપા કરીને તમારું વૉલેટ સુરક્ષિત રાખવા માટે પાસવર્ડ દાખલ કરો.</string>
<string name="wallet_security_purposes">નોંધ: વૉલેટ સુરક્ષા હેતુ માટે, એલબીઆરવાય તમારા પાસવર્ડને ફરીથી સેટ કરવામાં અસમર્થ છે.</string>
@@ -438,7 +421,6 @@
<!-- Channels -->
<string name="no_channel_created">તમે કોઈ ચેનલ બનાવી નથી.\n હવે નવી ચેનલ બનાવીને પ્રારંભ કરો!</string>
<string name="create_a_channel">એક ચેનલ બનાવો</string>
<string name="create_a_channel_item">એક ચેનલ બનાવો...</string>
<string name="edit_channel">ચેનલ સંપાદિત કરો</string>
<string name="delete_selection">પસંદગી કાઢી નાંખો?</string>
<string name="delete_channel">ચેનલ કાઢી નાંખો?</string>
@@ -455,7 +437,6 @@
<string name="title">શીર્ષક</string>
<string name="at">\@</string>
<string name="deposit">ડિપોઝિટ</string>
<string name="deposit_remains_yours">આ LBC તમારું રહે છે. નામ અનામત રાખવા માટે તે ડિપોઝિટ છે અને કોઈપણ સમયે પૂર્વવત્ થઈ શકે છે.</string>
<string name="storage_permission_rationale_download">LBRY ને તમારા ઉપકરણ પર ડાઉનલોડ સામગ્રી ઍક્સેસ કરવાની જરૂર છે.</string>
<string name="storage_permission_rationale_images">LBRY ને તમારા ડિવાઇસ સ્ટોરેજમાંથી છબીઓને લોડ કરવાની ઍક્સેસની જરૂર છે.</string>
<string name="select_thumbnail">થંબનેલ પસંદ કરો</string>
@@ -463,7 +444,6 @@
<string name="undetermined_image_filepath">ફાઇલ પાથ પસંદ કરેલી છબી માટે નક્કી કરી શકાતો નથી. કૃપા કરીને કોઈ અલગ સ્થાન પર એક છબી પસંદ કરો.</string>
<string name="wait_for_upload">કૃપા કરીને વર્તમાન અપલોડ સમાપ્ત થાય ત્યાં સુધી રાહ જુઓ.</string>
<string name="image_upload_failed">છબી અપલોડ કરવાની વિનંતી નિષ્ફળ થઈ. મેહરબાની કરી ને ફરી થી પ્રયાસ કરો.</string>
<string name="uploading">અપલોડ કરી રહ્યું છે...</string>
<string name="please_enter_channel_name">કૃપા કરીને એક ચેનલ નામ દાખલ કરો.</string>
<string name="channel_name_invalid_characters">તમારી ચેનલના નામમાં અમાન્ય અક્ષરો છે.</string>
<string name="channel_name_already_created">તમે સમાન નામવાળી ચેનલ પહેલેથી જ બનાવી લીધી છે.</string>
@@ -488,8 +468,6 @@
<item quantity="other">ચેનલો સફળતાપૂર્વક કાઢી નાખવામાં આવી હતી.</item>
</plurals>
<!-- Rewards -->
<string name="lbry_credits_allow">LBRY ક્રેડિટ્સ તમને સામગ્રી પ્રકાશિત અથવા ખરીદવાની મંજૂરી આપે છે.</string>
<string name="free_credits_worth">તમે ઇમેઇલ સરનામું પ્રદાન કર્યા પછી તમે %1$s ની મફત ક્રેડિટ મેળવી શકો છો.</string>
<string name="rewards_learn_more">&lt;a href=\"https://lbry.com/faq/earn-credits\"&gt;Learn more&lt;/a&gt;.</string>
<string name="get_started">શરૂ કરો</string>
@@ -578,7 +556,6 @@
<string name="get_social">સામાજિક થવું</string>
<string name="social_paragraph">તમે ડિસકોર્ડ, ફેસબુક, ઇન્સ્ટાગ્રામ, ટ્વિટર અથવા રેડ્ડિટ પર LBRY ટીમ અને સમુદાયના સભ્યો સાથે સંપર્ક કરી શકો છો.</string>
<string name="app_info">એપ્લિકેશન માહિતી</string>
<string name="loading">લોડ કરી રહ્યું છે...</string>
<string name="about_link_what_is_lbry">&lt;a href=\"https://lbry.com/faq/what-is-lbry\"&gt;What is LBRY?&lt;/a&gt;</string>
<string name="about_link_android_basics">&lt;a href=\"https://lbry.com/faq/android-basics\"&gt;Android Basics&lt;/a&gt;</string>
<string name="about_link_faq">&lt;a href=\"https://lbry.com/faq\"&gt;FAQ&lt;/a&gt;</string>
Loaded 100 of 121 files, more files were not shown because too many files have changed in this diff. Show more