fix merge conflict with master, prettier.
This commit is contained in:
Akinwale Ariwodola
commit
def105c8d2
24 changed files with 480 additions and 277 deletions
52
BUILD.md
52
BUILD.md
|
|
@ -1,6 +1,8 @@
|
|||
## Linux Build Instructions
|
||||
|
||||
This app has currently only been built on Ubuntu 14.04, 16.04, 17.10, and 18.04, but these instructions, or an analog of them, should work on most Linux or macOS environments.
|
||||
This app has currently only been built on Ubuntu 14.04, 16.04, 17.10, and 18.04, but these instructions, or an analog of them, should work on most Linux or macOS environments. An abridged version of these instructions is available at [QUICKSTART.md](QUICKSTART.md).
|
||||
|
||||
For instructions on how to build using a Docker image, please see [DOCKER.md](DOCKER.md).
|
||||
|
||||
### Install Prerequisites
|
||||
|
||||
|
|
@ -14,25 +16,31 @@ This app has currently only been built on Ubuntu 14.04, 16.04, 17.10, and 18.04,
|
|||
* yarn
|
||||
|
||||
#### apt Packages
|
||||
Based on the quick-start instructions at http://buildozer.readthedocs.io/en/latest/installation.html
|
||||
Install all apt packages required by running the following commands:
|
||||
```
|
||||
sudo dpkg --add-architecture i386
|
||||
sudo apt-get update
|
||||
sudo apt-get install autoconf autogen build-essential curl libtool libffi-dev python python-pip python-openssl python3.7 python3.7-dev python3-pip ccache git libncurses5:i386 libstdc++6:i386 libgtk2.0-0:i386 libpangox-1.0-0:i386 libpangoxft-1.0-0:i386 libidn11:i386 python2.7 python2.7-dev openjdk-8-jdk unzip zlib1g-dev zlib1g:i386 m4 libc6-dev-i386
|
||||
sudo apt-get -y update
|
||||
sudo apt-get install -y curl ca-certificates software-properties-common gpg-agent wget
|
||||
sudo add-apt-repository ppa:deadsnakes/ppa -y && \
|
||||
curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
|
||||
echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
|
||||
sudo apt-get -y update && apt-get -y install autoconf autogen automake libtool libffi-dev \
|
||||
build-essential python3.7 python3.7-dev python3.7-venv python3-pip ccache git libncurses5:i386 libstdc++6:i386 \
|
||||
libgtk2.0-0:i386 libpangox-1.0-0:i386 libpangoxft-1.0-0:i386 libidn11:i386 python2.7 python2.7-dev \
|
||||
python-pip openjdk-8-jdk unzip zlib1g-dev zlib1g:i386 m4 libc6-dev-i386 yarn gawk nodejs npm
|
||||
```
|
||||
Alternatively, the JDK available from http://www.oracle.com/technetwork/java/javase/downloads/index.html can be installed instead of the `openjdk-8-jdk` package.
|
||||
|
||||
#### Install Cython and Setuptools
|
||||
```
|
||||
sudo pip install --upgrade cython==0.28.1 setuptools
|
||||
sudo -H pip install --upgrade cython==0.28.1 setuptools
|
||||
```
|
||||
|
||||
#### Install buildozer
|
||||
A forked version of `buildozer` needs to be installed in order to copy the React Native UI source files into the corresponding directories.
|
||||
```
|
||||
git clone https://github.com/lbryio/buildozer.git
|
||||
cd buildozer
|
||||
sudo python2.7 setup.py install
|
||||
cd buildozer && python2.7 setup.py install && cd ..
|
||||
```
|
||||
|
||||
#### Create buildozer.spec
|
||||
|
|
@ -59,11 +67,18 @@ Assuming `lbry-android` as the current working folder:
|
|||
| p4a.source_dir | Path to the python-for-android repository folder. Currently set to the included `p4a` folder |
|
||||
| p4a.local_recipes | Path to a folder containing python_for_android recipes to be used in the build. The included `recipes` folder includes recipes for a successful build |
|
||||
|
||||
#### Create google-services.json
|
||||
The `google-services.json` file is required for the build to be successful due to the Firebase implementation. Simply copy the provided sample file into the same destination folder.
|
||||
```
|
||||
cd lbry-android
|
||||
cp p4a/pythonforandroid/bootstraps/lbry/templates/google-services.sample.json p4a/pythonforandroid/bootstraps/lbry/templates/google-services.json
|
||||
```
|
||||
|
||||
#### Setup Android SDK for buildozer
|
||||
Download the Android SDK, platform and build tools archives.
|
||||
* Android API 23 SDK - https://dl.google.com/android/android-sdk_r23-linux.tgz
|
||||
* Android API 27 platform - https://dl.google.com/android/repository/platform-27_r01.zip
|
||||
* Android build tools 26.0.1 - https://dl.google.com/android/repository/build-tools_r26.0.1-linux.
|
||||
* Android API 28 platform - https://dl.google.com/android/repository/platform-28_r06.zip
|
||||
* Android build tools 26.0.2 - https://dl.google.com/android/repository/build-tools_r26.0.2-linux.zip
|
||||
|
||||
Create the `.buildozer` path (and the `android` sub-path) in your home folder if it doesn't already exist.
|
||||
`mkdir ~/.buildozer`
|
||||
|
|
@ -75,17 +90,17 @@ tar -xf android-sdk_r23-linux.tgz ~/.buildozer/android/platform/
|
|||
mv ~/.buildozer/android/platform/android-sdk-linux ~/.buildozer/android/platform/android-sdk-23
|
||||
```
|
||||
|
||||
Extract the API 27 platform archive into the `android-sdk-23` folder and rename the extracted folder.
|
||||
Extract the API 28 platform archive into the `android-sdk-23` folder and rename the extracted folder.
|
||||
```
|
||||
unzip platform-27_r01.zip -d ~/.buildozer/android/platform/android-sdk-23/platforms
|
||||
mv ~/.buildozer/android/platform/android-sdk-23/platforms/android-8.1.0 ~/.buildozer/android/platform/android-sdk-23/platforms/android-27
|
||||
unzip ~/.buildozer/android/platform/platform-28_r06.zip -d ~/.buildozer/android/platform/android-sdk-23/platforms
|
||||
mv ~/.buildozer/android/platform/android-sdk-23/platforms/android-9 ~/.buildozer/android/platform/android-sdk-23/platforms/android-2
|
||||
```
|
||||
|
||||
Extract the build tools 26.0.1 build tools into the `android-sdk-23` folder and rename the extracted folder.
|
||||
Extract the build tools 26.0.2 build tools into the `android-sdk-23` folder and rename the extracted folder.
|
||||
```
|
||||
mkdir -p ~/.buildozer/android/platform/android-sdk-23/build-tools
|
||||
unzip ~/.buildozer/android/platform/build-tools_r26.0.1-linux.zip -d ~/.buildozer/android/platform/android-sdk-23/build-tools
|
||||
mv ~/.buildozer/android/platform/android-sdk-23/build-tools/android-8.0.0 ~/.buildozer/android/platform/android-sdk-23/build-tools/26.0.1
|
||||
unzip ~/.buildozer/android/platform/build-tools_r26.0.2-linux.zip -d ~/.buildozer/android/platform/android-sdk-23/build-tools
|
||||
mv ~/.buildozer/android/platform/android-sdk-23/build-tools/android-8.1.0 ~/.buildozer/android/platform/android-sdk-23/build-tools/26.0.2
|
||||
```
|
||||
|
||||
Finally, create the Android SDK license file. This prevents being prompted to accept the SDK license during the build process.
|
||||
|
|
@ -97,14 +112,17 @@ echo $'\nd56f5187479451eabf01fb78af6dfcb131a6481e' > ~/.buildozer/android/platfo
|
|||
#### Setup Crystax Android NDK for buildozer
|
||||
* Download the Crystax Android NDK from https://us.crystax.net/download/crystax-ndk-10.3.2-linux-x86_64.tar.xz and extract. Remember to update `android.ndk_path` in your `buildozer.spec` to the path of the extracted Crystax NDK archive.
|
||||
* Copy `build-target-python.sh` from the `scripts` folder in the cloned `lbry-android` repository to the `crystax-ndk-10.3.2/build/tools/` folder.
|
||||
* Copy `mangled-glibc-syscalls.h` from the `scripts` folder in the cloned `lbry-android` repository to the `crystax-ndk-10.3.2/platforms/android-21/arch-arm/usr/include/crystax/bionic/libc/include/sys/` folder.
|
||||
* Delete the `android-9` folder in `crystax-ndk-10.3.2/platforms`, and create a symbolic link named `android-9` to the `android-21` folder.
|
||||
|
||||
#### Build and Deploy
|
||||
Run `npm i` in the `lbry-android/app` folder to install the necessary modules required by the React Native user interface.
|
||||
Run `npm install -g react-native-cli` to install React Native CLI tools.
|
||||
|
||||
Run `npm i` in the `lbry-android/app` folder to install the necessary modules required by the React Native user interface, and then run `./bundle.sh`.
|
||||
|
||||
Run `./build.sh` in `lbry-android` to build the APK. The output can be found in the `bin` subdirectory.
|
||||
|
||||
To build and deploy, you can run `./deploy.sh`. This requires a connected device or running Android emulator.
|
||||
To build and deploy, you can run `./deploy.sh`. This requires a connected device or a running Android emulator.
|
||||
|
||||
#### Development
|
||||
If you already installed `Android SDK` and `adb`
|
||||
|
|
|
|||
69
DOCKER.md
Normal file
69
DOCKER.md
Normal file
|
|
@ -0,0 +1,69 @@
|
|||
# Introduction
|
||||
The purpose of this guide is to help whomever is interested in running the LBRY Android application from scratch on their device, but they're main computing platform is not Linux but macOS.
|
||||
|
||||
## Estimated build time
|
||||
25 - 40 minutes (depending on Internet connection speeds)
|
||||
|
||||
## What do you need?
|
||||
* A computer running the latest OS
|
||||
* Internet access to download modules and packages
|
||||
* At least 15GB of free disk space
|
||||
* Docker
|
||||
* Patience
|
||||
|
||||
## Step 1/6
|
||||
Create an application on [Firebase](https://console.firebase.google.com). In the **Android package name** field, input `io.lbry.browser`. Download the resulting `google-services.json` file and keep it safe, you'll be needing it later.
|
||||
|
||||
## Step 2/6
|
||||
Start the docker application and paste all of these lines into Terminal:
|
||||
|
||||
```bash
|
||||
docker run -it lbry/android-base:latest /bin/bash
|
||||
wget "https://www.crystax.net/download/crystax-ndk-10.3.2-linux-x86_64.tar.xz" -P ~/.buildozer/android/
|
||||
tar -xvf ~/.buildozer/android/crystax-ndk-10.3.2-linux-x86_64.tar.xz -C ~/.buildozer/android/
|
||||
rm -rf ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-9
|
||||
ln -s ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-21 ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-9
|
||||
git clone https://github.com/lbryio/lbry-android
|
||||
cd lbry-android;cp buildozer.spec.sample buildozer.spec
|
||||
cd app;npm i;cd ..
|
||||
cp scripts/build-target-python.sh ~/.buildozer/android/crystax-ndk-10.3.2/build/tools/build-target-python.sh
|
||||
cp scripts/mangled-glibc-syscalls.h ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-21/arch-arm/usr/include/crystax/bionic/libc/include/sys/mangled-glibc-syscalls.h
|
||||
cd p4a/pythonforandroid/bootstraps/lbry/build/templates
|
||||
apt install nano -y
|
||||
```
|
||||
|
||||
## Step 3/6
|
||||
Copy the contents of the `google-services.json` you downloaded earlier and paste them into Terminal after running the next command:
|
||||
|
||||
```bash
|
||||
nano google-services.json
|
||||
```
|
||||
|
||||
Type `^X` to save and exit.
|
||||
|
||||
## Step 4/6
|
||||
Paste more lines and I guess check your email, this will take some time:
|
||||
|
||||
```bash
|
||||
cd /lbry-android/app
|
||||
./bundle.sh
|
||||
cd ..
|
||||
buildozer android debug
|
||||
```
|
||||
|
||||
When the build is complete, you should see a message like: `[INFO]: # APK renamed to browser-0.7.3-debug.apk`. You will need this filename for the next step.
|
||||
|
||||
## Step 5/6
|
||||
In a separate Terminal window:
|
||||
|
||||
```bash
|
||||
docker ps # get container name
|
||||
docker cp CONTAINER_NAME:/lbry-android/bin/STEP_4_FILENAME ~/Desktop/ # copies STEP_4_FILENAME to your Desktop
|
||||
```
|
||||
|
||||
## Step 6/6
|
||||
- Download [Android File Transfer](https://www.android.com/filetransfer) and install it.
|
||||
- On your Android device, install [File Explorer](https://play.google.com/store/apps/details?id=com.mauriciotogneri.fileexplorer).
|
||||
- Plug in your Android device and swipe down from the top into the "USB for file transfer" settings (or similar name on your device) and make sure "Transfer files" is selected.
|
||||
- Open **Android File Transfer** on your computer and drag and drop `STEP_4_FILENAME` from your Desktop to the `Downloads` folder on the Android device.
|
||||
- Back on the Android device, navigate to `STEP_4_FILENAME` in the `Downloads` folder and tap it to begin installation.
|
||||
|
|
@ -72,18 +72,20 @@ wget 'https://www.crystax.net/download/crystax-ndk-10.3.2-linux-x86_64.tar.xz' -
|
|||
```
|
||||
|
||||
### Step 7 of 10
|
||||
Clone the lbryio/lbry-android git repository and create your buildozer.spec file. The provide buildozer.spec.sample contains defaults provided you followed steps 1 through 5 exactly as described. You can also customise the spec file if you want to.
|
||||
Clone the lbryio/lbry-android git repository and create your `buildozer.spec` and `google-services.json` files. The provided `buildozer.spec.sample` contains defaults provided you followed steps 1 through 5 exactly as described. You can also customise the spec file if you want to. The `google-services.sample.json` can be used to ensure the build completes successfully.
|
||||
```
|
||||
git clone https://github.com/lbryio/lbry-android
|
||||
cd lbry-android
|
||||
cp buildozer.spec.sample buildozer.spec
|
||||
cp p4a/pythonforandroid/bootstraps/lbry/templates/google-services.sample.json p4a/pythonforandroid/bootstraps/lbry/templates/google-services.json
|
||||
```
|
||||
|
||||
### Step 8 of 10
|
||||
Install the npm packages required for the app's React Native code.
|
||||
Install the npm packages required for the app's React Native code, and create the React Native app bundle.
|
||||
```
|
||||
cd app
|
||||
npm install
|
||||
./bundle.sh
|
||||
cd ..
|
||||
```
|
||||
|
||||
|
|
|
|||
2
app/package-lock.json
generated
2
app/package-lock.json
generated
|
|
@ -5553,7 +5553,7 @@
|
|||
}
|
||||
},
|
||||
"lbry-redux": {
|
||||
"version": "github:lbryio/lbry-redux#71586660b61c5e98c9f183e06d9c881e33a38e5e",
|
||||
"version": "github:lbryio/lbry-redux#b998577698d703714b0aa0c0e80c991902725a5c",
|
||||
"from": "github:lbryio/lbry-redux#publishing",
|
||||
"requires": {
|
||||
"proxy-polyfill": "0.1.6",
|
||||
|
|
|
|||
|
|
@ -21,4 +21,7 @@ const perform = dispatch => ({
|
|||
fetchChannelListMine: () => dispatch(doFetchChannelListMine()),
|
||||
});
|
||||
|
||||
export default connect(select, perform)(ChannelSelector);
|
||||
export default connect(
|
||||
select,
|
||||
perform
|
||||
)(ChannelSelector);
|
||||
|
|
|
|||
|
|
@ -34,19 +34,19 @@ export default class ChannelSelector extends React.PureComponent {
|
|||
|
||||
handleCreateCancel = () => {
|
||||
this.setState({ showCreateChannel: false, newChannelName: '', newChannelBid: 0.1 });
|
||||
}
|
||||
};
|
||||
|
||||
handlePickerValueChange = (itemValue, itemIndex) => {
|
||||
if (Constants.ITEM_CREATE_A_CHANNEL === itemValue) {
|
||||
this.setState({ showCreateChannel: true });
|
||||
} else {
|
||||
this.handleCreateCancel();
|
||||
this.handleChannelChange((Constants.ITEM_ANONYMOUS === itemValue) ? CLAIM_VALUES.CHANNEL_ANONYMOUS : itemValue);
|
||||
this.handleChannelChange(Constants.ITEM_ANONYMOUS === itemValue ? CLAIM_VALUES.CHANNEL_ANONYMOUS : itemValue);
|
||||
}
|
||||
this.setState({ currentSelectedValue: itemValue });
|
||||
}
|
||||
};
|
||||
|
||||
handleChannelChange = (value) => {
|
||||
handleChannelChange = value => {
|
||||
const { onChannelChange } = this.props;
|
||||
const { newChannelBid } = this.state;
|
||||
const channel = value;
|
||||
|
|
@ -63,9 +63,9 @@ export default class ChannelSelector extends React.PureComponent {
|
|||
onChannelChange(channel);
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
handleNewChannelNameChange = (value) => {
|
||||
handleNewChannelNameChange = value => {
|
||||
const { notify } = this.props;
|
||||
|
||||
let newChannelName = value;
|
||||
|
|
@ -83,9 +83,9 @@ export default class ChannelSelector extends React.PureComponent {
|
|||
newChannelNameError,
|
||||
newChannelName,
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
handleNewChannelBidChange = (newChannelBid) => {
|
||||
handleNewChannelBidChange = newChannelBid => {
|
||||
const { balance, notify } = this.props;
|
||||
let newChannelBidError;
|
||||
if (newChannelBid === 0) {
|
||||
|
|
@ -102,7 +102,7 @@ export default class ChannelSelector extends React.PureComponent {
|
|||
newChannelBid,
|
||||
newChannelBidError,
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
handleCreateChannelClick = () => {
|
||||
const { balance, createChannel, onChannelChange, notify } = this.props;
|
||||
|
|
@ -114,11 +114,10 @@ export default class ChannelSelector extends React.PureComponent {
|
|||
}
|
||||
|
||||
if (this.channelExists(newChannelName)) {
|
||||
notify({ message: 'You have already created a channel with the same name.'});
|
||||
notify({ message: 'You have already created a channel with the same name.' });
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
if (newChannelBid > balance) {
|
||||
notify({ message: 'Deposit cannot be higher than your balance' });
|
||||
return;
|
||||
|
|
@ -136,7 +135,7 @@ export default class ChannelSelector extends React.PureComponent {
|
|||
creatingChannel: false,
|
||||
addingChannel: false,
|
||||
currentSelectedValue: channelName,
|
||||
showCreateChannel: false
|
||||
showCreateChannel: false,
|
||||
});
|
||||
|
||||
if (onChannelChange) {
|
||||
|
|
@ -147,31 +146,34 @@ export default class ChannelSelector extends React.PureComponent {
|
|||
const failure = () => {
|
||||
notify({ message: 'Unable to create channel due to an internal error.' });
|
||||
this.setState({
|
||||
creatingChannel: false
|
||||
creatingChannel: false,
|
||||
});
|
||||
};
|
||||
|
||||
createChannel(channelName, newChannelBid).then(success, failure);
|
||||
}
|
||||
};
|
||||
|
||||
channelExists = (name) => {
|
||||
channelExists = name => {
|
||||
const { channels = [] } = this.props;
|
||||
for (let channel of channels) {
|
||||
if (name.toLowerCase() === channel.name.toLowerCase() || `@${name}`.toLowerCase() === channel.name.toLowerCase()) {
|
||||
if (
|
||||
name.toLowerCase() === channel.name.toLowerCase() ||
|
||||
`@${name}`.toLowerCase() === channel.name.toLowerCase()
|
||||
) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
};
|
||||
|
||||
render() {
|
||||
const channel = this.state.addingChannel ? 'new' : this.props.channel;
|
||||
const { fetchingChannels, channels = [] } = this.props;
|
||||
console.log(channels);
|
||||
const pickerItems = [
|
||||
{ name: Constants.ITEM_ANONYMOUS },
|
||||
{ name: Constants.ITEM_CREATE_A_CHANNEL }].concat(channels);
|
||||
const pickerItems = [{ name: Constants.ITEM_ANONYMOUS }, { name: Constants.ITEM_CREATE_A_CHANNEL }].concat(
|
||||
channels
|
||||
);
|
||||
const {
|
||||
newChannelName,
|
||||
newChannelNameError,
|
||||
|
|
@ -188,47 +190,55 @@ export default class ChannelSelector extends React.PureComponent {
|
|||
selectedValue={this.state.currentSelectedValue}
|
||||
style={channelSelectorStyle.channelPicker}
|
||||
itemStyle={channelSelectorStyle.channelPickerItem}
|
||||
onValueChange={this.handlePickerValueChange}>
|
||||
{pickerItems.map(item => <Picker.Item label={item.name} value={item.name} key={item.name} />)}
|
||||
onValueChange={this.handlePickerValueChange}
|
||||
>
|
||||
{pickerItems.map(item => (
|
||||
<Picker.Item label={item.name} value={item.name} key={item.name} />
|
||||
))}
|
||||
</Picker>
|
||||
|
||||
{this.state.showCreateChannel && (
|
||||
<View style={channelSelectorStyle.createChannelContainer}>
|
||||
<TextInput
|
||||
style={channelSelectorStyle.channelNameInput}
|
||||
value={this.state.newChannelName}
|
||||
onChangeText={this.handleNewChannelNameChange}
|
||||
placeholder={'Channel name'}
|
||||
underlineColorAndroid={Colors.NextLbryGreen}
|
||||
/>
|
||||
<View style={channelSelectorStyle.bidRow}>
|
||||
<Text style={channelSelectorStyle.label}>Deposit</Text>
|
||||
<View style={channelSelectorStyle.createChannelContainer}>
|
||||
<TextInput
|
||||
style={channelSelectorStyle.bidAmountInput}
|
||||
value={String(this.state.newChannelBid)}
|
||||
onChangeText={this.handleNewChannelBidChange}
|
||||
placeholder={'0.00'}
|
||||
keyboardType={'number-pad'}
|
||||
style={channelSelectorStyle.channelNameInput}
|
||||
value={this.state.newChannelName}
|
||||
onChangeText={this.handleNewChannelNameChange}
|
||||
placeholder={'Channel name'}
|
||||
underlineColorAndroid={Colors.NextLbryGreen}
|
||||
/>
|
||||
<View style={channelSelectorStyle.bidRow}>
|
||||
<Text style={channelSelectorStyle.label}>Deposit</Text>
|
||||
<TextInput
|
||||
style={channelSelectorStyle.bidAmountInput}
|
||||
value={String(this.state.newChannelBid)}
|
||||
onChangeText={this.handleNewChannelBidChange}
|
||||
placeholder={'0.00'}
|
||||
keyboardType={'number-pad'}
|
||||
underlineColorAndroid={Colors.NextLbryGreen}
|
||||
/>
|
||||
<Text style={channelSelectorStyle.currency}>LBC</Text>
|
||||
</View>
|
||||
<Text style={channelSelectorStyle.helpText}>This LBC remains yours. It is a deposit to reserve the name and can be undone at any time.</Text>
|
||||
<Text style={channelSelectorStyle.currency}>LBC</Text>
|
||||
</View>
|
||||
<Text style={channelSelectorStyle.helpText}>
|
||||
This LBC remains yours. It is a deposit to reserve the name and can be undone at any time.
|
||||
</Text>
|
||||
|
||||
<View style={channelSelectorStyle.buttonContainer}>
|
||||
{creatingChannel && <ActivityIndicator size={'small'} color={Colors.LbryGreen} />}
|
||||
{!creatingChannel &&
|
||||
<View style={channelSelectorStyle.buttons}>
|
||||
<Link style={channelSelectorStyle.cancelLink} text="Cancel" onPress={this.handleCreateCancel} />
|
||||
<Button style={channelSelectorStyle.createButton}
|
||||
disabled={!(this.state.newChannelName.trim().length > 0 && this.state.newChannelBid > 0)}
|
||||
text="Create"
|
||||
onPress={this.handleCreateChannelClick} />
|
||||
</View>}
|
||||
<View style={channelSelectorStyle.buttonContainer}>
|
||||
{creatingChannel && <ActivityIndicator size={'small'} color={Colors.LbryGreen} />}
|
||||
{!creatingChannel && (
|
||||
<View style={channelSelectorStyle.buttons}>
|
||||
<Link style={channelSelectorStyle.cancelLink} text="Cancel" onPress={this.handleCreateCancel} />
|
||||
<Button
|
||||
style={channelSelectorStyle.createButton}
|
||||
disabled={!(this.state.newChannelName.trim().length > 0 && this.state.newChannelBid > 0)}
|
||||
text="Create"
|
||||
onPress={this.handleCreateChannelClick}
|
||||
/>
|
||||
</View>
|
||||
)}
|
||||
</View>
|
||||
</View>
|
||||
</View>
|
||||
)}
|
||||
</View>
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -96,7 +96,8 @@ class FileItemMedia extends React.PureComponent {
|
|||
)}
|
||||
{!isResolvingUri && (
|
||||
<Text style={fileItemMediaStyle.autothumbText}>
|
||||
{title && title.trim().length > 0 &&
|
||||
{title &&
|
||||
title.trim().length > 0 &&
|
||||
title
|
||||
.replace(/\s+/g, '')
|
||||
.substring(0, Math.min(title.replace(' ', '').length, 5))
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
// @flow
|
||||
import React from 'react';
|
||||
import { regexAddress } from 'lbry-redux';
|
||||
import { Alert, TextInput, Text, View } from 'react-native';
|
||||
import Button from '../button';
|
||||
import walletStyle from '../../styles/wallet';
|
||||
import { Alert, Clipboard, TextInput, Text, View } from 'react-native';
|
||||
import Button from 'component/button';
|
||||
import Colors from 'styles/colors';
|
||||
import walletStyle from 'styles/wallet';
|
||||
|
||||
type DraftTransaction = {
|
||||
address: string,
|
||||
|
|
@ -99,10 +100,16 @@ class WalletSend extends React.PureComponent<Props> {
|
|||
onBlur={this.handleAddressInputBlur}
|
||||
onSubmitEditing={this.handleAddressInputSubmit}
|
||||
placeholder={'bbFxRyXXXXXXXXXXXZD8nE7XTLUxYnddTs'}
|
||||
underlineColorAndroid={Colors.NextLbryGreen}
|
||||
value={this.state.address}
|
||||
returnKeyType={'next'}
|
||||
style={[walletStyle.input, walletStyle.addressInput, walletStyle.bottomMarginMedium]}
|
||||
/>
|
||||
<Button
|
||||
icon={'paste'}
|
||||
style={walletStyle.button}
|
||||
onPress={() => Clipboard.getString().then(value => this.setState({ address: value, addressChanged: true }))}
|
||||
/>
|
||||
</View>
|
||||
<Text style={walletStyle.text}>Amount</Text>
|
||||
<View style={walletStyle.row}>
|
||||
|
|
@ -112,6 +119,7 @@ class WalletSend extends React.PureComponent<Props> {
|
|||
onChangeText={value => this.setState({ amount: value })}
|
||||
keyboardType={'numeric'}
|
||||
placeholder={'0'}
|
||||
underlineColorAndroid={Colors.NextLbryGreen}
|
||||
value={this.state.amount}
|
||||
style={[walletStyle.input, walletStyle.amountInput]}
|
||||
/>
|
||||
|
|
|
|||
|
|
@ -865,14 +865,15 @@ class FilePage extends React.PureComponent {
|
|||
/>
|
||||
</View>
|
||||
<View style={filePageStyle.subscriptionRow}>
|
||||
{((isPlayable && !fileInfo) || (isPlayable && fileInfo && !fileInfo.download_path)) && (
|
||||
<Button
|
||||
style={[filePageStyle.actionButton, filePageStyle.saveFileButton]}
|
||||
theme={'light'}
|
||||
icon={'download'}
|
||||
onPress={this.onSaveFilePressed}
|
||||
/>
|
||||
)}
|
||||
{false &&
|
||||
((isPlayable && !fileInfo) || (isPlayable && fileInfo && !fileInfo.download_path)) && (
|
||||
<Button
|
||||
style={[filePageStyle.actionButton, filePageStyle.saveFileButton]}
|
||||
theme={'light'}
|
||||
icon={'download'}
|
||||
onPress={this.onSaveFilePressed}
|
||||
/>
|
||||
)}
|
||||
<Button
|
||||
style={[filePageStyle.actionButton, filePageStyle.tipButton]}
|
||||
theme={'light'}
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ class EmailCollectPage extends React.PureComponent {
|
|||
const { onEmailViewLayout } = this.props;
|
||||
|
||||
const content = (
|
||||
<View onLayout={onEmailViewLayout}>
|
||||
<View onLayout={() => onEmailViewLayout('collect')}>
|
||||
<Text style={firstRunStyle.title}>Setup account</Text>
|
||||
<TextInput
|
||||
style={firstRunStyle.emailInput}
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ class EmailVerifyPage extends React.PureComponent {
|
|||
const { onEmailViewLayout, email } = this.props;
|
||||
|
||||
const content = (
|
||||
<View onLayout={onEmailViewLayout}>
|
||||
<View onLayout={() => onEmailViewLayout('verify')}>
|
||||
<Text style={firstRunStyle.title}>Verify Email</Text>
|
||||
<Text style={firstRunStyle.paragraph}>
|
||||
An email has been sent to{' '}
|
||||
|
|
|
|||
|
|
@ -24,7 +24,9 @@ class FirstRunScreen extends React.PureComponent {
|
|||
state = {
|
||||
currentPage: null,
|
||||
email: null,
|
||||
emailCollectTracked: false,
|
||||
emailSubmitted: false,
|
||||
enterPasswordTracked: false,
|
||||
isFirstRun: false,
|
||||
launchUrl: null,
|
||||
showSkip: false,
|
||||
|
|
@ -44,7 +46,10 @@ class FirstRunScreen extends React.PureComponent {
|
|||
|
||||
if (NativeModules.FirstRun) {
|
||||
NativeModules.FirstRun.isFirstRun().then(firstRun => {
|
||||
AsyncStorage.removeItem(Constants.KEY_FIRST_RUN_EMAIL);
|
||||
AsyncStorage.removeItem(Constants.KEY_EMAIL_VERIFY_PENDING);
|
||||
this.setState({ isFirstRun: firstRun });
|
||||
|
||||
if (firstRun) {
|
||||
this.setState({ currentPage: FirstRunScreen.pages[0] });
|
||||
} else {
|
||||
|
|
@ -118,6 +123,7 @@ class FirstRunScreen extends React.PureComponent {
|
|||
handleLeftButtonPressed = () => {
|
||||
// Go to setup account page when "Setup account" is pressed
|
||||
if (Constants.FIRST_RUN_PAGE_SKIP_ACCOUNT === this.state.currentPage) {
|
||||
this.setState({ emailCollectTracked: false }); // reset tracked flag
|
||||
return this.showPage(Constants.FIRST_RUN_PAGE_EMAIL_COLLECT);
|
||||
}
|
||||
|
||||
|
|
@ -128,6 +134,7 @@ class FirstRunScreen extends React.PureComponent {
|
|||
|
||||
// Go to email collection page if user cancels from email verification
|
||||
if (Constants.FIRST_RUN_PAGE_EMAIL_VERIFY === this.state.currentPage) {
|
||||
this.setState({ emailCollectTracked: false }); // reset tracked flag
|
||||
this.showPage(Constants.FIRST_RUN_PAGE_EMAIL_COLLECT);
|
||||
}
|
||||
};
|
||||
|
|
@ -228,10 +235,19 @@ class FirstRunScreen extends React.PureComponent {
|
|||
}
|
||||
};
|
||||
|
||||
onEmailViewLayout = () => {
|
||||
onEmailViewLayout = phase => {
|
||||
if ('collect' === phase) {
|
||||
if (!this.state.emailCollectTracked) {
|
||||
// we only want to track this once
|
||||
this.setState({ emailCollectTracked: true }, () =>
|
||||
NativeModules.Firebase.track('first_run_email_collect', null)
|
||||
);
|
||||
}
|
||||
} else if ('verify' === phase) {
|
||||
NativeModules.Firebase.track('first_run_email_verify', null);
|
||||
}
|
||||
|
||||
this.setState({ showBottomContainer: true, showSkip: true });
|
||||
AsyncStorage.removeItem(Constants.KEY_FIRST_RUN_EMAIL);
|
||||
AsyncStorage.removeItem(Constants.KEY_EMAIL_VERIFY_PENDING);
|
||||
};
|
||||
|
||||
onWalletPasswordChanged = password => {
|
||||
|
|
@ -239,6 +255,11 @@ class FirstRunScreen extends React.PureComponent {
|
|||
};
|
||||
|
||||
onWalletViewLayout = () => {
|
||||
if (!this.state.enterPasswordTracked) {
|
||||
this.setState({ enterPasswordTracked: true }, () =>
|
||||
NativeModules.Firebase.track('first_run_enter_password', null)
|
||||
);
|
||||
}
|
||||
this.setState({ showBottomContainer: true });
|
||||
};
|
||||
|
||||
|
|
@ -246,6 +267,11 @@ class FirstRunScreen extends React.PureComponent {
|
|||
this.setState({ showBottomContainer: true });
|
||||
};
|
||||
|
||||
onSkipAccountViewLayout = () => {
|
||||
NativeModules.Firebase.track('first_run_skip_account', null);
|
||||
this.setState({ showBottomContainer: true });
|
||||
};
|
||||
|
||||
onSkipSwitchChanged = checked => {
|
||||
this.setState({ skipAccountConfirmed: checked });
|
||||
};
|
||||
|
|
|
|||
|
|
@ -10,17 +10,10 @@ import {
|
|||
Text,
|
||||
TextInput,
|
||||
TouchableOpacity,
|
||||
View
|
||||
View,
|
||||
} from 'react-native';
|
||||
import { FlatGrid } from 'react-native-super-grid';
|
||||
import {
|
||||
isNameValid,
|
||||
buildURI,
|
||||
regexInvalidURI,
|
||||
CLAIM_VALUES,
|
||||
LICENSES,
|
||||
THUMBNAIL_STATUSES
|
||||
} from 'lbry-redux';
|
||||
import { isNameValid, buildURI, regexInvalidURI, CLAIM_VALUES, LICENSES, THUMBNAIL_STATUSES } from 'lbry-redux';
|
||||
import { DocumentPicker, DocumentPickerUtil } from 'react-native-document-picker';
|
||||
import { RNCamera } from 'react-native-camera';
|
||||
import Button from 'component/button';
|
||||
|
|
@ -53,7 +46,7 @@ class PublishPage extends React.PureComponent {
|
|||
title: null,
|
||||
name: null,
|
||||
price: 0,
|
||||
uri: null
|
||||
uri: null,
|
||||
};
|
||||
|
||||
didFocusListener;
|
||||
|
|
@ -72,7 +65,8 @@ class PublishPage extends React.PureComponent {
|
|||
getNewUri(name, channel) {
|
||||
const { resolveUri } = this.props;
|
||||
// If they are midway through a channel creation, treat it as anonymous until it completes
|
||||
const channelName = channel === CLAIM_VALUES.CHANNEL_ANONYMOUS || channel === CLAIM_VALUES.CHANNEL_NEW ? '' : channel;
|
||||
const channelName =
|
||||
channel === CLAIM_VALUES.CHANNEL_ANONYMOUS || channel === CLAIM_VALUES.CHANNEL_NEW ? '' : channel;
|
||||
|
||||
// We are only going to store the full uri, but we need to resolve the uri with and without the channel name
|
||||
let uri;
|
||||
|
|
@ -97,21 +91,11 @@ class PublishPage extends React.PureComponent {
|
|||
|
||||
handleModePressed = () => {
|
||||
this.setState({ advancedMode: !this.state.advancedMode });
|
||||
}
|
||||
};
|
||||
|
||||
handlePublishPressed = () => {
|
||||
const { notify, publish } = this.props;
|
||||
const {
|
||||
bid,
|
||||
channelName,
|
||||
currentMedia,
|
||||
description,
|
||||
name,
|
||||
price,
|
||||
priceSet,
|
||||
title,
|
||||
uri
|
||||
} = this.state;
|
||||
const { bid, channelName, currentMedia, description, name, price, priceSet, title, uri } = this.state;
|
||||
const thumbnail = null;
|
||||
|
||||
if (!name) {
|
||||
|
|
@ -134,13 +118,13 @@ class PublishPage extends React.PureComponent {
|
|||
contentIsFree: !priceSet,
|
||||
fee: { currency: 'LBC', price },
|
||||
uri: uri || undefined,
|
||||
channel: (CLAIM_VALUES.CHANNEL_ANONYMOUS === channelName) ? undefined : channelName,
|
||||
channel: CLAIM_VALUES.CHANNEL_ANONYMOUS === channelName ? undefined : channelName,
|
||||
isStillEditing: false,
|
||||
claim: null,
|
||||
};
|
||||
|
||||
this.setState({ currentPhase: Constants.PHASE_PUBLISH }, () => publish(publishParams));
|
||||
}
|
||||
};
|
||||
|
||||
onComponentFocused = () => {
|
||||
const { pushDrawerStack, setPlayerVisible } = this.props;
|
||||
|
|
@ -175,13 +159,13 @@ class PublishPage extends React.PureComponent {
|
|||
currentMedia: media,
|
||||
title: media.name,
|
||||
name: this.formatNameForTitle(media.name),
|
||||
currentPhase: Constants.PHASE_DETAILS
|
||||
currentPhase: Constants.PHASE_DETAILS,
|
||||
});
|
||||
}
|
||||
|
||||
formatNameForTitle = (title) => {
|
||||
formatNameForTitle = title => {
|
||||
return title.replace(regexInvalidURI, '-').toLowerCase();
|
||||
}
|
||||
};
|
||||
|
||||
showSelector() {
|
||||
this.setState({
|
||||
|
|
@ -200,36 +184,39 @@ class PublishPage extends React.PureComponent {
|
|||
title: null,
|
||||
name: null,
|
||||
price: 0,
|
||||
uri: null
|
||||
uri: null,
|
||||
});
|
||||
}
|
||||
|
||||
handleUploadPressed = () => {
|
||||
DocumentPicker.show({
|
||||
filetype: [DocumentPickerUtil.allFiles()]
|
||||
}, (error, res) => {
|
||||
console.log(error);
|
||||
console.log('***')
|
||||
console.log(res);
|
||||
if (!error) {
|
||||
DocumentPicker.show(
|
||||
{
|
||||
filetype: [DocumentPickerUtil.allFiles()],
|
||||
},
|
||||
(error, res) => {
|
||||
console.log(error);
|
||||
console.log('***');
|
||||
console.log(res);
|
||||
if (!error) {
|
||||
console.log(res);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
);
|
||||
};
|
||||
|
||||
handlePublishAgainPressed = () => {
|
||||
this.showSelector();
|
||||
}
|
||||
};
|
||||
|
||||
handleBidChange = (bid) => {
|
||||
handleBidChange = bid => {
|
||||
this.setState({ bid });
|
||||
}
|
||||
};
|
||||
|
||||
handlePriceChange = (price) => {
|
||||
handlePriceChange = price => {
|
||||
this.setState({ price });
|
||||
}
|
||||
};
|
||||
|
||||
handleNameChange = (name) => {
|
||||
handleNameChange = name => {
|
||||
const { notify } = this.props;
|
||||
this.setState({ name });
|
||||
if (!isNameValid(name, false)) {
|
||||
|
|
@ -239,20 +226,23 @@ class PublishPage extends React.PureComponent {
|
|||
|
||||
const uri = this.getNewUri(name, this.state.channelName);
|
||||
this.setState({ uri });
|
||||
}
|
||||
};
|
||||
|
||||
handleChannelChanged = (channel) => {
|
||||
handleChannelChanged = channel => {
|
||||
this.setState({ channelName: channel });
|
||||
}
|
||||
};
|
||||
|
||||
handleTitleChange = (title) => {
|
||||
this.setState({
|
||||
title,
|
||||
name: this.formatNameForTitle(title)
|
||||
}, () => {
|
||||
this.handleNameChange(this.state.name);
|
||||
});
|
||||
}
|
||||
handleTitleChange = title => {
|
||||
this.setState(
|
||||
{
|
||||
title,
|
||||
name: this.formatNameForTitle(title),
|
||||
},
|
||||
() => {
|
||||
this.handleNameChange(this.state.name);
|
||||
}
|
||||
);
|
||||
};
|
||||
|
||||
render() {
|
||||
const { navigation, notify } = this.props;
|
||||
|
|
@ -300,28 +290,30 @@ class PublishPage extends React.PureComponent {
|
|||
</View>
|
||||
</View>
|
||||
</View>
|
||||
{(!this.state.videos || !thumbnailPath) &&
|
||||
{(!this.state.videos || !thumbnailPath) && (
|
||||
<View style={publishStyle.loadingView}>
|
||||
<ActivityIndicator size='large' color={Colors.LbryGreen} />
|
||||
<ActivityIndicator size="large" color={Colors.LbryGreen} />
|
||||
</View>
|
||||
}
|
||||
{(this.state.videos && thumbnailPath) &&
|
||||
<FlatGrid
|
||||
style={publishStyle.galleryGrid}
|
||||
itemDimension={134}
|
||||
spacing={2}
|
||||
items={this.state.videos}
|
||||
renderItem={({ item, index }) => {
|
||||
return (
|
||||
<TouchableOpacity key={index} onPress={() => this.setCurrentMedia(item)}>
|
||||
<FastImage
|
||||
style={publishStyle.galleryGridImage}
|
||||
resizeMode={FastImage.resizeMode.cover}
|
||||
source={{ uri: `file://${thumbnailPath}/${item.id}.png` }} />
|
||||
</TouchableOpacity>
|
||||
);
|
||||
}}
|
||||
/>}
|
||||
)}
|
||||
{this.state.videos && thumbnailPath && (
|
||||
<FlatGrid
|
||||
style={publishStyle.galleryGrid}
|
||||
itemDimension={134}
|
||||
spacing={2}
|
||||
items={this.state.videos}
|
||||
renderItem={({ item, index }) => {
|
||||
return (
|
||||
<TouchableOpacity key={index} onPress={() => this.setCurrentMedia(item)}>
|
||||
<FastImage
|
||||
style={publishStyle.galleryGridImage}
|
||||
resizeMode={FastImage.resizeMode.cover}
|
||||
source={{ uri: `file://${thumbnailPath}/${item.id}.png` }}
|
||||
/>
|
||||
</TouchableOpacity>
|
||||
);
|
||||
}}
|
||||
/>
|
||||
)}
|
||||
</View>
|
||||
);
|
||||
} else if (Constants.PHASE_DETAILS === this.state.currentPhase && this.state.currentMedia) {
|
||||
|
|
@ -333,30 +325,30 @@ class PublishPage extends React.PureComponent {
|
|||
style={publishStyle.mainThumbnail}
|
||||
resizeMode={FastImage.resizeMode.contain}
|
||||
source={{ uri: `file://${thumbnailPath}/${currentMedia.id}.png` }}
|
||||
/>
|
||||
/>
|
||||
</View>
|
||||
|
||||
<View style={publishStyle.card}>
|
||||
<Text style={publishStyle.cardTitle}>Title</Text>
|
||||
<TextInput
|
||||
placeholder={"Title"}
|
||||
placeholder={'Title'}
|
||||
style={publishStyle.inputText}
|
||||
value={this.state.title}
|
||||
numberOfLines={1}
|
||||
underlineColorAndroid={Colors.NextLbryGreen}
|
||||
onChangeText={this.state.handleTitleChange}
|
||||
/>
|
||||
/>
|
||||
</View>
|
||||
|
||||
<View style={publishStyle.card}>
|
||||
<Text style={publishStyle.cardTitle}>Description</Text>
|
||||
<TextInput
|
||||
placeholder={"Description"}
|
||||
placeholder={'Description'}
|
||||
style={publishStyle.inputText}
|
||||
value={this.state.description}
|
||||
underlineColorAndroid={Colors.NextLbryGreen}
|
||||
onChangeText={this.state.handleDescriptionChange}
|
||||
/>
|
||||
/>
|
||||
</View>
|
||||
|
||||
<View style={publishStyle.card}>
|
||||
|
|
@ -364,70 +356,85 @@ class PublishPage extends React.PureComponent {
|
|||
<Text style={publishStyle.cardTitle}>Channel</Text>
|
||||
</View>
|
||||
|
||||
<ChannelSelector onChannelChange={this.handleChannelChange} />
|
||||
<ChannelSelector onChannelChange={this.handleChannelChange} />
|
||||
</View>
|
||||
|
||||
{this.state.advancedMode &&
|
||||
<View style={publishStyle.card}>
|
||||
<View style={publishStyle.titleRow}>
|
||||
<Text style={publishStyle.cardTitle}>Price</Text>
|
||||
<View style={publishStyle.switchTitleRow}>
|
||||
<Switch value={this.state.priceSet} onValueChange={value => this.setState({ priceSet: value }) } />
|
||||
{this.state.advancedMode && (
|
||||
<View style={publishStyle.card}>
|
||||
<View style={publishStyle.titleRow}>
|
||||
<Text style={publishStyle.cardTitle}>Price</Text>
|
||||
<View style={publishStyle.switchTitleRow}>
|
||||
<Switch value={this.state.priceSet} onValueChange={value => this.setState({ priceSet: value })} />
|
||||
</View>
|
||||
</View>
|
||||
|
||||
{!this.state.priceSet && (
|
||||
<Text style={publishStyle.cardText}>Your content will be free. Press the toggle to set a price.</Text>
|
||||
)}
|
||||
|
||||
{this.state.priceSet && (
|
||||
<View style={[publishStyle.inputRow, publishStyle.priceInputRow]}>
|
||||
<TextInput
|
||||
placeholder={'0.00'}
|
||||
keyboardType={'number-pad'}
|
||||
style={publishStyle.priceInput}
|
||||
underlineColorAndroid={Colors.NextLbryGreen}
|
||||
numberOfLines={1}
|
||||
value={String(this.state.price)}
|
||||
onChangeText={this.handlePriceChange}
|
||||
/>
|
||||
<Text style={publishStyle.currency}>LBC</Text>
|
||||
</View>
|
||||
)}
|
||||
</View>
|
||||
)}
|
||||
|
||||
{!this.state.priceSet &&
|
||||
<Text style={publishStyle.cardText}>Your content will be free. Press the toggle to set a price.</Text>}
|
||||
{this.state.advancedMode && (
|
||||
<View style={publishStyle.card}>
|
||||
<Text style={publishStyle.cardTitle}>Content Address</Text>
|
||||
<Text style={publishStyle.helpText}>
|
||||
The address where people can find your content (ex. lbry://myvideo)
|
||||
</Text>
|
||||
|
||||
{this.state.priceSet &&
|
||||
<View style={[publishStyle.inputRow, publishStyle.priceInputRow]}>
|
||||
<TextInput
|
||||
placeholder={"0.00"}
|
||||
keyboardType={'number-pad'}
|
||||
style={publishStyle.priceInput}
|
||||
placeholder={'lbry://'}
|
||||
style={publishStyle.inputText}
|
||||
underlineColorAndroid={Colors.NextLbryGreen}
|
||||
numberOfLines={1}
|
||||
value={String(this.state.price)}
|
||||
onChangeText={this.handlePriceChange}
|
||||
value={this.state.name}
|
||||
onChangeText={this.handleNameChange}
|
||||
/>
|
||||
<Text style={publishStyle.currency}>LBC</Text>
|
||||
</View>}
|
||||
</View>}
|
||||
|
||||
{this.state.advancedMode &&
|
||||
<View style={publishStyle.card}>
|
||||
<Text style={publishStyle.cardTitle}>Content Address</Text>
|
||||
<Text style={publishStyle.helpText}>The address where people can find your content (ex. lbry://myvideo)</Text>
|
||||
|
||||
<TextInput
|
||||
placeholder={"lbry://"}
|
||||
style={publishStyle.inputText}
|
||||
underlineColorAndroid={Colors.NextLbryGreen}
|
||||
numberOfLines={1}
|
||||
value={this.state.name}
|
||||
onChangeText={this.handleNameChange}
|
||||
/>
|
||||
<View style={publishStyle.inputRow}>
|
||||
<TextInput
|
||||
placeholder={"0.00"}
|
||||
style={publishStyle.priceInput}
|
||||
underlineColorAndroid={Colors.NextLbryGreen}
|
||||
numberOfLines={1}
|
||||
keyboardType={'numeric'}
|
||||
value={String(this.state.bid)}
|
||||
onChangeText={this.handleBidChange} />
|
||||
<Text style={publishStyle.currency}>LBC</Text>
|
||||
<View style={publishStyle.inputRow}>
|
||||
<TextInput
|
||||
placeholder={'0.00'}
|
||||
style={publishStyle.priceInput}
|
||||
underlineColorAndroid={Colors.NextLbryGreen}
|
||||
numberOfLines={1}
|
||||
keyboardType={'numeric'}
|
||||
value={String(this.state.bid)}
|
||||
onChangeText={this.handleBidChange}
|
||||
/>
|
||||
<Text style={publishStyle.currency}>LBC</Text>
|
||||
</View>
|
||||
<Text style={publishStyle.helpText}>
|
||||
This LBC remains yours and the deposit can be undone at any time.
|
||||
</Text>
|
||||
</View>
|
||||
<Text style={publishStyle.helpText}>This LBC remains yours and the deposit can be undone at any time.</Text>
|
||||
</View>}
|
||||
)}
|
||||
|
||||
<View style={publishStyle.actionButtons}>
|
||||
<Link style={publishStyle.cancelLink} text="Cancel" onPress={() => this.setState({ currentPhase: Constants.PHASE_SELECTOR })} />
|
||||
<Link
|
||||
style={publishStyle.cancelLink}
|
||||
text="Cancel"
|
||||
onPress={() => this.setState({ currentPhase: Constants.PHASE_SELECTOR })}
|
||||
/>
|
||||
|
||||
<View style={publishStyle.rightActionButtons}>
|
||||
<Button style={publishStyle.modeButton}
|
||||
<Button
|
||||
style={publishStyle.modeButton}
|
||||
text={this.state.advancedMode ? 'Simple' : 'Advanced'}
|
||||
onPress={this.handleModePressed} />
|
||||
onPress={this.handleModePressed}
|
||||
/>
|
||||
<Button style={publishStyle.publishButton} text="Publish" onPress={this.handlePublishPressed} />
|
||||
</View>
|
||||
</View>
|
||||
|
|
@ -441,11 +448,19 @@ class PublishPage extends React.PureComponent {
|
|||
<Text style={publishStyle.successText}>Congratulations! Your content was successfully uploaded.</Text>
|
||||
<View style={publishStyle.successRow}>
|
||||
<Link style={publishStyle.successUrl} text={this.state.uri} href={this.state.uri} />
|
||||
<TouchableOpacity onPress={() => { Clipboard.setString(this.state.uri); notify({ message: 'Copied.' }); }}>
|
||||
<TouchableOpacity
|
||||
onPress={() => {
|
||||
Clipboard.setString(this.state.uri);
|
||||
notify({ message: 'Copied.' });
|
||||
}}
|
||||
>
|
||||
<Icon name="clipboard" size={24} color={Colors.LbryGreen} />
|
||||
</TouchableOpacity>
|
||||
</View>
|
||||
<Text style={publishStyle.successText}>Your content will be live in a few minutes. In the mean time, feel free to publish more content or explore the app.</Text>
|
||||
<Text style={publishStyle.successText}>
|
||||
Your content will be live in a few minutes. In the mean time, feel free to publish more content or explore
|
||||
the app.
|
||||
</Text>
|
||||
</View>
|
||||
<View style={publishStyle.actionButtons}>
|
||||
<Button style={publishStyle.publishButton} text="Publish again" onPress={this.handlePublishAgainPressed} />
|
||||
|
|
@ -458,7 +473,9 @@ class PublishPage extends React.PureComponent {
|
|||
<View style={publishStyle.container}>
|
||||
<UriBar navigation={navigation} />
|
||||
{content}
|
||||
{(false && Constants.PHASE_SELECTOR !== this.state.currentPhase) && <FloatingWalletBalance navigation={navigation} />}
|
||||
{false && Constants.PHASE_SELECTOR !== this.state.currentPhase && (
|
||||
<FloatingWalletBalance navigation={navigation} />
|
||||
)}
|
||||
</View>
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -214,7 +214,7 @@ class SplashScreen extends React.PureComponent {
|
|||
|
||||
setTimeout(() => {
|
||||
this.updateStatus();
|
||||
}, 500);
|
||||
}, 1000);
|
||||
}
|
||||
|
||||
componentDidMount() {
|
||||
|
|
|
|||
|
|
@ -101,7 +101,11 @@ class WalletPage extends React.PureComponent {
|
|||
return (
|
||||
<View style={walletStyle.container}>
|
||||
<UriBar navigation={navigation} />
|
||||
<ScrollView style={walletStyle.scrollContainer} keyboardShouldPersistTaps={'handled'}>
|
||||
<ScrollView
|
||||
style={walletStyle.scrollContainer}
|
||||
keyboardShouldPersistTaps={'handled'}
|
||||
removeClippedSubviews={false}
|
||||
>
|
||||
<WalletSyncDriver navigation={navigation} />
|
||||
{!rewardsNotInterested && (!balance || balance === 0) && <WalletRewardsDriver navigation={navigation} />}
|
||||
<WalletBalance />
|
||||
|
|
|
|||
|
|
@ -3,60 +3,60 @@ import Colors from './colors';
|
|||
|
||||
const channelSelectorStyle = StyleSheet.create({
|
||||
container: {
|
||||
flex: 1
|
||||
flex: 1,
|
||||
},
|
||||
channelPicker: {
|
||||
fontFamily: 'Inter-UI-Regular',
|
||||
fontSize: 16,
|
||||
height: 52,
|
||||
width: '100%'
|
||||
width: '100%',
|
||||
},
|
||||
bidRow: {
|
||||
flex: 1,
|
||||
flexDirection: 'row',
|
||||
alignItems: 'center'
|
||||
alignItems: 'center',
|
||||
},
|
||||
label: {
|
||||
fontFamily: 'Inter-UI-Regular',
|
||||
fontSize: 16
|
||||
fontSize: 16,
|
||||
},
|
||||
channelNameInput: {
|
||||
fontFamily: 'Inter-UI-Regular',
|
||||
fontSize: 16
|
||||
},
|
||||
fontSize: 16,
|
||||
},
|
||||
bidAmountInput: {
|
||||
fontFamily: 'Inter-UI-Regular',
|
||||
fontSize: 16,
|
||||
marginLeft: 16,
|
||||
textAlign: 'right',
|
||||
width: 80
|
||||
width: 80,
|
||||
},
|
||||
helpText: {
|
||||
fontFamily: 'Inter-UI-Regular',
|
||||
fontSize: 12
|
||||
fontSize: 12,
|
||||
},
|
||||
createChannelContainer: {
|
||||
flex: 1,
|
||||
marginLeft: 8,
|
||||
marginRight: 8
|
||||
marginRight: 8,
|
||||
},
|
||||
buttonContainer: {
|
||||
flex: 1,
|
||||
marginTop: 16,
|
||||
justifyContent: 'flex-end'
|
||||
justifyContent: 'flex-end',
|
||||
},
|
||||
buttons: {
|
||||
flex: 1,
|
||||
flexDirection: 'row',
|
||||
alignItems: 'center',
|
||||
justifyContent: 'flex-end'
|
||||
justifyContent: 'flex-end',
|
||||
},
|
||||
cancelLink: {
|
||||
marginRight: 16
|
||||
marginRight: 16,
|
||||
},
|
||||
createButton: {
|
||||
backgroundColor: Colors.NextLbryGreen
|
||||
}
|
||||
backgroundColor: Colors.NextLbryGreen,
|
||||
},
|
||||
});
|
||||
|
||||
export default channelSelectorStyle;
|
||||
|
|
|
|||
|
|
@ -10,18 +10,18 @@ const publishStyle = StyleSheet.create({
|
|||
flex: 1,
|
||||
marginTop: 62,
|
||||
paddingTop: 2,
|
||||
backgroundColor: Colors.DarkGrey
|
||||
backgroundColor: Colors.DarkGrey,
|
||||
},
|
||||
galleryGrid: {
|
||||
flex: 1
|
||||
flex: 1,
|
||||
},
|
||||
galleryGridImage: {
|
||||
width: 134,
|
||||
height: 90
|
||||
height: 90,
|
||||
},
|
||||
inputText: {
|
||||
fontFamily: 'Inter-UI-Regular',
|
||||
fontSize: 16
|
||||
fontSize: 16,
|
||||
},
|
||||
card: {
|
||||
backgroundColor: Colors.White,
|
||||
|
|
@ -38,53 +38,53 @@ const publishStyle = StyleSheet.create({
|
|||
flex: 1,
|
||||
flexDirection: 'row',
|
||||
alignItems: 'center',
|
||||
justifyContent: 'space-between'
|
||||
justifyContent: 'space-between',
|
||||
},
|
||||
rightActionButtons: {
|
||||
flexDirection: 'row',
|
||||
alignItems: 'center'
|
||||
alignItems: 'center',
|
||||
},
|
||||
modeButton: {
|
||||
backgroundColor: Colors.NextLbryGreen,
|
||||
alignSelf: 'flex-end',
|
||||
marginRight: 20
|
||||
marginRight: 20,
|
||||
},
|
||||
publishButton: {
|
||||
backgroundColor: Colors.LbryGreen,
|
||||
alignSelf: 'flex-end'
|
||||
alignSelf: 'flex-end',
|
||||
},
|
||||
cardTitle: {
|
||||
fontFamily: 'Inter-UI-Regular',
|
||||
fontSize: 20,
|
||||
marginBottom: 8
|
||||
marginBottom: 8,
|
||||
},
|
||||
actionsView: {
|
||||
width: '100%',
|
||||
height: 240,
|
||||
overflow: 'hidden'
|
||||
overflow: 'hidden',
|
||||
},
|
||||
record: {
|
||||
backgroundColor: 'transparent',
|
||||
flex: 0.5,
|
||||
justifyContent: 'center',
|
||||
alignItems: 'center'
|
||||
alignItems: 'center',
|
||||
},
|
||||
subActions: {
|
||||
flex: 0.5,
|
||||
borderLeftWidth: 2,
|
||||
borderLeftColor: Colors.DarkerGrey
|
||||
borderLeftColor: Colors.DarkerGrey,
|
||||
},
|
||||
actionText: {
|
||||
color: Colors.White,
|
||||
fontFamily: 'Inter-UI-Regular',
|
||||
fontSize: 14,
|
||||
marginTop: 8
|
||||
marginTop: 8,
|
||||
},
|
||||
photo: {
|
||||
backgroundColor: 'transparent',
|
||||
height: 120,
|
||||
justifyContent: 'center',
|
||||
alignItems: 'center'
|
||||
alignItems: 'center',
|
||||
},
|
||||
upload: {
|
||||
backgroundColor: Colors.Black,
|
||||
|
|
@ -92,65 +92,65 @@ const publishStyle = StyleSheet.create({
|
|||
borderTopWidth: 2,
|
||||
borderTopColor: Colors.DarkerGrey,
|
||||
justifyContent: 'center',
|
||||
alignItems: 'center'
|
||||
alignItems: 'center',
|
||||
},
|
||||
publishDetails: {
|
||||
marginTop: 60
|
||||
marginTop: 60,
|
||||
},
|
||||
mainThumbnailContainer: {
|
||||
backgroundColor: Colors.Black,
|
||||
width: '100%',
|
||||
height: 240
|
||||
height: 240,
|
||||
},
|
||||
mainThumbnail: {
|
||||
height: 240
|
||||
height: 240,
|
||||
},
|
||||
inputRow: {
|
||||
flex: 1,
|
||||
flexDirection: 'row',
|
||||
alignItems: 'center'
|
||||
alignItems: 'center',
|
||||
},
|
||||
priceInput: {
|
||||
width: 80,
|
||||
fontFamily: 'Inter-UI-Regular',
|
||||
fontSize: 16
|
||||
fontSize: 16,
|
||||
},
|
||||
currency: {
|
||||
fontFamily: 'Inter-UI-Regular'
|
||||
fontFamily: 'Inter-UI-Regular',
|
||||
},
|
||||
cardRow: {
|
||||
flex: 1,
|
||||
flexDirection: 'row',
|
||||
alignItems: 'flex-start'
|
||||
alignItems: 'flex-start',
|
||||
},
|
||||
switchRow: {
|
||||
flex: 1,
|
||||
flexDirection: 'row',
|
||||
alignItems: 'center',
|
||||
marginLeft: 24
|
||||
marginLeft: 24,
|
||||
},
|
||||
switchTitleRow: {
|
||||
flexDirection: 'row',
|
||||
alignItems: 'center',
|
||||
marginLeft: 24,
|
||||
marginTop: -10
|
||||
marginTop: -10,
|
||||
},
|
||||
switchText: {
|
||||
marginRight: 4,
|
||||
fontSize: 16
|
||||
fontSize: 16,
|
||||
},
|
||||
loadingView: {
|
||||
flex: 1,
|
||||
alignItems: 'center',
|
||||
justifyContent: 'center'
|
||||
justifyContent: 'center',
|
||||
},
|
||||
titleRow: {
|
||||
flexDirection: 'row',
|
||||
justifyContent: 'space-between'
|
||||
justifyContent: 'space-between',
|
||||
},
|
||||
cardText: {
|
||||
fontFamily: 'Inter-UI-Regular',
|
||||
fontSize: 14
|
||||
fontSize: 14,
|
||||
},
|
||||
cameraPreview: {
|
||||
position: 'absolute',
|
||||
|
|
@ -158,7 +158,7 @@ const publishStyle = StyleSheet.create({
|
|||
right: 0,
|
||||
top: 0,
|
||||
bottom: 0,
|
||||
height: 240
|
||||
height: 240,
|
||||
},
|
||||
actionsSubView: {
|
||||
flex: 1,
|
||||
|
|
@ -167,34 +167,34 @@ const publishStyle = StyleSheet.create({
|
|||
left: 0,
|
||||
right: 0,
|
||||
top: 0,
|
||||
bottom: 0
|
||||
bottom: 0,
|
||||
},
|
||||
successContainer: {
|
||||
padding: 16
|
||||
padding: 16,
|
||||
},
|
||||
successTitle: {
|
||||
fontFamily: 'Inter-UI-Regular',
|
||||
fontSize: 28,
|
||||
marginBottom: 16
|
||||
marginBottom: 16,
|
||||
},
|
||||
successText: {
|
||||
fontFamily: 'Inter-UI-Regular',
|
||||
fontSize: 16,
|
||||
marginBottom: 16,
|
||||
lineHeight: 20
|
||||
lineHeight: 20,
|
||||
},
|
||||
successRow: {
|
||||
flex: 1,
|
||||
flexDirection: 'row',
|
||||
alignItems: 'center',
|
||||
marginBottom: 16
|
||||
marginBottom: 16,
|
||||
},
|
||||
successUrl: {
|
||||
fontSize: 32,
|
||||
fontFamily: 'Inter-UI-Regular',
|
||||
color: Colors.NextLbryGreen,
|
||||
marginRight: 16
|
||||
}
|
||||
marginRight: 16,
|
||||
},
|
||||
});
|
||||
|
||||
export default publishStyle;
|
||||
|
|
|
|||
|
|
@ -138,6 +138,7 @@ const walletStyle = StyleSheet.create({
|
|||
flex: 1,
|
||||
fontSize: 16,
|
||||
letterSpacing: 1.5,
|
||||
marginRight: 8,
|
||||
},
|
||||
warning: {
|
||||
backgroundColor: Colors.Orange,
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ version.filename = %(source.dir)s/main.py
|
|||
|
||||
# (list) Application requirements
|
||||
# comma seperated e.g. requirements = sqlite3,kivy
|
||||
requirements = python3crystax, openssl, sqlite3, hostpython3crystax, android, distro==1.4.0, pyjnius, certifi==2018.11.29, appdirs==1.4.3, docopt==0.6.2, base58==1.0.0, colorama==0.3.7, ecdsa==0.13, jsonschema==2.6.0, pbkdf2==1.3, pyyaml, protobuf==3.6.1, keyring==10.4.0, git+https://github.com/lbryio/lbry.git@v0.37.2#egg=lbrynet, git+https://github.com/lbryio/aioupnp.git@a404269d91cff5358bcffb8067b0fd1d9c6842d3#egg=aioupnp, asn1crypto, mock, netifaces, cryptography, aiohttp==3.5.4, multidict==4.5.2, yarl==1.3.0, chardet==3.0.4, async_timeout==3.0.1, git+https://github.com/lbryio/torba@397ebe842856a4297bea5281206f9fa40a84699c#egg=torba, coincurve, msgpack==0.6.1, six, attrs==18.2.0, pylru, hachoir
|
||||
requirements = python3crystax, openssl, sqlite3, hostpython3crystax, android, distro==1.4.0, pyjnius, certifi==2018.11.29, appdirs==1.4.3, docopt==0.6.2, base58==1.0.0, colorama==0.3.7, ecdsa==0.13, jsonschema==2.6.0, pbkdf2==1.3, pyyaml, protobuf==3.6.1, keyring==10.4.0, git+https://github.com/lbryio/lbry.git@v0.37.4#egg=lbrynet, git+https://github.com/lbryio/aioupnp.git@a404269d91cff5358bcffb8067b0fd1d9c6842d3#egg=aioupnp, asn1crypto, mock, netifaces, cryptography, aiohttp==3.5.4, multidict==4.5.2, yarl==1.3.0, chardet==3.0.4, async_timeout==3.0.1, git+https://github.com/lbryio/torba@v0.5.4a0#egg=torba, coincurve, msgpack==0.6.1, six, attrs==18.2.0, pylru, hachoir
|
||||
|
||||
# (str) Custom source folders for requirements
|
||||
# Sets custom source for any requirements with recipes
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ version.filename = %(source.dir)s/main.py
|
|||
|
||||
# (list) Application requirements
|
||||
# comma seperated e.g. requirements = sqlite3,kivy
|
||||
requirements = python3crystax, openssl, sqlite3, hostpython3crystax, android, distro==1.4.0, pyjnius, certifi==2018.11.29, appdirs==1.4.3, docopt==0.6.2, base58==1.0.0, colorama==0.3.7, ecdsa==0.13, jsonschema==2.6.0, pbkdf2==1.3, pyyaml, protobuf==3.6.1, keyring==10.4.0, git+https://github.com/lbryio/lbry.git@v0.37.2#egg=lbrynet, git+https://github.com/lbryio/aioupnp.git@a404269d91cff5358bcffb8067b0fd1d9c6842d3#egg=aioupnp, asn1crypto, mock, netifaces, cryptography, aiohttp==3.5.4, multidict==4.5.2, yarl==1.3.0, chardet==3.0.4, async_timeout==3.0.1, git+https://github.com/lbryio/torba@397ebe842856a4297bea5281206f9fa40a84699c#egg=torba, coincurve, msgpack==0.6.1, six, attrs==18.2.0, pylru, hachoir
|
||||
requirements = python3crystax, openssl, sqlite3, hostpython3crystax, android, distro==1.4.0, pyjnius, certifi==2018.11.29, appdirs==1.4.3, docopt==0.6.2, base58==1.0.0, colorama==0.3.7, ecdsa==0.13, jsonschema==2.6.0, pbkdf2==1.3, pyyaml, protobuf==3.6.1, keyring==10.4.0, git+https://github.com/lbryio/lbry.git@v0.37.4#egg=lbrynet, git+https://github.com/lbryio/aioupnp.git@a404269d91cff5358bcffb8067b0fd1d9c6842d3#egg=aioupnp, asn1crypto, mock, netifaces, cryptography, aiohttp==3.5.4, multidict==4.5.2, yarl==1.3.0, chardet==3.0.4, async_timeout==3.0.1, git+https://github.com/lbryio/torba@v0.5.4a0#egg=torba, coincurve, msgpack==0.6.1, six, attrs==18.2.0, pylru, hachoir
|
||||
|
||||
# (str) Custom source folders for requirements
|
||||
# Sets custom source for any requirements with recipes
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ version.filename = %(source.dir)s/main.py
|
|||
|
||||
# (list) Application requirements
|
||||
# comma seperated e.g. requirements = sqlite3,kivy
|
||||
requirements = python3crystax, openssl, sqlite3, hostpython3crystax, android, distro==1.4.0, pyjnius, certifi==2018.11.29, appdirs==1.4.3, docopt==0.6.2, base58==1.0.0, colorama==0.3.7, ecdsa==0.13, jsonschema==2.6.0, pbkdf2==1.3, pyyaml, protobuf==3.6.1, keyring==10.4.0, git+https://github.com/lbryio/lbry.git@v0.37.2#egg=lbrynet, git+https://github.com/lbryio/aioupnp.git@a404269d91cff5358bcffb8067b0fd1d9c6842d3#egg=aioupnp, asn1crypto, mock, netifaces, cryptography, aiohttp==3.5.4, multidict==4.5.2, yarl==1.3.0, chardet==3.0.4, async_timeout==3.0.1, git+https://github.com/lbryio/torba@397ebe842856a4297bea5281206f9fa40a84699c#egg=torba, coincurve, msgpack==0.6.1, six, attrs==18.2.0, pylru, hachoir
|
||||
requirements = python3crystax, openssl, sqlite3, hostpython3crystax, android, distro==1.4.0, pyjnius, certifi==2018.11.29, appdirs==1.4.3, docopt==0.6.2, base58==1.0.0, colorama==0.3.7, ecdsa==0.13, jsonschema==2.6.0, pbkdf2==1.3, pyyaml, protobuf==3.6.1, keyring==10.4.0, git+https://github.com/lbryio/lbry.git@v0.37.4#egg=lbrynet, git+https://github.com/lbryio/aioupnp.git@a404269d91cff5358bcffb8067b0fd1d9c6842d3#egg=aioupnp, asn1crypto, mock, netifaces, cryptography, aiohttp==3.5.4, multidict==4.5.2, yarl==1.3.0, chardet==3.0.4, async_timeout==3.0.1, git+https://github.com/lbryio/torba@v0.5.4a0#egg=torba, coincurve, msgpack==0.6.1, six, attrs==18.2.0, pylru, hachoir
|
||||
|
||||
# (str) Custom source folders for requirements
|
||||
# Sets custom source for any requirements with recipes
|
||||
|
|
|
|||
|
|
@ -0,0 +1,40 @@
|
|||
{
|
||||
"project_info": {
|
||||
"project_number": "861521963586",
|
||||
"firebase_url": "https://lbry-mobile-builds-debug.firebaseio.com",
|
||||
"project_id": "lbry-mobile-builds-debug",
|
||||
"storage_bucket": "lbry-mobile-builds-debug.appspot.com"
|
||||
},
|
||||
"client": [
|
||||
{
|
||||
"client_info": {
|
||||
"mobilesdk_app_id": "1:861521963586:android:592958d248940ab2",
|
||||
"android_client_info": {
|
||||
"package_name": "io.lbry.browser"
|
||||
}
|
||||
},
|
||||
"oauth_client": [
|
||||
{
|
||||
"client_id": "861521963586-60cmvg5nmnrqkrc11a7bpmpv5ra2d50q.apps.googleusercontent.com",
|
||||
"client_type": 3
|
||||
}
|
||||
],
|
||||
"api_key": [
|
||||
{
|
||||
"current_key": "AIzaSyC7A3BYcIdZP9-Q-VNHoexYJWgZA7WzsPI"
|
||||
}
|
||||
],
|
||||
"services": {
|
||||
"appinvite_service": {
|
||||
"other_platform_oauth_client": [
|
||||
{
|
||||
"client_id": "861521963586-60cmvg5nmnrqkrc11a7bpmpv5ra2d50q.apps.googleusercontent.com",
|
||||
"client_type": 3
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
],
|
||||
"configuration_version": "1"
|
||||
}
|
||||
3
package-lock.json
generated
Normal file
3
package-lock.json
generated
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
{
|
||||
"lockfileVersion": 1
|
||||
}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
__version__ = "0.7.3"
|
||||
__version__ = "0.7.5"
|
||||
|
||||
class ServiceApp(App):
|
||||
def build(self):
|
||||
|
|
|
|||
Loading…
Reference in a new issue