From cec1b2b5f568815ff6e09e068f5be99ce5c0659e Mon Sep 17 00:00:00 2001 From: Isaac Hutt Date: Sun, 5 Feb 2017 00:55:19 +0000 Subject: [PATCH 1/5] Small gen sript fix #451 --- gen-custom-android-build.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/gen-custom-android-build.py b/gen-custom-android-build.py index f06fd5e77..deabad178 100755 --- a/gen-custom-android-build.py +++ b/gen-custom-android-build.py @@ -356,14 +356,12 @@ def step_update_xml_nodes(jsdata, **options): item.name = '{}.settings.CustomSwitchPreference'.format(jsdata.get('package')) flushxml(soup, 'PreferenceScreen', preferences_xml, head=False) - # rename AnimatedProgressBar node in res/layout/toolbar.xml - toolbar_xml = os.path.join(ANDROID_PATH, 'res', 'layout', 'toolbar.xml') - soup = soup = BeautifulSoup(open(toolbar_xml, 'r'), + main_xml = os.path.join(ANDROID_PATH, 'res', 'layout', 'main.xml') + soup = soup = BeautifulSoup(open(main_xml, 'r'), 'xml', from_encoding='utf-8') item = soup.find('org.kiwix.kiwixmobile.views.AnimatedProgressBar') item.name = '{}.views.AnimatedProgressBar'.format(jsdata.get('package')) - flushxml(soup, 'RelativeLayout', toolbar_xml, head=False) - + flushxml(soup, 'RelativeLayout', main_xml, head=False) def step_update_gradle(jsdata, **options): """ uncomment compiling the content-libs.jar file into the APK """ From 0e3b2f9e76e531431ffdd65b6120fe56805411ae Mon Sep 17 00:00:00 2001 From: Isaac Hutt Date: Sun, 5 Feb 2017 01:03:25 +0000 Subject: [PATCH 2/5] Fix gen build script --- gen-custom-android-build.py | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/gen-custom-android-build.py b/gen-custom-android-build.py index 8d50d5a8d..125eff772 100755 --- a/gen-custom-android-build.py +++ b/gen-custom-android-build.py @@ -357,23 +357,14 @@ def step_update_xml_nodes(jsdata, **options): item.name = '{}.settings.CustomSwitchPreference'.format(jsdata.get('package')) flushxml(soup, 'PreferenceScreen', preferences_xml, head=False) - # rename AnimatedProgressBar node in res/layout/toolbar.xml - toolbar_xml = os.path.join(ANDROID_PATH, 'res', 'layout', 'toolbar.xml') - soup = BeautifulSoup(open(toolbar_xml, 'r'), - 'xml', from_encoding='utf-8') - item = soup.find('org.kiwix.kiwixmobile.views.AnimatedProgressBar') - item.name = '{}.views.AnimatedProgressBar'.format(jsdata.get('package')) - flushxml(soup, 'RelativeLayout', toolbar_xml, head=False) - - - main_xml = os.path.join(ANDROID_PATH, 'res', 'layout', 'main.xml') - soup = soup = BeautifulSoup(open(main_xml, 'r'), + main_xml = os.path.join(ANDROID_PATH, 'res', 'layout', 'main.xml') + soup = soup = BeautifulSoup(open(main_xml, 'r'), 'xml', from_encoding='utf-8') - item = soup.find('org.kiwix.kiwixmobile.views.AnimatedProgressBar') - item.name = '{}.views.AnimatedProgressBar'.format(jsdata.get('package')) - flushxml(soup, 'RelativeLayout', main_xml, head=False) + item = soup.find('org.kiwix.kiwixmobile.views.AnimatedProgressBar') + item.name = '{}.views.AnimatedProgressBar'.format(jsdata.get('package')) + flushxml(soup, 'RelativeLayout', main_xml, head=False) 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): From fb5b0dc15869cb54d1a2331267666530f75525ae Mon Sep 17 00:00:00 2001 From: Isaac Hutt Date: Sun, 5 Feb 2017 01:18:42 +0000 Subject: [PATCH 3/5] Revert "Android Support Library update" This reverts commit a248361aa0596e1f0d01215eae984bf3797070fa. --- build.gradle | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index cf3637668..497595e2d 100644 --- a/build.gradle +++ b/build.gradle @@ -22,14 +22,14 @@ repositories { } dependencies { - compile 'com.android.support:appcompat-v7:25.1.0' - compile 'com.android.support:support-v13:25.1.0' - compile 'com.android.support:support-v4:25.1.0' - compile 'com.android.support:design:25.1.0' - compile 'com.android.support:cardview-v7:25.1.0' + compile 'com.android.support:appcompat-v7:24.1.0' + compile 'com.android.support:support-v13:24.1.0' + compile 'com.android.support:support-v4:24.1.0' + compile 'com.android.support:design:24.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:rules:0.5' From ed9e083bc70eb9ac0b92435aaf1098dc0abea325 Mon Sep 17 00:00:00 2001 From: Isaac Hutt Date: Sun, 5 Feb 2017 01:25:57 +0000 Subject: [PATCH 4/5] Fix build.gradle to compile --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 497595e2d..ba4778e0b 100644 --- a/build.gradle +++ b/build.gradle @@ -53,7 +53,7 @@ dependencies { compile 'eu.mhutti1.utils.storage:android-storage-devices:0.4.7' compile 'com.jakewharton:butterknife:8.0.1' apt 'com.jakewharton:butterknife-compiler:8.0.1' - compile('com.mikepenz:fastadapter:2.1.6@aar') { + compile('com.mikepenz:fastadapter:1.6.0@aar') { transitive = true } compile 'com.mikepenz:fastadapter-extensions:1.8.0@aar' From 1b10044e2b70bd6693fbfdb3ba31096de8b208bc Mon Sep 17 00:00:00 2001 From: Karim Osman Date: Sun, 5 Feb 2017 04:52:54 +0100 Subject: [PATCH 5/5] Fix typo --- res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 7f49abd5f..d70899303 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -135,7 +135,7 @@ How to use large ZIM files? If your ZIM file is larger than 4GB, you might not be able to store it on your SD card due to filesystem limitations. Downloading in-app automaticaly handles larger files, splitting them up for you. - If however you are downloading on another device, you may need to split the ZIM file up using the fololwing software: + If however you are downloading on another device, you may need to split the ZIM file up using the following software: \u2022 On Microsoft Windows: HJ-Split \u2022 On Apple Mac OSX: Split and Concat \u2022 On GNU/Linux and with the console: split --bytes=4000M my_big_file.zim