LBRYCommunity/lbry-fdroid
1
0
Fork 0
Code Issues 4 Pull requests Projects Releases Packages Wiki Activity

Merge upstream, fix conflicts and remove dependencies

Browse source
This commit is contained in:
Javi Rueda 2020-09-11 22:51:39 +02:00
commit 3040cdbe33
66 changed files with 695 additions and 485 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/build.gradle
View file

@ -14,8 +14,8 @@ android {
applicationId "io.lbry.browser" applicationId "io.lbry.browser"
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 29 targetSdkVersion 29
versionCode 1601 versionCode 1602
versionName "0.16.1" versionName "0.16.2"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
} }
@ -99,6 +99,12 @@ dependencies {
implementation 'com.arthenica:mobile-ffmpeg-full-gpl:4.3.1.LTS' implementation 'com.arthenica:mobile-ffmpeg-full-gpl:4.3.1.LTS'
implementation('org.bitcoinj:bitcoinj-tools:0.14.7') {
exclude group: 'com.google.protobuf', module: 'protobuf-java'
exclude module: 'guava'
}
implementation 'org.java-websocket:Java-WebSocket:1.5.1'
compileOnly 'org.projectlombok:lombok:1.18.10' compileOnly 'org.projectlombok:lombok:1.18.10'
annotationProcessor 'org.projectlombok:lombok:1.18.10' annotationProcessor 'org.projectlombok:lombok:1.18.10'
annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0' annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'
@ -107,7 +113,7 @@ dependencies {
androidTestImplementation 'androidx.test.ext:junit:1.1.1' androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
__32bitImplementation 'io.lbry:lbrysdk32:0.80.0' __32bitImplementation 'io.lbry:lbrysdk32:0.81.0'
__64bitImplementation 'io.lbry:lbrysdk64:0.80.0' __64bitImplementation 'io.lbry:lbrysdk64:0.81.0'
} }

112
app/src/main/java/io/lbry/browser/FirstRunActivity.java
View file

@ -15,12 +15,22 @@ import androidx.appcompat.app.AppCompatActivity;
import androidx.core.text.HtmlCompat; import androidx.core.text.HtmlCompat;
import androidx.preference.PreferenceManager; 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.exceptions.AuthTokenInvalidatedException;
import io.lbry.browser.utils.Helper; import io.lbry.browser.utils.Helper;
import io.lbry.browser.utils.Lbry; import io.lbry.browser.utils.Lbry;
import io.lbry.browser.utils.LbryAnalytics; import io.lbry.browser.utils.LbryAnalytics;
import io.lbry.browser.utils.Lbryio; import io.lbry.browser.utils.Lbryio;
import io.lbry.lbrysdk.LbrynetService; import io.lbry.lbrysdk.LbrynetService;
import io.lbry.lbrysdk.ServiceHelper;
import io.lbry.lbrysdk.Utils;
public class FirstRunActivity extends AppCompatActivity { public class FirstRunActivity extends AppCompatActivity {
@ -44,12 +54,7 @@ public class FirstRunActivity extends AppCompatActivity {
}); });
registerAuthReceiver(); registerAuthReceiver();
if (!Lbry.SDK_READY) {
findViewById(R.id.welcome_wait_container).setVisibility(View.VISIBLE); findViewById(R.id.welcome_wait_container).setVisibility(View.VISIBLE);
} else {
authenticate();
}
IntentFilter filter = new IntentFilter(); IntentFilter filter = new IntentFilter();
filter.addAction(MainActivity.ACTION_SDK_READY); filter.addAction(MainActivity.ACTION_SDK_READY);
filter.addAction(LbrynetService.ACTION_STOP_SERVICE); filter.addAction(LbrynetService.ACTION_STOP_SERVICE);
@ -62,10 +67,38 @@ public class FirstRunActivity extends AppCompatActivity {
authenticate(); authenticate();
} else if (LbrynetService.ACTION_STOP_SERVICE.equals(action)) { } else if (LbrynetService.ACTION_STOP_SERVICE.equals(action)) {
finish(); finish();
if (MainActivity.instance != null) {
MainActivity.instance.finish();
}
} }
} }
}; };
registerReceiver(sdkReceiver, filter); 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() { public void onResume() {
@ -134,6 +167,75 @@ public class FirstRunActivity extends AppCompatActivity {
super.onDestroy(); 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 static class AuthenticateTask extends AsyncTask<Void, Void, Void> {
private Context context; private Context context;
public AuthenticateTask(Context context) { public AuthenticateTask(Context context) {

85
app/src/main/java/io/lbry/browser/MainActivity.java
View file

@ -87,6 +87,8 @@ import androidx.appcompat.widget.Toolbar;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import org.java_websocket.client.WebSocketClient;
import org.java_websocket.handshake.ServerHandshake;
import org.json.JSONArray; import org.json.JSONArray;
import org.json.JSONException; import org.json.JSONException;
import org.json.JSONObject; import org.json.JSONObject;
@ -96,6 +98,7 @@ import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.net.ConnectException; import java.net.ConnectException;
import java.net.URI;
import java.text.DecimalFormat; import java.text.DecimalFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
@ -185,6 +188,7 @@ import io.lbry.lbrysdk.ServiceHelper;
import io.lbry.lbrysdk.Utils; import io.lbry.lbrysdk.Utils;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import lombok.SneakyThrows;
import okhttp3.OkHttpClient; import okhttp3.OkHttpClient;
public class MainActivity extends AppCompatActivity implements SdkStatusListener { public class MainActivity extends AppCompatActivity implements SdkStatusListener {
@ -192,7 +196,9 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
private static final int PLAYBACK_NOTIFICATION_ID = 3; private static final int PLAYBACK_NOTIFICATION_ID = 3;
private static final String SPECIAL_URL_PREFIX = "lbry://?"; private static final String SPECIAL_URL_PREFIX = "lbry://?";
private static final int REMOTE_NOTIFICATION_REFRESH_TTL = 300000; // 5 minutes private static final int REMOTE_NOTIFICATION_REFRESH_TTL = 300000; // 5 minutes
public static MainActivity instance;
private boolean shuttingDown;
private Date remoteNotifcationsLastLoaded; private Date remoteNotifcationsLastLoaded;
private Map<String, Class> specialRouteFragmentClassMap; private Map<String, Class> specialRouteFragmentClassMap;
@Getter @Getter
@ -224,6 +230,7 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
@Setter @Setter
private BackPressInterceptor backPressInterceptor; private BackPressInterceptor backPressInterceptor;
private WebSocketClient webSocketClient;
private NotificationListAdapter notificationListAdapter; private NotificationListAdapter notificationListAdapter;
@ -368,6 +375,7 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
instance = this;
// workaround to fix dark theme because https://issuetracker.google.com/issues/37124582 // workaround to fix dark theme because https://issuetracker.google.com/issues/37124582
try { try {
new WebView(this); new WebView(this);
@ -812,12 +820,18 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
openFragment(PublishFormFragment.class, true, NavMenuItem.ID_ITEM_NEW_PUBLISH, params); 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<>(); Map<String, Object> params = new HashMap<>();
params.put("url", url); params.put("url", url);
params.put("claim", getCachedClaimForUrl(url)); params.put("claim", getCachedClaimForUrl(url));
if (!Helper.isNullOrEmpty(source)) {
params.put("source", source);
}
openFragment(ChannelFragment.class, true, NavMenuItem.ID_ITEM_FOLLOWING, params); openFragment(ChannelFragment.class, true, NavMenuItem.ID_ITEM_FOLLOWING, params);
} }
public void openChannelUrl(String url) {
openChannelUrl(url, null);
}
private Claim getCachedClaimForUrl(String url) { private Claim getCachedClaimForUrl(String url) {
ClaimCacheKey key = new ClaimCacheKey(); ClaimCacheKey key = new ClaimCacheKey();
@ -838,21 +852,33 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
} }
public void openFileUrl(String url) { public void openFileUrl(String url) {
openFileUrl(url, null);
}
public void openFileUrl(String url, String source) {
Map<String, Object> params = new HashMap<>(); Map<String, Object> params = new HashMap<>();
params.put("url", url); params.put("url", url);
if (!Helper.isNullOrEmpty(source)) {
params.put("source", source);
}
openFragment(FileViewFragment.class, true, NavMenuItem.ID_ITEM_FOLLOWING, params); 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(); String specialPath = url.substring(8).toLowerCase();
if (specialRouteFragmentClassMap.containsKey(specialPath)) { if (specialRouteFragmentClassMap.containsKey(specialPath)) {
Class fragmentClass = specialRouteFragmentClassMap.get(specialPath); Class fragmentClass = specialRouteFragmentClassMap.get(specialPath);
if (fragmentClassNavIdMap.containsKey(fragmentClass)) { if (fragmentClassNavIdMap.containsKey(fragmentClass)) {
Map<String, Object> params = null;
if (!Helper.isNullOrEmpty(source)) {
params = new HashMap<>();
params.put("source", source);
}
openFragment( openFragment(
specialRouteFragmentClassMap.get(specialPath), specialRouteFragmentClassMap.get(specialPath),
true, true,
fragmentClassNavIdMap.get(fragmentClass), fragmentClassNavIdMap.get(fragmentClass),
null params
); );
} }
} }
@ -951,11 +977,15 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
@Override @Override
protected void onDestroy() { protected void onDestroy() {
shuttingDown = true;
unregisterReceivers(); unregisterReceivers();
NotificationManagerCompat notificationManager = NotificationManagerCompat.from(this); NotificationManagerCompat notificationManager = NotificationManagerCompat.from(this);
if (receivedStopService || !isServiceRunning(this, LbrynetService.class)) { if (receivedStopService || !isServiceRunning(this, LbrynetService.class)) {
notificationManager.cancelAll(); notificationManager.cancelAll();
} }
if (webSocketClient != null) {
webSocketClient.close();
}
if (dbHelper != null) { if (dbHelper != null) {
dbHelper.close(); dbHelper.close();
} }
@ -1021,15 +1051,46 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); 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) { }
};
webSocketClient.connect();
}
}
@Override @Override
protected void onResume() { protected void onResume() {
super.onResume(); super.onResume();
checkWebSocketClient();
enteringPIPMode = false; enteringPIPMode = false;
applyNavbarSigninPadding(); applyNavbarSigninPadding();
checkFirstRun(); checkFirstRun();
checkNowPlaying(); checkNowPlaying();
if (isFirstRunCompleted()) {
// check (and start) the LBRY SDK service // check (and start) the LBRY SDK service
serviceRunning = isServiceRunning(this, LbrynetService.class); serviceRunning = isServiceRunning(this, LbrynetService.class);
if (!serviceRunning) { if (!serviceRunning) {
@ -1037,6 +1098,7 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
//findViewById(R.id.global_sdk_initializing_status).setVisibility(View.VISIBLE); //findViewById(R.id.global_sdk_initializing_status).setVisibility(View.VISIBLE);
ServiceHelper.start(this, "", LbrynetService.class, "lbrynetservice"); ServiceHelper.start(this, "", LbrynetService.class, "lbrynetservice");
} }
}
checkSdkReady(); checkSdkReady();
showSignedInUser(); showSignedInUser();
checkPendingOpens(); checkPendingOpens();
@ -1046,6 +1108,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 checkPendingOpens() { private void checkPendingOpens() {
if (pendingFollowingReload) { if (pendingFollowingReload) {
loadFollowingContent(); loadFollowingContent();
@ -2159,6 +2226,10 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
}).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); }).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
} }
public void navigateBackToNotifications() {
showNotifications();
}
@Override @Override
public void onBackPressed() { public void onBackPressed() {
if (findViewById(R.id.url_suggestions_container).getVisibility() == View.VISIBLE) { if (findViewById(R.id.url_suggestions_container).getVisibility() == View.VISIBLE) {
@ -2169,6 +2240,7 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
hideNotifications(); hideNotifications();
return; return;
} }
if (backPressInterceptor != null && backPressInterceptor.onBackPressed()) { if (backPressInterceptor != null && backPressInterceptor.onBackPressed()) {
return; return;
} }
@ -2567,6 +2639,7 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
loadRemoteNotifications(false); loadRemoteNotifications(false);
checkUrlIntent(getIntent()); checkUrlIntent(getIntent());
checkWebSocketClient();
LbryAnalytics.logEvent(LbryAnalytics.EVENT_APP_LAUNCH); LbryAnalytics.logEvent(LbryAnalytics.EVENT_APP_LAUNCH);
appStarted = true; appStarted = true;
} }
@ -3239,14 +3312,14 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
String targetUrl = notification.getTargetUrl(); String targetUrl = notification.getTargetUrl();
if (targetUrl.startsWith(SPECIAL_URL_PREFIX)) { if (targetUrl.startsWith(SPECIAL_URL_PREFIX)) {
openSpecialUrl(targetUrl); openSpecialUrl(targetUrl, "notification");
} else { } else {
LbryUri target = LbryUri.tryParse(notification.getTargetUrl()); LbryUri target = LbryUri.tryParse(notification.getTargetUrl());
if (target != null) { if (target != null) {
if (target.isChannel()) { if (target.isChannel()) {
openChannelUrl(notification.getTargetUrl()); openChannelUrl(notification.getTargetUrl(), "notification");
} else { } else {
openFileUrl(notification.getTargetUrl()); openFileUrl(notification.getTargetUrl(), "notification");
} }
} }
} }

2
app/src/main/java/io/lbry/browser/adapter/ClaimListAdapter.java
View file

@ -323,7 +323,7 @@ public class ClaimListAdapter extends RecyclerView.Adapter<ClaimListAdapter.View
int paddingBottom = position == getItemCount() - 1 ? 16 : 8; int paddingBottom = position == getItemCount() - 1 ? 16 : 8;
int paddingTopScaled = Helper.getScaledValue(paddingTop, scale); int paddingTopScaled = Helper.getScaledValue(paddingTop, scale);
int paddingBottomScaled = Helper.getScaledValue(paddingBottom, 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); Claim original = items.get(position);
boolean isRepost = Claim.TYPE_REPOST.equalsIgnoreCase(original.getValueType()); boolean isRepost = Claim.TYPE_REPOST.equalsIgnoreCase(original.getValueType());

4
app/src/main/java/io/lbry/browser/adapter/CommentListAdapter.java
View file

@ -173,9 +173,9 @@ public class CommentListAdapter extends RecyclerView.Adapter<CommentListAdapter.
public void onBindViewHolder(ViewHolder holder, int position) { public void onBindViewHolder(ViewHolder holder, int position) {
Comment comment = items.get(position); Comment comment = items.get(position);
holder.itemView.setPadding( holder.itemView.setPadding(
nested ? Helper.getScaledValue(56, scale) : holder.itemView.getPaddingLeft(), nested ? Helper.getScaledValue(56, scale) : holder.itemView.getPaddingStart(),
holder.itemView.getPaddingTop(), holder.itemView.getPaddingTop(),
nested ? 0 : holder.itemView.getPaddingRight(), nested ? 0 : holder.itemView.getPaddingEnd(),
holder.itemView.getPaddingBottom()); holder.itemView.getPaddingBottom());
holder.channelName.setText(comment.getChannelName()); holder.channelName.setText(comment.getChannelName());

8
app/src/main/java/io/lbry/browser/ui/BaseFragment.java
View file

@ -65,6 +65,14 @@ public class BaseFragment extends Fragment {
MainActivity.resumeGlobalPlayer(context); 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; rewardDriverClickListenerSet = false;
super.onStop(); super.onStop();
} }

2
app/src/main/java/io/lbry/browser/utils/Helper.java
View file

@ -20,7 +20,6 @@ import android.provider.MediaStore;
import android.text.method.LinkMovementMethod; import android.text.method.LinkMovementMethod;
import android.view.ContextMenu; import android.view.ContextMenu;
import android.view.View; import android.view.View;
import android.widget.LinearLayout;
import android.widget.ProgressBar; import android.widget.ProgressBar;
import android.widget.TextView; import android.widget.TextView;
@ -32,6 +31,7 @@ import androidx.recyclerview.widget.RecyclerView;
import com.google.android.gms.common.util.Hex; import com.google.android.gms.common.util.Hex;
import org.bitcoinj.core.Base58;
import org.json.JSONArray; import org.json.JSONArray;
import org.json.JSONException; import org.json.JSONException;
import org.json.JSONObject; import org.json.JSONObject;

20
app/src/main/java/io/lbry/browser/utils/Lbry.java
View file

@ -2,12 +2,15 @@ package io.lbry.browser.utils;
import android.util.Log; import android.util.Log;
import org.bitcoinj.core.Base58;
import org.json.JSONArray; import org.json.JSONArray;
import org.json.JSONException; import org.json.JSONException;
import org.json.JSONObject; import org.json.JSONObject;
import java.io.IOException; import java.io.IOException;
import java.security.KeyStore; import java.security.KeyStore;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
@ -17,6 +20,7 @@ import java.util.Iterator;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Random;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import io.lbry.browser.exceptions.ApiCallException; 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;
}
}
} }

1
app/src/main/java/io/lbry/browser/utils/Lbryio.java
View file

@ -57,6 +57,7 @@ public final class Lbryio {
public static final String TAG = "Lbryio"; public static final String TAG = "Lbryio";
public static final String CONNECTION_STRING = "https://api.lbry.com"; 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 final String AUTH_TOKEN_PARAM = "auth_token";
public static List<Subscription> subscriptions = new ArrayList<>(); public static List<Subscription> subscriptions = new ArrayList<>();
public static List<Claim> cacheResolvedSubscriptions = new ArrayList<>(); public static List<Claim> cacheResolvedSubscriptions = new ArrayList<>();

2
app/src/main/res/layout/activity_first_run.xml
View file

@ -24,7 +24,7 @@
android:id="@+id/welcome_progress_bar" android:id="@+id/welcome_progress_bar"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:layout_marginRight="8dp" android:layout_marginEnd="8dp"
android:layout_gravity="center_vertical"/> android:layout_gravity="center_vertical"/>
<TextView <TextView
android:id="@+id/welcome_wait_text" android:id="@+id/welcome_wait_text"

2
app/src/main/res/layout/activity_verification.xml
View file

@ -21,7 +21,7 @@
android:visibility="gone" android:visibility="gone"
android:layout_width="36dp" android:layout_width="36dp"
android:layout_height="36dp" android:layout_height="36dp"
android:layout_marginRight="8dp" android:layout_marginEnd="8dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:background="?attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"

32
app/src/main/res/layout/app_bar_main.xml
View file

@ -33,17 +33,17 @@
android:id="@+id/wunderbar" android:id="@+id/wunderbar"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:drawableLeft="@drawable/ic_search" android:drawableStart="@drawable/ic_search"
android:drawablePadding="8dp" android:drawablePadding="8dp"
android:drawableTint="@color/actionBarForeground" android:drawableTint="@color/actionBarForeground"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="24dp" android:layout_marginEnd="24dp"
android:hint="@string/uri_placeholder" android:hint="@string/uri_placeholder"
android:imeOptions="actionGo" android:imeOptions="actionGo"
android:inputType="textNoSuggestions" android:inputType="textNoSuggestions"
android:paddingRight="36dp" android:paddingEnd="36dp"
android:selectAllOnFocus="true" android:selectAllOnFocus="true"
android:singleLine="true" android:singleLine="true"
android:textFontWeight="300" android:textFontWeight="300"
@ -54,8 +54,8 @@
android:background="?attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="24dp" android:layout_marginEnd="24dp"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:visibility="gone"> android:visibility="gone">
<ImageView <ImageView
@ -71,7 +71,7 @@
android:background="?attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:layout_centerVertical="true"> android:layout_centerVertical="true">
<ImageView <ImageView
android:id="@+id/notifications_toggle_icon" android:id="@+id/notifications_toggle_icon"
@ -88,10 +88,10 @@
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:minWidth="12dp" android:minWidth="12dp"
android:paddingLeft="2dp" android:paddingStart="2dp"
android:paddingRight="2dp" android:paddingEnd="2dp"
android:layout_marginTop="12dp" android:layout_marginTop="12dp"
android:layout_marginLeft="24dp" android:layout_marginStart="24dp"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="10sp" android:textSize="10sp"
android:visibility="invisible" android:visibility="invisible"
@ -171,7 +171,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="8dp" android:layout_marginStart="8dp"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:text="@string/installation_id_loaded" android:text="@string/installation_id_loaded"
@ -195,7 +195,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="8dp" android:layout_marginStart="8dp"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:text="@string/known_tags_loaded" android:text="@string/known_tags_loaded"
@ -219,7 +219,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="8dp" android:layout_marginStart="8dp"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:text="@string/exchange_rate_loaded" android:text="@string/exchange_rate_loaded"
@ -243,7 +243,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="8dp" android:layout_marginStart="8dp"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:text="@string/user_authenticated" android:text="@string/user_authenticated"
@ -267,7 +267,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="8dp" android:layout_marginStart="8dp"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:text="@string/installation_registered" android:text="@string/installation_registered"
@ -291,7 +291,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="8dp" android:layout_marginStart="8dp"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:text="@string/subscriptions_loaded" android:text="@string/subscriptions_loaded"
@ -315,7 +315,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="8dp" android:layout_marginStart="8dp"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:text="@string/subscriptions_resolved" android:text="@string/subscriptions_resolved"

6
app/src/main/res/layout/card_invites_by_email.xml
View file

@ -47,14 +47,14 @@
android:layout_width="20dp" android:layout_width="20dp"
android:layout_height="20dp" android:layout_height="20dp"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginRight="24dp" android:layout_marginEnd="24dp"
android:layout_toLeftOf="@id/invites_email_button" android:layout_toStartOf="@id/invites_email_button"
android:visibility="gone" /> android:visibility="gone" />
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/invites_email_button" android:id="@+id/invites_email_button"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:enabled="false" android:enabled="false"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:text="@string/invite" /> android:text="@string/invite" />

12
app/src/main/res/layout/card_invites_by_link.xml
View file

@ -24,7 +24,7 @@
android:id="@+id/invites_loading_channels_progress" android:id="@+id/invites_loading_channels_progress"
android:layout_width="20dp" android:layout_width="20dp"
android:layout_height="20dp" android:layout_height="20dp"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:visibility="gone" /> android:visibility="gone" />
</RelativeLayout> </RelativeLayout>
@ -54,11 +54,11 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_toLeftOf="@id/invites_copy_invite_link" android:layout_toStartOf="@id/invites_copy_invite_link"
android:paddingTop="8dp" android:paddingTop="8dp"
android:paddingBottom="8dp" android:paddingBottom="8dp"
android:paddingLeft="12dp" android:paddingStart="12dp"
android:paddingRight="12dp"> android:paddingEnd="12dp">
<TextView <TextView
android:id="@+id/invites_invite_link" android:id="@+id/invites_invite_link"
android:clickable="true" android:clickable="true"
@ -72,14 +72,14 @@
</LinearLayout> </LinearLayout>
<ImageButton <ImageButton
android:id="@+id/invites_copy_invite_link" android:id="@+id/invites_copy_invite_link"
android:layout_marginLeft="8dp" android:layout_marginStart="8dp"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:background="@null" android:background="@null"
android:src="@drawable/ic_copy" android:src="@drawable/ic_copy"
android:tint="@color/lbryGreen" android:tint="@color/lbryGreen"
android:layout_alignParentRight="true" /> android:layout_alignParentEnd="true" />
</RelativeLayout> </RelativeLayout>
<TextView <TextView

2
app/src/main/res/layout/card_invites_history.xml
View file

@ -23,7 +23,7 @@
android:id="@+id/invites_loading_status_progress" android:id="@+id/invites_loading_status_progress"
android:layout_width="20dp" android:layout_width="20dp"
android:layout_height="20dp" android:layout_height="20dp"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:visibility="gone" /> android:visibility="gone" />
</RelativeLayout> </RelativeLayout>

4
app/src/main/res/layout/card_reward_driver.xml
View file

@ -27,8 +27,8 @@
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="8dp" android:layout_marginStart="8dp"
android:layout_toRightOf="@id/reward_driver_icon" android:layout_toEndOf="@id/reward_driver_icon"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:lineSpacingMultiplier="1.2" android:lineSpacingMultiplier="1.2"
android:textColor="@color/white" android:textColor="@color/white"

34
app/src/main/res/layout/card_wallet_balance.xml
View file

@ -51,7 +51,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="4dp" android:layout_marginStart="4dp"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:text="@string/lbc" android:text="@string/lbc"
android:textColor="@color/white" android:textColor="@color/white"
@ -76,8 +76,8 @@
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:text="@string/buy_lbc" android:text="@string/buy_lbc"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginLeft="12dp" android:layout_marginStart="12dp"
android:layout_marginRight="12dp" android:layout_marginEnd="12dp"
android:textSize="16sp" /> android:textSize="16sp" />
<TextView <TextView
@ -85,8 +85,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="6dp" android:layout_marginTop="6dp"
android:layout_marginLeft="16dp" android:layout_marginStart="16dp"
android:layout_marginRight="16dp" android:layout_marginEnd="16dp"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:text="@string/convert_credits" android:text="@string/convert_credits"
android:textColorLink="@color/lbryGreen" android:textColorLink="@color/lbryGreen"
@ -97,7 +97,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginLeft="16dp" android:layout_marginStart="16dp"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:text="@string/convert_credits_bittrex" android:text="@string/convert_credits_bittrex"
android:textColorLink="@color/lbryGreen" android:textColorLink="@color/lbryGreen"
@ -115,8 +115,8 @@
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="16dp" android:layout_marginStart="16dp"
android:layout_marginRight="16dp"> android:layout_marginEnd="16dp">
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight="1" android:layout_weight="1"
@ -129,7 +129,7 @@
android:textColor="@color/lbryGreen" /> android:textColor="@color/lbryGreen" />
<LinearLayout <LinearLayout
android:orientation="vertical" android:orientation="vertical"
android:layout_marginLeft="4dp" android:layout_marginStart="4dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<TextView <TextView
@ -155,7 +155,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="2dp" android:layout_marginStart="2dp"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:text="@string/lbc" android:text="@string/lbc"
android:textAllCaps="true" android:textAllCaps="true"
@ -189,9 +189,9 @@
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="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:fontFamily="@font/inter"
android:layout_marginLeft="24dp" android:layout_marginStart="24dp"
android:text="@string/unlock" android:text="@string/unlock"
android:textColor="@color/lbryGreen" android:textColor="@color/lbryGreen"
android:textSize="14sp" android:textSize="14sp"
@ -201,8 +201,8 @@
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_width="16dp" android:layout_width="16dp"
android:layout_height="16dp" android:layout_height="16dp"
android:layout_marginLeft="24dp" android:layout_marginStart="24dp"
android:layout_toRightOf="@id/wallet_in_tips_label" android:layout_toEndOf="@id/wallet_in_tips_label"
android:visibility="gone" /> android:visibility="gone" />
</RelativeLayout> </RelativeLayout>
@ -232,7 +232,7 @@
android:textColor="@color/lbryGreen" /> android:textColor="@color/lbryGreen" />
<LinearLayout <LinearLayout
android:orientation="vertical" android:orientation="vertical"
android:layout_marginLeft="4dp" android:layout_marginStart="4dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<TextView <TextView
@ -258,7 +258,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="2dp" android:layout_marginStart="2dp"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:text="@string/lbc" android:text="@string/lbc"
android:textAllCaps="true" android:textAllCaps="true"
@ -288,7 +288,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="2dp" android:layout_marginStart="2dp"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:text="@string/lbc" android:text="@string/lbc"
android:textAllCaps="true" android:textAllCaps="true"

10
app/src/main/res/layout/card_wallet_receive_credits.xml
View file

@ -36,7 +36,7 @@
android:id="@+id/wallet_receive_address" android:id="@+id/wallet_receive_address"
android:clickable="true" android:clickable="true"
android:layout_centerVertical="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_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
@ -45,21 +45,21 @@
android:letterSpacing="0.05" android:letterSpacing="0.05"
android:paddingTop="8dp" android:paddingTop="8dp"
android:paddingBottom="8dp" android:paddingBottom="8dp"
android:paddingLeft="8dp" android:paddingStart="8dp"
android:paddingRight="8dp" android:paddingEnd="8dp"
android:singleLine="true" android:singleLine="true"
android:textAlignment="center" android:textAlignment="center"
android:ellipsize="middle" /> android:ellipsize="middle" />
<ImageButton <ImageButton
android:id="@+id/wallet_copy_receive_address" android:id="@+id/wallet_copy_receive_address"
android:layout_marginLeft="8dp" android:layout_marginStart="8dp"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:background="@null" android:background="@null"
android:src="@drawable/ic_copy" android:src="@drawable/ic_copy"
android:tint="@color/lbryGreen" android:tint="@color/lbryGreen"
android:layout_alignParentRight="true" /> android:layout_alignParentEnd="true" />
</RelativeLayout> </RelativeLayout>
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton

6
app/src/main/res/layout/card_wallet_recent_transactions.xml
View file

@ -12,8 +12,8 @@
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="16dp" android:layout_marginStart="16dp"
android:layout_marginRight="16dp" android:layout_marginEnd="16dp"
android:layout_marginTop="16dp"> android:layout_marginTop="16dp">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -63,7 +63,7 @@
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="8dp" android:layout_marginStart="8dp"
android:text="@string/loading_transactions" android:text="@string/loading_transactions"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:textSize="14sp" android:textSize="14sp"

16
app/src/main/res/layout/card_wallet_send_credits.xml
View file

@ -52,10 +52,10 @@
<TextView <TextView
android:id="@+id/wallet_input_currency" 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_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="8dp" android:layout_marginStart="8dp"
android:layout_marginTop="30dp" android:layout_marginTop="30dp"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:text="@string/lbc" android:text="@string/lbc"
@ -65,8 +65,8 @@
<LinearLayout <LinearLayout
android:id="@+id/wallet_inline_balance_container" android:id="@+id/wallet_inline_balance_container"
android:layout_toRightOf="@id/wallet_input_currency" android:layout_toEndOf="@id/wallet_input_currency"
android:layout_marginLeft="24dp" android:layout_marginStart="24dp"
android:layout_marginTop="28dp" android:layout_marginTop="28dp"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -82,21 +82,21 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:textFontWeight="300" android:textFontWeight="300"
android:layout_marginLeft="2dp" /> android:layout_marginStart="2dp" />
</LinearLayout> </LinearLayout>
<ProgressBar <ProgressBar
android:id="@+id/wallet_send_progress" android:id="@+id/wallet_send_progress"
android:layout_width="20dp" android:layout_width="20dp"
android:layout_height="20dp" android:layout_height="20dp"
android:layout_toLeftOf="@id/wallet_send" android:layout_toStartOf="@id/wallet_send"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginRight="8dp" android:layout_marginEnd="8dp"
android:visibility="gone" /> android:visibility="gone" />
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/wallet_send" android:id="@+id/wallet_send"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"

14
app/src/main/res/layout/card_wallet_sync.xml
View file

@ -12,7 +12,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="16dp" android:layout_marginStart="16dp"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:textStyle="bold" android:textStyle="bold"
@ -29,8 +29,8 @@
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="16dp" android:layout_marginStart="16dp"
android:layout_marginRight="16dp" android:layout_marginEnd="16dp"
android:weightSum="10"> android:weightSum="10">
<TextView <TextView
android:layout_weight="4" android:layout_weight="4"
@ -66,8 +66,8 @@
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="16dp" android:layout_marginStart="16dp"
android:layout_marginRight="16dp" android:layout_marginEnd="16dp"
android:weightSum="10"> android:weightSum="10">
<TextView <TextView
android:layout_weight="4" android:layout_weight="4"
@ -106,8 +106,8 @@
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="16dp" android:layout_marginStart="16dp"
android:layout_marginRight="16dp" android:layout_marginEnd="16dp"
android:layout_marginBottom="12dp" android:layout_marginBottom="12dp"
android:weightSum="2"> android:weightSum="2">
<TextView <TextView

16
app/src/main/res/layout/container_comment_form.xml
View file

@ -24,7 +24,7 @@
android:textFontWeight="300" /> android:textFontWeight="300" />
<ProgressBar <ProgressBar
android:id="@+id/comment_form_channels_loading" android:id="@+id/comment_form_channels_loading"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_width="20dp" android:layout_width="20dp"
android:layout_height="20dp" android:layout_height="20dp"
@ -57,12 +57,12 @@
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="8dp"> android:layout_marginStart="8dp">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:layout_marginRight="40dp"> android:layout_marginEnd="40dp">
<TextView <TextView
android:id="@+id/comment_form_replying_to_text" android:id="@+id/comment_form_replying_to_text"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -87,7 +87,7 @@
android:id="@+id/comment_form_clear_reply_to" android:id="@+id/comment_form_clear_reply_to"
android:background="?attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:clickable="true" android:clickable="true"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:layout_width="36dp" android:layout_width="36dp"
android:layout_height="36dp"> android:layout_height="36dp">
<ImageView <ImageView
@ -136,8 +136,8 @@
<com.google.android.material.textfield.TextInputLayout <com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_toRightOf="@id/comment_form_avatar_container" android:layout_toEndOf="@id/comment_form_avatar_container"
android:layout_marginLeft="16dp"> android:layout_marginStart="16dp">
<com.google.android.material.textfield.TextInputEditText <com.google.android.material.textfield.TextInputEditText
android:id="@+id/comment_form_body" android:id="@+id/comment_form_body"
android:hint="@string/comment" android:hint="@string/comment"
@ -179,8 +179,8 @@
android:layout_width="20dp" android:layout_width="20dp"
android:layout_height="20dp" android:layout_height="20dp"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_toRightOf="@id/comment_form_post" android:layout_toEndOf="@id/comment_form_post"
android:layout_marginLeft="24dp" android:layout_marginStart="24dp"
android:visibility="gone" /> android:visibility="gone" />
</RelativeLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>

16
app/src/main/res/layout/container_inline_channel_form.xml
View file

@ -42,10 +42,10 @@
<TextView <TextView
android:id="@+id/inline_channel_form_inline_currency" 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_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="8dp" android:layout_marginStart="8dp"
android:layout_marginTop="30dp" android:layout_marginTop="30dp"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:text="@string/lbc" android:text="@string/lbc"
@ -55,8 +55,8 @@
<LinearLayout <LinearLayout
android:id="@+id/inline_channel_form_inline_balance_container" android:id="@+id/inline_channel_form_inline_balance_container"
android:layout_toRightOf="@id/inline_channel_form_inline_currency" android:layout_toEndOf="@id/inline_channel_form_inline_currency"
android:layout_marginLeft="24dp" android:layout_marginStart="24dp"
android:layout_marginTop="28dp" android:layout_marginTop="28dp"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -72,7 +72,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:textFontWeight="300" android:textFontWeight="300"
android:layout_marginLeft="2dp" /> android:layout_marginStart="2dp" />
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>
@ -105,15 +105,15 @@
android:layout_width="20dp" android:layout_width="20dp"
android:layout_height="20dp" android:layout_height="20dp"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginRight="24dp" android:layout_marginEnd="24dp"
android:layout_toLeftOf="@id/inline_channel_form_create_button" android:layout_toStartOf="@id/inline_channel_form_create_button"
android:visibility="gone" /> android:visibility="gone" />
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/inline_channel_form_create_button" android:id="@+id/inline_channel_form_create_button"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:text="@string/create"/> android:text="@string/create"/>

14
app/src/main/res/layout/content_main.xml
View file

@ -104,7 +104,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginLeft="8dp" android:layout_marginStart="8dp"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:text="@string/sdk_initializing" android:text="@string/sdk_initializing"
android:textSize="14sp" android:textSize="14sp"
@ -118,8 +118,8 @@
android:clickable="true" android:clickable="true"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="4dp" android:layout_marginStart="4dp"
android:layout_marginRight="4dp" android:layout_marginEnd="4dp"
android:layout_marginBottom="4dp" android:layout_marginBottom="4dp"
android:visibility="gone" android:visibility="gone"
app:cardElevation="8dp" app:cardElevation="8dp"
@ -133,9 +133,9 @@
android:layout_width="160dp" android:layout_width="160dp"
android:layout_height="90dp" /> android:layout_height="90dp" />
<LinearLayout <LinearLayout
android:layout_toRightOf="@id/global_now_playing_player_view" android:layout_toEndOf="@id/global_now_playing_player_view"
android:layout_toLeftOf="@id/global_now_playing_close" android:layout_toStartOf="@id/global_now_playing_close"
android:layout_marginLeft="8dp" android:layout_marginStart="8dp"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:orientation="vertical" android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -165,7 +165,7 @@
android:layout_width="36dp" android:layout_width="36dp"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:clickable="true" android:clickable="true"
android:layout_marginLeft="8dp"> android:layout_marginStart="8dp">
<ImageView <ImageView
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"

18
app/src/main/res/layout/dialog_content_from.xml
View file

@ -4,8 +4,8 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView
android:layout_marginLeft="10dp" android:layout_marginStart="10dp"
android:layout_marginRight="10dp" android:layout_marginEnd="10dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -19,8 +19,8 @@
android:layout_height="0.5dp" android:layout_height="0.5dp"
android:background="@color/divider" android:background="@color/divider"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginLeft="8dp" android:layout_marginStart="8dp"
android:layout_marginRight="8dp" /> android:layout_marginEnd="8dp" />
<RelativeLayout <RelativeLayout
android:id="@+id/content_from_past_24_hours_item" android:id="@+id/content_from_past_24_hours_item"
@ -41,7 +41,7 @@
android:id="@+id/content_from_past_24_hours_item_selected" android:id="@+id/content_from_past_24_hours_item_selected"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:src="@drawable/ic_check" android:src="@drawable/ic_check"
android:tint="@color/lbryGreen" android:tint="@color/lbryGreen"
@ -67,7 +67,7 @@
android:id="@+id/content_from_past_week_item_selected" android:id="@+id/content_from_past_week_item_selected"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:src="@drawable/ic_check" android:src="@drawable/ic_check"
android:tint="@color/lbryGreen" android:tint="@color/lbryGreen"
@ -93,7 +93,7 @@
android:id="@+id/content_from_past_month_item_selected" android:id="@+id/content_from_past_month_item_selected"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:src="@drawable/ic_check" android:src="@drawable/ic_check"
android:tint="@color/lbryGreen" android:tint="@color/lbryGreen"
@ -119,7 +119,7 @@
android:id="@+id/content_from_past_year_item_selected" android:id="@+id/content_from_past_year_item_selected"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:src="@drawable/ic_check" android:src="@drawable/ic_check"
android:tint="@color/lbryGreen" android:tint="@color/lbryGreen"
@ -145,7 +145,7 @@
android:id="@+id/content_from_all_time_item_selected" android:id="@+id/content_from_all_time_item_selected"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:src="@drawable/ic_check" android:src="@drawable/ic_check"
android:tint="@color/lbryGreen" android:tint="@color/lbryGreen"

20
app/src/main/res/layout/dialog_content_scope.xml
View file

@ -4,8 +4,8 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView
android:layout_marginLeft="10dp" android:layout_marginStart="10dp"
android:layout_marginRight="10dp" android:layout_marginEnd="10dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -19,8 +19,8 @@
android:layout_height="0.5dp" android:layout_height="0.5dp"
android:background="@color/divider" android:background="@color/divider"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginLeft="8dp" android:layout_marginStart="8dp"
android:layout_marginRight="8dp" /> android:layout_marginEnd="8dp" />
<RelativeLayout <RelativeLayout
android:id="@+id/content_scope_everyone_item" android:id="@+id/content_scope_everyone_item"
@ -37,10 +37,10 @@
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:text="@string/fa_globe_americas" /> android:text="@string/fa_globe_americas" />
<TextView <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_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="16dp" android:layout_marginStart="16dp"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:text="@string/everyone" android:text="@string/everyone"
@ -50,7 +50,7 @@
android:id="@+id/content_scope_everyone_item_selected" android:id="@+id/content_scope_everyone_item_selected"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:src="@drawable/ic_check" android:src="@drawable/ic_check"
android:tint="@color/lbryGreen" android:tint="@color/lbryGreen"
@ -72,10 +72,10 @@
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:text="@string/fa_hashtag" /> android:text="@string/fa_hashtag" />
<TextView <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_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="16dp" android:layout_marginStart="16dp"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:text="@string/tags_you_follow" android:text="@string/tags_you_follow"
@ -85,7 +85,7 @@
android:id="@+id/content_scope_tags_item_selected" android:id="@+id/content_scope_tags_item_selected"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:src="@drawable/ic_check" android:src="@drawable/ic_check"
android:tint="@color/lbryGreen" android:tint="@color/lbryGreen"

26
app/src/main/res/layout/dialog_content_sort.xml
View file

@ -4,8 +4,8 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView
android:layout_marginLeft="10dp" android:layout_marginStart="10dp"
android:layout_marginRight="10dp" android:layout_marginEnd="10dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -19,8 +19,8 @@
android:layout_height="0.5dp" android:layout_height="0.5dp"
android:background="@color/divider" android:background="@color/divider"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginLeft="8dp" android:layout_marginStart="8dp"
android:layout_marginRight="8dp" /> android:layout_marginEnd="8dp" />
<RelativeLayout <RelativeLayout
android:id="@+id/sort_by_trending_item" android:id="@+id/sort_by_trending_item"
@ -37,10 +37,10 @@
android:src="@drawable/ic_trending" android:src="@drawable/ic_trending"
android:tint="@color/foreground" /> android:tint="@color/foreground" />
<TextView <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_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="16dp" android:layout_marginStart="16dp"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:text="@string/trending_content" android:text="@string/trending_content"
@ -50,7 +50,7 @@
android:id="@+id/sort_by_trending_item_selected" android:id="@+id/sort_by_trending_item_selected"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:src="@drawable/ic_check" android:src="@drawable/ic_check"
android:tint="@color/lbryGreen" android:tint="@color/lbryGreen"
@ -72,10 +72,10 @@
android:src="@drawable/ic_new" android:src="@drawable/ic_new"
android:tint="@color/foreground" /> android:tint="@color/foreground" />
<TextView <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_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="16dp" android:layout_marginStart="16dp"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:text="@string/new_content" android:text="@string/new_content"
@ -85,7 +85,7 @@
android:id="@+id/sort_by_new_item_selected" android:id="@+id/sort_by_new_item_selected"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:src="@drawable/ic_check" android:src="@drawable/ic_check"
android:tint="@color/lbryGreen" android:tint="@color/lbryGreen"
@ -107,10 +107,10 @@
android:src="@drawable/ic_top" android:src="@drawable/ic_top"
android:tint="@color/foreground" /> android:tint="@color/foreground" />
<TextView <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_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="16dp" android:layout_marginStart="16dp"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:text="@string/top_content" android:text="@string/top_content"
@ -120,7 +120,7 @@
android:id="@+id/sort_by_top_item_selected" android:id="@+id/sort_by_top_item_selected"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:src="@drawable/ic_check" android:src="@drawable/ic_check"
android:tint="@color/lbryGreen" android:tint="@color/lbryGreen"

18
app/src/main/res/layout/dialog_create_support.xml
View file

@ -50,7 +50,7 @@
android:text="@string/channel_to_show_support_as" /> android:text="@string/channel_to_show_support_as" />
<ProgressBar <ProgressBar
android:id="@+id/create_support_channel_progress" android:id="@+id/create_support_channel_progress"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_width="20dp" android:layout_width="20dp"
android:layout_height="20dp" android:layout_height="20dp"
@ -83,10 +83,10 @@
<TextView <TextView
android:id="@+id/create_support_input_currency" 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_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="8dp" android:layout_marginStart="8dp"
android:layout_marginTop="30dp" android:layout_marginTop="30dp"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:text="@string/lbc" android:text="@string/lbc"
@ -96,8 +96,8 @@
<LinearLayout <LinearLayout
android:id="@+id/create_support_inline_balance_container" android:id="@+id/create_support_inline_balance_container"
android:layout_toRightOf="@id/create_support_input_currency" android:layout_toEndOf="@id/create_support_input_currency"
android:layout_marginLeft="24dp" android:layout_marginStart="24dp"
android:layout_marginTop="28dp" android:layout_marginTop="28dp"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -113,7 +113,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:textFontWeight="300" android:textFontWeight="300"
android:layout_marginLeft="2dp" /> android:layout_marginStart="2dp" />
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>
@ -148,9 +148,9 @@
android:id="@+id/create_support_progress" android:id="@+id/create_support_progress"
android:layout_width="20dp" android:layout_width="20dp"
android:layout_height="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_centerVertical="true"
android:layout_marginRight="8dp" android:layout_marginEnd="8dp"
android:visibility="gone" /> android:visibility="gone" />
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
@ -159,7 +159,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:text="@string/send_lbc_tip" android:text="@string/send_lbc_tip"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:layout_centerVertical="true" /> android:layout_centerVertical="true" />
</RelativeLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>

36
app/src/main/res/layout/dialog_customize_tags.xml
View file

@ -8,8 +8,8 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView
android:layout_marginLeft="10dp" android:layout_marginStart="10dp"
android:layout_marginRight="10dp" android:layout_marginEnd="10dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -23,22 +23,22 @@
android:layout_height="0.5dp" android:layout_height="0.5dp"
android:background="@color/divider" android:background="@color/divider"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginLeft="8dp" android:layout_marginStart="8dp"
android:layout_marginRight="8dp" android:layout_marginEnd="8dp"
android:layout_marginBottom="16dp"/> android:layout_marginBottom="16dp"/>
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/customize_tags_followed_list" android:id="@+id/customize_tags_followed_list"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="16dp" android:layout_marginStart="16dp"
android:layout_marginRight="16dp" /> android:layout_marginEnd="16dp" />
<TextView <TextView
android:id="@+id/customize_no_followed_tags" android:id="@+id/customize_no_followed_tags"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="16dp" android:layout_marginStart="16dp"
android:layout_marginRight="16dp" android:layout_marginEnd="16dp"
android:layout_marginBottom="6dp" android:layout_marginBottom="6dp"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:text="@string/no_followed_tags" android:text="@string/no_followed_tags"
@ -51,23 +51,23 @@
android:layout_height="0.5dp" android:layout_height="0.5dp"
android:background="@color/divider" android:background="@color/divider"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:layout_marginLeft="8dp" android:layout_marginStart="8dp"
android:layout_marginRight="8dp" android:layout_marginEnd="8dp"
android:layout_marginBottom="16dp"/> android:layout_marginBottom="16dp"/>
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/customize_tags_suggested_list" android:id="@+id/customize_tags_suggested_list"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="16dp" android:layout_marginStart="16dp"
android:layout_marginRight="16dp" /> android:layout_marginEnd="16dp" />
<TextView <TextView
android:id="@+id/customize_no_tag_results" android:id="@+id/customize_no_tag_results"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="16dp" android:layout_marginStart="16dp"
android:layout_marginRight="16dp" android:layout_marginEnd="16dp"
android:layout_marginBottom="6dp" android:layout_marginBottom="6dp"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:text="@string/no_tag_results" android:text="@string/no_tag_results"
@ -79,8 +79,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:layout_marginLeft="16dp" android:layout_marginStart="16dp"
android:layout_marginRight="16dp" android:layout_marginEnd="16dp"
android:layout_marginBottom="16dp"> android:layout_marginBottom="16dp">
<com.google.android.material.textfield.TextInputEditText <com.google.android.material.textfield.TextInputEditText
android:id="@+id/customize_tag_filter_input" android:id="@+id/customize_tag_filter_input"
@ -97,8 +97,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_marginLeft="16dp" android:layout_marginStart="16dp"
android:layout_marginRight="16dp" android:layout_marginEnd="16dp"
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:text="@string/done" /> android:text="@string/done" />

6
app/src/main/res/layout/dialog_discover.xml
View file

@ -22,7 +22,7 @@
android:id="@+id/discover_loading" android:id="@+id/discover_loading"
android:layout_width="20dp" android:layout_width="20dp"
android:layout_height="20dp" android:layout_height="20dp"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:visibility="gone" /> android:visibility="gone" />
</RelativeLayout> </RelativeLayout>
@ -46,8 +46,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_marginLeft="16dp" android:layout_marginStart="16dp"
android:layout_marginRight="16dp" android:layout_marginEnd="16dp"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:text="@string/done" /> android:text="@string/done" />

22
app/src/main/res/layout/dialog_repost_claim.xml
View file

@ -74,7 +74,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_toRightOf="@id/repost_name_prefix" android:layout_toEndOf="@id/repost_name_prefix"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:singleLine="true" android:singleLine="true"
android:textSize="14sp" android:textSize="14sp"
@ -107,10 +107,10 @@
<TextView <TextView
android:id="@+id/repost_input_currency" 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_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="8dp" android:layout_marginStart="8dp"
android:layout_marginTop="30dp" android:layout_marginTop="30dp"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:text="@string/lbc" android:text="@string/lbc"
@ -120,8 +120,8 @@
<LinearLayout <LinearLayout
android:id="@+id/repost_inline_balance_container" android:id="@+id/repost_inline_balance_container"
android:layout_toRightOf="@id/repost_input_currency" android:layout_toEndOf="@id/repost_input_currency"
android:layout_marginLeft="24dp" android:layout_marginStart="24dp"
android:layout_marginTop="28dp" android:layout_marginTop="28dp"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -137,7 +137,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:textFontWeight="300" android:textFontWeight="300"
android:layout_marginLeft="2dp" /> android:layout_marginStart="2dp" />
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>
@ -165,8 +165,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginRight="24dp" android:layout_marginEnd="24dp"
android:layout_toLeftOf="@id/repost_button" android:layout_toStartOf="@id/repost_button"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:textSize="14sp" android:textSize="14sp"
android:text="@string/show_advanced" /> android:text="@string/show_advanced" />
@ -174,9 +174,9 @@
android:id="@+id/repost_progress" android:id="@+id/repost_progress"
android:layout_width="20dp" android:layout_width="20dp"
android:layout_height="20dp" android:layout_height="20dp"
android:layout_toLeftOf="@id/repost_button" android:layout_toStartOf="@id/repost_button"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginRight="8dp" android:layout_marginEnd="8dp"
android:visibility="gone" /> android:visibility="gone" />
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/repost_button" android:id="@+id/repost_button"
@ -184,7 +184,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:text="@string/repost" android:text="@string/repost"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:layout_centerVertical="true" /> android:layout_centerVertical="true" />
</RelativeLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>

30
app/src/main/res/layout/exo_playback_control_view.xml
View file

@ -14,7 +14,7 @@
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_width="72dp" android:layout_width="72dp"
android:layout_height="72dp" android:layout_height="72dp"
android:layout_toLeftOf="@id/player_play_pause"> android:layout_toStartOf="@id/player_play_pause">
<ImageView <ImageView
android:layout_width="36dp" android:layout_width="36dp"
android:layout_height="36dp" android:layout_height="36dp"
@ -66,7 +66,7 @@
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_width="72dp" android:layout_width="72dp"
android:layout_height="72dp" android:layout_height="72dp"
android:layout_toRightOf="@id/player_play_pause"> android:layout_toEndOf="@id/player_play_pause">
<ImageView <ImageView
android:layout_width="36dp" android:layout_width="36dp"
android:layout_height="36dp" android:layout_height="36dp"
@ -84,7 +84,7 @@
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="48dp" android:layout_height="48dp"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:visibility="gone"> android:visibility="gone">
<ImageView <ImageView
android:id="@+id/player_image_cast_toggle" android:id="@+id/player_image_cast_toggle"
@ -103,14 +103,14 @@
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_width="56dp" android:layout_width="56dp"
android:layout_height="48dp" android:layout_height="48dp"
android:layout_toLeftOf="@id/player_toggle_fullscreen"> android:layout_toStartOf="@id/player_toggle_fullscreen">
<TextView <TextView
android:id="@+id/player_playback_speed_label" android:id="@+id/player_playback_speed_label"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="8dp" android:layout_marginEnd="8dp"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:letterSpacing="0.05" android:letterSpacing="0.05"
android:singleLine="true" android:singleLine="true"
@ -126,7 +126,7 @@
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="48dp" android:layout_height="48dp"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"> android:layout_alignParentEnd="true">
<ImageView <ImageView
android:id="@+id/player_image_full_screen_toggle" android:id="@+id/player_image_full_screen_toggle"
android:layout_width="24dp" android:layout_width="24dp"
@ -140,9 +140,9 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="48dp" android:layout_height="48dp"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_toLeftOf="@id/player_playback_speed" android:layout_toStartOf="@id/player_playback_speed"
android:paddingLeft="16dp" android:paddingStart="16dp"
android:paddingRight="4dp"> android:paddingEnd="4dp">
<TextView <TextView
android:id="@+id/player_duration_elapsed" android:id="@+id/player_duration_elapsed"
android:layout_width="64dp" android:layout_width="64dp"
@ -155,12 +155,12 @@
android:textSize="14sp" /> android:textSize="14sp" />
<com.google.android.exoplayer2.ui.DefaultTimeBar <com.google.android.exoplayer2.ui.DefaultTimeBar
android:id="@id/exo_progress" android:id="@id/exo_progress"
android:layout_toLeftOf="@id/player_duration_total" android:layout_toStartOf="@id/player_duration_total"
android:layout_toRightOf="@id/player_duration_elapsed" android:layout_toEndOf="@id/player_duration_elapsed"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="24dp" android:layout_height="24dp"
android:layout_marginLeft="4dp" android:layout_marginStart="4dp"
android:layout_marginRight="4dp" android:layout_marginEnd="4dp"
android:layout_centerVertical="true" android:layout_centerVertical="true"
app:scrubber_color="@color/scrubberColor" app:scrubber_color="@color/scrubberColor"
app:played_color="@color/playedColor" app:played_color="@color/playedColor"
@ -170,7 +170,7 @@
android:layout_width="64dp" android:layout_width="64dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:gravity="end" android:gravity="end"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:singleLine="true" android:singleLine="true"

18
app/src/main/res/layout/floating_wallet_balance.xml
View file

@ -6,7 +6,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:layout_marginRight="8dp" android:layout_marginEnd="8dp"
android:elevation="4dp" android:elevation="4dp"
app:layout_constraintRight_toRightOf="parent" app:layout_constraintRight_toRightOf="parent"
app:layout_constraintBottom_toBottomOf="parent"> app:layout_constraintBottom_toBottomOf="parent">
@ -19,8 +19,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="8dp" android:paddingTop="8dp"
android:paddingBottom="8dp" android:paddingBottom="8dp"
android:paddingLeft="8dp" android:paddingStart="8dp"
android:paddingRight="44dp" android:paddingEnd="44dp"
android:visibility="invisible"> android:visibility="invisible">
<io.lbry.browser.ui.controls.SolidIconView <io.lbry.browser.ui.controls.SolidIconView
android:layout_width="16dp" android:layout_width="16dp"
@ -33,7 +33,7 @@
android:id="@+id/floating_reward_value" android:id="@+id/floating_reward_value"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="2dp" android:layout_marginStart="2dp"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:textColor="@color/white" android:textColor="@color/white"
@ -51,11 +51,11 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_toRightOf="@id/floating_reward_container" android:layout_toRightOf="@id/floating_reward_container"
android:layout_marginLeft="-36dp" android:layout_marginStart="-36dp"
android:paddingTop="8dp" android:paddingTop="8dp"
android:paddingBottom="8dp" android:paddingBottom="8dp"
android:paddingLeft="12dp" android:paddingStart="12dp"
android:paddingRight="16dp"> android:paddingEnd="16dp">
<io.lbry.browser.ui.controls.SolidIconView <io.lbry.browser.ui.controls.SolidIconView
android:layout_width="16dp" android:layout_width="16dp"
android:layout_height="16dp" android:layout_height="16dp"
@ -73,7 +73,7 @@
android:id="@+id/floating_balance_value" android:id="@+id/floating_balance_value"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="2dp" android:layout_marginStart="2dp"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:textColor="@color/white" android:textColor="@color/white"
@ -87,7 +87,7 @@
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_width="16dp" android:layout_width="16dp"
android:layout_height="16dp" android:layout_height="16dp"
android:layout_marginLeft="2dp" /> android:layout_marginStart="2dp" />
</LinearLayout> </LinearLayout>

38
app/src/main/res/layout/fragment_all_content.xml
View file

@ -25,8 +25,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:layout_marginLeft="16dp" android:layout_marginStart="16dp"
android:layout_marginRight="16dp"> android:layout_marginEnd="16dp">
<TextView <TextView
android:id="@+id/all_content_page_title" android:id="@+id/all_content_page_title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -41,7 +41,7 @@
android:layout_width="16dp" android:layout_width="16dp"
android:layout_height="16dp" android:layout_height="16dp"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_alignParentRight="true" /> android:layout_alignParentEnd="true" />
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
@ -50,8 +50,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="2dp" android:layout_marginTop="2dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:layout_marginLeft="16dp" android:layout_marginStart="16dp"
android:layout_marginRight="16dp" android:layout_marginEnd="16dp"
android:visibility="visible"> android:visibility="visible">
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -76,7 +76,7 @@
<ImageView <ImageView
android:layout_width="16dp" android:layout_width="16dp"
android:layout_height="16dp" android:layout_height="16dp"
android:layout_marginLeft="2dp" android:layout_marginStart="2dp"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:src="@drawable/ic_arrow_dropdown" android:src="@drawable/ic_arrow_dropdown"
android:tint="@color/foreground" /> android:tint="@color/foreground" />
@ -85,10 +85,10 @@
<TextView <TextView
android:id="@+id/all_content_for_prefix" android:id="@+id/all_content_for_prefix"
android:layout_centerVertical="true" 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_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="2dp" android:layout_marginStart="2dp"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:textFontWeight="300" android:textFontWeight="300"
android:textSize="12sp" android:textSize="12sp"
@ -96,12 +96,12 @@
android:visibility="gone" /> android:visibility="gone" />
<LinearLayout <LinearLayout
android:id="@+id/all_content_scope_link" 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:background="?attr/selectableItemBackground"
android:clickable="true" android:clickable="true"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="2dp" android:layout_marginStart="2dp"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:visibility="gone"> android:visibility="gone">
<TextView <TextView
@ -109,7 +109,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginLeft="4dp" android:layout_marginStart="4dp"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:textFontWeight="300" android:textFontWeight="300"
android:textSize="12sp" android:textSize="12sp"
@ -117,7 +117,7 @@
<ImageView <ImageView
android:layout_width="16dp" android:layout_width="16dp"
android:layout_height="16dp" android:layout_height="16dp"
android:layout_marginLeft="2dp" android:layout_marginStart="2dp"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:src="@drawable/ic_arrow_dropdown" android:src="@drawable/ic_arrow_dropdown"
android:tint="@color/foreground" /> android:tint="@color/foreground" />
@ -126,10 +126,10 @@
<TextView <TextView
android:id="@+id/all_content_from_prefix" android:id="@+id/all_content_from_prefix"
android:layout_centerVertical="true" 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_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="2dp" android:layout_marginStart="2dp"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:textFontWeight="300" android:textFontWeight="300"
android:textSize="12sp" android:textSize="12sp"
@ -142,15 +142,15 @@
android:clickable="true" android:clickable="true"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="2dp" android:layout_marginStart="2dp"
android:layout_toRightOf="@id/all_content_sort_link" android:layout_toEndOf="@id/all_content_sort_link"
android:visibility="gone"> android:visibility="gone">
<TextView <TextView
android:id="@+id/all_content_time_link_text" android:id="@+id/all_content_time_link_text"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginLeft="4dp" android:layout_marginStart="4dp"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:textFontWeight="300" android:textFontWeight="300"
android:textSize="12sp" android:textSize="12sp"
@ -158,7 +158,7 @@
<ImageView <ImageView
android:layout_width="16dp" android:layout_width="16dp"
android:layout_height="16dp" android:layout_height="16dp"
android:layout_marginLeft="2dp" android:layout_marginStart="2dp"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:src="@drawable/ic_arrow_dropdown" android:src="@drawable/ic_arrow_dropdown"
android:tint="@color/foreground" /> android:tint="@color/foreground" />
@ -170,7 +170,7 @@
android:background="?attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:clickable="true" android:clickable="true"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"

30
app/src/main/res/layout/fragment_channel.xml
View file

@ -19,7 +19,7 @@
<ProgressBar <ProgressBar
android:layout_width="16dp" android:layout_width="16dp"
android:layout_height="16dp" android:layout_height="16dp"
android:layout_marginRight="8dp" android:layout_marginEnd="8dp"
android:layout_gravity="center_vertical" /> android:layout_gravity="center_vertical" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -53,18 +53,18 @@
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="12dp" android:layout_marginStart="12dp"
android:layout_marginRight="12dp" android:layout_marginEnd="12dp"
android:layout_above="@+id/channel_view_tabs" 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"> android:orientation="vertical">
<TextView <TextView
android:id="@+id/channel_view_title" android:id="@+id/channel_view_title"
android:background="@color/channelCoverBackground" android:background="@color/channelCoverBackground"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="4dp" android:paddingStart="4dp"
android:paddingRight="4dp" android:paddingEnd="4dp"
android:paddingTop="2dp" android:paddingTop="2dp"
android:paddingBottom="2dp" android:paddingBottom="2dp"
android:ellipsize="end" android:ellipsize="end"
@ -80,8 +80,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="2dp" android:layout_marginTop="2dp"
android:layout_marginBottom="2dp" android:layout_marginBottom="2dp"
android:paddingLeft="4dp" android:paddingStart="4dp"
android:paddingRight="4dp" android:paddingEnd="4dp"
android:paddingTop="2dp" android:paddingTop="2dp"
android:paddingBottom="2dp" android:paddingBottom="2dp"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
@ -95,7 +95,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:paddingLeft="110dp" android:paddingStart="110dp"
app:tabGravity="fill" app:tabGravity="fill"
app:tabMode="scrollable"/> app:tabMode="scrollable"/>
<RelativeLayout <RelativeLayout
@ -103,7 +103,7 @@
android:layout_width="80dp" android:layout_width="80dp"
android:layout_height="80dp" android:layout_height="80dp"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_marginLeft="12dp" android:layout_marginStart="12dp"
android:layout_marginBottom="12dp"> android:layout_marginBottom="12dp">
<RelativeLayout <RelativeLayout
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
@ -143,7 +143,7 @@
android:elevation="4dp" android:elevation="4dp"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:padding="8dp"> android:padding="8dp">
<RelativeLayout <RelativeLayout
android:id="@+id/channel_view_edit" android:id="@+id/channel_view_edit"
@ -151,7 +151,7 @@
android:background="?attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:layout_width="36dp" android:layout_width="36dp"
android:layout_height="36dp" android:layout_height="36dp"
android:layout_marginRight="8dp" android:layout_marginEnd="8dp"
android:visibility="gone"> android:visibility="gone">
<ImageView <ImageView
android:layout_centerInParent="true" android:layout_centerInParent="true"
@ -166,7 +166,7 @@
android:background="?attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:layout_width="36dp" android:layout_width="36dp"
android:layout_height="36dp" android:layout_height="36dp"
android:layout_marginRight="8dp" android:layout_marginEnd="8dp"
android:visibility="gone"> android:visibility="gone">
<ImageView <ImageView
android:layout_centerInParent="true" android:layout_centerInParent="true"
@ -181,7 +181,7 @@
android:background="?attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:layout_width="36dp" android:layout_width="36dp"
android:layout_height="36dp" android:layout_height="36dp"
android:layout_marginRight="8dp"> android:layout_marginEnd="8dp">
<ImageView <ImageView
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:layout_width="22dp" android:layout_width="22dp"
@ -195,7 +195,7 @@
android:clickable="true" android:clickable="true"
android:layout_width="36dp" android:layout_width="36dp"
android:layout_height="36dp" android:layout_height="36dp"
android:layout_marginRight="8dp"> android:layout_marginEnd="8dp">
<io.lbry.browser.ui.controls.SolidIconView <io.lbry.browser.ui.controls.SolidIconView
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:layout_width="24dp" android:layout_width="24dp"

16
app/src/main/res/layout/fragment_channel_comments.xml
View file

@ -8,8 +8,8 @@
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="48dp" android:layout_height="48dp"
android:layout_marginLeft="16dp" android:layout_marginStart="16dp"
android:layout_marginRight="16dp"> android:layout_marginEnd="16dp">
<ProgressBar <ProgressBar
android:id="@+id/channel_comments_progress" android:id="@+id/channel_comments_progress"
android:layout_width="20dp" android:layout_width="20dp"
@ -31,16 +31,16 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="0dp" android:layout_marginTop="0dp"
android:layout_marginLeft="16dp" android:layout_marginStart="16dp"
android:layout_marginRight="16dp" android:layout_marginEnd="16dp"
android:layout_marginBottom="16dp" /> android:layout_marginBottom="16dp" />
<TextView <TextView
android:id="@+id/channel_no_comments" android:id="@+id/channel_no_comments"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="16dp" android:layout_marginStart="16dp"
android:layout_marginRight="16dp" android:layout_marginEnd="16dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:text="@string/no_comments" android:text="@string/no_comments"
@ -52,8 +52,8 @@
android:id="@+id/channel_comments_sdk_initializing" android:id="@+id/channel_comments_sdk_initializing"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="16dp" android:layout_marginStart="16dp"
android:layout_marginRight="16dp" android:layout_marginEnd="16dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:text="@string/sdk_initializing_comments" android:text="@string/sdk_initializing_comments"

14
app/src/main/res/layout/fragment_channel_content.xml
View file

@ -27,8 +27,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="2dp" android:layout_marginTop="2dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:layout_marginLeft="16dp" android:layout_marginStart="16dp"
android:layout_marginRight="16dp" android:layout_marginEnd="16dp"
android:visibility="visible"> android:visibility="visible">
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -53,7 +53,7 @@
<ImageView <ImageView
android:layout_width="16dp" android:layout_width="16dp"
android:layout_height="16dp" android:layout_height="16dp"
android:layout_marginLeft="2dp" android:layout_marginStart="2dp"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:src="@drawable/ic_arrow_dropdown" android:src="@drawable/ic_arrow_dropdown"
android:tint="@color/foreground" /> android:tint="@color/foreground" />
@ -66,15 +66,15 @@
android:clickable="true" android:clickable="true"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="24dp" android:layout_marginStart="24dp"
android:layout_toRightOf="@id/channel_content_sort_link" android:layout_toEndOf="@id/channel_content_sort_link"
android:visibility="gone"> android:visibility="gone">
<TextView <TextView
android:id="@+id/channel_content_time_link_text" android:id="@+id/channel_content_time_link_text"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginLeft="4dp" android:layout_marginStart="4dp"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:textFontWeight="300" android:textFontWeight="300"
android:textSize="12sp" android:textSize="12sp"
@ -82,7 +82,7 @@
<ImageView <ImageView
android:layout_width="16dp" android:layout_width="16dp"
android:layout_height="16dp" android:layout_height="16dp"
android:layout_marginLeft="2dp" android:layout_marginStart="2dp"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:src="@drawable/ic_arrow_dropdown" android:src="@drawable/ic_arrow_dropdown"
android:tint="@color/foreground" /> android:tint="@color/foreground" />

36
app/src/main/res/layout/fragment_channel_form.xml
View file

@ -29,7 +29,7 @@
android:background="@drawable/bg_small_icon" android:background="@drawable/bg_small_icon"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:layout_marginLeft="16dp" android:layout_marginStart="16dp"
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
android:layout_alignParentBottom="true"> android:layout_alignParentBottom="true">
<ImageView <ImageView
@ -45,16 +45,16 @@
<LinearLayout <LinearLayout
android:id="@+id/channel_form_upload_progress" android:id="@+id/channel_form_upload_progress"
android:background="@color/channelCoverBackground" android:background="@color/channelCoverBackground"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="4dp" android:layout_marginStart="4dp"
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingTop="2dp" android:paddingTop="2dp"
android:paddingBottom="2dp" android:paddingBottom="2dp"
android:paddingLeft="8dp" android:paddingStart="8dp"
android:paddingRight="8dp" android:paddingEnd="8dp"
android:visibility="gone"> android:visibility="gone">
<ProgressBar <ProgressBar
android:layout_width="16dp" android:layout_width="16dp"
@ -62,7 +62,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="4dp" android:layout_marginStart="4dp"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:text="@string/uploading" android:text="@string/uploading"
android:textColor="@color/white" android:textColor="@color/white"
@ -103,7 +103,7 @@
android:background="@drawable/bg_small_icon" android:background="@drawable/bg_small_icon"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:layout_marginLeft="16dp" android:layout_marginStart="16dp"
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"> android:layout_centerHorizontal="true">
@ -169,7 +169,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="28dp" android:layout_marginTop="28dp"
android:layout_marginLeft="12dp" android:layout_marginStart="12dp"
android:text="@string/at" android:text="@string/at"
android:visibility="gone" /> android:visibility="gone" />
</RelativeLayout> </RelativeLayout>
@ -195,10 +195,10 @@
<TextView <TextView
android:id="@+id/channel_form_input_currency" 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_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="8dp" android:layout_marginStart="8dp"
android:layout_marginTop="30dp" android:layout_marginTop="30dp"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:text="@string/lbc" android:text="@string/lbc"
@ -208,8 +208,8 @@
<LinearLayout <LinearLayout
android:id="@+id/channel_form_inline_balance_container" android:id="@+id/channel_form_inline_balance_container"
android:layout_toRightOf="@id/channel_form_input_currency" android:layout_toEndOf="@id/channel_form_input_currency"
android:layout_marginLeft="24dp" android:layout_marginStart="24dp"
android:layout_marginTop="28dp" android:layout_marginTop="28dp"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -225,7 +225,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:textFontWeight="300" android:textFontWeight="300"
android:layout_marginLeft="2dp" /> android:layout_marginStart="2dp" />
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>
@ -323,8 +323,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginRight="24dp" android:layout_marginEnd="24dp"
android:layout_toLeftOf="@id/channel_form_save_button" android:layout_toStartOf="@id/channel_form_save_button"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:textSize="14sp" android:textSize="14sp"
android:text="@string/show_optional_fields" /> android:text="@string/show_optional_fields" />
@ -333,14 +333,14 @@
android:layout_width="20dp" android:layout_width="20dp"
android:layout_height="20dp" android:layout_height="20dp"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginRight="24dp" android:layout_marginEnd="24dp"
android:layout_toLeftOf="@+id/channel_form_save_button" android:layout_toStartOf="@+id/channel_form_save_button"
android:visibility="gone" /> android:visibility="gone" />
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/channel_form_save_button" android:id="@+id/channel_form_save_button"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:text="@string/save" /> android:text="@string/save" />

8
app/src/main/res/layout/fragment_channel_manager.xml
View file

@ -15,9 +15,9 @@
android:id="@+id/channel_manager_list_loading" android:id="@+id/channel_manager_list_loading"
android:layout_width="20dp" android:layout_width="20dp"
android:layout_height="20dp" android:layout_height="20dp"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:layout_marginRight="16dp" android:layout_marginEnd="16dp"
android:visibility="gone" /> android:visibility="gone" />
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/channel_manager_list" android:id="@+id/channel_manager_list"
@ -66,9 +66,9 @@
android:id="@+id/channel_manager_fab_new_channel" android:id="@+id/channel_manager_fab_new_channel"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_marginRight="16dp" android:layout_marginEnd="16dp"
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
android:src="@drawable/ic_add" android:src="@drawable/ic_add"
android:visibility="gone" /> android:visibility="gone" />

72
app/src/main/res/layout/fragment_file_view.xml
View file

@ -19,7 +19,7 @@
<ProgressBar <ProgressBar
android:layout_width="16dp" android:layout_width="16dp"
android:layout_height="16dp" android:layout_height="16dp"
android:layout_marginRight="8dp" android:layout_marginEnd="8dp"
android:layout_gravity="center_vertical" /> android:layout_gravity="center_vertical" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -75,13 +75,13 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
android:layout_marginRight="4dp" android:layout_marginEnd="4dp"
android:paddingTop="2dp" android:paddingTop="2dp"
android:paddingBottom="2dp" android:paddingBottom="2dp"
android:paddingLeft="6dp" android:paddingStart="6dp"
android:paddingRight="7dp" android:paddingEnd="7dp"
android:visibility="gone"> android:visibility="gone">
<io.lbry.browser.ui.controls.SolidIconView <io.lbry.browser.ui.controls.SolidIconView
android:layout_width="12dp" android:layout_width="12dp"
@ -95,7 +95,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginLeft="1dp" android:layout_marginStart="1dp"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:textColor="@android:color/black" android:textColor="@android:color/black"
android:textSize="14sp" android:textSize="14sp"
@ -136,11 +136,11 @@
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
<LinearLayout <LinearLayout
android:layout_toRightOf="@id/file_view_unsupported_gerbil" android:layout_toEndOf="@id/file_view_unsupported_gerbil"
android:orientation="vertical" android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="24dp" android:layout_marginStart="24dp"
android:layout_centerVertical="true"> android:layout_centerVertical="true">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -183,15 +183,15 @@
android:background="?attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:paddingTop="8dp" android:paddingTop="8dp"
android:paddingBottom="8dp" android:paddingBottom="8dp"
android:paddingLeft="16dp" android:paddingStart="16dp"
android:paddingRight="4dp"> android:paddingEnd="4dp">
<LinearLayout <LinearLayout
android:id="@+id/file_view_title_layout" android:id="@+id/file_view_title_layout"
android:orientation="vertical" android:orientation="vertical"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="48dp"> android:layout_marginEnd="48dp">
<TextView <TextView
android:id="@+id/file_view_title" android:id="@+id/file_view_title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -208,7 +208,7 @@
android:id="@+id/file_view_view_count" android:id="@+id/file_view_view_count"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="16dp" android:layout_marginEnd="16dp"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:textSize="12sp" android:textSize="12sp"
android:textFontWeight="300" android:textFontWeight="300"
@ -226,8 +226,8 @@
<ImageView <ImageView
android:id="@+id/file_view_desc_toggle_arrow" android:id="@+id/file_view_desc_toggle_arrow"
android:src="@drawable/ic_arrow_dropdown" android:src="@drawable/ic_arrow_dropdown"
android:layout_toLeftOf="@+id/file_view_title_layout" android:layout_toStartOf="@+id/file_view_title_layout"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
@ -482,15 +482,15 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="12dp" android:paddingTop="12dp"
android:paddingLeft="16dp" android:paddingStart="16dp"
android:paddingBottom="12dp" android:paddingBottom="12dp"
android:layout_toLeftOf="@id/file_view_icon_follow"> android:layout_toStartOf="@id/file_view_icon_follow">
<RelativeLayout <RelativeLayout
android:id="@+id/file_view_publisher_avatar" android:id="@+id/file_view_publisher_avatar"
android:layout_width="50dp" android:layout_width="50dp"
android:layout_height="50dp" android:layout_height="50dp"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginRight="16dp" android:layout_marginEnd="16dp"
android:visibility="gone"> android:visibility="gone">
<RelativeLayout <RelativeLayout
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
@ -545,12 +545,12 @@
android:id="@+id/file_view_icon_follow" android:id="@+id/file_view_icon_follow"
android:clickable="true" android:clickable="true"
android:background="?attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:layout_marginLeft="16dp" android:layout_marginStart="16dp"
android:layout_marginRight="16dp" android:layout_marginEnd="16dp"
android:text="@string/fa_heart" android:text="@string/fa_heart"
android:textColor="@color/red" android:textColor="@color/red"
android:textSize="20dp" /> android:textSize="20dp" />
@ -559,12 +559,12 @@
android:id="@+id/file_view_icon_unfollow" android:id="@+id/file_view_icon_unfollow"
android:clickable="true" android:clickable="true"
android:background="?attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:layout_marginLeft="16dp" android:layout_marginStart="16dp"
android:layout_marginRight="16dp" android:layout_marginEnd="16dp"
android:text="@string/fa_heart_broken" android:text="@string/fa_heart_broken"
android:textSize="20dp" android:textSize="20dp"
android:visibility="invisible" /> android:visibility="invisible" />
@ -591,8 +591,8 @@
android:autoLink="all" android:autoLink="all"
android:textColorLink="@color/lbryGreen" android:textColorLink="@color/lbryGreen"
android:textFontWeight="300" android:textFontWeight="300"
android:layout_marginLeft="16dp" android:layout_marginStart="16dp"
android:layout_marginRight="16dp" /> android:layout_marginEnd="16dp" />
<LinearLayout <LinearLayout
android:id="@+id/file_view_tag_area" android:id="@+id/file_view_tag_area"
android:orientation="horizontal" android:orientation="horizontal"
@ -600,8 +600,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="10" android:layout_weight="10"
android:paddingTop="36dp" android:paddingTop="36dp"
android:layout_marginLeft="16dp" android:layout_marginStart="16dp"
android:layout_marginRight="16dp"> android:layout_marginEnd="16dp">
<TextView <TextView
android:layout_weight="2" android:layout_weight="2"
android:layout_width="0dp" android:layout_width="0dp"
@ -613,7 +613,7 @@
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/file_view_tag_list" android:id="@+id/file_view_tag_list"
android:layout_weight="8" android:layout_weight="8"
android:layout_marginLeft="8dp" android:layout_marginStart="8dp"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
</LinearLayout> </LinearLayout>
@ -635,8 +635,8 @@
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="16dp" android:layout_marginStart="16dp"
android:layout_marginRight="16dp"> android:layout_marginEnd="16dp">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -657,8 +657,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginLeft="16dp" android:layout_marginStart="16dp"
android:layout_marginRight="16dp" android:layout_marginEnd="16dp"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:text="@string/no_related_content" android:text="@string/no_related_content"
android:textSize="14sp" android:textSize="14sp"
@ -687,8 +687,8 @@
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="16dp" android:layout_marginStart="16dp"
android:layout_marginRight="16dp"> android:layout_marginEnd="16dp">
<ProgressBar <ProgressBar
android:id="@+id/file_view_comments_progress" android:id="@+id/file_view_comments_progress"
android:layout_width="16dp" android:layout_width="16dp"
@ -712,8 +712,8 @@
android:id="@+id/file_view_no_comments" android:id="@+id/file_view_no_comments"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="16dp" android:layout_marginStart="16dp"
android:layout_marginRight="16dp" android:layout_marginEnd="16dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:text="@string/no_comments" android:text="@string/no_comments"

30
app/src/main/res/layout/fragment_following.xml
View file

@ -26,8 +26,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="6dp" android:layout_marginBottom="6dp"
android:layout_marginLeft="16dp" android:layout_marginStart="16dp"
android:layout_marginRight="16dp"> android:layout_marginEnd="16dp">
<TextView <TextView
android:id="@+id/following_page_title" android:id="@+id/following_page_title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -41,14 +41,14 @@
android:layout_height="16dp" android:layout_height="16dp"
android:visibility="gone" android:visibility="gone"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_alignParentRight="true" /> android:layout_alignParentEnd="true" />
<ProgressBar <ProgressBar
android:id="@+id/following_content_progress" android:id="@+id/following_content_progress"
android:visibility="gone" android:visibility="gone"
android:layout_width="16dp" android:layout_width="16dp"
android:layout_height="16dp" android:layout_height="16dp"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_alignParentRight="true" /> android:layout_alignParentEnd="true" />
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
@ -57,8 +57,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="2dp" android:layout_marginTop="2dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:layout_marginLeft="16dp" android:layout_marginStart="16dp"
android:layout_marginRight="16dp" android:layout_marginEnd="16dp"
android:visibility="gone"> android:visibility="gone">
<LinearLayout <LinearLayout
android:id="@+id/following_sort_link" android:id="@+id/following_sort_link"
@ -79,7 +79,7 @@
<ImageView <ImageView
android:layout_width="16dp" android:layout_width="16dp"
android:layout_height="16dp" android:layout_height="16dp"
android:layout_marginLeft="2dp" android:layout_marginStart="2dp"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:src="@drawable/ic_arrow_dropdown" android:src="@drawable/ic_arrow_dropdown"
android:tint="@color/foreground" /> android:tint="@color/foreground" />
@ -87,12 +87,12 @@
<LinearLayout <LinearLayout
android:id="@+id/following_time_link" 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:background="?attr/selectableItemBackground"
android:clickable="true" android:clickable="true"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="24dp" android:layout_marginStart="24dp"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:visibility="gone"> android:visibility="gone">
<TextView <TextView
@ -107,7 +107,7 @@
<ImageView <ImageView
android:layout_width="16dp" android:layout_width="16dp"
android:layout_height="16dp" android:layout_height="16dp"
android:layout_marginLeft="2dp" android:layout_marginStart="2dp"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:src="@drawable/ic_arrow_dropdown" android:src="@drawable/ic_arrow_dropdown"
android:tint="@color/foreground" /> android:tint="@color/foreground" />
@ -118,7 +118,7 @@
android:background="?attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:clickable="true" android:clickable="true"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
@ -131,8 +131,8 @@
android:id="@+id/following_page_info" android:id="@+id/following_page_info"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="16dp" android:layout_marginStart="16dp"
android:layout_marginRight="16dp" android:layout_marginEnd="16dp"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:textFontWeight="300" android:textFontWeight="300"
android:text="@string/lbry_works_better" android:text="@string/lbry_works_better"
@ -188,8 +188,8 @@
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/following_suggested_done_button" android:id="@+id/following_suggested_done_button"
android:layout_marginLeft="16dp" android:layout_marginStart="16dp"
android:layout_marginRight="16dp" android:layout_marginEnd="16dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"

2
app/src/main/res/layout/fragment_invites.xml
View file

@ -80,7 +80,7 @@
android:layout_alignParentBottom="true"> android:layout_alignParentBottom="true">
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/invites_get_started_button" android:id="@+id/invites_get_started_button"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"

48
app/src/main/res/layout/fragment_library.xml
View file

@ -8,8 +8,8 @@
android:id="@+id/library_filter_card" android:id="@+id/library_filter_card"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="16dp" android:layout_marginStart="16dp"
android:layout_marginRight="16dp" android:layout_marginEnd="16dp"
android:layout_marginTop="16dp"> android:layout_marginTop="16dp">
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -32,8 +32,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginLeft="24dp" android:layout_marginStart="24dp"
android:layout_toRightOf="@id/library_filter_link_downloads" android:layout_toEndOf="@id/library_filter_link_downloads"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:text="@string/purchases" /> android:text="@string/purchases" />
<TextView <TextView
@ -43,8 +43,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginLeft="24dp" android:layout_marginStart="24dp"
android:layout_toRightOf="@id/library_filter_link_purchases" android:layout_toEndOf="@id/library_filter_link_purchases"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:text="@string/history" android:text="@string/history"
android:textSize="14sp" /> android:textSize="14sp" />
@ -52,7 +52,7 @@
android:id="@+id/library_list_loading" android:id="@+id/library_list_loading"
android:layout_width="20dp" android:layout_width="20dp"
android:layout_height="20dp" android:layout_height="20dp"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:visibility="gone" /> android:visibility="gone" />
<TextView <TextView
@ -61,7 +61,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:text="@string/stats" android:text="@string/stats"
android:textColor="@color/lbryGreen" android:textColor="@color/lbryGreen"
@ -75,8 +75,8 @@
android:layout_below="@id/library_filter_card" android:layout_below="@id/library_filter_card"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="16dp" android:layout_marginStart="16dp"
android:layout_marginRight="16dp" android:layout_marginEnd="16dp"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:visibility="gone"> android:visibility="gone">
<LinearLayout <LinearLayout
@ -105,7 +105,7 @@
android:id="@+id/library_storage_stat_unit" android:id="@+id/library_storage_stat_unit"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="3dp" android:layout_marginStart="3dp"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:text="@string/mb" android:text="@string/mb"
android:textColor="@color/lbryGreen" android:textColor="@color/lbryGreen"
@ -119,7 +119,7 @@
android:clickable="true" android:clickable="true"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:text="@string/hide" android:text="@string/hide"
@ -174,13 +174,13 @@
android:layout_height="10dp" android:layout_height="10dp"
android:layout_centerVertical="true" /> android:layout_centerVertical="true" />
<TextView <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_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:text="@string/video" android:text="@string/video"
android:layout_marginLeft="4dp" android:layout_marginStart="4dp"
android:textFontWeight="300" android:textFontWeight="300"
android:textSize="12sp" /> android:textSize="12sp" />
@ -190,7 +190,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:text="@string/zero_mb" android:text="@string/zero_mb"
android:textFontWeight="300" android:textFontWeight="300"
@ -210,13 +210,13 @@
android:layout_height="10dp" android:layout_height="10dp"
android:layout_centerVertical="true" /> android:layout_centerVertical="true" />
<TextView <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_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:text="@string/audio" android:text="@string/audio"
android:layout_marginLeft="4dp" android:layout_marginStart="4dp"
android:textFontWeight="300" android:textFontWeight="300"
android:textSize="12sp" /> android:textSize="12sp" />
@ -226,7 +226,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:text="@string/zero_mb" android:text="@string/zero_mb"
android:textFontWeight="300" android:textFontWeight="300"
@ -246,13 +246,13 @@
android:layout_height="10dp" android:layout_height="10dp"
android:layout_centerVertical="true" /> android:layout_centerVertical="true" />
<TextView <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_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:text="@string/images" android:text="@string/images"
android:layout_marginLeft="4dp" android:layout_marginStart="4dp"
android:textFontWeight="300" android:textFontWeight="300"
android:textSize="12sp" /> android:textSize="12sp" />
@ -262,7 +262,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:text="@string/zero_mb" android:text="@string/zero_mb"
android:textFontWeight="300" android:textFontWeight="300"
@ -282,13 +282,13 @@
android:layout_height="10dp" android:layout_height="10dp"
android:layout_centerVertical="true" /> android:layout_centerVertical="true" />
<TextView <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_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:text="@string/other" android:text="@string/other"
android:layout_marginLeft="4dp" android:layout_marginStart="4dp"
android:textFontWeight="300" android:textFontWeight="300"
android:textSize="12sp" /> android:textSize="12sp" />
@ -298,7 +298,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:text="@string/zero_mb" android:text="@string/zero_mb"
android:textFontWeight="300" android:textFontWeight="300"

8
app/src/main/res/layout/fragment_publish.xml
View file

@ -26,7 +26,7 @@
android:layout_weight="1" android:layout_weight="1"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginLeft="-1.5dp"> android:layout_marginStart="-1.5dp">
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -64,7 +64,7 @@
android:clickable="true" android:clickable="true"
android:background="@android:color/black" android:background="@android:color/black"
android:foreground="?attr/selectableItemBackground" 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_width="match_parent"
android:layout_height="148.5dp"> android:layout_height="148.5dp">
<LinearLayout <LinearLayout
@ -106,7 +106,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_below="@id/publish_photo_upload_divider" android:layout_below="@id/publish_photo_upload_divider"
android:layout_toRightOf="@id/publish_vertical_divider"> android:layout_toEndOf="@id/publish_vertical_divider">
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -168,7 +168,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="8dp" android:layout_marginStart="8dp"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:text="@string/loading_videos" android:text="@string/loading_videos"
android:textColor="@color/white" android:textColor="@color/white"

50
app/src/main/res/layout/fragment_publish_form.xml
View file

@ -29,16 +29,16 @@
<LinearLayout <LinearLayout
android:id="@+id/publish_form_thumbnail_upload_progress" android:id="@+id/publish_form_thumbnail_upload_progress"
android:background="@color/channelCoverBackground" android:background="@color/channelCoverBackground"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="4dp" android:layout_marginStart="4dp"
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingTop="2dp" android:paddingTop="2dp"
android:paddingBottom="2dp" android:paddingBottom="2dp"
android:paddingLeft="8dp" android:paddingStart="8dp"
android:paddingRight="8dp" android:paddingEnd="8dp"
android:visibility="gone"> android:visibility="gone">
<ProgressBar <ProgressBar
android:layout_width="16dp" android:layout_width="16dp"
@ -46,7 +46,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="4dp" android:layout_marginStart="4dp"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:text="@string/uploading" android:text="@string/uploading"
android:textColor="@color/white" android:textColor="@color/white"
@ -58,7 +58,7 @@
android:background="@drawable/bg_small_icon" android:background="@drawable/bg_small_icon"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:layout_marginLeft="16dp" android:layout_marginStart="16dp"
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"> android:layout_centerHorizontal="true">
@ -149,7 +149,7 @@
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:textFontWeight="300" android:textFontWeight="300"
android:textSize="16sp" /> android:textSize="16sp" />
@ -183,7 +183,7 @@
android:layout_width="20dp" android:layout_width="20dp"
android:layout_height="20dp" android:layout_height="20dp"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginRight="16dp" android:layout_marginEnd="16dp"
android:visibility="gone" /> android:visibility="gone" />
<TextView <TextView
@ -191,7 +191,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" 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:fontFamily="@font/inter"
android:textFontWeight="300" android:textFontWeight="300"
android:textSize="14sp" /> android:textSize="14sp" />
@ -243,7 +243,7 @@
android:id="@+id/publish_form_loading_channels" android:id="@+id/publish_form_loading_channels"
android:layout_width="20dp" android:layout_width="20dp"
android:layout_height="20dp" android:layout_height="20dp"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:visibility="gone" /> android:visibility="gone" />
</RelativeLayout> </RelativeLayout>
@ -280,7 +280,7 @@
android:id="@+id/publish_form_price_switch" android:id="@+id/publish_form_price_switch"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:layout_centerVertical="true" /> android:layout_centerVertical="true" />
</RelativeLayout> </RelativeLayout>
@ -318,8 +318,8 @@
android:entries="@array/publish_currencies" android:entries="@array/publish_currencies"
android:layout_width="110dp" android:layout_width="110dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_toRightOf="@+id/publish_form_price_layout" android:layout_toEndOf="@+id/publish_form_price_layout"
android:layout_marginLeft="4dp" android:layout_marginStart="4dp"
android:layout_marginTop="24dp" /> android:layout_marginTop="24dp" />
</RelativeLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>
@ -349,7 +349,7 @@
android:id="@+id/publish_form_generate_address" android:id="@+id/publish_form_generate_address"
android:background="?attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:clickable="true" android:clickable="true"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -416,10 +416,10 @@
<TextView <TextView
android:id="@+id/publish_form_input_currency" 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_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="8dp" android:layout_marginStart="8dp"
android:layout_marginTop="30dp" android:layout_marginTop="30dp"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:text="@string/lbc" android:text="@string/lbc"
@ -429,8 +429,8 @@
<LinearLayout <LinearLayout
android:id="@+id/publish_form_inline_balance_container" android:id="@+id/publish_form_inline_balance_container"
android:layout_toRightOf="@id/publish_form_input_currency" android:layout_toEndOf="@id/publish_form_input_currency"
android:layout_marginLeft="24dp" android:layout_marginStart="24dp"
android:layout_marginTop="28dp" android:layout_marginTop="28dp"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -446,7 +446,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:textFontWeight="300" android:textFontWeight="300"
android:layout_marginLeft="2dp" /> android:layout_marginStart="2dp" />
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>
@ -538,7 +538,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="end" android:layout_gravity="end"
android:layout_marginTop="24dp" android:layout_marginTop="24dp"
android:layout_marginRight="16dp" android:layout_marginEnd="16dp"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:text="@string/show_extra_fields" android:text="@string/show_extra_fields"
android:textFontWeight="300" /> android:textFontWeight="300" />
@ -546,8 +546,8 @@
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="16dp" android:paddingStart="16dp"
android:paddingRight="16dp" android:paddingEnd="16dp"
android:layout_marginTop="24dp"> android:layout_marginTop="24dp">
<TextView <TextView
android:id="@+id/publish_form_cancel" android:id="@+id/publish_form_cancel"
@ -567,14 +567,14 @@
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_width="20dp" android:layout_width="20dp"
android:layout_height="20dp" android:layout_height="20dp"
android:layout_marginRight="16dp" android:layout_marginEnd="16dp"
android:layout_toLeftOf="@id/publish_form_publish_button" android:layout_toStartOf="@id/publish_form_publish_button"
android:visibility="gone" /> android:visibility="gone" />
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/publish_form_publish_button" android:id="@+id/publish_form_publish_button"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:text="@string/publish" /> android:text="@string/publish" />

8
app/src/main/res/layout/fragment_publishes.xml
View file

@ -15,9 +15,9 @@
android:id="@+id/publishes_list_loading" android:id="@+id/publishes_list_loading"
android:layout_width="20dp" android:layout_width="20dp"
android:layout_height="20dp" android:layout_height="20dp"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:layout_marginRight="16dp" android:layout_marginEnd="16dp"
android:visibility="gone" /> android:visibility="gone" />
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/publishes_list" android:id="@+id/publishes_list"
@ -66,9 +66,9 @@
android:id="@+id/publishes_fab_new_publish" android:id="@+id/publishes_fab_new_publish"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_marginRight="16dp" android:layout_marginEnd="16dp"
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
android:src="@drawable/ic_add" android:src="@drawable/ic_add"
android:visibility="gone" /> android:visibility="gone" />

14
app/src/main/res/layout/fragment_rewards.xml
View file

@ -8,8 +8,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="16dp" android:paddingTop="16dp"
android:paddingLeft="16dp" android:paddingStart="16dp"
android:paddingRight="16dp"> android:paddingEnd="16dp">
<androidx.cardview.widget.CardView <androidx.cardview.widget.CardView
android:id="@+id/rewards_filter_card" android:id="@+id/rewards_filter_card"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -35,8 +35,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginLeft="16dp" android:layout_marginStart="16dp"
android:layout_toRightOf="@id/rewards_filter_link_unclaimed" android:layout_toEndOf="@id/rewards_filter_link_unclaimed"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:text="@string/all" android:text="@string/all"
android:textSize="14sp" /> android:textSize="14sp" />
@ -44,7 +44,7 @@
android:id="@+id/rewards_list_loading" android:id="@+id/rewards_list_loading"
android:layout_width="20dp" android:layout_width="20dp"
android:layout_height="20dp" android:layout_height="20dp"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:visibility="gone" /> android:visibility="gone" />
</RelativeLayout> </RelativeLayout>
@ -87,7 +87,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginLeft="8dp" android:layout_marginStart="8dp"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:textSize="24sp" android:textSize="24sp"
android:textColor="@color/white" /> android:textColor="@color/white" />
@ -143,7 +143,7 @@
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/rewards_get_started_button" android:id="@+id/rewards_get_started_button"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"

2
app/src/main/res/layout/fragment_search.xml
View file

@ -11,7 +11,7 @@
android:layout_width="20dp" android:layout_width="20dp"
android:layout_height="20dp" android:layout_height="20dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginRight="8dp" android:layout_marginEnd="8dp"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintRight_toRightOf="parent"/> app:layout_constraintRight_toRightOf="parent"/>

4
app/src/main/res/layout/fragment_transaction_history.xml
View file

@ -9,8 +9,8 @@
android:id="@+id/transaction_history_no_transactions" android:id="@+id/transaction_history_no_transactions"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="16dp" android:layout_marginStart="16dp"
android:layout_marginRight="16dp" android:layout_marginEnd="16dp"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:textSize="14sp" android:textSize="14sp"
android:text="@string/no_transactions" android:text="@string/no_transactions"

6
app/src/main/res/layout/fragment_verification_phone.xml
View file

@ -136,8 +136,8 @@
android:id="@+id/verification_phone_verify_progress" android:id="@+id/verification_phone_verify_progress"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:layout_toRightOf="@id/verification_phone_verify_button" android:layout_toEndOf="@id/verification_phone_verify_button"
android:layout_marginLeft="16dp" android:layout_marginStart="16dp"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:visibility="gone" /> android:visibility="gone" />
@ -149,7 +149,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:text="@string/edit" android:text="@string/edit"
android:textColor="@color/white" android:textColor="@color/white"

2
app/src/main/res/layout/fragment_verification_wallet.xml
View file

@ -33,7 +33,7 @@
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginTop="24dp" /> android:layout_marginTop="24dp" />
</RelativeLayout> </RelativeLayout>

2
app/src/main/res/layout/fragment_wallet.xml
View file

@ -95,7 +95,7 @@
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/wallet_sign_up_button" android:id="@+id/wallet_sign_up_button"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"

22
app/src/main/res/layout/list_item_channel.xml
View file

@ -2,8 +2,8 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="16dp" android:paddingStart="16dp"
android:paddingRight="16dp" android:paddingEnd="16dp"
android:paddingTop="8dp" android:paddingTop="8dp"
android:paddingBottom="8dp" android:paddingBottom="8dp"
android:clickable="true" android:clickable="true"
@ -32,7 +32,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginLeft="4dp" android:layout_marginStart="4dp"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:textColor="@color/lightForeground" android:textColor="@color/lightForeground"
android:textFontWeight="300" android:textFontWeight="300"
@ -41,7 +41,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginLeft="4dp" android:layout_marginStart="4dp"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:text="@string/reposted" android:text="@string/reposted"
android:textColor="@color/lightForeground" android:textColor="@color/lightForeground"
@ -83,13 +83,13 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
android:layout_marginRight="4dp" android:layout_marginEnd="4dp"
android:paddingTop="1dp" android:paddingTop="1dp"
android:paddingBottom="1dp" android:paddingBottom="1dp"
android:paddingLeft="2dp" android:paddingStart="2dp"
android:paddingRight="2dp" android:paddingEnd="2dp"
android:visibility="gone"> android:visibility="gone">
<io.lbry.browser.ui.controls.SolidIconView <io.lbry.browser.ui.controls.SolidIconView
android:layout_width="16dp" android:layout_width="16dp"
@ -102,7 +102,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginLeft="2dp" android:layout_marginStart="2dp"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:textSize="14sp" android:textSize="14sp"
android:textFontWeight="300" /> android:textFontWeight="300" />
@ -128,8 +128,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginLeft="16dp" android:layout_marginStart="16dp"
android:layout_toRightOf="@id/claim_media_container"> android:layout_toEndOf="@id/claim_media_container">
<TextView <TextView
android:id="@+id/claim_vanity_url" android:id="@+id/claim_vanity_url"
android:layout_width="wrap_content" android:layout_width="wrap_content"

2
app/src/main/res/layout/list_item_channel_filter.xml
View file

@ -7,7 +7,7 @@
android:background="@drawable/bg_selected_item" android:background="@drawable/bg_selected_item"
android:layout_width="100dp" android:layout_width="100dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="2dp"> android:layout_marginEnd="2dp">
<RelativeLayout <RelativeLayout
android:id="@+id/channel_filter_media_container" android:id="@+id/channel_filter_media_container"
android:layout_width="80dp" android:layout_width="80dp"

10
app/src/main/res/layout/list_item_comment.xml
View file

@ -7,8 +7,8 @@
android:focusable="true" android:focusable="true"
android:orientation="vertical" android:orientation="vertical"
android:paddingBottom="8dp" android:paddingBottom="8dp"
android:paddingLeft="16dp" android:paddingStart="16dp"
android:paddingRight="16dp" android:paddingEnd="16dp"
android:paddingTop="8dp"> android:paddingTop="8dp">
<RelativeLayout <RelativeLayout
@ -46,8 +46,8 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_toRightOf="@id/comment_avatar_container" android:layout_toEndOf="@id/comment_avatar_container"
android:layout_marginLeft="16dp" android:layout_marginStart="16dp"
android:orientation="vertical"> android:orientation="vertical">
<RelativeLayout <RelativeLayout
@ -66,7 +66,7 @@
android:id="@+id/comment_time" android:id="@+id/comment_time"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:textColor="@color/lightGrey" android:textColor="@color/lightGrey"

12
app/src/main/res/layout/list_item_editors_choice.xml
View file

@ -9,8 +9,8 @@
android:id="@+id/editors_choice_header_title" android:id="@+id/editors_choice_header_title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="16dp" android:layout_marginStart="16dp"
android:layout_marginRight="16dp" android:layout_marginEnd="16dp"
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:textSize="24sp" android:textSize="24sp"
@ -22,8 +22,8 @@
android:foreground="?attr/selectableItemBackground" android:foreground="?attr/selectableItemBackground"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="16dp" android:layout_marginStart="16dp"
android:layout_marginRight="16dp" android:layout_marginEnd="16dp"
android:layout_marginBottom="16dp"> android:layout_marginBottom="16dp">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -49,10 +49,10 @@
android:layout_centerVertical="true"/> android:layout_centerVertical="true"/>
<TextView <TextView
android:id="@+id/editors_choice_content_description" 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_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="16dp" android:layout_marginStart="16dp"
android:lineSpacingMultiplier="1.2" android:lineSpacingMultiplier="1.2"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:ellipsize="end" android:ellipsize="end"

26
app/src/main/res/layout/list_item_featured_search_result.xml
View file

@ -2,8 +2,8 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="16dp" android:paddingStart="16dp"
android:paddingRight="16dp" android:paddingEnd="16dp"
android:paddingTop="8dp" android:paddingTop="8dp"
android:paddingBottom="8dp" android:paddingBottom="8dp"
android:clickable="true" android:clickable="true"
@ -27,7 +27,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginLeft="4dp" android:layout_marginStart="4dp"
android:clickable="true" android:clickable="true"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:textFontWeight="300" android:textFontWeight="300"
@ -36,7 +36,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginLeft="4dp" android:layout_marginStart="4dp"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:text="@string/reposted" android:text="@string/reposted"
android:textSize="12sp" android:textSize="12sp"
@ -78,8 +78,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:layout_marginRight="4dp" android:layout_marginEnd="4dp"
android:layout_marginBottom="4dp" android:layout_marginBottom="4dp"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:textColor="@android:color/white" android:textColor="@android:color/white"
@ -93,13 +93,13 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
android:layout_marginRight="4dp" android:layout_marginEnd="4dp"
android:paddingTop="2dp" android:paddingTop="2dp"
android:paddingBottom="2dp" android:paddingBottom="2dp"
android:paddingLeft="6dp" android:paddingStart="6dp"
android:paddingRight="7dp" android:paddingEnd="7dp"
android:visibility="gone"> android:visibility="gone">
<io.lbry.browser.ui.controls.SolidIconView <io.lbry.browser.ui.controls.SolidIconView
android:layout_width="12dp" android:layout_width="12dp"
@ -113,7 +113,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginLeft="1dp" android:layout_marginStart="1dp"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:textColor="@android:color/black" android:textColor="@android:color/black"
android:textSize="14sp" android:textSize="14sp"
@ -139,8 +139,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:layout_marginLeft="16dp" android:layout_marginStart="16dp"
android:layout_toRightOf="@id/claim_media_container"> android:layout_toEndOf="@id/claim_media_container">
<TextView <TextView
android:id="@+id/claim_vanity_url" android:id="@+id/claim_vanity_url"
android:layout_width="wrap_content" android:layout_width="wrap_content"

4
app/src/main/res/layout/list_item_gallery.xml
View file

@ -16,8 +16,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:layout_marginRight="4dp" android:layout_marginEnd="4dp"
android:layout_marginBottom="4dp" android:layout_marginBottom="4dp"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:textColor="@android:color/white" android:textColor="@android:color/white"

4
app/src/main/res/layout/list_item_nav_menu_group.xml
View file

@ -4,8 +4,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:layout_marginLeft="16dp" android:layout_marginStart="16dp"
android:layout_marginRight="16dp" android:layout_marginEnd="16dp"
android:layout_marginBottom="4dp"> android:layout_marginBottom="4dp">
<TextView <TextView
android:id="@+id/nav_menu_title" android:id="@+id/nav_menu_title"

6
app/src/main/res/layout/list_item_nav_menu_item.xml
View file

@ -5,8 +5,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="12dp" android:paddingTop="12dp"
android:paddingBottom="12dp" android:paddingBottom="12dp"
android:paddingLeft="20dp" android:paddingStart="20dp"
android:paddingRight="20dp" android:paddingEnd="20dp"
android:clickable="true" android:clickable="true"
android:focusable="true" android:focusable="true"
android:background="@drawable/bg_selected_nav_item" android:background="@drawable/bg_selected_nav_item"
@ -22,7 +22,7 @@
<TextView <TextView
android:id="@+id/nav_menu_title" android:id="@+id/nav_menu_title"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:layout_marginLeft="12dp" android:layout_marginStart="12dp"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"

6
app/src/main/res/layout/list_item_notification.xml
View file

@ -5,8 +5,8 @@
android:clickable="true" android:clickable="true"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="8dp" android:layout_marginStart="8dp"
android:layout_marginRight="8dp" android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"> android:layout_marginBottom="8dp">
<LinearLayout <LinearLayout
android:id="@+id/notification_layout" android:id="@+id/notification_layout"
@ -14,7 +14,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal"> android:orientation="horizontal">
<RelativeLayout <RelativeLayout
android:layout_marginLeft="16dp" android:layout_marginStart="16dp"
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="48dp" android:layout_height="48dp"
android:layout_gravity="center_vertical"> android:layout_gravity="center_vertical">

28
app/src/main/res/layout/list_item_stream.xml
View file

@ -3,8 +3,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:paddingLeft="16dp" android:paddingStart="16dp"
android:paddingRight="16dp" android:paddingEnd="16dp"
android:paddingTop="8dp" android:paddingTop="8dp"
android:paddingBottom="8dp" android:paddingBottom="8dp"
android:clickable="true" android:clickable="true"
@ -32,7 +32,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginLeft="4dp" android:layout_marginStart="4dp"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:textColor="@color/lightForeground" android:textColor="@color/lightForeground"
android:textFontWeight="300" android:textFontWeight="300"
@ -41,7 +41,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginLeft="4dp" android:layout_marginStart="4dp"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:text="@string/reposted" android:text="@string/reposted"
android:textColor="@color/lightForeground" android:textColor="@color/lightForeground"
@ -83,8 +83,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:layout_marginRight="4dp" android:layout_marginEnd="4dp"
android:layout_marginBottom="4dp" android:layout_marginBottom="4dp"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:textColor="@android:color/white" android:textColor="@android:color/white"
@ -98,13 +98,13 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
android:layout_marginRight="4dp" android:layout_marginEnd="4dp"
android:paddingTop="2dp" android:paddingTop="2dp"
android:paddingBottom="2dp" android:paddingBottom="2dp"
android:paddingLeft="6dp" android:paddingStart="6dp"
android:paddingRight="7dp" android:paddingEnd="7dp"
android:visibility="gone"> android:visibility="gone">
<io.lbry.browser.ui.controls.SolidIconView <io.lbry.browser.ui.controls.SolidIconView
android:layout_width="12dp" android:layout_width="12dp"
@ -118,7 +118,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginLeft="1dp" android:layout_marginStart="1dp"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:textColor="@android:color/black" android:textColor="@android:color/black"
android:textSize="14sp" android:textSize="14sp"
@ -151,8 +151,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:layout_marginLeft="16dp" android:layout_marginStart="16dp"
android:layout_toRightOf="@id/claim_media_container"> android:layout_toEndOf="@id/claim_media_container">
<LinearLayout <LinearLayout
android:id="@+id/claim_text_loading_placeholder_1" android:id="@+id/claim_text_loading_placeholder_1"
android:background="@color/lighterGrey" android:background="@color/lighterGrey"
@ -217,7 +217,7 @@
android:id="@+id/claim_file_size" android:id="@+id/claim_file_size"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:textSize="11sp" android:textSize="11sp"
android:textFontWeight="300" /> android:textFontWeight="300" />

8
app/src/main/res/layout/list_item_suggested_channel.xml
View file

@ -10,8 +10,8 @@
android:focusable="true" android:focusable="true"
android:paddingTop="12dp" android:paddingTop="12dp"
android:paddingBottom="12dp" android:paddingBottom="12dp"
android:paddingLeft="8dp" android:paddingStart="8dp"
android:paddingRight="8dp"> android:paddingEnd="8dp">
<RelativeLayout <RelativeLayout
android:id="@+id/suggested_media_container" android:id="@+id/suggested_media_container"
android:layout_width="80dp" android:layout_width="80dp"
@ -64,6 +64,6 @@
android:textSize="12sp" android:textSize="12sp"
android:paddingTop="2dp" android:paddingTop="2dp"
android:paddingBottom="3dp" android:paddingBottom="3dp"
android:paddingLeft="8dp" android:paddingStart="8dp"
android:paddingRight="8dp" /> android:paddingEnd="8dp" />
</LinearLayout> </LinearLayout>

10
app/src/main/res/layout/list_item_tag.xml
View file

@ -5,19 +5,19 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="6dp" android:layout_marginBottom="6dp"
android:layout_marginRight="6dp" android:layout_marginEnd="6dp"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingTop="4dp" android:paddingTop="4dp"
android:paddingBottom="4dp" android:paddingBottom="4dp"
android:paddingLeft="8dp" android:paddingStart="8dp"
android:paddingRight="12dp" android:paddingEnd="12dp"
android:foreground="?attr/selectableItemBackground"> android:foreground="?attr/selectableItemBackground">
<ImageView <ImageView
android:id="@+id/tag_action" android:id="@+id/tag_action"
android:layout_width="16dp" android:layout_width="16dp"
android:layout_height="16dp" android:layout_height="16dp"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginRight="4dp" android:layout_marginEnd="4dp"
android:tint="@color/darkForeground" /> android:tint="@color/darkForeground" />
<TextView <TextView
android:id="@+id/tag_name" android:id="@+id/tag_name"
@ -25,7 +25,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:fontFamily="@font/inter" android:fontFamily="@font/inter"
android:layout_marginLeft="4dp" android:layout_marginStart="4dp"
android:textSize="12sp" android:textSize="12sp"
android:textFontWeight="300" /> android:textFontWeight="300" />
</LinearLayout> </LinearLayout>

8
app/src/main/res/layout/list_item_url_suggestion.xml
View file

@ -2,8 +2,8 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_width="match_parent" android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:paddingLeft="12dp" android:paddingStart="12dp"
android:paddingRight="12dp" android:paddingEnd="12dp"
android:paddingTop="12dp" android:paddingTop="12dp"
android:paddingBottom="12dp" android:paddingBottom="12dp"
android:clickable="true" android:clickable="true"
@ -18,9 +18,9 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" 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_centerVertical="true"
android:layout_marginLeft="12dp" android:layout_marginStart="12dp"
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView
android:id="@+id/url_suggestion_title" android:id="@+id/url_suggestion_title"

2
app/src/main/res/layout/popup_webview.xml
View file

@ -15,6 +15,6 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_alignParentRight="true" android:layout_alignParentEnd="true"
style="@style/Widget.MaterialComponents.Button.TextButton"/> style="@style/Widget.MaterialComponents.Button.TextButton"/>
</RelativeLayout> </RelativeLayout>