Splash screen, discover and file Pages #30

Merged
akinwale merged 14 commits from react-ui into master 2018-03-11 16:32:14 +01:00
8 changed files with 321 additions and 7 deletions
Showing only changes of commit 6eee4a9b99 - Show all commits

View file

@ -34,5 +34,5 @@ install:
- mkdir -p ~/.buildozer/android/platform/android-sdk-23/licenses - mkdir -p ~/.buildozer/android/platform/android-sdk-23/licenses
- echo $'\nd56f5187479451eabf01fb78af6dfcb131a6481e' > ~/.buildozer/android/platform/android-sdk-23/licenses/android-sdk-license - echo $'\nd56f5187479451eabf01fb78af6dfcb131a6481e' > ~/.buildozer/android/platform/android-sdk-23/licenses/android-sdk-license
script: script:
- buildozer android debug | grep -v 'working:' --line-buffered - buildozer android debug | grep -Fv -e 'working:' -e 'copy' --line-buffered
- cp bin/*.apk /dev/null - cp bin/*.apk /dev/null

2
app/bundle.sh Executable file
View file

@ -0,0 +1,2 @@
#!/bin/sh
react-native bundle --platform android --dev false --entry-file index.js --bundle-output ../src/main/assets/index.android.bundle --assets-dest ../src/main/res/

View file

@ -16,7 +16,7 @@ source.dir = ./src/main/python
source.include_exts = py,png,jpg,kv,atlas source.include_exts = py,png,jpg,kv,atlas
# (list) List of inclusions using pattern matching # (list) List of inclusions using pattern matching
#source.include_patterns = assets/*,images/*.png #source.include_patterns = assets/*, res/*
# (list) Source files to exclude (let empty to not exclude anything) # (list) Source files to exclude (let empty to not exclude anything)
#source.exclude_exts = spec #source.exclude_exts = spec
@ -137,8 +137,9 @@ android.ndk = 13b
# (list) List of Java files to add to the android project (can be java or a # (list) List of Java files to add to the android project (can be java or a
# directory containing the files) # directory containing the files)
android.add_src = ./src/main/java android.add_src = ./src/main
# (str) Path to the React files and node_modules for building
android.react_src = ./app android.react_src = ./app
# (list) Android AAR archives to add (currently works only with sdl2_gradle # (list) Android AAR archives to add (currently works only with sdl2_gradle

View file

@ -16,7 +16,7 @@ source.dir = ./src/main/python
source.include_exts = py,png,jpg,kv,atlas source.include_exts = py,png,jpg,kv,atlas
# (list) List of inclusions using pattern matching # (list) List of inclusions using pattern matching
#source.include_patterns = assets/*,images/*.png #source.include_patterns = assets/*, res/*
# (list) Source files to exclude (let empty to not exclude anything) # (list) Source files to exclude (let empty to not exclude anything)
#source.exclude_exts = spec #source.exclude_exts = spec
@ -137,8 +137,9 @@ android.ndk = 13b
# (list) List of Java files to add to the android project (can be java or a # (list) List of Java files to add to the android project (can be java or a
# directory containing the files) # directory containing the files)
android.add_src = ./src/main/java android.add_src = ./src/main
# (str) Path to the React files and node_modules for building
android.react_src = ./app android.react_src = ./app
# (list) Android AAR archives to add (currently works only with sdl2_gradle # (list) Android AAR archives to add (currently works only with sdl2_gradle

View file

@ -61,12 +61,20 @@
<meta-data android:name="{{ m.split('=', 1)[0] }}" android:value="{{ m.split('=', 1)[-1] }}"/>{% endfor %} <meta-data android:name="{{ m.split('=', 1)[0] }}" android:value="{{ m.split('=', 1)[-1] }}"/>{% endfor %}
<meta-data android:name="wakelock" android:value="{% if args.wakelock %}1{% else %}0{% endif %}"/> <meta-data android:name="wakelock" android:value="{% if args.wakelock %}1{% else %}0{% endif %}"/>
<activity android:name="io.lbry.lbrynet.ServiceControlActivity" <!--activity android:name="io.lbry.lbrynet.ServiceControlActivity"
android:label="@string/app_name" android:label="@string/app_name"
android:configChanges="keyboardHidden|orientation{% if args.min_sdk_version >= 13 %}|screenSize{% endif %}" android:configChanges="keyboardHidden|orientation{% if args.min_sdk_version >= 13 %}|screenSize{% endif %}"
android:screenOrientation="{{ args.orientation }}"
-->
<activity android:name="io.lbry.lbrynet.MainActivity"
android:label="@string/app_name"
android:theme="@style/Theme.AppCompat.Light.NoActionBar"
android:configChanges="keyboardHidden|orientation{% if args.min_sdk_version >= 13 %}|screenSize{% endif %}"
android:screenOrientation="{{ args.orientation }}" android:screenOrientation="{{ args.orientation }}"
> >
{% if args.launcher %} {% if args.launcher %}
<intent-filter> <intent-filter>
<action android:name="org.kivy.LAUNCH" /> <action android:name="org.kivy.LAUNCH" />

View file

@ -31,6 +31,10 @@ android {
targetSdkVersion {{ android_api }} targetSdkVersion {{ android_api }}
versionCode {{ args.numeric_version }} versionCode {{ args.numeric_version }}
versionName '{{ args.version }}' versionName '{{ args.version }}'
ndk {
abiFilters "armeabi-v7a", "x86"
}
} }
{% if args.sign -%} {% if args.sign -%}

File diff suppressed because one or more lines are too long

View file

@ -0,0 +1 @@
DNT­×1UžÉø;ŽÀÍ