kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-08-03 18:56:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	android/build.gradle
This commit is contained in:
Elad Keyshawn 2017-02-05 10:10:20 +02:00
commit a217fd8efd
3 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
build.gradle
View File

@ -22,14 +22,14 @@ repositories {
} }
dependencies { dependencies {
compile 'com.android.support:appcompat-v7:25.1.0' compile 'com.android.support:appcompat-v7:24.1.0'
compile 'com.android.support:support-v13:25.1.0' compile 'com.android.support:support-v13:24.1.0'
compile 'com.android.support:support-v4:25.1.0' compile 'com.android.support:support-v4:24.1.0'
compile 'com.android.support:design:25.1.0' compile 'com.android.support:design:24.1.0'
compile 'com.android.support:cardview-v7:25.1.0' compile 'com.android.support:cardview-v7:21.0.+'
androidTestCompile 'com.android.support:support-annotations:25.1.0' androidTestCompile 'com.android.support:support-annotations:24.1.0'
androidTestCompile 'com.android.support.test:runner:0.5' androidTestCompile 'com.android.support.test:runner:0.5'
androidTestCompile 'com.android.support.test:rules:0.5' androidTestCompile 'com.android.support.test:rules:0.5'
@ -56,6 +56,7 @@ dependencies {
// fast adapter // fast adapter
compile('com.mikepenz:fastadapter:2.1.6@aar') { compile('com.mikepenz:fastadapter:2.1.6@aar') {
compile('com.mikepenz:fastadapter:1.6.0@aar') {
transitive = true transitive = true
} }
compile 'com.mikepenz:fastadapter-extensions:1.8.0@aar' compile 'com.mikepenz:fastadapter-extensions:1.8.0@aar'

16
gen-custom-android-build.py
View File

@ -357,16 +357,14 @@ def step_update_xml_nodes(jsdata, **options):
item.name = '{}.settings.CustomSwitchPreference'.format(jsdata.get('package')) item.name = '{}.settings.CustomSwitchPreference'.format(jsdata.get('package'))
flushxml(soup, 'PreferenceScreen', preferences_xml, head=False) flushxml(soup, 'PreferenceScreen', preferences_xml, head=False)
# rename AnimatedProgressBar node in res/layout/toolbar.xml main_xml = os.path.join(ANDROID_PATH, 'res', 'layout', 'main.xml')
toolbar_xml = os.path.join(ANDROID_PATH, 'res', 'layout', 'toolbar.xml') soup = soup = BeautifulSoup(open(main_xml, 'r'),
soup = BeautifulSoup(open(toolbar_xml, 'r'), 'xml', from_encoding='utf-8')
'xml', from_encoding='utf-8') item = soup.find('org.kiwix.kiwixmobile.views.AnimatedProgressBar')
item = soup.find('org.kiwix.kiwixmobile.views.AnimatedProgressBar') item.name = '{}.views.AnimatedProgressBar'.format(jsdata.get('package'))
item.name = '{}.views.AnimatedProgressBar'.format(jsdata.get('package')) flushxml(soup, 'RelativeLayout', main_xml, head=False)
flushxml(soup, 'RelativeLayout', toolbar_xml, head=False)
except: except:
logger.error('BeautifulSoup could not open file in res/xml') logger.error('BeautifulSoup could not open file in res/xml')
def step_update_gradle(jsdata, **options): def step_update_gradle(jsdata, **options):

2
res/values/strings.xml
View File

@ -135,7 +135,7 @@
<string name="help_12">How to use large ZIM files?</string> <string name="help_12">How to use large ZIM files?</string>
<string name="help_13">If your ZIM file is larger than 4GB, you might not be able to store it on your SD card due to filesystem limitations.</string> <string name="help_13">If your ZIM file is larger than 4GB, you might not be able to store it on your SD card due to filesystem limitations.</string>
<string name="help_14">Downloading in-app automaticaly handles larger files, splitting them up for you.</string> <string name="help_14">Downloading in-app automaticaly handles larger files, splitting them up for you.</string>
<string name="help_15">If however you are downloading on another device, you may need to split the ZIM file up using the fololwing software:</string> <string name="help_15">If however you are downloading on another device, you may need to split the ZIM file up using the following software:</string>
<string name="help_16">\u2022 On Microsoft Windows: HJ-Split</string> <string name="help_16">\u2022 On Microsoft Windows: HJ-Split</string>
<string name="help_17">\u2022 On Apple Mac OSX: Split and Concat</string> <string name="help_17">\u2022 On Apple Mac OSX: Split and Concat</string>
<string name="help_18">\u2022 On GNU/Linux and with the console: split --bytes=4000M my_big_file.zim</string> <string name="help_18">\u2022 On GNU/Linux and with the console: split --bytes=4000M my_big_file.zim</string>