Compare commits

...
18 Commits
Author SHA1 Message Date
Akinwale Ariwodola 8196b69211 bumpversion 0.16.2 --> 0.16.3 2020-09-14 11:20:47 +01:00
Akinwale Ariwodola dc861caf6c fix websocket for Android < 7.0 2020-09-14 11:19:50 +01:00
Akinwale Ariwodola adb5ffa8d0 exclude x86_64 lib from build 2020-09-14 11:06:39 +01:00
Akinwale Ariwodola d918cb28bd sdk 0.81.0 2020-09-11 13:50:16 +01:00
Akinwale Ariwodola 7ce7314ab9 bumpversion 0.16.1 --> 0.16.2 2020-09-11 13:41:30 +01:00
Javi Rueda 13e5caa0ef Use Start/End instead of Left/Right to support RTL (#1005)
* Use Start/End instead of Left/Right to support RTL
* Change it also for relative layout properties
2020-09-11 13:28:37 +01:00
Akinwale Ariwodola ff59a7a89f Merge pull request #1007 from lbryio/first-run-install-id
generate install_id natively
2020-09-11 13:22:42 +01:00
Akinwale Ariwodola c3efa4d004 generate install_id natively 2020-09-10 12:20:49 +01:00
Akinwale Ariwodola ed50e1300a real time notifications over websocket (#1000)
* real time notifications over websocket
* automatically re-establish websocket connections
2020-09-09 14:16:22 +01:00
Akinwale Ariwodola 86dbfd54d1 Merge pull request #1006 from lbryio/notification-back
proper back navigation to the notifications screen
2020-09-09 14:05:29 +01:00
Akinwale Ariwodola 535120eebd proper back navigation to the notifications screen 2020-09-09 14:03:36 +01:00
Akinwale Ariwodola c1106d7186 display correct playback speed for media 2020-09-04 12:50:22 +01:00
Akinwale Ariwodola 45be7f2c9b Merge pull request #1004 from lbryio/player-resume-black-screen
display player view correctly after dismissing PIP view
2020-09-04 12:33:53 +01:00
Akinwale Ariwodola d6baf3d1c8 display player view correctly after dismissing PIP view 2020-09-04 12:32:53 +01:00
Akinwale Ariwodola 08c38c1723 bumpversion 0.16.0 --> 0.16.1 2020-08-28 10:07:20 +01:00
Javi Rueda af4fa454d3 Add setting to enable sending buffering events (#993)
* Add setting to enable sending buffering events
* Use true as default value
2020-08-28 10:06:41 +01:00
Akinwale Ariwodola 0620582a4e fix in-app notification read background in dark mode 2020-08-28 10:04:10 +01:00
Akinwale Ariwodola b11c07e3d1 fix comment redirect from device notifications 2020-08-28 10:00:57 +01:00
70 changed files with 743 additions and 489 deletions

No files matched your search

+8 -4
View File
@@ -16,14 +16,15 @@ android {
applicationId "io.lbry.browser"
minSdkVersion 21
targetSdkVersion 29
versionCode 1600
versionName "0.16.0"
versionCode 1603
versionName "0.16.3"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
packagingOptions {
exclude 'META-INF/DEPENDENCIES'
exclude 'lib/x86_64/darwin/libscrypt.dylib'
}
productFlavors {
@@ -117,6 +118,9 @@ dependencies {
implementation 'com.arthenica:mobile-ffmpeg-full-gpl:4.3.1.LTS'
implementation 'org.bitcoinj:bitcoinj-tools:0.14.7'
implementation 'org.java-websocket:Java-WebSocket:1.5.1'
compileOnly 'org.projectlombok:lombok:1.18.10'
annotationProcessor 'org.projectlombok:lombok:1.18.10'
annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'
@@ -125,8 +129,8 @@ dependencies {
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
__32bitImplementation 'io.lbry:lbrysdk32:0.80.0'
__64bitImplementation 'io.lbry:lbrysdk64:0.80.0'
__32bitImplementation 'io.lbry:lbrysdk32:0.81.0'
__64bitImplementation 'io.lbry:lbrysdk64:0.81.0'
}
apply plugin: 'com.google.gms.google-services'
@@ -15,12 +15,22 @@ import androidx.appcompat.app.AppCompatActivity;
import androidx.core.text.HtmlCompat;
import androidx.preference.PreferenceManager;
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStreamReader;
import io.lbry.browser.exceptions.AuthTokenInvalidatedException;
import io.lbry.browser.utils.Helper;
import io.lbry.browser.utils.Lbry;
import io.lbry.browser.utils.LbryAnalytics;
import io.lbry.browser.utils.Lbryio;
import io.lbry.lbrysdk.LbrynetService;
import io.lbry.lbrysdk.ServiceHelper;
import io.lbry.lbrysdk.Utils;
public class FirstRunActivity extends AppCompatActivity {
@@ -44,12 +54,7 @@ public class FirstRunActivity extends AppCompatActivity {
});
registerAuthReceiver();
if (!Lbry.SDK_READY) {
findViewById(R.id.welcome_wait_container).setVisibility(View.VISIBLE);
} else {
authenticate();
}
findViewById(R.id.welcome_wait_container).setVisibility(View.VISIBLE);
IntentFilter filter = new IntentFilter();
filter.addAction(MainActivity.ACTION_SDK_READY);
filter.addAction(LbrynetService.ACTION_STOP_SERVICE);
@@ -62,10 +67,38 @@ public class FirstRunActivity extends AppCompatActivity {
authenticate();
} else if (LbrynetService.ACTION_STOP_SERVICE.equals(action)) {
finish();
if (MainActivity.instance != null) {
MainActivity.instance.finish();
}
}
}
};
registerReceiver(sdkReceiver, filter);
CheckInstallIdTask task = new CheckInstallIdTask(this, new CheckInstallIdTask.InstallIdHandler() {
@Override
public void onInstallIdChecked(boolean result) {
// start the sdk from FirstRun
boolean serviceRunning = MainActivity.isServiceRunning(MainActivity.instance, LbrynetService.class);
if (!serviceRunning) {
Lbry.SDK_READY = false;
ServiceHelper.start(MainActivity.instance, "", LbrynetService.class, "lbrynetservice");
}
if (result) {
// install_id generated and validated, authenticate now
authenticate();
return;
}
// we weren't able to generate the install_id ourselves, depend on the sdk for that
if (Lbry.SDK_READY) {
authenticate();
return;
}
}
});
task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
}
public void onResume() {
@@ -134,6 +167,75 @@ public class FirstRunActivity extends AppCompatActivity {
super.onDestroy();
}
private void generateIdAndAuthenticate() {
}
private static class CheckInstallIdTask extends AsyncTask<Void, Void, Boolean> {
private Context context;
private InstallIdHandler handler;
public CheckInstallIdTask(Context context, InstallIdHandler handler) {
this.context = context;
this.handler = handler;
}
protected Boolean doInBackground(Void... params) {
// Load the installation id from the file system
String lbrynetDir = String.format("%s/%s", Utils.getAppInternalStorageDir(context), "lbrynet");
File dir = new File(lbrynetDir);
boolean dirExists = dir.isDirectory();
if (!dirExists) {
dirExists = dir.mkdirs();
}
if (!dirExists) {
return false;
}
String installIdPath = String.format("%s/install_id", lbrynetDir);
File file = new File(installIdPath);
String installId = null;
if (!file.exists()) {
// generate the install_id
installId = Lbry.generateId();
BufferedWriter writer = null;
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 {
Helper.closeCloseable(writer);
}
} else {
// read the installation id from the file
BufferedReader reader = null;
try {
reader = new BufferedReader(new InputStreamReader(new FileInputStream(installIdPath)));
installId = reader.readLine();
} catch (IOException ex) {
return false;
} finally {
Helper.closeCloseable(reader);
}
}
if (!Helper.isNullOrEmpty(installId)) {
Lbry.INSTALLATION_ID = installId;
}
return !Helper.isNullOrEmpty(installId);
}
protected void onPostExecute(Boolean result) {
if (handler != null) {
handler.onInstallIdChecked(result);
}
}
public interface InstallIdHandler {
void onInstallIdChecked(boolean result);
}
}
private static class AuthenticateTask extends AsyncTask<Void, Void, Void> {
private Context context;
public AuthenticateTask(Context context) {
@@ -98,6 +98,8 @@ import androidx.appcompat.widget.Toolbar;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import org.java_websocket.client.WebSocketClient;
import org.java_websocket.handshake.ServerHandshake;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
@@ -107,6 +109,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.InputStreamReader;
import java.net.ConnectException;
import java.net.URI;
import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.Arrays;
@@ -121,6 +124,8 @@ import java.util.concurrent.TimeUnit;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.net.ssl.SSLParameters;
import io.lbry.browser.adapter.NavigationMenuAdapter;
import io.lbry.browser.adapter.NotificationListAdapter;
import io.lbry.browser.adapter.UrlSuggestionListAdapter;
@@ -199,6 +204,7 @@ import io.lbry.lbrysdk.ServiceHelper;
import io.lbry.lbrysdk.Utils;
import lombok.Getter;
import lombok.Setter;
import lombok.SneakyThrows;
import okhttp3.OkHttpClient;
public class MainActivity extends AppCompatActivity implements SdkStatusListener {
@@ -207,7 +213,9 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
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 MainActivity instance;
private boolean shuttingDown;
private Date remoteNotifcationsLastLoaded;
private Map<String, Class> specialRouteFragmentClassMap;
@Getter
@@ -240,6 +248,7 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
@Setter
private BackPressInterceptor backPressInterceptor;
private WebSocketClient webSocketClient;
@Getter
private String firebaseMessagingToken;
@@ -311,6 +320,7 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
public static final String PREFERENCE_KEY_NOTIFICATION_CREATOR = "io.lbry.browser.preference.notifications.Creator";
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";
// Internal flags / setting preferences
public static final String PREFERENCE_KEY_INTERNAL_SKIP_WALLET_ACCOUNT = "io.lbry.browser.preference.internal.WalletSkipAccount";
@@ -386,6 +396,7 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
@Override
protected void onCreate(Bundle savedInstanceState) {
instance = this;
// workaround to fix dark theme because https://issuetracker.google.com/issues/37124582
try {
new WebView(this);
@@ -862,12 +873,18 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
openFragment(PublishFormFragment.class, true, NavMenuItem.ID_ITEM_NEW_PUBLISH, params);
}
public void openChannelUrl(String url) {
public void openChannelUrl(String url, String source) {
Map<String, Object> params = new HashMap<>();
params.put("url", url);
params.put("claim", getCachedClaimForUrl(url));
if (!Helper.isNullOrEmpty(source)) {
params.put("source", source);
}
openFragment(ChannelFragment.class, true, NavMenuItem.ID_ITEM_FOLLOWING, params);
}
public void openChannelUrl(String url) {
openChannelUrl(url, null);
}
private Claim getCachedClaimForUrl(String url) {
ClaimCacheKey key = new ClaimCacheKey();
@@ -888,21 +905,33 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
}
public void openFileUrl(String url) {
openFileUrl(url, null);
}
public void openFileUrl(String url, String source) {
Map<String, Object> params = new HashMap<>();
params.put("url", url);
if (!Helper.isNullOrEmpty(source)) {
params.put("source", source);
}
openFragment(FileViewFragment.class, true, NavMenuItem.ID_ITEM_FOLLOWING, params);
}
private void openSpecialUrl(String url) {
private void openSpecialUrl(String url, String source) {
String specialPath = url.substring(8).toLowerCase();
if (specialRouteFragmentClassMap.containsKey(specialPath)) {
Class fragmentClass = specialRouteFragmentClassMap.get(specialPath);
if (fragmentClassNavIdMap.containsKey(fragmentClass)) {
Map<String, Object> params = null;
if (!Helper.isNullOrEmpty(source)) {
params = new HashMap<>();
params.put("source", source);
}
openFragment(
specialRouteFragmentClassMap.get(specialPath),
true,
fragmentClassNavIdMap.get(fragmentClass),
null
params
);
}
}
@@ -1001,11 +1030,15 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
@Override
protected void onDestroy() {
shuttingDown = true;
unregisterReceivers();
NotificationManagerCompat notificationManager = NotificationManagerCompat.from(this);
if (receivedStopService || !isServiceRunning(this, LbrynetService.class)) {
notificationManager.cancelAll();
}
if (webSocketClient != null) {
webSocketClient.close();
}
if (dbHelper != null) {
dbHelper.close();
}
@@ -1071,22 +1104,61 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
}
@SneakyThrows
private void checkWebSocketClient() {
if ((webSocketClient == null || webSocketClient.isClosed()) && !Helper.isNullOrEmpty(Lbryio.AUTH_TOKEN)) {
webSocketClient = new WebSocketClient(new URI(String.format("%s%s", Lbryio.WS_CONNECTION_BASE_URL, Lbryio.AUTH_TOKEN))) {
@Override
public void onOpen(ServerHandshake handshakedata) { }
@Override
public void onMessage(String message) {
loadRemoteNotifications(false);
}
@Override
public void onClose(int code, String reason, boolean remote) {
if (!shuttingDown) {
// attempt to re-establish the connection if the app isn't being closed
checkWebSocketClient();
}
}
@Override
public void onError(Exception ex) { }
protected void onSetSSLParameters(SSLParameters sslParameters) {
// don't call setEndpointIdentificationAlgorithm for API level < 24
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
sslParameters.setEndpointIdentificationAlgorithm("HTTPS");
}
}
};
webSocketClient.connect();
}
}
@Override
protected void onResume() {
super.onResume();
checkPurchases();
checkWebSocketClient();
enteringPIPMode = false;
applyNavbarSigninPadding();
checkFirstRun();
checkNowPlaying();
// check (and start) the LBRY SDK service
serviceRunning = isServiceRunning(this, LbrynetService.class);
if (!serviceRunning) {
Lbry.SDK_READY = false;
//findViewById(R.id.global_sdk_initializing_status).setVisibility(View.VISIBLE);
ServiceHelper.start(this, "", LbrynetService.class, "lbrynetservice");
if (isFirstRunCompleted()) {
// check (and start) the LBRY SDK service
serviceRunning = isServiceRunning(this, LbrynetService.class);
if (!serviceRunning) {
Lbry.SDK_READY = false;
//findViewById(R.id.global_sdk_initializing_status).setVisibility(View.VISIBLE);
ServiceHelper.start(this, "", LbrynetService.class, "lbrynetservice");
}
}
checkSdkReady();
showSignedInUser();
@@ -1097,6 +1169,11 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
}*/
}
public boolean isFirstRunCompleted() {
SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this);
return sp.getBoolean(PREFERENCE_KEY_INTERNAL_FIRST_RUN_COMPLETED, false);
}
private void checkPurchases() {
if (billingClient != null) {
Purchase.PurchasesResult result = billingClient.queryPurchases(BillingClient.SkuType.INAPP);
@@ -2240,6 +2317,10 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
}).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
}
public void navigateBackToNotifications() {
showNotifications();
}
@Override
public void onBackPressed() {
if (findViewById(R.id.url_suggestions_container).getVisibility() == View.VISIBLE) {
@@ -2250,6 +2331,7 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
hideNotifications();
return;
}
if (backPressInterceptor != null && backPressInterceptor.onBackPressed()) {
return;
}
@@ -2648,6 +2730,7 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
loadRemoteNotifications(false);
checkUrlIntent(getIntent());
checkWebSocketClient();
LbryAnalytics.logEvent(LbryAnalytics.EVENT_APP_LAUNCH);
appStarted = true;
}
@@ -2730,9 +2813,9 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
try {
LbryUri uri = LbryUri.parse(url);
if (uri.isChannel()) {
openChannelUrl(uri.toString());
openChannelUrl(url);
} else {
openFileUrl(uri.toString());
openFileUrl(url);
}
} catch (LbryUriException ex) {
// pass
@@ -3094,6 +3177,9 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
if (appPlayer != null && inPictureInPictureMode && !isBackgroundPlaybackEnabled()) {
appPlayer.setPlayWhenReady(false);
}
if (inPictureInPictureMode) {
MainActivity.playerReassigned = true;
}
super.onStop();
}
@@ -3317,14 +3403,14 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
String targetUrl = notification.getTargetUrl();
if (targetUrl.startsWith(SPECIAL_URL_PREFIX)) {
openSpecialUrl(targetUrl);
openSpecialUrl(targetUrl, "notification");
} else {
LbryUri target = LbryUri.tryParse(notification.getTargetUrl());
if (target != null) {
if (target.isChannel()) {
openChannelUrl(notification.getTargetUrl());
openChannelUrl(notification.getTargetUrl(), "notification");
} else {
openFileUrl(notification.getTargetUrl());
openFileUrl(notification.getTargetUrl(), "notification");
}
}
}
@@ -323,7 +323,7 @@ public class ClaimListAdapter extends RecyclerView.Adapter<ClaimListAdapter.View
int paddingBottom = position == getItemCount() - 1 ? 16 : 8;
int paddingTopScaled = Helper.getScaledValue(paddingTop, scale);
int paddingBottomScaled = Helper.getScaledValue(paddingBottom, scale);
vh.itemView.setPadding(vh.itemView.getPaddingLeft(), paddingTopScaled, vh.itemView.getPaddingRight(), paddingBottomScaled);
vh.itemView.setPadding(vh.itemView.getPaddingStart(), paddingTopScaled, vh.itemView.getPaddingEnd(), paddingBottomScaled);
Claim original = items.get(position);
boolean isRepost = Claim.TYPE_REPOST.equalsIgnoreCase(original.getValueType());
@@ -173,9 +173,9 @@ public class CommentListAdapter extends RecyclerView.Adapter<CommentListAdapter.
public void onBindViewHolder(ViewHolder holder, int position) {
Comment comment = items.get(position);
holder.itemView.setPadding(
nested ? Helper.getScaledValue(56, scale) : holder.itemView.getPaddingLeft(),
nested ? Helper.getScaledValue(56, scale) : holder.itemView.getPaddingStart(),
holder.itemView.getPaddingTop(),
nested ? 0 : holder.itemView.getPaddingRight(),
nested ? 0 : holder.itemView.getPaddingEnd(),
holder.itemView.getPaddingBottom());
holder.channelName.setText(comment.getChannelName());
@@ -159,7 +159,8 @@ public class NotificationListAdapter extends RecyclerView.Adapter<NotificationLi
public void onBindViewHolder(NotificationListAdapter.ViewHolder vh, int position) {
LbryNotification notification = items.get(position);
vh.layoutView.setBackgroundColor(ContextCompat.getColor(context, notification.isSeen() ? R.color.white : R.color.nextLbryGreenSemiTransparent));
vh.layoutView.setBackgroundColor(ContextCompat.getColor(context, notification.isSeen() ? android.R.color.transparent : R.color.nextLbryGreenSemiTransparent));
vh.titleView.setVisibility(!Helper.isNullOrEmpty(notification.getTitle()) ? View.VISIBLE : View.GONE);
vh.titleView.setText(notification.getTitle());
@@ -65,6 +65,14 @@ public class BaseFragment extends Fragment {
MainActivity.resumeGlobalPlayer(context);
}
}
if (params != null && params.containsKey("source") && "notification".equalsIgnoreCase(params.get("source").toString())) {
Context context = getContext();
if (context instanceof MainActivity) {
((MainActivity) context).navigateBackToNotifications();
}
}
rewardDriverClickListenerSet = false;
super.onStop();
}
@@ -298,7 +298,15 @@ public class FileViewFragment extends BaseFragment implements
loadingNewClaim = false;
}
} else if (playbackState == Player.STATE_BUFFERING) {
if (MainActivity.appPlayer != null && MainActivity.appPlayer.getCurrentPosition() > 0) {
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();
@@ -720,6 +728,7 @@ public class FileViewFragment extends BaseFragment implements
}
}
updatePlaybackSpeedView(root);
loadAndScheduleDurations();
}
@@ -764,6 +773,7 @@ public class FileViewFragment extends BaseFragment implements
View root = getView();
if (root != null) {
PlayerView view = root.findViewById(R.id.file_view_exoplayer_view);
view.setVisibility(View.VISIBLE);
view.setPlayer(null);
view.setPlayer(MainActivity.appPlayer);
}
@@ -1175,6 +1185,16 @@ public class FileViewFragment extends BaseFragment implements
commentsList.setLayoutManager(commentsListLLM);
}
private void updatePlaybackSpeedView(View root) {
if (root != null) {
PlayerView playerView = root.findViewById(R.id.file_view_exoplayer_view);
TextView textPlaybackSpeed = playerView.findViewById(R.id.player_playback_speed_label);
textPlaybackSpeed.setText(MainActivity.appPlayer != null && MainActivity.appPlayer.getPlaybackParameters() != null ?
Helper.getDisplayValueForPlaybackSpeed((double) MainActivity.appPlayer.getPlaybackParameters().speed) :
DEFAULT_PLAYBACK_SPEED);
}
}
private void deleteCurrentClaim() {
if (claim != null) {
Helper.setViewVisibility(layoutDisplayArea, View.INVISIBLE);
@@ -20,7 +20,6 @@ import android.provider.MediaStore;
import android.text.method.LinkMovementMethod;
import android.view.ContextMenu;
import android.view.View;
import android.widget.LinearLayout;
import android.widget.ProgressBar;
import android.widget.TextView;
@@ -32,6 +31,7 @@ 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;
@@ -103,6 +103,11 @@ public final class Helper {
}
}
public static String getDisplayValueForPlaybackSpeed(Double speed) {
DecimalFormat formatter = new DecimalFormat("0.##");
return String.format("%sx", formatter.format(speed));
}
public static String capitalize(String value) {
StringBuilder sb = new StringBuilder();
boolean capitalizeNext = true;
@@ -2,12 +2,15 @@ package io.lbry.browser.utils;
import android.util.Log;
import org.bitcoinj.core.Base58;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
import java.io.IOException;
import java.security.KeyStore;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -17,6 +20,7 @@ import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Random;
import java.util.concurrent.TimeUnit;
import io.lbry.browser.exceptions.ApiCallException;
@@ -522,4 +526,20 @@ public final class Lbry {
}
}
}
public static String generateId() {
return generateId(64);
}
public static String generateId(int numBytes) {
byte[] arr = new byte[numBytes];
new Random().nextBytes(arr);
try {
MessageDigest md = MessageDigest.getInstance("SHA-384");
byte[] hash = md.digest(arr);
return Base58.encode(hash);
} catch (NoSuchAlgorithmException e) {
// pass
return null;
}
}
}
@@ -57,6 +57,7 @@ public final class Lbryio {
public static final String TAG = "Lbryio";
public static final String CONNECTION_STRING = "https://api.lbry.com";
public static final String WS_CONNECTION_BASE_URL = "wss://api.lbry.com/subscribe?auth_token=";
public static final String AUTH_TOKEN_PARAM = "auth_token";
public static List<Subscription> subscriptions = new ArrayList<>();
public static List<Claim> cacheResolvedSubscriptions = new ArrayList<>();
@@ -24,7 +24,7 @@
android:id="@+id/welcome_progress_bar"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginRight="8dp"
android:layout_marginEnd="8dp"
android:layout_gravity="center_vertical"/>
<TextView
android:id="@+id/welcome_wait_text"
@@ -21,7 +21,7 @@
android:visibility="gone"
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_marginRight="8dp"
android:layout_marginEnd="8dp"
android:layout_marginTop="8dp"
android:background="?attr/selectableItemBackground"
app:layout_constraintTop_toTopOf="parent"
+16 -16
View File
@@ -33,17 +33,17 @@
android:id="@+id/wunderbar"
android:background="@android:color/transparent"
android:layout_centerVertical="true"
android:drawableLeft="@drawable/ic_search"
android:drawableStart="@drawable/ic_search"
android:drawablePadding="8dp"
android:drawableTint="@color/actionBarForeground"
android:fontFamily="@font/inter"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginRight="24dp"
android:layout_marginEnd="24dp"
android:hint="@string/uri_placeholder"
android:imeOptions="actionGo"
android:inputType="textNoSuggestions"
android:paddingRight="36dp"
android:paddingEnd="36dp"
android:selectAllOnFocus="true"
android:singleLine="true"
android:textFontWeight="300"
@@ -54,8 +54,8 @@
android:background="?attr/selectableItemBackground"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="24dp"
android:layout_alignParentRight="true"
android:layout_marginEnd="24dp"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:visibility="gone">
<ImageView
@@ -71,7 +71,7 @@
android:background="?attr/selectableItemBackground"
android:layout_width="48dp"
android:layout_height="match_parent"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true">
<ImageView
android:id="@+id/notifications_toggle_icon"
@@ -88,10 +88,10 @@
android:fontFamily="@font/inter"
android:gravity="center_horizontal"
android:minWidth="12dp"
android:paddingLeft="2dp"
android:paddingRight="2dp"
android:paddingStart="2dp"
android:paddingEnd="2dp"
android:layout_marginTop="12dp"
android:layout_marginLeft="24dp"
android:layout_marginStart="24dp"
android:textColor="@color/white"
android:textSize="10sp"
android:visibility="invisible"
@@ -171,7 +171,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_marginStart="8dp"
android:layout_gravity="center_vertical"
android:fontFamily="@font/inter"
android:text="@string/installation_id_loaded"
@@ -195,7 +195,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_marginStart="8dp"
android:layout_gravity="center_vertical"
android:fontFamily="@font/inter"
android:text="@string/known_tags_loaded"
@@ -219,7 +219,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_marginStart="8dp"
android:layout_gravity="center_vertical"
android:fontFamily="@font/inter"
android:text="@string/exchange_rate_loaded"
@@ -243,7 +243,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_marginStart="8dp"
android:layout_gravity="center_vertical"
android:fontFamily="@font/inter"
android:text="@string/user_authenticated"
@@ -267,7 +267,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_marginStart="8dp"
android:layout_gravity="center_vertical"
android:fontFamily="@font/inter"
android:text="@string/installation_registered"
@@ -291,7 +291,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_marginStart="8dp"
android:layout_gravity="center_vertical"
android:fontFamily="@font/inter"
android:text="@string/subscriptions_loaded"
@@ -315,7 +315,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_marginStart="8dp"
android:layout_gravity="center_vertical"
android:fontFamily="@font/inter"
android:text="@string/subscriptions_resolved"
@@ -47,14 +47,14 @@
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_centerVertical="true"
android:layout_marginRight="24dp"
android:layout_toLeftOf="@id/invites_email_button"
android:layout_marginEnd="24dp"
android:layout_toStartOf="@id/invites_email_button"
android:visibility="gone" />
<com.google.android.material.button.MaterialButton
android:id="@+id/invites_email_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:enabled="false"
android:fontFamily="@font/inter"
android:text="@string/invite" />
@@ -24,7 +24,7 @@
android:id="@+id/invites_loading_channels_progress"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:visibility="gone" />
</RelativeLayout>
@@ -54,11 +54,11 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toLeftOf="@id/invites_copy_invite_link"
android:layout_toStartOf="@id/invites_copy_invite_link"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:paddingLeft="12dp"
android:paddingRight="12dp">
android:paddingStart="12dp"
android:paddingEnd="12dp">
<TextView
android:id="@+id/invites_invite_link"
android:clickable="true"
@@ -72,14 +72,14 @@
</LinearLayout>
<ImageButton
android:id="@+id/invites_copy_invite_link"
android:layout_marginLeft="8dp"
android:layout_marginStart="8dp"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_centerVertical="true"
android:background="@null"
android:src="@drawable/ic_copy"
android:tint="@color/lbryGreen"
android:layout_alignParentRight="true" />
android:layout_alignParentEnd="true" />
</RelativeLayout>
<TextView
@@ -23,7 +23,7 @@
android:id="@+id/invites_loading_status_progress"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:visibility="gone" />
</RelativeLayout>
@@ -27,8 +27,8 @@
android:layout_centerVertical="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_toRightOf="@id/reward_driver_icon"
android:layout_marginStart="8dp"
android:layout_toEndOf="@id/reward_driver_icon"
android:fontFamily="@font/inter"
android:lineSpacingMultiplier="1.2"
android:textColor="@color/white"
+17 -17
View File
@@ -51,7 +51,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="4dp"
android:layout_marginStart="4dp"
android:fontFamily="@font/inter"
android:text="@string/lbc"
android:textColor="@color/white"
@@ -76,8 +76,8 @@
android:fontFamily="@font/inter"
android:text="@string/buy_lbc"
android:layout_marginTop="8dp"
android:layout_marginLeft="12dp"
android:layout_marginRight="12dp"
android:layout_marginStart="12dp"
android:layout_marginEnd="12dp"
android:textSize="16sp" />
<TextView
@@ -85,8 +85,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:fontFamily="@font/inter"
android:text="@string/convert_credits"
android:textColorLink="@color/lbryGreen"
@@ -97,7 +97,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginLeft="16dp"
android:layout_marginStart="16dp"
android:fontFamily="@font/inter"
android:text="@string/convert_credits_bittrex"
android:textColorLink="@color/lbryGreen"
@@ -115,8 +115,8 @@
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp">
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp">
<LinearLayout
android:layout_width="0dp"
android:layout_weight="1"
@@ -129,7 +129,7 @@
android:textColor="@color/lbryGreen" />
<LinearLayout
android:orientation="vertical"
android:layout_marginLeft="4dp"
android:layout_marginStart="4dp"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
@@ -155,7 +155,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="2dp"
android:layout_marginStart="2dp"
android:fontFamily="@font/inter"
android:text="@string/lbc"
android:textAllCaps="true"
@@ -189,9 +189,9 @@
android:layout_centerVertical="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toRightOf="@id/wallet_in_tips_label"
android:layout_toEndOf="@id/wallet_in_tips_label"
android:fontFamily="@font/inter"
android:layout_marginLeft="24dp"
android:layout_marginStart="24dp"
android:text="@string/unlock"
android:textColor="@color/lbryGreen"
android:textSize="14sp"
@@ -201,8 +201,8 @@
android:layout_centerVertical="true"
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_marginLeft="24dp"
android:layout_toRightOf="@id/wallet_in_tips_label"
android:layout_marginStart="24dp"
android:layout_toEndOf="@id/wallet_in_tips_label"
android:visibility="gone" />
</RelativeLayout>
@@ -232,7 +232,7 @@
android:textColor="@color/lbryGreen" />
<LinearLayout
android:orientation="vertical"
android:layout_marginLeft="4dp"
android:layout_marginStart="4dp"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
@@ -258,7 +258,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="2dp"
android:layout_marginStart="2dp"
android:fontFamily="@font/inter"
android:text="@string/lbc"
android:textAllCaps="true"
@@ -288,7 +288,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="2dp"
android:layout_marginStart="2dp"
android:fontFamily="@font/inter"
android:text="@string/lbc"
android:textAllCaps="true"
@@ -36,7 +36,7 @@
android:id="@+id/wallet_receive_address"
android:clickable="true"
android:layout_centerVertical="true"
android:layout_toLeftOf="@id/wallet_copy_receive_address"
android:layout_toStartOf="@id/wallet_copy_receive_address"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fontFamily="@font/inter"
@@ -45,21 +45,21 @@
android:letterSpacing="0.05"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:paddingStart="8dp"
android:paddingEnd="8dp"
android:singleLine="true"
android:textAlignment="center"
android:ellipsize="middle" />
<ImageButton
android:id="@+id/wallet_copy_receive_address"
android:layout_marginLeft="8dp"
android:layout_marginStart="8dp"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_centerVertical="true"
android:background="@null"
android:src="@drawable/ic_copy"
android:tint="@color/lbryGreen"
android:layout_alignParentRight="true" />
android:layout_alignParentEnd="true" />
</RelativeLayout>
<com.google.android.material.button.MaterialButton
@@ -12,8 +12,8 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginTop="16dp">
<TextView
android:layout_width="wrap_content"
@@ -63,7 +63,7 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_marginStart="8dp"
android:text="@string/loading_transactions"
android:fontFamily="@font/inter"
android:textSize="14sp"
@@ -52,10 +52,10 @@
<TextView
android:id="@+id/wallet_input_currency"
android:layout_toRightOf="@id/wallet_input_layout_amount"
android:layout_toEndOf="@id/wallet_input_layout_amount"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="30dp"
android:fontFamily="@font/inter"
android:text="@string/lbc"
@@ -65,8 +65,8 @@
<LinearLayout
android:id="@+id/wallet_inline_balance_container"
android:layout_toRightOf="@id/wallet_input_currency"
android:layout_marginLeft="24dp"
android:layout_toEndOf="@id/wallet_input_currency"
android:layout_marginStart="24dp"
android:layout_marginTop="28dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -82,21 +82,21 @@
android:layout_height="wrap_content"
android:fontFamily="@font/inter"
android:textFontWeight="300"
android:layout_marginLeft="2dp" />
android:layout_marginStart="2dp" />
</LinearLayout>
<ProgressBar
android:id="@+id/wallet_send_progress"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_toLeftOf="@id/wallet_send"
android:layout_toStartOf="@id/wallet_send"
android:layout_centerVertical="true"
android:layout_marginRight="8dp"
android:layout_marginEnd="8dp"
android:visibility="gone" />
<com.google.android.material.button.MaterialButton
android:id="@+id/wallet_send"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+7 -7
View File
@@ -12,7 +12,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:fontFamily="@font/inter"
android:textStyle="bold"
@@ -29,8 +29,8 @@
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:weightSum="10">
<TextView
android:layout_weight="4"
@@ -66,8 +66,8 @@
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:weightSum="10">
<TextView
android:layout_weight="4"
@@ -106,8 +106,8 @@
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="12dp"
android:weightSum="2">
<TextView
@@ -24,7 +24,7 @@
android:textFontWeight="300" />
<ProgressBar
android:id="@+id/comment_form_channels_loading"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_width="20dp"
android:layout_height="20dp"
@@ -57,12 +57,12 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp">
android:layout_marginStart="8dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_marginRight="40dp">
android:layout_marginEnd="40dp">
<TextView
android:id="@+id/comment_form_replying_to_text"
android:layout_width="wrap_content"
@@ -87,7 +87,7 @@
android:id="@+id/comment_form_clear_reply_to"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_width="36dp"
android:layout_height="36dp">
<ImageView
@@ -136,8 +136,8 @@
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_toRightOf="@id/comment_form_avatar_container"
android:layout_marginLeft="16dp">
android:layout_toEndOf="@id/comment_form_avatar_container"
android:layout_marginStart="16dp">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/comment_form_body"
android:hint="@string/comment"
@@ -179,8 +179,8 @@
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_centerVertical="true"
android:layout_toRightOf="@id/comment_form_post"
android:layout_marginLeft="24dp"
android:layout_toEndOf="@id/comment_form_post"
android:layout_marginStart="24dp"
android:visibility="gone" />
</RelativeLayout>
</LinearLayout>
@@ -42,10 +42,10 @@
<TextView
android:id="@+id/inline_channel_form_inline_currency"
android:layout_toRightOf="@id/inline_channel_form_layout_deposit"
android:layout_toEndOf="@id/inline_channel_form_layout_deposit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="30dp"
android:fontFamily="@font/inter"
android:text="@string/lbc"
@@ -55,8 +55,8 @@
<LinearLayout
android:id="@+id/inline_channel_form_inline_balance_container"
android:layout_toRightOf="@id/inline_channel_form_inline_currency"
android:layout_marginLeft="24dp"
android:layout_toEndOf="@id/inline_channel_form_inline_currency"
android:layout_marginStart="24dp"
android:layout_marginTop="28dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -72,7 +72,7 @@
android:layout_height="wrap_content"
android:fontFamily="@font/inter"
android:textFontWeight="300"
android:layout_marginLeft="2dp" />
android:layout_marginStart="2dp" />
</LinearLayout>
</RelativeLayout>
@@ -105,15 +105,15 @@
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_centerVertical="true"
android:layout_marginRight="24dp"
android:layout_toLeftOf="@id/inline_channel_form_create_button"
android:layout_marginEnd="24dp"
android:layout_toStartOf="@id/inline_channel_form_create_button"
android:visibility="gone" />
<com.google.android.material.button.MaterialButton
android:id="@+id/inline_channel_form_create_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:fontFamily="@font/inter"
android:text="@string/create"/>
+7 -7
View File
@@ -104,7 +104,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="8dp"
android:layout_marginStart="8dp"
android:fontFamily="@font/inter"
android:text="@string/sdk_initializing"
android:textSize="14sp"
@@ -118,8 +118,8 @@
android:clickable="true"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="4dp"
android:layout_marginRight="4dp"
android:layout_marginStart="4dp"
android:layout_marginEnd="4dp"
android:layout_marginBottom="4dp"
android:visibility="gone"
app:cardElevation="8dp"
@@ -133,9 +133,9 @@
android:layout_width="160dp"
android:layout_height="90dp" />
<LinearLayout
android:layout_toRightOf="@id/global_now_playing_player_view"
android:layout_toLeftOf="@id/global_now_playing_close"
android:layout_marginLeft="8dp"
android:layout_toEndOf="@id/global_now_playing_player_view"
android:layout_toStartOf="@id/global_now_playing_close"
android:layout_marginStart="8dp"
android:layout_centerVertical="true"
android:orientation="vertical"
android:layout_width="match_parent"
@@ -165,7 +165,7 @@
android:layout_width="36dp"
android:layout_alignParentEnd="true"
android:clickable="true"
android:layout_marginLeft="8dp">
android:layout_marginStart="8dp">
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
@@ -4,8 +4,8 @@
android:layout_height="match_parent"
android:orientation="vertical">
<TextView
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:layout_marginTop="8dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -19,8 +19,8 @@
android:layout_height="0.5dp"
android:background="@color/divider"
android:layout_marginTop="8dp"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp" />
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp" />
<RelativeLayout
android:id="@+id/content_from_past_24_hours_item"
@@ -41,7 +41,7 @@
android:id="@+id/content_from_past_24_hours_item_selected"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:src="@drawable/ic_check"
android:tint="@color/lbryGreen"
@@ -67,7 +67,7 @@
android:id="@+id/content_from_past_week_item_selected"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:src="@drawable/ic_check"
android:tint="@color/lbryGreen"
@@ -93,7 +93,7 @@
android:id="@+id/content_from_past_month_item_selected"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:src="@drawable/ic_check"
android:tint="@color/lbryGreen"
@@ -119,7 +119,7 @@
android:id="@+id/content_from_past_year_item_selected"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:src="@drawable/ic_check"
android:tint="@color/lbryGreen"
@@ -145,7 +145,7 @@
android:id="@+id/content_from_all_time_item_selected"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:src="@drawable/ic_check"
android:tint="@color/lbryGreen"
@@ -4,8 +4,8 @@
android:layout_height="match_parent"
android:orientation="vertical">
<TextView
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:layout_marginTop="8dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -19,8 +19,8 @@
android:layout_height="0.5dp"
android:background="@color/divider"
android:layout_marginTop="8dp"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp" />
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp" />
<RelativeLayout
android:id="@+id/content_scope_everyone_item"
@@ -37,10 +37,10 @@
android:layout_centerVertical="true"
android:text="@string/fa_globe_americas" />
<TextView
android:layout_toRightOf="@+id/content_scope_everyone_item_icon"
android:layout_toEndOf="@+id/content_scope_everyone_item_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginStart="16dp"
android:layout_centerVertical="true"
android:fontFamily="@font/inter"
android:text="@string/everyone"
@@ -50,7 +50,7 @@
android:id="@+id/content_scope_everyone_item_selected"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:src="@drawable/ic_check"
android:tint="@color/lbryGreen"
@@ -72,10 +72,10 @@
android:layout_centerVertical="true"
android:text="@string/fa_hashtag" />
<TextView
android:layout_toRightOf="@+id/content_scope_tags_item_icon"
android:layout_toEndOf="@+id/content_scope_tags_item_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginStart="16dp"
android:layout_centerVertical="true"
android:fontFamily="@font/inter"
android:text="@string/tags_you_follow"
@@ -85,7 +85,7 @@
android:id="@+id/content_scope_tags_item_selected"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:src="@drawable/ic_check"
android:tint="@color/lbryGreen"
+13 -13
View File
@@ -4,8 +4,8 @@
android:layout_height="match_parent"
android:orientation="vertical">
<TextView
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:layout_marginTop="8dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -19,8 +19,8 @@
android:layout_height="0.5dp"
android:background="@color/divider"
android:layout_marginTop="8dp"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp" />
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp" />
<RelativeLayout
android:id="@+id/sort_by_trending_item"
@@ -37,10 +37,10 @@
android:src="@drawable/ic_trending"
android:tint="@color/foreground" />
<TextView
android:layout_toRightOf="@+id/sort_by_trending_item_icon"
android:layout_toEndOf="@+id/sort_by_trending_item_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginStart="16dp"
android:layout_centerVertical="true"
android:fontFamily="@font/inter"
android:text="@string/trending_content"
@@ -50,7 +50,7 @@
android:id="@+id/sort_by_trending_item_selected"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:src="@drawable/ic_check"
android:tint="@color/lbryGreen"
@@ -72,10 +72,10 @@
android:src="@drawable/ic_new"
android:tint="@color/foreground" />
<TextView
android:layout_toRightOf="@+id/sort_by_new_item_icon"
android:layout_toEndOf="@+id/sort_by_new_item_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginStart="16dp"
android:layout_centerVertical="true"
android:fontFamily="@font/inter"
android:text="@string/new_content"
@@ -85,7 +85,7 @@
android:id="@+id/sort_by_new_item_selected"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:src="@drawable/ic_check"
android:tint="@color/lbryGreen"
@@ -107,10 +107,10 @@
android:src="@drawable/ic_top"
android:tint="@color/foreground" />
<TextView
android:layout_toRightOf="@+id/sort_by_top_item_icon"
android:layout_toEndOf="@+id/sort_by_top_item_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginStart="16dp"
android:layout_centerVertical="true"
android:fontFamily="@font/inter"
android:text="@string/top_content"
@@ -120,7 +120,7 @@
android:id="@+id/sort_by_top_item_selected"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:src="@drawable/ic_check"
android:tint="@color/lbryGreen"
@@ -50,7 +50,7 @@
android:text="@string/channel_to_show_support_as" />
<ProgressBar
android:id="@+id/create_support_channel_progress"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_width="20dp"
android:layout_height="20dp"
@@ -83,10 +83,10 @@
<TextView
android:id="@+id/create_support_input_currency"
android:layout_toRightOf="@id/create_support_input_layout_amount"
android:layout_toEndOf="@id/create_support_input_layout_amount"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="30dp"
android:fontFamily="@font/inter"
android:text="@string/lbc"
@@ -96,8 +96,8 @@
<LinearLayout
android:id="@+id/create_support_inline_balance_container"
android:layout_toRightOf="@id/create_support_input_currency"
android:layout_marginLeft="24dp"
android:layout_toEndOf="@id/create_support_input_currency"
android:layout_marginStart="24dp"
android:layout_marginTop="28dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -113,7 +113,7 @@
android:layout_height="wrap_content"
android:fontFamily="@font/inter"
android:textFontWeight="300"
android:layout_marginLeft="2dp" />
android:layout_marginStart="2dp" />
</LinearLayout>
</RelativeLayout>
@@ -148,9 +148,9 @@
android:id="@+id/create_support_progress"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_toLeftOf="@id/create_support_send"
android:layout_toStartOf="@id/create_support_send"
android:layout_centerVertical="true"
android:layout_marginRight="8dp"
android:layout_marginEnd="8dp"
android:visibility="gone" />
<com.google.android.material.button.MaterialButton
@@ -159,7 +159,7 @@
android:layout_height="wrap_content"
android:fontFamily="@font/inter"
android:text="@string/send_lbc_tip"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true" />
</RelativeLayout>
</LinearLayout>
@@ -8,8 +8,8 @@
android:layout_height="match_parent"
android:orientation="vertical">
<TextView
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:layout_marginTop="8dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -23,22 +23,22 @@
android:layout_height="0.5dp"
android:background="@color/divider"
android:layout_marginTop="8dp"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="16dp"/>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/customize_tags_followed_list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp" />
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp" />
<TextView
android:id="@+id/customize_no_followed_tags"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="6dp"
android:fontFamily="@font/inter"
android:text="@string/no_followed_tags"
@@ -51,23 +51,23 @@
android:layout_height="0.5dp"
android:background="@color/divider"
android:layout_marginTop="10dp"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="16dp"/>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/customize_tags_suggested_list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp" />
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp" />
<TextView
android:id="@+id/customize_no_tag_results"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="6dp"
android:fontFamily="@font/inter"
android:text="@string/no_tag_results"
@@ -79,8 +79,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="16dp">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/customize_tag_filter_input"
@@ -97,8 +97,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="16dp"
android:fontFamily="@font/inter"
android:text="@string/done" />
+3 -3
View File
@@ -22,7 +22,7 @@
android:id="@+id/discover_loading"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:visibility="gone" />
</RelativeLayout>
@@ -46,8 +46,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:fontFamily="@font/inter"
android:text="@string/done" />
+11 -11
View File
@@ -74,7 +74,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toRightOf="@id/repost_name_prefix"
android:layout_toEndOf="@id/repost_name_prefix"
android:fontFamily="@font/inter"
android:singleLine="true"
android:textSize="14sp"
@@ -107,10 +107,10 @@
<TextView
android:id="@+id/repost_input_currency"
android:layout_toRightOf="@id/repost_input_layout_amount"
android:layout_toEndOf="@id/repost_input_layout_amount"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="30dp"
android:fontFamily="@font/inter"
android:text="@string/lbc"
@@ -120,8 +120,8 @@
<LinearLayout
android:id="@+id/repost_inline_balance_container"
android:layout_toRightOf="@id/repost_input_currency"
android:layout_marginLeft="24dp"
android:layout_toEndOf="@id/repost_input_currency"
android:layout_marginStart="24dp"
android:layout_marginTop="28dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -137,7 +137,7 @@
android:layout_height="wrap_content"
android:fontFamily="@font/inter"
android:textFontWeight="300"
android:layout_marginLeft="2dp" />
android:layout_marginStart="2dp" />
</LinearLayout>
</RelativeLayout>
</LinearLayout>
@@ -165,8 +165,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginRight="24dp"
android:layout_toLeftOf="@id/repost_button"
android:layout_marginEnd="24dp"
android:layout_toStartOf="@id/repost_button"
android:fontFamily="@font/inter"
android:textSize="14sp"
android:text="@string/show_advanced" />
@@ -174,9 +174,9 @@
android:id="@+id/repost_progress"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_toLeftOf="@id/repost_button"
android:layout_toStartOf="@id/repost_button"
android:layout_centerVertical="true"
android:layout_marginRight="8dp"
android:layout_marginEnd="8dp"
android:visibility="gone" />
<com.google.android.material.button.MaterialButton
android:id="@+id/repost_button"
@@ -184,7 +184,7 @@
android:layout_height="wrap_content"
android:fontFamily="@font/inter"
android:text="@string/repost"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true" />
</RelativeLayout>
</LinearLayout>
@@ -14,7 +14,7 @@
android:layout_centerVertical="true"
android:layout_width="72dp"
android:layout_height="72dp"
android:layout_toLeftOf="@id/player_play_pause">
android:layout_toStartOf="@id/player_play_pause">
<ImageView
android:layout_width="36dp"
android:layout_height="36dp"
@@ -66,7 +66,7 @@
android:layout_centerVertical="true"
android:layout_width="72dp"
android:layout_height="72dp"
android:layout_toRightOf="@id/player_play_pause">
android:layout_toEndOf="@id/player_play_pause">
<ImageView
android:layout_width="36dp"
android:layout_height="36dp"
@@ -84,7 +84,7 @@
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_alignParentTop="true"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:visibility="gone">
<ImageView
android:id="@+id/player_image_cast_toggle"
@@ -103,14 +103,14 @@
android:layout_alignParentBottom="true"
android:layout_width="56dp"
android:layout_height="48dp"
android:layout_toLeftOf="@id/player_toggle_fullscreen">
android:layout_toStartOf="@id/player_toggle_fullscreen">
<TextView
android:id="@+id/player_playback_speed_label"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="8dp"
android:layout_marginEnd="8dp"
android:fontFamily="@font/inter"
android:letterSpacing="0.05"
android:singleLine="true"
@@ -126,7 +126,7 @@
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true">
android:layout_alignParentEnd="true">
<ImageView
android:id="@+id/player_image_full_screen_toggle"
android:layout_width="24dp"
@@ -140,9 +140,9 @@
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_alignParentBottom="true"
android:layout_toLeftOf="@id/player_playback_speed"
android:paddingLeft="16dp"
android:paddingRight="4dp">
android:layout_toStartOf="@id/player_playback_speed"
android:paddingStart="16dp"
android:paddingEnd="4dp">
<TextView
android:id="@+id/player_duration_elapsed"
android:layout_width="64dp"
@@ -155,12 +155,12 @@
android:textSize="14sp" />
<com.google.android.exoplayer2.ui.DefaultTimeBar
android:id="@id/exo_progress"
android:layout_toLeftOf="@id/player_duration_total"
android:layout_toRightOf="@id/player_duration_elapsed"
android:layout_toStartOf="@id/player_duration_total"
android:layout_toEndOf="@id/player_duration_elapsed"
android:layout_width="match_parent"
android:layout_height="24dp"
android:layout_marginLeft="4dp"
android:layout_marginRight="4dp"
android:layout_marginStart="4dp"
android:layout_marginEnd="4dp"
android:layout_centerVertical="true"
app:scrubber_color="@color/scrubberColor"
app:played_color="@color/playedColor"
@@ -170,7 +170,7 @@
android:layout_width="64dp"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:gravity="end"
android:fontFamily="@font/inter"
android:singleLine="true"
@@ -6,7 +6,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:layout_marginRight="8dp"
android:layout_marginEnd="8dp"
android:elevation="4dp"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintBottom_toBottomOf="parent">
@@ -19,8 +19,8 @@
android:layout_height="wrap_content"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:paddingLeft="8dp"
android:paddingRight="44dp"
android:paddingStart="8dp"
android:paddingEnd="44dp"
android:visibility="invisible">
<io.lbry.browser.ui.controls.SolidIconView
android:layout_width="16dp"
@@ -33,7 +33,7 @@
android:id="@+id/floating_reward_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="2dp"
android:layout_marginStart="2dp"
android:layout_gravity="center_vertical"
android:fontFamily="@font/inter"
android:textColor="@color/white"
@@ -51,11 +51,11 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toRightOf="@id/floating_reward_container"
android:layout_marginLeft="-36dp"
android:layout_marginStart="-36dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:paddingLeft="12dp"
android:paddingRight="16dp">
android:paddingStart="12dp"
android:paddingEnd="16dp">
<io.lbry.browser.ui.controls.SolidIconView
android:layout_width="16dp"
android:layout_height="16dp"
@@ -73,7 +73,7 @@
android:id="@+id/floating_balance_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="2dp"
android:layout_marginStart="2dp"
android:layout_gravity="center_vertical"
android:fontFamily="@font/inter"
android:textColor="@color/white"
@@ -87,7 +87,7 @@
android:layout_gravity="center_vertical"
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_marginLeft="2dp" />
android:layout_marginStart="2dp" />
</LinearLayout>
@@ -25,8 +25,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp">
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp">
<TextView
android:id="@+id/all_content_page_title"
android:layout_width="wrap_content"
@@ -41,7 +41,7 @@
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_centerVertical="true"
android:layout_alignParentRight="true" />
android:layout_alignParentEnd="true" />
</RelativeLayout>
<RelativeLayout
@@ -50,8 +50,8 @@
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:layout_marginBottom="8dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:visibility="visible">
<LinearLayout
android:layout_width="wrap_content"
@@ -76,7 +76,7 @@
<ImageView
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_marginLeft="2dp"
android:layout_marginStart="2dp"
android:layout_gravity="center_vertical"
android:src="@drawable/ic_arrow_dropdown"
android:tint="@color/foreground" />
@@ -85,10 +85,10 @@
<TextView
android:id="@+id/all_content_for_prefix"
android:layout_centerVertical="true"
android:layout_toRightOf="@id/all_content_sort_link"
android:layout_toEndOf="@id/all_content_sort_link"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="2dp"
android:layout_marginStart="2dp"
android:fontFamily="@font/inter"
android:textFontWeight="300"
android:textSize="12sp"
@@ -96,12 +96,12 @@
android:visibility="gone" />
<LinearLayout
android:id="@+id/all_content_scope_link"
android:layout_toRightOf="@id/all_content_sort_link"
android:layout_toEndOf="@id/all_content_sort_link"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="2dp"
android:layout_marginStart="2dp"
android:layout_centerVertical="true"
android:visibility="gone">
<TextView
@@ -109,7 +109,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="4dp"
android:layout_marginStart="4dp"
android:fontFamily="@font/inter"
android:textFontWeight="300"
android:textSize="12sp"
@@ -117,7 +117,7 @@
<ImageView
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_marginLeft="2dp"
android:layout_marginStart="2dp"
android:layout_gravity="center_vertical"
android:src="@drawable/ic_arrow_dropdown"
android:tint="@color/foreground" />
@@ -126,10 +126,10 @@
<TextView
android:id="@+id/all_content_from_prefix"
android:layout_centerVertical="true"
android:layout_toRightOf="@id/all_content_sort_link"
android:layout_toEndOf="@id/all_content_sort_link"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="2dp"
android:layout_marginStart="2dp"
android:fontFamily="@font/inter"
android:textFontWeight="300"
android:textSize="12sp"
@@ -142,15 +142,15 @@
android:clickable="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="2dp"
android:layout_toRightOf="@id/all_content_sort_link"
android:layout_marginStart="2dp"
android:layout_toEndOf="@id/all_content_sort_link"
android:visibility="gone">
<TextView
android:id="@+id/all_content_time_link_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="4dp"
android:layout_marginStart="4dp"
android:fontFamily="@font/inter"
android:textFontWeight="300"
android:textSize="12sp"
@@ -158,7 +158,7 @@
<ImageView
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_marginLeft="2dp"
android:layout_marginStart="2dp"
android:layout_gravity="center_vertical"
android:src="@drawable/ic_arrow_dropdown"
android:tint="@color/foreground" />
@@ -170,7 +170,7 @@
android:background="?attr/selectableItemBackground"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:clickable="true"
android:fontFamily="@font/inter"
+15 -15
View File
@@ -19,7 +19,7 @@
<ProgressBar
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_marginRight="8dp"
android:layout_marginEnd="8dp"
android:layout_gravity="center_vertical" />
<TextView
android:layout_width="wrap_content"
@@ -53,18 +53,18 @@
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="12dp"
android:layout_marginRight="12dp"
android:layout_marginStart="12dp"
android:layout_marginEnd="12dp"
android:layout_above="@+id/channel_view_tabs"
android:layout_toRightOf="@id/channel_view_icon_container"
android:layout_toEndOf="@id/channel_view_icon_container"
android:orientation="vertical">
<TextView
android:id="@+id/channel_view_title"
android:background="@color/channelCoverBackground"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="4dp"
android:paddingRight="4dp"
android:paddingStart="4dp"
android:paddingEnd="4dp"
android:paddingTop="2dp"
android:paddingBottom="2dp"
android:ellipsize="end"
@@ -80,8 +80,8 @@
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:layout_marginBottom="2dp"
android:paddingLeft="4dp"
android:paddingRight="4dp"
android:paddingStart="4dp"
android:paddingEnd="4dp"
android:paddingTop="2dp"
android:paddingBottom="2dp"
android:fontFamily="@font/inter"
@@ -95,7 +95,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:paddingLeft="110dp"
android:paddingStart="110dp"
app:tabGravity="fill"
app:tabMode="scrollable"/>
<RelativeLayout
@@ -103,7 +103,7 @@
android:layout_width="80dp"
android:layout_height="80dp"
android:layout_alignParentBottom="true"
android:layout_marginLeft="12dp"
android:layout_marginStart="12dp"
android:layout_marginBottom="12dp">
<RelativeLayout
android:layout_centerHorizontal="true"
@@ -143,7 +143,7 @@
android:elevation="4dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:padding="8dp">
<RelativeLayout
android:id="@+id/channel_view_edit"
@@ -151,7 +151,7 @@
android:background="?attr/selectableItemBackground"
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_marginRight="8dp"
android:layout_marginEnd="8dp"
android:visibility="gone">
<ImageView
android:layout_centerInParent="true"
@@ -166,7 +166,7 @@
android:background="?attr/selectableItemBackground"
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_marginRight="8dp"
android:layout_marginEnd="8dp"
android:visibility="gone">
<ImageView
android:layout_centerInParent="true"
@@ -181,7 +181,7 @@
android:background="?attr/selectableItemBackground"
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_marginRight="8dp">
android:layout_marginEnd="8dp">
<ImageView
android:layout_centerInParent="true"
android:layout_width="22dp"
@@ -195,7 +195,7 @@
android:clickable="true"
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_marginRight="8dp">
android:layout_marginEnd="8dp">
<io.lbry.browser.ui.controls.SolidIconView
android:layout_centerInParent="true"
android:layout_width="24dp"
@@ -8,8 +8,8 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp">
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp">
<ProgressBar
android:id="@+id/channel_comments_progress"
android:layout_width="20dp"
@@ -31,16 +31,16 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="0dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="16dp" />
<TextView
android:id="@+id/channel_no_comments"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginTop="8dp"
android:fontFamily="@font/inter"
android:text="@string/no_comments"
@@ -52,8 +52,8 @@
android:id="@+id/channel_comments_sdk_initializing"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginTop="8dp"
android:fontFamily="@font/inter"
android:text="@string/sdk_initializing_comments"
@@ -27,8 +27,8 @@
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:layout_marginBottom="8dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:visibility="visible">
<LinearLayout
android:layout_width="wrap_content"
@@ -53,7 +53,7 @@
<ImageView
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_marginLeft="2dp"
android:layout_marginStart="2dp"
android:layout_gravity="center_vertical"
android:src="@drawable/ic_arrow_dropdown"
android:tint="@color/foreground" />
@@ -66,15 +66,15 @@
android:clickable="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="24dp"
android:layout_toRightOf="@id/channel_content_sort_link"
android:layout_marginStart="24dp"
android:layout_toEndOf="@id/channel_content_sort_link"
android:visibility="gone">
<TextView
android:id="@+id/channel_content_time_link_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="4dp"
android:layout_marginStart="4dp"
android:fontFamily="@font/inter"
android:textFontWeight="300"
android:textSize="12sp"
@@ -82,7 +82,7 @@
<ImageView
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_marginLeft="2dp"
android:layout_marginStart="2dp"
android:layout_gravity="center_vertical"
android:src="@drawable/ic_arrow_dropdown"
android:tint="@color/foreground" />
@@ -29,7 +29,7 @@
android:background="@drawable/bg_small_icon"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginLeft="16dp"
android:layout_marginStart="16dp"
android:layout_marginBottom="16dp"
android:layout_alignParentBottom="true">
<ImageView
@@ -45,16 +45,16 @@
<LinearLayout
android:id="@+id/channel_form_upload_progress"
android:background="@color/channelCoverBackground"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="4dp"
android:layout_marginStart="4dp"
android:layout_marginTop="4dp"
android:orientation="horizontal"
android:paddingTop="2dp"
android:paddingBottom="2dp"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:paddingStart="8dp"
android:paddingEnd="8dp"
android:visibility="gone">
<ProgressBar
android:layout_width="16dp"
@@ -62,7 +62,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="4dp"
android:layout_marginStart="4dp"
android:fontFamily="@font/inter"
android:text="@string/uploading"
android:textColor="@color/white"
@@ -103,7 +103,7 @@
android:background="@drawable/bg_small_icon"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginLeft="16dp"
android:layout_marginStart="16dp"
android:layout_marginBottom="16dp"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true">
@@ -169,7 +169,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="28dp"
android:layout_marginLeft="12dp"
android:layout_marginStart="12dp"
android:text="@string/at"
android:visibility="gone" />
</RelativeLayout>
@@ -195,10 +195,10 @@
<TextView
android:id="@+id/channel_form_input_currency"
android:layout_toRightOf="@id/channel_form_input_layout_deposit"
android:layout_toEndOf="@id/channel_form_input_layout_deposit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="30dp"
android:fontFamily="@font/inter"
android:text="@string/lbc"
@@ -208,8 +208,8 @@
<LinearLayout
android:id="@+id/channel_form_inline_balance_container"
android:layout_toRightOf="@id/channel_form_input_currency"
android:layout_marginLeft="24dp"
android:layout_toEndOf="@id/channel_form_input_currency"
android:layout_marginStart="24dp"
android:layout_marginTop="28dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -225,7 +225,7 @@
android:layout_height="wrap_content"
android:fontFamily="@font/inter"
android:textFontWeight="300"
android:layout_marginLeft="2dp" />
android:layout_marginStart="2dp" />
</LinearLayout>
</RelativeLayout>
@@ -323,8 +323,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginRight="24dp"
android:layout_toLeftOf="@id/channel_form_save_button"
android:layout_marginEnd="24dp"
android:layout_toStartOf="@id/channel_form_save_button"
android:fontFamily="@font/inter"
android:textSize="14sp"
android:text="@string/show_optional_fields" />
@@ -333,14 +333,14 @@
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_centerVertical="true"
android:layout_marginRight="24dp"
android:layout_toLeftOf="@+id/channel_form_save_button"
android:layout_marginEnd="24dp"
android:layout_toStartOf="@+id/channel_form_save_button"
android:visibility="gone" />
<com.google.android.material.button.MaterialButton
android:id="@+id/channel_form_save_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:fontFamily="@font/inter"
android:text="@string/save" />
@@ -15,9 +15,9 @@
android:id="@+id/channel_manager_list_loading"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_marginTop="16dp"
android:layout_marginRight="16dp"
android:layout_marginEnd="16dp"
android:visibility="gone" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/channel_manager_list"
@@ -66,9 +66,9 @@
android:id="@+id/channel_manager_fab_new_channel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:layout_marginRight="16dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="16dp"
android:src="@drawable/ic_add"
android:visibility="gone" />
+36 -36
View File
@@ -19,7 +19,7 @@
<ProgressBar
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_marginRight="8dp"
android:layout_marginEnd="8dp"
android:layout_gravity="center_vertical" />
<TextView
android:layout_width="wrap_content"
@@ -75,13 +75,13 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_marginTop="4dp"
android:layout_marginRight="4dp"
android:layout_marginEnd="4dp"
android:paddingTop="2dp"
android:paddingBottom="2dp"
android:paddingLeft="6dp"
android:paddingRight="7dp"
android:paddingStart="6dp"
android:paddingEnd="7dp"
android:visibility="gone">
<io.lbry.browser.ui.controls.SolidIconView
android:layout_width="12dp"
@@ -95,7 +95,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="1dp"
android:layout_marginStart="1dp"
android:fontFamily="@font/inter"
android:textColor="@android:color/black"
android:textSize="14sp"
@@ -136,11 +136,11 @@
android:layout_centerVertical="true"
android:layout_height="wrap_content" />
<LinearLayout
android:layout_toRightOf="@id/file_view_unsupported_gerbil"
android:layout_toEndOf="@id/file_view_unsupported_gerbil"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="24dp"
android:layout_marginStart="24dp"
android:layout_centerVertical="true">
<TextView
android:layout_width="wrap_content"
@@ -183,15 +183,15 @@
android:background="?attr/selectableItemBackground"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:paddingLeft="16dp"
android:paddingRight="4dp">
android:paddingStart="16dp"
android:paddingEnd="4dp">
<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_marginRight="48dp">
android:layout_marginEnd="48dp">
<TextView
android:id="@+id/file_view_title"
android:layout_width="wrap_content"
@@ -208,7 +208,7 @@
android:id="@+id/file_view_view_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="16dp"
android:layout_marginEnd="16dp"
android:fontFamily="@font/inter"
android:textSize="12sp"
android:textFontWeight="300"
@@ -226,8 +226,8 @@
<ImageView
android:id="@+id/file_view_desc_toggle_arrow"
android:src="@drawable/ic_arrow_dropdown"
android:layout_toLeftOf="@+id/file_view_title_layout"
android:layout_alignParentRight="true"
android:layout_toStartOf="@+id/file_view_title_layout"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_width="24dp"
android:layout_height="24dp"
@@ -482,15 +482,15 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="12dp"
android:paddingLeft="16dp"
android:paddingStart="16dp"
android:paddingBottom="12dp"
android:layout_toLeftOf="@id/file_view_icon_follow">
android:layout_toStartOf="@id/file_view_icon_follow">
<RelativeLayout
android:id="@+id/file_view_publisher_avatar"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_gravity="center_vertical"
android:layout_marginRight="16dp"
android:layout_marginEnd="16dp"
android:visibility="gone">
<RelativeLayout
android:layout_centerHorizontal="true"
@@ -545,12 +545,12 @@
android:id="@+id/file_view_icon_follow"
android:clickable="true"
android:background="?attr/selectableItemBackground"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:text="@string/fa_heart"
android:textColor="@color/red"
android:textSize="20dp" />
@@ -559,12 +559,12 @@
android:id="@+id/file_view_icon_unfollow"
android:clickable="true"
android:background="?attr/selectableItemBackground"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:text="@string/fa_heart_broken"
android:textSize="20dp"
android:visibility="invisible" />
@@ -591,8 +591,8 @@
android:autoLink="all"
android:textColorLink="@color/lbryGreen"
android:textFontWeight="300"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp" />
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp" />
<LinearLayout
android:id="@+id/file_view_tag_area"
android:orientation="horizontal"
@@ -600,8 +600,8 @@
android:layout_height="wrap_content"
android:layout_weight="10"
android:paddingTop="36dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp">
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp">
<TextView
android:layout_weight="2"
android:layout_width="0dp"
@@ -613,7 +613,7 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/file_view_tag_list"
android:layout_weight="8"
android:layout_marginLeft="8dp"
android:layout_marginStart="8dp"
android:layout_width="0dp"
android:layout_height="wrap_content" />
</LinearLayout>
@@ -635,8 +635,8 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp">
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -657,8 +657,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:fontFamily="@font/inter"
android:text="@string/no_related_content"
android:textSize="14sp"
@@ -687,8 +687,8 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp">
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp">
<ProgressBar
android:id="@+id/file_view_comments_progress"
android:layout_width="16dp"
@@ -712,8 +712,8 @@
android:id="@+id/file_view_no_comments"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginTop="8dp"
android:fontFamily="@font/inter"
android:text="@string/no_comments"
+15 -15
View File
@@ -26,8 +26,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="6dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp">
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp">
<TextView
android:id="@+id/following_page_title"
android:layout_width="wrap_content"
@@ -41,14 +41,14 @@
android:layout_height="16dp"
android:visibility="gone"
android:layout_centerVertical="true"
android:layout_alignParentRight="true" />
android:layout_alignParentEnd="true" />
<ProgressBar
android:id="@+id/following_content_progress"
android:visibility="gone"
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_centerVertical="true"
android:layout_alignParentRight="true" />
android:layout_alignParentEnd="true" />
</RelativeLayout>
<RelativeLayout
@@ -57,8 +57,8 @@
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:layout_marginBottom="8dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:visibility="gone">
<LinearLayout
android:id="@+id/following_sort_link"
@@ -79,7 +79,7 @@
<ImageView
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_marginLeft="2dp"
android:layout_marginStart="2dp"
android:layout_gravity="center_vertical"
android:src="@drawable/ic_arrow_dropdown"
android:tint="@color/foreground" />
@@ -87,12 +87,12 @@
<LinearLayout
android:id="@+id/following_time_link"
android:layout_toRightOf="@id/following_sort_link"
android:layout_toEndOf="@id/following_sort_link"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="24dp"
android:layout_marginStart="24dp"
android:layout_centerVertical="true"
android:visibility="gone">
<TextView
@@ -107,7 +107,7 @@
<ImageView
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_marginLeft="2dp"
android:layout_marginStart="2dp"
android:layout_gravity="center_vertical"
android:src="@drawable/ic_arrow_dropdown"
android:tint="@color/foreground" />
@@ -118,7 +118,7 @@
android:background="?attr/selectableItemBackground"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:clickable="true"
android:fontFamily="@font/inter"
@@ -131,8 +131,8 @@
android:id="@+id/following_page_info"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:fontFamily="@font/inter"
android:textFontWeight="300"
android:text="@string/lbry_works_better"
@@ -188,8 +188,8 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/following_suggested_done_button"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
+1 -1
View File
@@ -80,7 +80,7 @@
android:layout_alignParentBottom="true">
<com.google.android.material.button.MaterialButton
android:id="@+id/invites_get_started_button"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
+24 -24
View File
@@ -8,8 +8,8 @@
android:id="@+id/library_filter_card"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginTop="16dp">
<RelativeLayout
android:layout_width="match_parent"
@@ -32,8 +32,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="24dp"
android:layout_toRightOf="@id/library_filter_link_downloads"
android:layout_marginStart="24dp"
android:layout_toEndOf="@id/library_filter_link_downloads"
android:fontFamily="@font/inter"
android:text="@string/purchases" />
<TextView
@@ -43,8 +43,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="24dp"
android:layout_toRightOf="@id/library_filter_link_purchases"
android:layout_marginStart="24dp"
android:layout_toEndOf="@id/library_filter_link_purchases"
android:fontFamily="@font/inter"
android:text="@string/history"
android:textSize="14sp" />
@@ -52,7 +52,7 @@
android:id="@+id/library_list_loading"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:visibility="gone" />
<TextView
@@ -61,7 +61,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:fontFamily="@font/inter"
android:text="@string/stats"
android:textColor="@color/lbryGreen"
@@ -75,8 +75,8 @@
android:layout_below="@id/library_filter_card"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginTop="16dp"
android:visibility="gone">
<LinearLayout
@@ -105,7 +105,7 @@
android:id="@+id/library_storage_stat_unit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="3dp"
android:layout_marginStart="3dp"
android:fontFamily="@font/inter"
android:text="@string/mb"
android:textColor="@color/lbryGreen"
@@ -119,7 +119,7 @@
android:clickable="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_marginTop="4dp"
android:fontFamily="@font/inter"
android:text="@string/hide"
@@ -174,13 +174,13 @@
android:layout_height="10dp"
android:layout_centerVertical="true" />
<TextView
android:layout_toRightOf="@id/library_storage_legend_video_icon"
android:layout_toEndOf="@id/library_storage_legend_video_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:fontFamily="@font/inter"
android:text="@string/video"
android:layout_marginLeft="4dp"
android:layout_marginStart="4dp"
android:textFontWeight="300"
android:textSize="12sp" />
@@ -190,7 +190,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_centerVertical="true"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:fontFamily="@font/inter"
android:text="@string/zero_mb"
android:textFontWeight="300"
@@ -210,13 +210,13 @@
android:layout_height="10dp"
android:layout_centerVertical="true" />
<TextView
android:layout_toRightOf="@id/library_storage_legend_audio_icon"
android:layout_toEndOf="@id/library_storage_legend_audio_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:fontFamily="@font/inter"
android:text="@string/audio"
android:layout_marginLeft="4dp"
android:layout_marginStart="4dp"
android:textFontWeight="300"
android:textSize="12sp" />
@@ -226,7 +226,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_centerVertical="true"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:fontFamily="@font/inter"
android:text="@string/zero_mb"
android:textFontWeight="300"
@@ -246,13 +246,13 @@
android:layout_height="10dp"
android:layout_centerVertical="true" />
<TextView
android:layout_toRightOf="@id/library_storage_legend_image_icon"
android:layout_toEndOf="@id/library_storage_legend_image_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:fontFamily="@font/inter"
android:text="@string/images"
android:layout_marginLeft="4dp"
android:layout_marginStart="4dp"
android:textFontWeight="300"
android:textSize="12sp" />
@@ -262,7 +262,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_centerVertical="true"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:fontFamily="@font/inter"
android:text="@string/zero_mb"
android:textFontWeight="300"
@@ -282,13 +282,13 @@
android:layout_height="10dp"
android:layout_centerVertical="true" />
<TextView
android:layout_toRightOf="@id/library_storage_legend_other_icon"
android:layout_toEndOf="@id/library_storage_legend_other_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:fontFamily="@font/inter"
android:text="@string/other"
android:layout_marginLeft="4dp"
android:layout_marginStart="4dp"
android:textFontWeight="300"
android:textSize="12sp" />
@@ -298,7 +298,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_centerVertical="true"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:fontFamily="@font/inter"
android:text="@string/zero_mb"
android:textFontWeight="300"
+4 -4
View File
@@ -26,7 +26,7 @@
android:layout_weight="1"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginLeft="-1.5dp">
android:layout_marginStart="-1.5dp">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -64,7 +64,7 @@
android:clickable="true"
android:background="@android:color/black"
android:foreground="?attr/selectableItemBackground"
android:layout_toRightOf="@id/publish_vertical_divider"
android:layout_toEndOf="@id/publish_vertical_divider"
android:layout_width="match_parent"
android:layout_height="148.5dp">
<LinearLayout
@@ -106,7 +106,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/publish_photo_upload_divider"
android:layout_toRightOf="@id/publish_vertical_divider">
android:layout_toEndOf="@id/publish_vertical_divider">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -168,7 +168,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_marginStart="8dp"
android:fontFamily="@font/inter"
android:text="@string/loading_videos"
android:textColor="@color/white"
@@ -29,16 +29,16 @@
<LinearLayout
android:id="@+id/publish_form_thumbnail_upload_progress"
android:background="@color/channelCoverBackground"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="4dp"
android:layout_marginStart="4dp"
android:layout_marginTop="4dp"
android:orientation="horizontal"
android:paddingTop="2dp"
android:paddingBottom="2dp"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:paddingStart="8dp"
android:paddingEnd="8dp"
android:visibility="gone">
<ProgressBar
android:layout_width="16dp"
@@ -46,7 +46,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="4dp"
android:layout_marginStart="4dp"
android:fontFamily="@font/inter"
android:text="@string/uploading"
android:textColor="@color/white"
@@ -58,7 +58,7 @@
android:background="@drawable/bg_small_icon"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginLeft="16dp"
android:layout_marginStart="16dp"
android:layout_marginBottom="16dp"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true">
@@ -149,7 +149,7 @@
android:layout_centerVertical="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:fontFamily="@font/inter"
android:textFontWeight="300"
android:textSize="16sp" />
@@ -183,7 +183,7 @@
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_centerVertical="true"
android:layout_marginRight="16dp"
android:layout_marginEnd="16dp"
android:visibility="gone" />
<TextView
@@ -191,7 +191,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toRightOf="@id/publish_form_video_opt_progress"
android:layout_toEndOf="@id/publish_form_video_opt_progress"
android:fontFamily="@font/inter"
android:textFontWeight="300"
android:textSize="14sp" />
@@ -243,7 +243,7 @@
android:id="@+id/publish_form_loading_channels"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:visibility="gone" />
</RelativeLayout>
@@ -280,7 +280,7 @@
android:id="@+id/publish_form_price_switch"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true" />
</RelativeLayout>
@@ -318,8 +318,8 @@
android:entries="@array/publish_currencies"
android:layout_width="110dp"
android:layout_height="wrap_content"
android:layout_toRightOf="@+id/publish_form_price_layout"
android:layout_marginLeft="4dp"
android:layout_toEndOf="@+id/publish_form_price_layout"
android:layout_marginStart="4dp"
android:layout_marginTop="24dp" />
</RelativeLayout>
</LinearLayout>
@@ -349,7 +349,7 @@
android:id="@+id/publish_form_generate_address"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -416,10 +416,10 @@
<TextView
android:id="@+id/publish_form_input_currency"
android:layout_toRightOf="@id/publish_form_input_layout_deposit"
android:layout_toEndOf="@id/publish_form_input_layout_deposit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="30dp"
android:fontFamily="@font/inter"
android:text="@string/lbc"
@@ -429,8 +429,8 @@
<LinearLayout
android:id="@+id/publish_form_inline_balance_container"
android:layout_toRightOf="@id/publish_form_input_currency"
android:layout_marginLeft="24dp"
android:layout_toEndOf="@id/publish_form_input_currency"
android:layout_marginStart="24dp"
android:layout_marginTop="28dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -446,7 +446,7 @@
android:layout_height="wrap_content"
android:fontFamily="@font/inter"
android:textFontWeight="300"
android:layout_marginLeft="2dp" />
android:layout_marginStart="2dp" />
</LinearLayout>
</RelativeLayout>
@@ -538,7 +538,7 @@
android:layout_height="wrap_content"
android:layout_gravity="end"
android:layout_marginTop="24dp"
android:layout_marginRight="16dp"
android:layout_marginEnd="16dp"
android:fontFamily="@font/inter"
android:text="@string/show_extra_fields"
android:textFontWeight="300" />
@@ -546,8 +546,8 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:layout_marginTop="24dp">
<TextView
android:id="@+id/publish_form_cancel"
@@ -567,14 +567,14 @@
android:layout_centerVertical="true"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_marginRight="16dp"
android:layout_toLeftOf="@id/publish_form_publish_button"
android:layout_marginEnd="16dp"
android:layout_toStartOf="@id/publish_form_publish_button"
android:visibility="gone" />
<com.google.android.material.button.MaterialButton
android:id="@+id/publish_form_publish_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:fontFamily="@font/inter"
android:text="@string/publish" />
@@ -15,9 +15,9 @@
android:id="@+id/publishes_list_loading"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_marginTop="16dp"
android:layout_marginRight="16dp"
android:layout_marginEnd="16dp"
android:visibility="gone" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/publishes_list"
@@ -66,9 +66,9 @@
android:id="@+id/publishes_fab_new_publish"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:layout_marginRight="16dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="16dp"
android:src="@drawable/ic_add"
android:visibility="gone" />
+7 -7
View File
@@ -8,8 +8,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="16dp"
android:paddingLeft="16dp"
android:paddingRight="16dp">
android:paddingStart="16dp"
android:paddingEnd="16dp">
<androidx.cardview.widget.CardView
android:id="@+id/rewards_filter_card"
android:layout_width="match_parent"
@@ -35,8 +35,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="16dp"
android:layout_toRightOf="@id/rewards_filter_link_unclaimed"
android:layout_marginStart="16dp"
android:layout_toEndOf="@id/rewards_filter_link_unclaimed"
android:fontFamily="@font/inter"
android:text="@string/all"
android:textSize="14sp" />
@@ -44,7 +44,7 @@
android:id="@+id/rewards_list_loading"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:visibility="gone" />
</RelativeLayout>
@@ -87,7 +87,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="8dp"
android:layout_marginStart="8dp"
android:fontFamily="@font/inter"
android:textSize="24sp"
android:textColor="@color/white" />
@@ -143,7 +143,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/rewards_get_started_button"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
+1 -1
View File
@@ -11,7 +11,7 @@
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_marginTop="8dp"
android:layout_marginRight="8dp"
android:layout_marginEnd="8dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintRight_toRightOf="parent"/>
@@ -9,8 +9,8 @@
android:id="@+id/transaction_history_no_transactions"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:fontFamily="@font/inter"
android:textSize="14sp"
android:text="@string/no_transactions"
@@ -136,8 +136,8 @@
android:id="@+id/verification_phone_verify_progress"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_toRightOf="@id/verification_phone_verify_button"
android:layout_marginLeft="16dp"
android:layout_toEndOf="@id/verification_phone_verify_button"
android:layout_marginStart="16dp"
android:layout_centerVertical="true"
android:visibility="gone" />
@@ -149,7 +149,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:fontFamily="@font/inter"
android:text="@string/edit"
android:textColor="@color/white"
@@ -33,7 +33,7 @@
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_gravity="center"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginTop="24dp" />
</RelativeLayout>
+1 -1
View File
@@ -95,7 +95,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/wallet_sign_up_button"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
+11 -11
View File
@@ -2,8 +2,8 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:clickable="true"
@@ -32,7 +32,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="4dp"
android:layout_marginStart="4dp"
android:fontFamily="@font/inter"
android:textColor="@color/lightForeground"
android:textFontWeight="300"
@@ -41,7 +41,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="4dp"
android:layout_marginStart="4dp"
android:fontFamily="@font/inter"
android:text="@string/reposted"
android:textColor="@color/lightForeground"
@@ -83,13 +83,13 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_marginTop="4dp"
android:layout_marginRight="4dp"
android:layout_marginEnd="4dp"
android:paddingTop="1dp"
android:paddingBottom="1dp"
android:paddingLeft="2dp"
android:paddingRight="2dp"
android:paddingStart="2dp"
android:paddingEnd="2dp"
android:visibility="gone">
<io.lbry.browser.ui.controls.SolidIconView
android:layout_width="16dp"
@@ -102,7 +102,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="2dp"
android:layout_marginStart="2dp"
android:fontFamily="@font/inter"
android:textSize="14sp"
android:textFontWeight="300" />
@@ -128,8 +128,8 @@
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_centerVertical="true"
android:layout_marginLeft="16dp"
android:layout_toRightOf="@id/claim_media_container">
android:layout_marginStart="16dp"
android:layout_toEndOf="@id/claim_media_container">
<TextView
android:id="@+id/claim_vanity_url"
android:layout_width="wrap_content"
@@ -7,7 +7,7 @@
android:background="@drawable/bg_selected_item"
android:layout_width="100dp"
android:layout_height="wrap_content"
android:layout_marginRight="2dp">
android:layout_marginEnd="2dp">
<RelativeLayout
android:id="@+id/channel_filter_media_container"
android:layout_width="80dp"
@@ -7,8 +7,8 @@
android:focusable="true"
android:orientation="vertical"
android:paddingBottom="8dp"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:paddingTop="8dp">
<RelativeLayout
@@ -46,8 +46,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_toRightOf="@id/comment_avatar_container"
android:layout_marginLeft="16dp"
android:layout_toEndOf="@id/comment_avatar_container"
android:layout_marginStart="16dp"
android:orientation="vertical">
<RelativeLayout
@@ -66,7 +66,7 @@
android:id="@+id/comment_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_centerInParent="true"
android:fontFamily="@font/inter"
android:textColor="@color/lightGrey"
@@ -9,8 +9,8 @@
android:id="@+id/editors_choice_header_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="16dp"
android:fontFamily="@font/inter"
android:textSize="24sp"
@@ -22,8 +22,8 @@
android:foreground="?attr/selectableItemBackground"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="16dp">
<LinearLayout
android:layout_width="match_parent"
@@ -49,10 +49,10 @@
android:layout_centerVertical="true"/>
<TextView
android:id="@+id/editors_choice_content_description"
android:layout_toRightOf="@id/editors_choice_content_thumbnail"
android:layout_toEndOf="@id/editors_choice_content_thumbnail"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginStart="16dp"
android:lineSpacingMultiplier="1.2"
android:fontFamily="@font/inter"
android:ellipsize="end"
@@ -2,8 +2,8 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:clickable="true"
@@ -27,7 +27,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="4dp"
android:layout_marginStart="4dp"
android:clickable="true"
android:fontFamily="@font/inter"
android:textFontWeight="300"
@@ -36,7 +36,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="4dp"
android:layout_marginStart="4dp"
android:fontFamily="@font/inter"
android:text="@string/reposted"
android:textSize="12sp"
@@ -78,8 +78,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:layout_marginRight="4dp"
android:layout_alignParentEnd="true"
android:layout_marginEnd="4dp"
android:layout_marginBottom="4dp"
android:fontFamily="@font/inter"
android:textColor="@android:color/white"
@@ -93,13 +93,13 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_marginTop="4dp"
android:layout_marginRight="4dp"
android:layout_marginEnd="4dp"
android:paddingTop="2dp"
android:paddingBottom="2dp"
android:paddingLeft="6dp"
android:paddingRight="7dp"
android:paddingStart="6dp"
android:paddingEnd="7dp"
android:visibility="gone">
<io.lbry.browser.ui.controls.SolidIconView
android:layout_width="12dp"
@@ -113,7 +113,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="1dp"
android:layout_marginStart="1dp"
android:fontFamily="@font/inter"
android:textColor="@android:color/black"
android:textSize="14sp"
@@ -139,8 +139,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_marginLeft="16dp"
android:layout_toRightOf="@id/claim_media_container">
android:layout_marginStart="16dp"
android:layout_toEndOf="@id/claim_media_container">
<TextView
android:id="@+id/claim_vanity_url"
android:layout_width="wrap_content"
@@ -16,8 +16,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:layout_marginRight="4dp"
android:layout_alignParentEnd="true"
android:layout_marginEnd="4dp"
android:layout_marginBottom="4dp"
android:fontFamily="@font/inter"
android:textColor="@android:color/white"
@@ -4,8 +4,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="4dp">
<TextView
android:id="@+id/nav_menu_title"
@@ -5,8 +5,8 @@
android:layout_height="wrap_content"
android:paddingTop="12dp"
android:paddingBottom="12dp"
android:paddingLeft="20dp"
android:paddingRight="20dp"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:clickable="true"
android:focusable="true"
android:background="@drawable/bg_selected_nav_item"
@@ -22,7 +22,7 @@
<TextView
android:id="@+id/nav_menu_title"
android:fontFamily="@font/inter"
android:layout_marginLeft="12dp"
android:layout_marginStart="12dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
@@ -5,8 +5,8 @@
android:clickable="true"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp">
<LinearLayout
android:id="@+id/notification_layout"
@@ -14,7 +14,7 @@
android:layout_height="wrap_content"
android:orientation="horizontal">
<RelativeLayout
android:layout_marginLeft="16dp"
android:layout_marginStart="16dp"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_gravity="center_vertical">
+14 -14
View File
@@ -3,8 +3,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:clickable="true"
@@ -32,7 +32,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="4dp"
android:layout_marginStart="4dp"
android:fontFamily="@font/inter"
android:textColor="@color/lightForeground"
android:textFontWeight="300"
@@ -41,7 +41,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="4dp"
android:layout_marginStart="4dp"
android:fontFamily="@font/inter"
android:text="@string/reposted"
android:textColor="@color/lightForeground"
@@ -83,8 +83,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:layout_marginRight="4dp"
android:layout_alignParentEnd="true"
android:layout_marginEnd="4dp"
android:layout_marginBottom="4dp"
android:fontFamily="@font/inter"
android:textColor="@android:color/white"
@@ -98,13 +98,13 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_marginTop="4dp"
android:layout_marginRight="4dp"
android:layout_marginEnd="4dp"
android:paddingTop="2dp"
android:paddingBottom="2dp"
android:paddingLeft="6dp"
android:paddingRight="7dp"
android:paddingStart="6dp"
android:paddingEnd="7dp"
android:visibility="gone">
<io.lbry.browser.ui.controls.SolidIconView
android:layout_width="12dp"
@@ -118,7 +118,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="1dp"
android:layout_marginStart="1dp"
android:fontFamily="@font/inter"
android:textColor="@android:color/black"
android:textSize="14sp"
@@ -151,8 +151,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_marginLeft="16dp"
android:layout_toRightOf="@id/claim_media_container">
android:layout_marginStart="16dp"
android:layout_toEndOf="@id/claim_media_container">
<LinearLayout
android:id="@+id/claim_text_loading_placeholder_1"
android:background="@color/lighterGrey"
@@ -217,7 +217,7 @@
android:id="@+id/claim_file_size"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:fontFamily="@font/inter"
android:textSize="11sp"
android:textFontWeight="300" />
@@ -10,8 +10,8 @@
android:focusable="true"
android:paddingTop="12dp"
android:paddingBottom="12dp"
android:paddingLeft="8dp"
android:paddingRight="8dp">
android:paddingStart="8dp"
android:paddingEnd="8dp">
<RelativeLayout
android:id="@+id/suggested_media_container"
android:layout_width="80dp"
@@ -64,6 +64,6 @@
android:textSize="12sp"
android:paddingTop="2dp"
android:paddingBottom="3dp"
android:paddingLeft="8dp"
android:paddingRight="8dp" />
android:paddingStart="8dp"
android:paddingEnd="8dp" />
</LinearLayout>
+5 -5
View File
@@ -5,19 +5,19 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="6dp"
android:layout_marginRight="6dp"
android:layout_marginEnd="6dp"
android:orientation="horizontal"
android:paddingTop="4dp"
android:paddingBottom="4dp"
android:paddingLeft="8dp"
android:paddingRight="12dp"
android:paddingStart="8dp"
android:paddingEnd="12dp"
android:foreground="?attr/selectableItemBackground">
<ImageView
android:id="@+id/tag_action"
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_gravity="center_vertical"
android:layout_marginRight="4dp"
android:layout_marginEnd="4dp"
android:tint="@color/darkForeground" />
<TextView
android:id="@+id/tag_name"
@@ -25,7 +25,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:fontFamily="@font/inter"
android:layout_marginLeft="4dp"
android:layout_marginStart="4dp"
android:textSize="12sp"
android:textFontWeight="300" />
</LinearLayout>
@@ -2,8 +2,8 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:paddingLeft="12dp"
android:paddingRight="12dp"
android:paddingStart="12dp"
android:paddingEnd="12dp"
android:paddingTop="12dp"
android:paddingBottom="12dp"
android:clickable="true"
@@ -18,9 +18,9 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_toRightOf="@id/url_suggestion_icon"
android:layout_toEndOf="@id/url_suggestion_icon"
android:layout_centerVertical="true"
android:layout_marginLeft="12dp"
android:layout_marginStart="12dp"
android:orientation="vertical">
<TextView
android:id="@+id/url_suggestion_title"
+1 -1
View File
@@ -15,6 +15,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
style="@style/Widget.MaterialComponents.Button.TextButton"/>
</RelativeLayout>
+1
View File
@@ -245,6 +245,7 @@
<string name="keep_sdk_in_background">Keep the LBRY service running in the background for improved wallet and network performance</string>
<string name="participate_in_data_network">Participate in the data network (requires app and background service restart)</string>
<string name="send_buffering_events">Send buffering events to LBRY servers</string>
<!-- URL suggestions -->
<string name="search_url_title">%1$s - Search</string>
+6
View File
@@ -64,5 +64,11 @@
app:title="@string/participate_in_data_network"
app:iconSpaceReserved="false"
app:singleLineTitle="false" />
<SwitchPreferenceCompat
app:key="io.lbry.browser.preference.other.SendBufferingEvents"
app:title="@string/send_buffering_events"
app:defaultValue="true"
app:iconSpaceReserved="false"
app:singleLineTitle="false" />
</PreferenceCategory>
</PreferenceScreen>