Compare commits

..
Author SHA1 Message Date
Akinwale Ariwodola 0f4f0e01ed don't proceed with publish if optimization is in progress. 2020-05-22 17:48:55 +01:00
Akinwale Ariwodola 19515fb407 Add media player error handling policy. Use : in share links. 2020-05-22 17:37:02 +01:00
Akinwale Ariwodola f410fa07ef Afrikaans and Spanish strings 2020-05-22 17:17:44 +01:00
Akinwale Ariwodola 729d7fe2a1 force US locale for amount / bid values sent with sdk requests 2020-05-22 15:40:06 +01:00
Akinwale Ariwodola aa1b9972a8 fix merge conflict 2020-05-22 15:07:33 +01:00
Akinwale Ariwodola 03764f64b9 Claim new_android reward. Use canonical_url for share links. 2020-05-22 15:01:01 +01:00
Akinwale Ariwodola 7d95c3c3d5 fix no related content display 2020-05-22 14:02:01 +01:00
Akinwale Ariwodola 8f39ad6d32 Inline publish address validation error. Increase image upload request timeout. 2020-05-22 13:45:29 +01:00
Akinwale Ariwodola 94c3f67fe5 Add exoplayer mediasession extension. Set player auto attributes. 2020-05-22 13:01:28 +01:00
Akinwale Ariwodola b51db6439b Fix file size display. Tweak playback speed control. 2020-05-22 08:27:34 +01:00
Akinwale Ariwodola e1ab522dc7 change play and pause icons 2020-05-22 08:06:28 +01:00
Akinwale Ariwodola 7879ab738b quick skip and playback speed media controls 2020-05-22 07:31:47 +01:00
Akinwale Ariwodola b901ff7b0d adjust minimum deposit. fix channel edit mode. 2020-05-22 05:52:49 +01:00
Akinwale Ariwodola 2f7e999e49 fix for possible blank / invalid video thumbnails 2020-05-22 05:17:10 +01:00
Akinwale Ariwodola 616e3597db fix edit channel crash 2020-05-22 04:57:40 +01:00
Akinwale Ariwodola 528f81c59a Filter own claims fron downloads. Fix address input. 2020-05-22 04:31:12 +01:00
Akinwale Ariwodola 5839821f8f show URL suggestions and data network (DHT) settings 2020-05-22 03:54:24 +01:00
Akinwale Ariwodola 1d8f0dabe6 publish drivers for unresolved file page and featured search result item 2020-05-22 03:37:12 +01:00
Akinwale Ariwodola 2231119d36 Implement file and channel page delete actions. UI action cleanup. 2020-05-22 03:17:33 +01:00
Akinwale Ariwodola 0fec3c6a6f remove closeDatabase calls causing crashes 2020-05-21 22:07:25 +01:00
Akinwale Ariwodola c11e2fcd7a finish publish experience 2020-05-21 22:02:50 +01:00
Akinwale Ariwodola fafb20b39a publish editing 2020-05-21 16:24:37 +01:00
Akinwale Ariwodola 4d2656f676 Basic native mobile publishing 2020-05-21 14:23:14 +01:00
Akinwale Ariwodola 818fc80549 Merge branch 'native-rewrite' of https://github.com/lbryio/lbry-android into native-rewrite 2020-05-20 22:58:18 +01:00
Akinwale Ariwodola dc758491a9 Publish form and publish creation flow. UI tweaks and fixes. 2020-05-20 22:57:48 +01:00
Akinwale Ariwodola f6672ca695 Merge pull request #882 from infinite-persistence/native-rewrite
Fix minor typo for string in 'generate_address_hint'.
2020-05-20 10:13:21 +01:00
infiinte-persistence 573325c576 Fix minor typo for string in 'generate_address_hint'.
conintue --> continue
2020-05-20 15:24:33 +08:00
Akinwale Ariwodola 7514a81a31 Some dark theme and crash fixes. Implement publish form. 2020-05-20 00:01:50 +01:00
Akinwale Ariwodola 39b91a8886 Fix displayed amounts. Send Firebase token with install_new. 2020-05-19 19:38:30 +01:00
Akinwale Ariwodola 3e032a0f9d sdk 0.74.0. Publish and Publishes pages. 2020-05-19 15:56:24 +01:00
Akinwale Ariwodola 314e6be77e Some visual tweaks. Wunderbar clear focus hotfix for some devices. 2020-05-18 22:17:53 +01:00
Akinwale Ariwodola 9aaa4db5f0 fix some events 2020-05-18 03:57:06 +01:00
Akinwale Ariwodola d4d58d7508 bumpversion 0.15.1 --> 0.15.2 2020-05-18 03:34:31 +01:00
Akinwale Ariwodola 5eb35e3283 Abandon channels and bulk delete files tasks. Some visual tweaks. 2020-05-18 03:29:30 +01:00
Akinwale Ariwodola a42442b13b Better handling of file view URLs. Some issue list fixes. 2020-05-17 20:52:38 +01:00
Akinwale Ariwodola f317aa2174 Make file view a fragment to prevent headaches with multiple Android task recents 2020-05-17 15:48:07 +01:00
Akinwale Ariwodola 82dc0255f1 bumpversion 0.15.0 --> 0.15.1 2020-05-15 20:07:53 +01:00
Akinwale Ariwodola 244d54ed39 Library page. URL and view history. 2020-05-15 20:07:05 +01:00
Akinwale Ariwodola 47f56950a5 url history and player fixes 2020-05-14 19:25:16 +01:00
Akinwale Ariwodola fb2b798106 change launch mode from singleInstance to singleTask 2020-05-14 13:33:27 +01:00
Akinwale Ariwodola 7cf97feb9e fix channel list adapters 2020-05-14 04:14:06 +01:00
Akinwale Ariwodola d1faaa9362 don't display invites history if none exist 2020-05-14 03:47:51 +01:00
Akinwale Ariwodola aad718c714 purchase_uri for free content 2020-05-14 03:43:08 +01:00
Akinwale Ariwodola 6bed7bfd2f display text and markdown content 2020-05-14 03:36:46 +01:00
Akinwale Ariwodola df4785fb5f tweak about page layout 2020-05-14 02:24:00 +01:00
Akinwale Ariwodola 9eb7177a15 tweak player loading and playback when loading new claims 2020-05-14 02:18:54 +01:00
Akinwale Ariwodola 103565d57c SDK 0.73.1. Finish file view experience. 2020-05-14 01:59:29 +01:00
Akinwale Ariwodola da4591fb2e remove debug log 2020-05-12 17:22:22 +01:00
Akinwale Ariwodola 6ac4a25715 sdk 0.72.0. Customize player view and controls. 2020-05-12 17:17:42 +01:00
Akinwale Ariwodola b4599ec7c5 add Invites page 2020-05-11 19:38:21 +01:00
Akinwale Ariwodola bc2e8b7ec0 phone number verification and rewards page 2020-05-10 23:11:48 +01:00
Akinwale Ariwodola 2df4d76927 Channel management and channel creation / editing 2020-05-07 19:06:59 +01:00
Akinwale Ariwodola f45c517048 Channel follow/unfollow fixes. Display stream cost. 2020-05-05 01:25:30 +01:00
Akinwale Ariwodola c78f669fb1 Handle lbry:// url scheme. Properly set URL bar values. SDK 0.71.0. 2020-05-03 22:39:04 +01:00
Akinwale Ariwodola 78dd587901 Send tip dialog. Channel page share and follow/unfollow. 2020-05-03 13:46:31 +01:00
Akinwale Ariwodola 8cb51f5c17 Search cache. File view updates. Floating wallet balance. 2020-05-02 17:41:23 +01:00
Akinwale Ariwodola f4b28c4d90 display no related content view when none loaded 2020-05-01 16:52:29 +01:00
Akinwale Ariwodola cfa7e07eba Editor's Choice. Reposts. Some ontent page tweaks. 2020-05-01 13:49:56 +01:00
Akinwale Ariwodola 5ceb081972 Wallet sync get and set preferences, update interval. 2020-05-01 04:44:40 +01:00
Akinwale Ariwodola 1d1c761d3f Finish Following and All Content views. Add customize your tags view. 2020-04-30 19:05:37 +01:00
Akinwale Ariwodola 59584c1be7 Fix first time wallet sync. add Discover dialog to Following page. 2020-04-29 01:35:51 +01:00
Akinwale Ariwodola 10175470de fix Gitlab CI script 2020-04-28 14:39:57 +01:00
Akinwale Ariwodola 2604baa221 add printVersionName gradle task 2020-04-28 14:34:50 +01:00
Akinwale Ariwodola 1adf073de6 update gitlab CI script 2020-04-28 14:31:03 +01:00
Akinwale Ariwodola cf052f9c80 initial native rewrite commit 2020-04-28 14:25:39 +01:00
12 changed files with 112 additions and 164 deletions

No files matched your search

+3
View File
@@ -0,0 +1,3 @@
.buildozer
.buildozer-downloads
.gradle
+2 -2
View File
@@ -52,9 +52,9 @@ task printVersionName {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'androidx.appcompat:appcompat:1.2.0-rc01'
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'com.google.android.material:material:1.2.0-alpha06'
implementation 'com.google.android.material:material:1.1.0'
implementation "androidx.cardview:cardview:1.0.0"
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation 'androidx.navigation:navigation-fragment:2.2.2'
@@ -17,7 +17,6 @@ import android.content.res.Configuration;
import android.content.res.TypedArray;
import android.database.sqlite.SQLiteDatabase;
import android.graphics.Color;
import android.graphics.Typeface;
import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.AsyncTask;
@@ -27,10 +26,7 @@ import android.os.Handler;
import android.provider.MediaStore;
import android.support.v4.media.session.MediaSessionCompat;
import android.text.Editable;
import android.text.Spannable;
import android.text.SpannableString;
import android.text.TextWatcher;
import android.text.style.TypefaceSpan;
import android.util.Base64;
import android.util.Log;
import android.view.KeyEvent;
@@ -66,7 +62,6 @@ import androidx.core.app.NotificationManagerCompat;
import androidx.core.content.ContextCompat;
import androidx.core.content.FileProvider;
import androidx.core.content.res.ResourcesCompat;
import androidx.core.graphics.TypefaceCompat;
import androidx.core.graphics.drawable.DrawableCompat;
import androidx.core.view.GravityCompat;
import androidx.core.view.OnApplyWindowInsetsListener;
@@ -116,7 +111,6 @@ import io.lbry.browser.listener.DownloadActionListener;
import io.lbry.browser.listener.FetchChannelsListener;
import io.lbry.browser.listener.FetchClaimsListener;
import io.lbry.browser.listener.FilePickerListener;
import io.lbry.browser.listener.ScreenOrientationListener;
import io.lbry.browser.listener.SdkStatusListener;
import io.lbry.browser.listener.StoragePermissionListener;
import io.lbry.browser.listener.WalletBalanceListener;
@@ -179,8 +173,6 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
private Map<String, Class> specialRouteFragmentClassMap;
private boolean inPictureInPictureMode;
@Getter
private boolean inFullscreenMode;
public static SimpleExoPlayer appPlayer;
public static Cache playerCache;
public static boolean playerReassigned;
@@ -308,7 +300,6 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
private List<CameraPermissionListener> cameraPermissionListeners;
private List<DownloadActionListener> downloadActionListeners;
private List<FilePickerListener> filePickerListeners;
private List<ScreenOrientationListener> screenOrientationListeners;
private List<SdkStatusListener> sdkStatusListeners;
private List<StoragePermissionListener> storagePermissionListeners;
private List<WalletBalanceListener> walletBalanceListeners;
@@ -403,19 +394,31 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
// setup uri bar
setupUriBar();
/*View decorView = getWindow().getDecorView();
decorView.setOnSystemUiVisibilityChangeListener(new View.OnSystemUiVisibilityChangeListener() {
@Override
public void onSystemUiVisibilityChange(int visibility) {
if ((visibility & View.SYSTEM_UI_FLAG_FULLSCREEN) == 0) {
findViewById(R.id.app_bar_main_container).setFitsSystemWindows(false);
findViewById(R.id.drawer_layout).setFitsSystemWindows(false);
} else {
findViewById(R.id.app_bar_main_container).setFitsSystemWindows(true);
findViewById(R.id.drawer_layout).setFitsSystemWindows(true);
}
}
});*/
// other
pendingSyncSetQueue = new ArrayList<>();
openNavFragments = new HashMap<>();
cameraPermissionListeners = new ArrayList<>();
downloadActionListeners = new ArrayList<>();
fetchChannelsListeners = new ArrayList<>();
fetchClaimsListeners = new ArrayList<>();
filePickerListeners = new ArrayList<>();
screenOrientationListeners = new ArrayList<>();
sdkStatusListeners = new ArrayList<>();
storagePermissionListeners = new ArrayList<>();
walletBalanceListeners = new ArrayList<>();
fetchClaimsListeners = new ArrayList<>();
fetchChannelsListeners = new ArrayList<>();
sdkStatusListeners.add(this);
@@ -528,39 +531,14 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
checkNotificationOpenIntent(intent);
}
public void onConfigurationChanged(Configuration newConfig) {
super.onConfigurationChanged(newConfig);
switch (newConfig.orientation) {
case Configuration.ORIENTATION_PORTRAIT:
for (ScreenOrientationListener listener : screenOrientationListeners) {
listener.onPortraitOrientationEntered();
}
break;
case Configuration.ORIENTATION_LANDSCAPE:
for (ScreenOrientationListener listener : screenOrientationListeners) {
listener.onLandscapeOrientationEntered();
}
break;
public void addCameraPermissionListener(CameraPermissionListener listener) {
if (!cameraPermissionListeners.contains(listener)) {
cameraPermissionListeners.add(listener);
}
}
public void setActionBarTitle(int stringResourceId) {
ActionBar actionBar = getSupportActionBar();
if (actionBar != null) {
SpannableString spannable = new SpannableString(getString(stringResourceId));
spannable.setSpan(new TypefaceSpan("inter"), 0, spannable.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
actionBar.setTitle(spannable);
}
}
public void addScreenOrientationListener(ScreenOrientationListener listener) {
if (!screenOrientationListeners.contains(listener)) {
screenOrientationListeners.add(listener);
}
}
public void removeScreenOrientationListener(ScreenOrientationListener listener) {
screenOrientationListeners.remove(listener);
public void removeCameraPermissionListener(CameraPermissionListener listener) {
cameraPermissionListeners.remove(listener);
}
public void addDownloadActionListener(DownloadActionListener listener) {
@@ -583,17 +561,6 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
filePickerListeners.remove(listener);
}
public void addCameraPermissionListener(CameraPermissionListener listener) {
if (!cameraPermissionListeners.contains(listener)) {
cameraPermissionListeners.add(listener);
}
}
public void removeCameraPermissionListener(CameraPermissionListener listener) {
cameraPermissionListeners.remove(listener);
}
public void addSdkStatusListener(SdkStatusListener listener) {
if (!sdkStatusListeners.contains(listener)) {
sdkStatusListeners.add(listener);
@@ -797,7 +764,7 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
private void renderFullMode() {
getSupportActionBar().show();
findViewById(R.id.content_main).setVisibility(View.VISIBLE);
findViewById(R.id.floating_balance_main_container).setVisibility(inFullscreenMode ? View.INVISIBLE : View.VISIBLE);
findViewById(R.id.floating_balance_main_container).setVisibility(View.VISIBLE);
Fragment fragment = getCurrentFragment();
if (!(fragment instanceof FileViewFragment)) {
findViewById(R.id.global_now_playing_card).setVisibility(View.VISIBLE);
@@ -1327,7 +1294,6 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
}
public void enterFullScreenMode() {
inFullscreenMode = true;
hideFloatingWalletBalance();
ActionBar actionBar = getSupportActionBar();
if (actionBar != null) {
@@ -1371,7 +1337,6 @@ public class MainActivity extends AppCompatActivity implements SdkStatusListener
if (actionBar != null) {
actionBar.show();
}
inFullscreenMode = false;
}
private void initKeyStore() {
@@ -1,6 +0,0 @@
package io.lbry.browser.listener;
public interface ScreenOrientationListener {
void onPortraitOrientationEntered();
void onLandscapeOrientationEntered();
}
@@ -503,8 +503,10 @@ public class ChannelFormFragment extends BaseFragment implements
activity.addFilePickerListener(this);
activity.addWalletBalanceListener(this);
activity.setActionBarTitle(editMode ? R.string.edit_channel : R.string.create_a_channel);
ActionBar actionBar = activity.getSupportActionBar();
if (actionBar != null) {
actionBar.setTitle(editMode ? R.string.edit_channel : R.string.create_a_channel);
}
}
}
@@ -542,7 +544,10 @@ public class ChannelFormFragment extends BaseFragment implements
LbryAnalytics.setCurrentScreen(activity, "Channel Form", "ChannelForm");
activity.addStoragePermissionListener(this);
if (editMode) {
activity.setActionBarTitle(R.string.edit_channel);
ActionBar actionBar = activity.getSupportActionBar();
if (actionBar != null) {
actionBar.setTitle(R.string.edit_channel);
}
}
}
String filterText = Helper.getValue(inputTagFilter.getText());
@@ -94,7 +94,6 @@ import io.lbry.browser.dialog.SendTipDialogFragment;
import io.lbry.browser.exceptions.LbryUriException;
import io.lbry.browser.listener.DownloadActionListener;
import io.lbry.browser.listener.FetchClaimsListener;
import io.lbry.browser.listener.ScreenOrientationListener;
import io.lbry.browser.listener.SdkStatusListener;
import io.lbry.browser.listener.StoragePermissionListener;
import io.lbry.browser.model.Claim;
@@ -136,11 +135,7 @@ import io.lbry.lbrysdk.LbrynetService;
import io.lbry.lbrysdk.Utils;
public class FileViewFragment extends BaseFragment implements
MainActivity.BackPressInterceptor, DownloadActionListener,
FetchClaimsListener,
ScreenOrientationListener,
SdkStatusListener,
StoragePermissionListener {
MainActivity.BackPressInterceptor, DownloadActionListener, FetchClaimsListener, SdkStatusListener, StoragePermissionListener {
private static final int RELATED_CONTENT_SIZE = 16;
private static final String DEFAULT_PLAYBACK_SPEED = "1x";
@@ -223,7 +218,6 @@ public class FileViewFragment extends BaseFragment implements
MainActivity activity = (MainActivity) context;
activity.setBackPressInterceptor(this);
activity.addDownloadActionListener(this);
activity.addScreenOrientationListener(this);
activity.addFetchClaimsListener(this);
if (!MainActivity.hasPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE, context)) {
activity.addStoragePermissionListener(this);
@@ -296,7 +290,6 @@ public class FileViewFragment extends BaseFragment implements
if (claim != null) {
Helper.saveViewHistory(currentUrl, claim);
checkAndLoadRelatedContent();
renderClaim();
if (claim.getFile() == null) {
loadFile();
@@ -359,8 +352,8 @@ public class FileViewFragment extends BaseFragment implements
}
}
private void initWebView(View root) {
WebView webView = root.findViewById(R.id.file_view_webview);
private void initWebView(View view) {
WebView webView = view.findViewById(R.id.file_view_webview);
webView.setWebViewClient(new LbryWebViewClient(getContext()));
WebSettings webSettings = webView.getSettings();
webSettings.setAllowFileAccess(true);
@@ -396,7 +389,6 @@ public class FileViewFragment extends BaseFragment implements
logUrlEvent(url);
resetViewCount();
resetFee();
View root = getView();
if (root != null) {
((RecyclerView) root.findViewById(R.id.file_view_related_content_list)).setAdapter(null);
@@ -488,7 +480,6 @@ public class FileViewFragment extends BaseFragment implements
if (claim != null) {
Helper.saveViewHistory(url, claim);
checkAndLoadRelatedContent();
renderClaim();
}
}
@@ -540,10 +531,8 @@ public class FileViewFragment extends BaseFragment implements
MainActivity activity = (MainActivity) context;
activity.removeDownloadActionListener(this);
activity.removeFetchClaimsListener(this);
activity.removeScreenOrientationListener(this);
activity.removeSdkStatusListener(this);
activity.removeStoragePermissionListener(this);
//activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
}
}
@@ -589,8 +578,6 @@ public class FileViewFragment extends BaseFragment implements
checkAndResetNowPlayingClaim();
loadFile();
checkAndLoadRelatedContent();
renderClaim();
} else {
// render nothing at location
@@ -607,6 +594,8 @@ public class FileViewFragment extends BaseFragment implements
}
private void initUi(View root) {
initWebView(root);
buttonPublishSomething.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
@@ -1200,18 +1189,13 @@ public class FileViewFragment extends BaseFragment implements
} else {
restoreMainActionButton();
}
}
checkOwnClaim();
}
private void checkAndLoadRelatedContent() {
View root = getView();
if (root != null) {
RecyclerView relatedContentList = root.findViewById(R.id.file_view_related_content_list);
if (relatedContentList == null || relatedContentList.getAdapter() == null || relatedContentList.getAdapter().getItemCount() == 0) {
loadRelatedContent();
}
}
checkOwnClaim();
}
private void showUnsupportedView() {
@@ -1569,31 +1553,25 @@ public class FileViewFragment extends BaseFragment implements
if (!fileExists) {
showError(getString(R.string.claim_file_not_found, claimFile != null ? claimFile.getDownloadPath() : ""));
} else if (fileUri != null) {
View root = getView();
Context context = getContext();
if (root != null) {
if (mediaType.startsWith("image")) {
// display the image
View container = root.findViewById(R.id.file_view_imageviewer_container);
PhotoView photoView = root.findViewById(R.id.file_view_imageviewer);
if (mediaType.startsWith("image")) {
// display the image
View container = getView().findViewById(R.id.file_view_imageviewer_container);
PhotoView photoView = getView().findViewById(R.id.file_view_imageviewer);
if (context != null) {
Glide.with(context.getApplicationContext()).load(fileUri).centerInside().into(photoView);
}
hideFloatingWalletBalance();
container.setVisibility(View.VISIBLE);
} else if (mediaType.startsWith("text")) {
// show web view (and parse markdown too)
View container = root.findViewById(R.id.file_view_webview_container);
WebView webView = root.findViewById(R.id.file_view_webview);
if (Arrays.asList("text/markdown", "text/md").contains(mediaType.toLowerCase())) {
loadMarkdownFromFile(claimFile.getDownloadPath());
} else {
webView.loadUrl(fileUri.toString());
}
hideFloatingWalletBalance();
container.setVisibility(View.VISIBLE);
Glide.with(getContext().getApplicationContext()).load(fileUri).centerInside().into(photoView);
hideFloatingWalletBalance();
container.setVisibility(View.VISIBLE);
} else if (mediaType.startsWith("text")) {
// show web view (and parse markdown too)
View container = getView().findViewById(R.id.file_view_webview_container);
WebView webView = getView().findViewById(R.id.file_view_webview);
if (Arrays.asList("text/markdown", "text/md").contains(mediaType.toLowerCase())) {
loadMarkdownFromFile(claimFile.getDownloadPath());
} else {
webView.loadUrl(fileUri.toString());
}
hideFloatingWalletBalance();
container.setVisibility(View.VISIBLE);
}
handled = true;
}
@@ -1666,7 +1644,6 @@ public class FileViewFragment extends BaseFragment implements
SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);
canShowMatureContent = sp.getBoolean(MainActivity.PREFERENCE_KEY_SHOW_MATURE_CONTENT, false);
}
LighthouseSearchTask relatedTask = new LighthouseSearchTask(
title, RELATED_CONTENT_SIZE, 0, canShowMatureContent, claimId, relatedLoading, new ClaimSearchResultHandler() {
@Override
@@ -1678,33 +1655,30 @@ public class FileViewFragment extends BaseFragment implements
}
}
Context ctx = getContext();
if (ctx != null) {
relatedContentAdapter = new ClaimListAdapter(filteredClaims, ctx);
relatedContentAdapter.setListener(new ClaimListAdapter.ClaimListItemListener() {
@Override
public void onClaimClicked(Claim claim) {
if (context instanceof MainActivity) {
MainActivity activity = (MainActivity) context;
if (claim.getName().startsWith("@")) {
activity.openChannelUrl(claim.getPermanentUrl());
} else {
activity.openFileUrl(claim.getPermanentUrl()); //openClaimUrl(claim.getPermanentUrl());
}
relatedContentAdapter = new ClaimListAdapter(filteredClaims, context);
relatedContentAdapter.setListener(new ClaimListAdapter.ClaimListItemListener() {
@Override
public void onClaimClicked(Claim claim) {
if (context instanceof MainActivity) {
MainActivity activity = (MainActivity) context;
if (claim.getName().startsWith("@")) {
activity.openChannelUrl(claim.getPermanentUrl());
} else {
activity.openFileUrl(claim.getPermanentUrl()); //openClaimUrl(claim.getPermanentUrl());
}
}
});
View v = getView();
if (v != null) {
RecyclerView relatedContentList = root.findViewById(R.id.file_view_related_content_list);
relatedContentList.setAdapter(relatedContentAdapter);
relatedContentAdapter.notifyDataSetChanged();
Helper.setViewVisibility(
v.findViewById(R.id.file_view_no_related_content),
relatedContentAdapter == null || relatedContentAdapter.getItemCount() == 0 ? View.VISIBLE : View.GONE);
}
});
View v = getView();
if (v != null) {
RecyclerView relatedContentList = root.findViewById(R.id.file_view_related_content_list);
relatedContentList.setAdapter(relatedContentAdapter);
relatedContentAdapter.notifyDataSetChanged();
Helper.setViewVisibility(
v.findViewById(R.id.file_view_no_related_content),
relatedContentAdapter == null || relatedContentAdapter.getItemCount() == 0 ? View.VISIBLE : View.GONE);
}
}
@@ -1774,12 +1748,12 @@ public class FileViewFragment extends BaseFragment implements
}
}
@SuppressLint("SourceLockedOrientationActivity")
private void disableFullScreenMode() {
Context context = getContext();
if (context instanceof MainActivity) {
MainActivity activity = (MainActivity) context;
View root = getView();
RelativeLayout mediaContainer = root.findViewById(R.id.file_view_media_container);
View exoplayerContainer = root.findViewById(R.id.file_view_exoplayer_container);
((ViewGroup) exoplayerContainer.getParent()).removeView(exoplayerContainer);
@@ -2081,22 +2055,6 @@ public class FileViewFragment extends BaseFragment implements
checkOwnClaim();
}
@Override
public void onPortraitOrientationEntered() {
Context context = getContext();
if (context instanceof MainActivity && ((MainActivity) context).isInFullscreenMode()) {
disableFullScreenMode();
}
}
@Override
public void onLandscapeOrientationEntered() {
Context context = getContext();
if (claim != null && claim.isPlayable() && context instanceof MainActivity && !((MainActivity) context).isInFullscreenMode()) {
enableFullScreenMode();
}
}
private static class LbryWebViewClient extends WebViewClient {
private Context context;
public LbryWebViewClient(Context context) {
@@ -180,7 +180,10 @@ public class AboutFragment extends BaseFragment implements SdkStatusListener {
activity.lockDrawer();
activity.hideFloatingWalletBalance();
activity.setActionBarTitle(R.string.about_lbry);
ActionBar actionBar = activity.getSupportActionBar();
if (actionBar != null) {
actionBar.setTitle(R.string.about_lbry);
}
}
}
@@ -35,7 +35,10 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Shared
activity.lockDrawer();
activity.hideFloatingWalletBalance();
activity.setActionBarTitle(R.string.settings);
ActionBar actionBar = activity.getSupportActionBar();
if (actionBar != null) {
actionBar.setTitle(R.string.settings);
}
}
}
@@ -499,7 +499,10 @@ public class PublishFormFragment extends BaseFragment implements
activity.addFilePickerListener(this);
activity.addWalletBalanceListener(this);
activity.setActionBarTitle(editMode ? R.string.edit_content : R.string.new_publish);
ActionBar actionBar = activity.getSupportActionBar();
if (actionBar != null) {
actionBar.setTitle(editMode ? R.string.edit_content : R.string.new_publish);
}
}
}
@@ -886,7 +889,10 @@ public class PublishFormFragment extends BaseFragment implements
LbryAnalytics.setCurrentScreen(activity, "Channel Form", "ChannelForm");
activity.addStoragePermissionListener(this);
if (editMode) {
activity.setActionBarTitle(R.string.edit_content);
ActionBar actionBar = activity.getSupportActionBar();
if (actionBar != null) {
actionBar.setTitle(R.string.edit_content);
}
}
}
@@ -10,7 +10,6 @@ import android.widget.ProgressBar;
import androidx.annotation.NonNull;
import androidx.appcompat.app.ActionBar;
import androidx.core.content.ContextCompat;
import androidx.recyclerview.widget.DividerItemDecoration;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
@@ -49,9 +48,7 @@ public class TransactionHistoryFragment extends BaseFragment implements Transact
Context context = getContext();
LinearLayoutManager llm = new LinearLayoutManager(context);
transactionList.setLayoutManager(llm);
DividerItemDecoration itemDecoration = new DividerItemDecoration(context, DividerItemDecoration.VERTICAL);
itemDecoration.setDrawable(ContextCompat.getDrawable(context, R.drawable.thin_divider));
transactionList.addItemDecoration(itemDecoration);
transactionList.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL));
transactionList.addOnScrollListener(new RecyclerView.OnScrollListener() {
@Override
@@ -136,7 +133,10 @@ public class TransactionHistoryFragment extends BaseFragment implements Transact
activity.showNavigationBackIcon();
activity.lockDrawer();
activity.setActionBarTitle(R.string.transaction_history);
ActionBar actionBar = activity.getSupportActionBar();
if (actionBar != null) {
actionBar.setTitle(R.string.transaction_history);
}
}
}
Executable
+5
View File
@@ -0,0 +1,5 @@
#!/bin/sh
cd app
react-native bundle --platform android --dev false --entry-file src/index.js --bundle-output ../src/main/assets/index.android.bundle --assets-dest ../src/main/res/
cd ..
buildozer android debug
Executable
+6
View File
@@ -0,0 +1,6 @@
#!/bin/sh
cd app
react-native bundle --platform android --dev true --entry-file src/index.js --bundle-output ../src/main/assets/index.android.bundle --assets-dest ../src/main/res/
cd ..
buildozer android debug deploy