OpenLP

Merge lp:~bennett-6/openlp/android2 into lp:openlp/android2

  1. android2
  2. Merge into android2
Proposed by Bennett Piater
Status: Merged
Merge reported by: Tim Bentley
Merged at revision: not available
Proposed branch: lp:~bennett-6/openlp/android2
Merge into: lp:openlp/android2
Diff against target: 256 lines (+67/-51)
5 files modified
app/app.iml (+42/-47)
app/build.gradle (+1/-1)
app/src/main/java/org/openlp/android2/OpenLP.java (+21/-0)
build.gradle (+1/-1)
gradle/wrapper/gradle-wrapper.properties (+2/-2)
To merge this branch: bzr merge lp:~bennett-6/openlp/android2
Reviewer Review Type Date Requested Status
Tim Bentley Approve
Review via email: mp+337263@code.launchpad.net

Description of the change

Use hardware volume keys to switch slides.

To post a comment you must log in.
Revision history for this message
Tim Bentley (trb143) wrote :

but rejected.
This will not merge due to all the other changes in the file which are different to the current release.
I have added your code to trunk and will do a test build this weekend on play store.
Thanks for this it is appreciated.

review: Approve
Revision history for this message
Bennett Piater (bennett-6) wrote :

> but rejected.
> This will not merge due to all the other changes in the file which are
> different to the current release.
> I have added your code to trunk and will do a test build this weekend on play
> store.
> Thanks for this it is appreciated.

You're welcome, thanks for taking this!

I know I did horrible things, I can't use bazaar and didn't have time to learn. I'm used to git.
Maybe next time ;)

Revision history for this message
Tim Bentley (trb143) wrote :

The challenges are around android versions of libraries etc and not your code.
The code dropped in 100% fine,

Revision history for this message
Bennett Piater (bennett-6) wrote :

> The challenges are around android versions of libraries etc and not your code.
> The code dropped in 100% fine,

Yeah, I know. I referred to the equivalent of 'git commit -a' which I did and would never do with git.

Revision history for this message
Raoul Snyman (raoul-snyman) wrote :

Can we close this merge proposal? Tim, is this merged now?

Revision history for this message
Raoul Snyman (raoul-snyman) wrote :

Bennett, just an FYI, git is the only VCS that you need to do "-a" with to include all files. All other VCSes work the way Bazaar does (it is modeled on the convention, unlike git).

Revision history for this message
Tim Bentley (trb143) wrote :

Marking as merged as the code is in the Release 7 version

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'app/app.iml'
2--- app/app.iml 2016-11-15 20:51:23 +0000
3+++ app/app.iml 2018-02-07 11:46:12 +0000
4@@ -1,5 +1,5 @@
5 <?xml version="1.0" encoding="UTF-8"?>
6-<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="fixssl" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
7+<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
8 <component name="FacetManager">
9 <facet type="android-gradle" name="Android-Gradle">
10 <configuration>
11@@ -9,7 +9,6 @@
12 <facet type="android" name="Android">
13 <configuration>
14 <option name="SELECTED_BUILD_VARIANT" value="debug" />
15- <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
16 <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
17 <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
18 <afterSyncTasks>
19@@ -23,31 +22,31 @@
20 </configuration>
21 </facet>
22 </component>
23- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
24+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
25 <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
26 <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
27 <exclude-output />
28 <content url="file://$MODULE_DIR$">
29+ <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
30 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
31 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
32 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
33 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
34- <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
35 <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
36 <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
37+ <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
38 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
39 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
40 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
41 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
42- <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
43 <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
44 <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
45+ <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
46 <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
47 <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
48 <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
49 <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
50 <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
51- <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
52 <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
53 <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
54 <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
55@@ -55,85 +54,81 @@
56 <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
57 <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
58 <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
59- <sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
60 <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
61 <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
62+ <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
63+ <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
64+ <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
65+ <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
66+ <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
67+ <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
68+ <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
69 <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
70 <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
71 <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
72 <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
73 <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
74- <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
75 <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
76 <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
77+ <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
78+ <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
79+ <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
80+ <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
81+ <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
82+ <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
83+ <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
84 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
85 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
86 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
87 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
88 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
89- <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
90 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
91 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
92- <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
93- <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
94- <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
95- <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
96- <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
97- <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
98- <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
99- <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
100 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
101 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
102+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/build-info" />
103 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
104+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
105 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
106- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
107- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/25.0.0/jars" />
108- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.0.0/jars" />
109- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/25.0.0/jars" />
110- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/25.0.0/jars" />
111- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-compat/25.0.0/jars" />
112- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-core-ui/25.0.0/jars" />
113- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-core-utils/25.0.0/jars" />
114- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-fragment/25.0.0/jars" />
115- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-media-compat/25.0.0/jars" />
116- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/25.0.0/jars" />
117- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/25.0.0/jars" />
118- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/transition/25.0.0/jars" />
119+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes-jar" />
120 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
121 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
122 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
123- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
124 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
125 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
126 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
127+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
128 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
129+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
130 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
131- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
132+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
133 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
134 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
135- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
136 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
137 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
138+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
139+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
140 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
141+ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
142 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
143 <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
144 <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
145 </content>
146 <orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
147 <orderEntry type="sourceFolder" forTests="false" />
148- <orderEntry type="library" exported="" name="support-annotations-25.0.0" level="project" />
149- <orderEntry type="library" exported="" name="design-25.0.0" level="project" />
150- <orderEntry type="library" exported="" name="classes" level="project" />
151- <orderEntry type="library" exported="" name="support-v4-25.0.0" level="project" />
152- <orderEntry type="library" exported="" name="support-media-compat-25.0.0" level="project" />
153- <orderEntry type="library" exported="" name="transition-25.0.0" level="project" />
154- <orderEntry type="library" exported="" name="support-compat-25.0.0" level="project" />
155- <orderEntry type="library" exported="" name="support-fragment-25.0.0" level="project" />
156- <orderEntry type="library" exported="" name="animated-vector-drawable-25.0.0" level="project" />
157- <orderEntry type="library" exported="" name="support-core-ui-25.0.0" level="project" />
158- <orderEntry type="library" exported="" name="appcompat-v7-25.0.0" level="project" />
159- <orderEntry type="library" exported="" name="support-vector-drawable-25.0.0" level="project" />
160- <orderEntry type="library" exported="" name="support-core-utils-25.0.0" level="project" />
161- <orderEntry type="library" exported="" name="recyclerview-v7-25.0.0" level="project" />
162+ <orderEntry type="library" name="com.android.support:support-fragment-25.0.0" level="project" />
163+ <orderEntry type="library" name="com.android.support:support-annotations:25.0.0@jar" level="project" />
164+ <orderEntry type="library" name="com.android.support:support-core-ui-25.0.0" level="project" />
165+ <orderEntry type="library" name="com.android.support:support-core-utils-25.0.0" level="project" />
166+ <orderEntry type="library" name="__local_aars__:/home/bennett/Github/openlp-android2/app/libs/classes.jar:unspecified@jar" level="project" />
167+ <orderEntry type="library" name="com.android.support:appcompat-v7-25.0.0" level="project" />
168+ <orderEntry type="library" name="com.android.support:transition-25.0.0" level="project" />
169+ <orderEntry type="library" name="com.android.support:support-media-compat-25.0.0" level="project" />
170+ <orderEntry type="library" name="com.android.support:support-compat-25.0.0" level="project" />
171+ <orderEntry type="library" name="com.android.support:design-25.0.0" level="project" />
172+ <orderEntry type="library" name="com.android.support:animated-vector-drawable-25.0.0" level="project" />
173+ <orderEntry type="library" name="com.android.support:recyclerview-v7-25.0.0" level="project" />
174+ <orderEntry type="library" name="com.android.support:support-vector-drawable-25.0.0" level="project" />
175+ <orderEntry type="library" name="com.android.support:support-v4-25.0.0" level="project" />
176 </component>
177 </module>
178\ No newline at end of file
179
180=== modified file 'app/build.gradle'
181--- app/build.gradle 2016-11-15 20:51:23 +0000
182+++ app/build.gradle 2018-02-07 11:46:12 +0000
183@@ -2,7 +2,7 @@
184 project.archivesBaseName = 'OpenLP'
185 android {
186 compileSdkVersion 25
187- buildToolsVersion "25"
188+ buildToolsVersion '26.0.2'
189
190 defaultConfig {
191 applicationId "org.openlp.android2"
192
193=== modified file 'app/src/main/java/org/openlp/android2/OpenLP.java'
194--- app/src/main/java/org/openlp/android2/OpenLP.java 2016-11-15 20:51:23 +0000
195+++ app/src/main/java/org/openlp/android2/OpenLP.java 2018-02-07 11:46:12 +0000
196@@ -27,6 +27,7 @@
197 import android.app.FragmentManager;
198 import android.os.Bundle;
199 import android.util.Log;
200+import android.view.KeyEvent;
201 import android.view.Menu;
202 import android.view.MenuItem;
203 import android.view.View;
204@@ -190,6 +191,26 @@
205 }
206
207 /**
208+ * Handle volume keys to go forward/backward
209+ */
210+ @Override
211+ public boolean onKeyDown(int keyCode, KeyEvent event) {
212+ switch (keyCode) {
213+ case KeyEvent.KEYCODE_VOLUME_UP:
214+ Log.d(LOG_TAG, "volume up");
215+ previous(findViewById(android.R.id.content));
216+ return true;
217+ case KeyEvent.KEYCODE_VOLUME_DOWN:
218+ Log.d(LOG_TAG, "volume down");
219+ next(findViewById(android.R.id.content));
220+ return true;
221+
222+ default:
223+ return super.onKeyDown(keyCode, event);
224+ }
225+ }
226+
227+ /**
228 * Set Display to allow for Duel Columns
229 */
230 protected void duelTab(){
231
232=== modified file 'build.gradle'
233--- build.gradle 2016-11-15 20:51:23 +0000
234+++ build.gradle 2018-02-07 11:46:12 +0000
235@@ -5,7 +5,7 @@
236 jcenter()
237 }
238 dependencies {
239- classpath 'com.android.tools.build:gradle:2.2.2'
240+ classpath 'com.android.tools.build:gradle:3.0.0'
241
242 // NOTE: Do not place your application dependencies here; they belong
243 // in the individual module build.gradle files
244
245=== modified file 'gradle/wrapper/gradle-wrapper.properties'
246--- gradle/wrapper/gradle-wrapper.properties 2016-11-15 20:51:23 +0000
247+++ gradle/wrapper/gradle-wrapper.properties 2018-02-07 11:46:12 +0000
248@@ -1,6 +1,6 @@
249-#Fri Sep 16 06:02:15 BST 2016
250+#Tue Feb 06 15:21:06 CET 2018
251 distributionBase=GRADLE_USER_HOME
252 distributionPath=wrapper/dists
253 zipStoreBase=GRADLE_USER_HOME
254 zipStorePath=wrapper/dists
255-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
256+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

Subscribers

People subscribed via source and target branches