Merge lp:~trb143/openlp/android_fixes into lp:openlp/android2
- android_fixes
- Merge into android2
Proposed by
Tim Bentley
Status: | Merged |
---|---|
Merged at revision: | 39 |
Proposed branch: | lp:~trb143/openlp/android_fixes |
Merge into: | lp:openlp/android2 |
Diff against target: |
2928 lines (+1325/-368) 75 files modified
app/build.gradle (+18/-21) app/src/main/java/org/openlp/android2/OpenLP.java (+6/-2) app/src/main/java/org/openlp/android2/api/Api.java (+1/-1) app/src/main/java/org/openlp/android2/common/JsonHelpers.java (+4/-1) app/src/main/java/org/openlp/android2/common/NavigationOptions.java (+1/-1) app/src/main/java/org/openlp/android2/common/OpenLPFragment.java (+79/-38) app/src/main/java/org/openlp/android2/common/OpenLPSSLSocketFactory.java (+0/-66) app/src/main/java/org/openlp/android2/common/OpenLPURLBuilder.java (+86/-0) app/src/main/java/org/openlp/android2/common/RequestQueueService.java (+99/-0) app/src/main/java/org/openlp/android2/common/StateHolder.java (+22/-0) app/src/main/java/org/openlp/android2/dialogs/AlertDisplayDialog.java (+1/-3) app/src/main/java/org/openlp/android2/dialogs/BlankDisplayDialog.java (+4/-6) app/src/main/java/org/openlp/android2/dialogs/SearchSelectionDialog.java (+135/-0) app/src/main/java/org/openlp/android2/fragments/AboutFragment.java (+1/-1) app/src/main/java/org/openlp/android2/fragments/HomeFragment.java (+1/-1) app/src/main/java/org/openlp/android2/fragments/LiveListFragment.java (+17/-13) app/src/main/java/org/openlp/android2/fragments/LiveWebFragment.java (+1/-1) app/src/main/java/org/openlp/android2/fragments/NavigationDrawerFragment.java (+1/-1) app/src/main/java/org/openlp/android2/fragments/SearchFragment.java (+357/-0) app/src/main/java/org/openlp/android2/fragments/ServiceListFragment.java (+11/-7) app/src/main/java/org/openlp/android2/fragments/StageWebFragment.java (+1/-1) app/src/main/java/org/openlp/android2/fragments/WebFragment.java (+5/-12) app/src/main/res/drawable/custom_border.xml (+11/-0) app/src/main/res/drawable/customborder.xml (+0/-11) app/src/main/res/drawable/search_list.xml (+11/-0) app/src/main/res/layout-xlarge/fragment_livelist_list.xml (+10/-1) app/src/main/res/layout/activity_main.xml (+1/-1) app/src/main/res/layout/fragment_item_grid.xml (+0/-12) app/src/main/res/layout/fragment_livelist_grid.xml (+0/-45) app/src/main/res/layout/fragment_livelist_list.xml (+13/-15) app/src/main/res/layout/fragment_search.xml (+77/-0) app/src/main/res/layout/fragment_service_list.xml (+15/-3) app/src/main/res/layout/fragment_servicelist_grid.xml (+0/-20) app/src/main/res/layout/search_action_dialog.xml (+40/-0) app/src/main/res/layout/search_result_row.xml (+18/-0) app/src/main/res/layout/spinner_dropdown_item.xml (+11/-0) app/src/main/res/layout/spinner_list_item.xml (+11/-0) app/src/main/res/menu/open_l.xml (+0/-4) app/src/main/res/values-af/strings.xml (+30/-1) app/src/main/res/values-bg/strings.xml (+2/-1) app/src/main/res/values-cs/strings.xml (+0/-2) app/src/main/res/values-da/strings.xml (+4/-2) app/src/main/res/values-de/strings.xml (+6/-6) app/src/main/res/values-en-rGB/strings.xml (+0/-2) app/src/main/res/values-en-rZA/strings.xml (+0/-2) app/src/main/res/values-es/strings.xml (+3/-2) app/src/main/res/values-et/strings.xml (+1/-2) app/src/main/res/values-fi/strings.xml (+0/-2) app/src/main/res/values-fr/strings.xml (+31/-1) app/src/main/res/values-hu/strings.xml (+4/-6) app/src/main/res/values-id/strings.xml (+4/-2) app/src/main/res/values-it/strings.xml (+51/-2) app/src/main/res/values-ja/strings.xml (+15/-1) app/src/main/res/values-ko/strings.xml (+5/-0) app/src/main/res/values-large/refs.xml (+0/-1) app/src/main/res/values-lt/strings.xml (+0/-2) app/src/main/res/values-lv/strings.xml (+48/-1) app/src/main/res/values-nb/strings.xml (+0/-2) app/src/main/res/values-nl/strings.xml (+4/-2) app/src/main/res/values-nn/strings.xml (+2/-0) app/src/main/res/values-pap/strings.xml (+2/-1) app/src/main/res/values-pl/strings.xml (+6/-2) app/src/main/res/values-pt-rBR/strings.xml (+7/-4) app/src/main/res/values-ro/strings.xml (+0/-2) app/src/main/res/values-ru/strings.xml (+3/-8) app/src/main/res/values-sk/strings.xml (+0/-2) app/src/main/res/values-sv/strings.xml (+0/-2) app/src/main/res/values-sw600dp/refs.xml (+0/-2) app/src/main/res/values-uk/strings.xml (+6/-2) app/src/main/res/values-zh-rTW/strings.xml (+0/-2) app/src/main/res/values/keyStrings.xml (+0/-2) app/src/main/res/values/strings.xml (+2/-2) app/src/main/res/xml/pref_general.xml (+1/-1) app/src/main/res/xml/pref_notification.xml (+0/-6) fixssl.iml (+19/-0) |
To merge this branch: | bzr merge lp:~trb143/openlp/android_fixes |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Tomas Groth | Approve | ||
Raoul Snyman | Pending | ||
Review via email: mp+310577@code.launchpad.net |
This proposal supersedes a proposal from 2016-11-10.
Commit message
Description of the change
Version 6 release
To post a comment you must log in.
Revision history for this message
Raoul Snyman (raoul-snyman) wrote : Posted in a previous version of this proposal | # |
review:
Needs Fixing
Revision history for this message
Tomas Groth (tomasgroth) : | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'app/build.gradle' | |||
2 | --- app/build.gradle 2016-01-11 20:02:36 +0000 | |||
3 | +++ app/build.gradle 2016-11-10 19:40:57 +0000 | |||
4 | @@ -1,17 +1,16 @@ | |||
5 | 1 | apply plugin: 'com.android.application' | 1 | apply plugin: 'com.android.application' |
6 | 2 | |||
7 | 3 | project.archivesBaseName = 'OpenLP' | 2 | project.archivesBaseName = 'OpenLP' |
8 | 4 | |||
9 | 5 | android { | 3 | android { |
12 | 6 | compileSdkVersion 22 | 4 | compileSdkVersion 25 |
13 | 7 | buildToolsVersion "21.1.2" | 5 | buildToolsVersion "25" |
14 | 8 | 6 | ||
15 | 9 | defaultConfig { | 7 | defaultConfig { |
16 | 10 | applicationId "org.openlp.android2" | 8 | applicationId "org.openlp.android2" |
20 | 11 | minSdkVersion 15 | 9 | minSdkVersion 16 |
21 | 12 | targetSdkVersion 22 | 10 | targetSdkVersion 25 |
22 | 13 | versionCode 5 | 11 | versionCode 6 |
23 | 14 | versionName "2.0" | 12 | versionName "2.0" |
24 | 13 | vectorDrawables.useSupportLibrary = true | ||
25 | 15 | } | 14 | } |
26 | 16 | android { | 15 | android { |
27 | 17 | lintOptions { | 16 | lintOptions { |
28 | @@ -19,6 +18,9 @@ | |||
29 | 19 | } | 18 | } |
30 | 20 | } | 19 | } |
31 | 21 | buildTypes { | 20 | buildTypes { |
32 | 21 | debug { | ||
33 | 22 | debuggable true | ||
34 | 23 | } | ||
35 | 22 | release { | 24 | release { |
36 | 23 | minifyEnabled false | 25 | minifyEnabled false |
37 | 24 | proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' | 26 | proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' |
38 | @@ -26,20 +28,15 @@ | |||
39 | 26 | } | 28 | } |
40 | 27 | testOptions { | 29 | testOptions { |
41 | 28 | unitTests.returnDefaultValues = true | 30 | unitTests.returnDefaultValues = true |
42 | 31 | } | ||
43 | 32 | |||
44 | 33 | dependencies { | ||
45 | 34 | compile fileTree(include: ['*.jar'], dir: 'libs') | ||
46 | 35 | compile 'com.android.support:appcompat-v7:25.0.0' | ||
47 | 36 | compile 'com.android.support:support-v4:25.0.0' | ||
48 | 37 | compile 'com.android.support:design:25.0.0' | ||
49 | 38 | } | ||
50 | 29 | } | 39 | } |
51 | 30 | |||
52 | 31 | dependencies { | 40 | dependencies { |
66 | 32 | compile fileTree(include: ['*.jar'], dir: 'libs') | 41 | compile files('libs/classes.jar') |
54 | 33 | compile 'com.android.support:appcompat-v7:22.2.1' | ||
55 | 34 | compile 'com.android.support:support-v4:22.2.1' | ||
56 | 35 | compile 'com.android.support:design:22.2.1' | ||
57 | 36 | compile 'com.loopj.android:android-async-http:1.4.6' | ||
58 | 37 | testCompile 'junit:junit:4.12' | ||
59 | 38 | testCompile 'org.easytesting:fest:1.0.16' | ||
60 | 39 | testCompile 'com.squareup:fest-android:1.0.8' | ||
61 | 40 | testCompile('org.robolectric:robolectric:3.0-rc2') { | ||
62 | 41 | exclude group: 'commons-logging', module: 'commons-logging' | ||
63 | 42 | exclude group: 'org.apache.httpcomponents', module: 'httpclient' | ||
64 | 43 | } | ||
65 | 44 | } | ||
67 | 45 | } | 42 | } |
68 | 46 | \ No newline at end of file | 43 | \ No newline at end of file |
69 | 47 | 44 | ||
70 | === added file 'app/libs/classes.jar' | |||
71 | 48 | Binary files app/libs/classes.jar 1970-01-01 00:00:00 +0000 and app/libs/classes.jar 2016-11-10 19:40:57 +0000 differ | 45 | Binary files app/libs/classes.jar 1970-01-01 00:00:00 +0000 and app/libs/classes.jar 2016-11-10 19:40:57 +0000 differ |
72 | === modified file 'app/src/main/java/org/openlp/android2/OpenLP.java' | |||
73 | --- app/src/main/java/org/openlp/android2/OpenLP.java 2016-01-09 11:10:39 +0000 | |||
74 | +++ app/src/main/java/org/openlp/android2/OpenLP.java 2016-11-10 19:40:57 +0000 | |||
75 | @@ -1,7 +1,7 @@ | |||
76 | 1 | /****************************************************************************** | 1 | /****************************************************************************** |
77 | 2 | * OpenLP - Open Source Lyrics Projection * | 2 | * OpenLP - Open Source Lyrics Projection * |
78 | 3 | * --------------------------------------------------------------------------- * | 3 | * --------------------------------------------------------------------------- * |
80 | 4 | * Copyright (c) 2011-2015 OpenLP Android Developers * | 4 | * Copyright (c) 2011-2016 OpenLP Android Developers * |
81 | 5 | * --------------------------------------------------------------------------- * | 5 | * --------------------------------------------------------------------------- * |
82 | 6 | * This program is free software; you can redistribute it and/or modify it * | 6 | * This program is free software; you can redistribute it and/or modify it * |
83 | 7 | * under the terms of the GNU General Public License as published by the Free * | 7 | * under the terms of the GNU General Public License as published by the Free * |
84 | @@ -35,6 +35,8 @@ | |||
85 | 35 | 35 | ||
86 | 36 | import org.openlp.android2.activities.SettingsActivity; | 36 | import org.openlp.android2.activities.SettingsActivity; |
87 | 37 | import org.openlp.android2.common.NavigationOptions; | 37 | import org.openlp.android2.common.NavigationOptions; |
88 | 38 | import org.openlp.android2.common.OpenLPURLBuilder; | ||
89 | 39 | import org.openlp.android2.common.StateHolder; | ||
90 | 38 | import org.openlp.android2.dialogs.AlertDisplayDialog; | 40 | import org.openlp.android2.dialogs.AlertDisplayDialog; |
91 | 39 | import org.openlp.android2.dialogs.BlankDisplayDialog; | 41 | import org.openlp.android2.dialogs.BlankDisplayDialog; |
92 | 40 | import org.openlp.android2.fragments.AboutFragment; | 42 | import org.openlp.android2.fragments.AboutFragment; |
93 | @@ -65,6 +67,8 @@ | |||
94 | 65 | protected void onCreate(Bundle savedInstanceState) { | 67 | protected void onCreate(Bundle savedInstanceState) { |
95 | 66 | super.onCreate(savedInstanceState); | 68 | super.onCreate(savedInstanceState); |
96 | 67 | setContentView(R.layout.activity_main); | 69 | setContentView(R.layout.activity_main); |
97 | 70 | OpenLPURLBuilder.getInstance().setContext(this); | ||
98 | 71 | StateHolder.getInstance().setContext(this); | ||
99 | 68 | 72 | ||
100 | 69 | doPreferenceCheck(); | 73 | doPreferenceCheck(); |
101 | 70 | 74 | ||
102 | @@ -140,7 +144,7 @@ | |||
103 | 140 | .replace(R.id.container_left, ServiceListFragment.newInstance(), "servicelist") | 144 | .replace(R.id.container_left, ServiceListFragment.newInstance(), "servicelist") |
104 | 141 | .commit(); | 145 | .commit(); |
105 | 142 | fragmentManager.beginTransaction() | 146 | fragmentManager.beginTransaction() |
107 | 143 | .replace(R.id.container_right, LiveListFragment.newInstance()) | 147 | .replace(R.id.container_right, LiveListFragment.newInstance(), "livelist") |
108 | 144 | .commit(); | 148 | .commit(); |
109 | 145 | mTitle = getString(R.string.live_list); | 149 | mTitle = getString(R.string.live_list); |
110 | 146 | toggerContainer(R.id.next_button, View.VISIBLE); | 150 | toggerContainer(R.id.next_button, View.VISIBLE); |
111 | 147 | 151 | ||
112 | === modified file 'app/src/main/java/org/openlp/android2/api/Api.java' | |||
113 | --- app/src/main/java/org/openlp/android2/api/Api.java 2015-01-19 21:09:12 +0000 | |||
114 | +++ app/src/main/java/org/openlp/android2/api/Api.java 2016-11-10 19:40:57 +0000 | |||
115 | @@ -1,7 +1,7 @@ | |||
116 | 1 | /****************************************************************************** | 1 | /****************************************************************************** |
117 | 2 | * OpenLP - Open Source Lyrics Projection * | 2 | * OpenLP - Open Source Lyrics Projection * |
118 | 3 | * --------------------------------------------------------------------------- * | 3 | * --------------------------------------------------------------------------- * |
120 | 4 | * Copyright (c) 2011-2015 OpenLP Android Developers * | 4 | * Copyright (c) 2011-2016 OpenLP Android Developers * |
121 | 5 | * --------------------------------------------------------------------------- * | 5 | * --------------------------------------------------------------------------- * |
122 | 6 | * This program is free software; you can redistribute it and/or modify it * | 6 | * This program is free software; you can redistribute it and/or modify it * |
123 | 7 | * under the terms of the GNU General Public License as published by the Free * | 7 | * under the terms of the GNU General Public License as published by the Free * |
124 | 8 | 8 | ||
125 | === modified file 'app/src/main/java/org/openlp/android2/common/JsonHelpers.java' | |||
126 | --- app/src/main/java/org/openlp/android2/common/JsonHelpers.java 2015-11-22 14:56:47 +0000 | |||
127 | +++ app/src/main/java/org/openlp/android2/common/JsonHelpers.java 2016-11-10 19:40:57 +0000 | |||
128 | @@ -1,7 +1,7 @@ | |||
129 | 1 | /****************************************************************************** | 1 | /****************************************************************************** |
130 | 2 | * OpenLP - Open Source Lyrics Projection * | 2 | * OpenLP - Open Source Lyrics Projection * |
131 | 3 | * --------------------------------------------------------------------------- * | 3 | * --------------------------------------------------------------------------- * |
133 | 4 | * Copyright (c) 2011-2015 OpenLP Android Developers * | 4 | * Copyright (c) 2011-2016 OpenLP Android Developers * |
134 | 5 | * --------------------------------------------------------------------------- * | 5 | * --------------------------------------------------------------------------- * |
135 | 6 | * This program is free software; you can redistribute it and/or modify it * | 6 | * This program is free software; you can redistribute it and/or modify it * |
136 | 7 | * under the terms of the GNU General Public License as published by the Free * | 7 | * under the terms of the GNU General Public License as published by the Free * |
137 | @@ -18,6 +18,8 @@ | |||
138 | 18 | *******************************************************************************/ | 18 | *******************************************************************************/ |
139 | 19 | package org.openlp.android2.common; | 19 | package org.openlp.android2.common; |
140 | 20 | 20 | ||
141 | 21 | import android.util.Log; | ||
142 | 22 | |||
143 | 21 | import org.json.JSONException; | 23 | import org.json.JSONException; |
144 | 22 | import org.json.JSONObject; | 24 | import org.json.JSONObject; |
145 | 23 | import org.json.JSONStringer; | 25 | import org.json.JSONStringer; |
146 | @@ -37,6 +39,7 @@ | |||
147 | 37 | responseJSON = new JSONStringer().object().key("request").value(jo) | 39 | responseJSON = new JSONStringer().object().key("request").value(jo) |
148 | 38 | .endObject().toString(); | 40 | .endObject().toString(); |
149 | 39 | responseJSON = URLEncoder.encode(responseJSON, "UTF-8"); | 41 | responseJSON = URLEncoder.encode(responseJSON, "UTF-8"); |
150 | 42 | Log.d(LOG_TAG, String.format("createRequestJSON: %s : %s : %s", key, value, responseJSON)); | ||
151 | 40 | return responseJSON; | 43 | return responseJSON; |
152 | 41 | } catch (JSONException e) { | 44 | } catch (JSONException e) { |
153 | 42 | throw new JSONHandlerException(e); | 45 | throw new JSONHandlerException(e); |
154 | 43 | 46 | ||
155 | === modified file 'app/src/main/java/org/openlp/android2/common/NavigationOptions.java' | |||
156 | --- app/src/main/java/org/openlp/android2/common/NavigationOptions.java 2015-10-18 18:43:08 +0000 | |||
157 | +++ app/src/main/java/org/openlp/android2/common/NavigationOptions.java 2016-11-10 19:40:57 +0000 | |||
158 | @@ -1,7 +1,7 @@ | |||
159 | 1 | /****************************************************************************** | 1 | /****************************************************************************** |
160 | 2 | * OpenLP - Open Source Lyrics Projection * | 2 | * OpenLP - Open Source Lyrics Projection * |
161 | 3 | * --------------------------------------------------------------------------- * | 3 | * --------------------------------------------------------------------------- * |
163 | 4 | * Copyright (c) 2011-2015 OpenLP Android Developers * | 4 | * Copyright (c) 2011-2016 OpenLP Android Developers * |
164 | 5 | * --------------------------------------------------------------------------- * | 5 | * --------------------------------------------------------------------------- * |
165 | 6 | * This program is free software; you can redistribute it and/or modify it * | 6 | * This program is free software; you can redistribute it and/or modify it * |
166 | 7 | * under the terms of the GNU General Public License as published by the Free * | 7 | * under the terms of the GNU General Public License as published by the Free * |
167 | 8 | 8 | ||
168 | === modified file 'app/src/main/java/org/openlp/android2/common/OpenLPFragment.java' | |||
169 | --- app/src/main/java/org/openlp/android2/common/OpenLPFragment.java 2015-10-06 22:40:40 +0000 | |||
170 | +++ app/src/main/java/org/openlp/android2/common/OpenLPFragment.java 2016-11-10 19:40:57 +0000 | |||
171 | @@ -1,7 +1,7 @@ | |||
172 | 1 | /****************************************************************************** | 1 | /****************************************************************************** |
173 | 2 | * OpenLP - Open Source Lyrics Projection * | 2 | * OpenLP - Open Source Lyrics Projection * |
174 | 3 | * --------------------------------------------------------------------------- * | 3 | * --------------------------------------------------------------------------- * |
176 | 4 | * Copyright (c) 2011-2015 OpenLP Android Developers * | 4 | * Copyright (c) 2011-2016 OpenLP Android Developers * |
177 | 5 | * --------------------------------------------------------------------------- * | 5 | * --------------------------------------------------------------------------- * |
178 | 6 | * This program is free software; you can redistribute it and/or modify it * | 6 | * This program is free software; you can redistribute it and/or modify it * |
179 | 7 | * under the terms of the GNU General Public License as published by the Free * | 7 | * under the terms of the GNU General Public License as published by the Free * |
180 | @@ -26,18 +26,30 @@ | |||
181 | 26 | 26 | ||
182 | 27 | import android.widget.ListView; | 27 | import android.widget.ListView; |
183 | 28 | import android.widget.Toast; | 28 | import android.widget.Toast; |
187 | 29 | import com.loopj.android.http.AsyncHttpClient; | 29 | |
188 | 30 | import com.loopj.android.http.TextHttpResponseHandler; | 30 | import com.android.volley.AuthFailureError; |
189 | 31 | import org.apache.http.Header; | 31 | import com.android.volley.ClientError; |
190 | 32 | import com.android.volley.DefaultRetryPolicy; | ||
191 | 33 | import com.android.volley.NetworkError; | ||
192 | 34 | import com.android.volley.NoConnectionError; | ||
193 | 35 | import com.android.volley.ParseError; | ||
194 | 36 | import com.android.volley.Request; | ||
195 | 37 | import com.android.volley.Response; | ||
196 | 38 | import com.android.volley.ServerError; | ||
197 | 39 | import com.android.volley.TimeoutError; | ||
198 | 40 | import com.android.volley.VolleyError; | ||
199 | 41 | import com.android.volley.toolbox.StringRequest; | ||
200 | 32 | import org.openlp.android2.R; | 42 | import org.openlp.android2.R; |
201 | 33 | import org.openlp.android2.api.Api; | 43 | import org.openlp.android2.api.Api; |
202 | 34 | 44 | ||
203 | 45 | import java.util.HashMap; | ||
204 | 46 | import java.util.Map; | ||
205 | 47 | |||
206 | 35 | abstract public class OpenLPFragment extends ListFragment{ | 48 | abstract public class OpenLPFragment extends ListFragment{ |
207 | 36 | 49 | ||
208 | 37 | private String LOG_TAG = OpenLPFragment.class.getName(); | 50 | private String LOG_TAG = OpenLPFragment.class.getName(); |
209 | 38 | public Context context; | 51 | public Context context; |
212 | 39 | protected String calledURL; | 52 | protected String urlcalled; |
211 | 40 | protected OpenLPHttpClient httpClient; | ||
213 | 41 | protected String updateUrl; | 53 | protected String updateUrl; |
214 | 42 | 54 | ||
215 | 43 | abstract public void itemClicked(int position); | 55 | abstract public void itemClicked(int position); |
216 | @@ -48,42 +60,71 @@ | |||
217 | 48 | itemClicked(position); | 60 | itemClicked(position); |
218 | 49 | } | 61 | } |
219 | 50 | 62 | ||
220 | 51 | private static AsyncHttpClient client = new AsyncHttpClient(); | ||
221 | 52 | |||
222 | 53 | protected void refreshDisplay(){} | 63 | protected void refreshDisplay(){} |
223 | 54 | protected void populateDisplay(String responseString, boolean inError) {} | 64 | protected void populateDisplay(String responseString, boolean inError) {} |
224 | 55 | protected void processUpdate(String responseString, boolean inError) {} | 65 | protected void processUpdate(String responseString, boolean inError) {} |
225 | 56 | 66 | ||
256 | 57 | protected void triggerTextRequest(String url) { | 67 | protected void triggerTextRequest(final String urlbase) { |
257 | 58 | calledURL = url; | 68 | String url = RequestQueueService.getInstance(this.context).getUrl(urlbase); |
258 | 59 | Log.d(LOG_TAG, "Trigger Request for url " + url); | 69 | updateUrl = urlbase; |
259 | 60 | String callurl = String.format("%s%s", httpClient.getAbsoluteUrl(client), url ); | 70 | |
260 | 61 | client.get(callurl, null, new TextHttpResponseHandler() { | 71 | StringRequest request = new StringRequest( |
261 | 62 | @Override | 72 | Request.Method.GET, |
262 | 63 | public void onSuccess(int statusCode, Header[] headers, String responseString) { | 73 | url, |
263 | 64 | // called when response HTTP status is "200 OK" | 74 | listener, |
264 | 65 | manageResponse(responseString, true); | 75 | errorListener) { |
265 | 66 | } | 76 | |
266 | 67 | @Override | 77 | @Override |
267 | 68 | public void onFailure(int statusCode, Header[] headers, String responseString, Throwable throwable) { | 78 | public Map<String, String> getHeaders() throws AuthFailureError { |
268 | 69 | // called when response HTTP status is "4XX" (eg. 401, 403, 404) | 79 | return createBasicAuthHeader("user", "passwd"); |
269 | 70 | if (statusCode == 401) { | 80 | } |
270 | 71 | Toast.makeText(context, R.string.httpreturn_unauthorised, Toast.LENGTH_LONG).show(); | 81 | }; |
271 | 72 | } else { | 82 | //Set a retry policy in case of SocketTimeout & ConnectionTimeout Exceptions. |
272 | 73 | Toast.makeText(context, R.string.unable, Toast.LENGTH_LONG).show(); | 83 | // Volley does retry for you if you have specified the policy. |
273 | 74 | } | 84 | request.setRetryPolicy(new DefaultRetryPolicy( |
274 | 75 | manageResponse(responseString, false); | 85 | RequestQueueService.getInstance(this.context).getConnectionTimeout(), |
275 | 76 | } | 86 | DefaultRetryPolicy.DEFAULT_MAX_RETRIES, DefaultRetryPolicy.DEFAULT_BACKOFF_MULT)); |
276 | 77 | }); | 87 | request.setTag("OpenLP"); |
277 | 78 | } | 88 | RequestQueueService.getInstance(this.context).addToRequestQueue(request); |
278 | 79 | 89 | } | |
279 | 80 | public void manageResponse(String response, boolean notInError) { | 90 | |
280 | 81 | if (calledURL.equals(updateUrl)) { | 91 | Map<String, String> createBasicAuthHeader(String username, String password) { |
281 | 82 | populateDisplay(response, notInError); | 92 | Map<String, String> headers = new HashMap<String, String>(); |
282 | 83 | }else { | 93 | headers.put("Authorization", RequestQueueService.getInstance(context).getBasicAuth()); |
283 | 84 | processUpdate(response, notInError); | 94 | |
284 | 85 | } | 95 | return headers; |
285 | 86 | } | 96 | } |
286 | 97 | |||
287 | 98 | Response.Listener<String> listener = new Response.Listener<String>() { | ||
288 | 99 | @Override | ||
289 | 100 | public void onResponse(String response) { | ||
290 | 101 | if (urlcalled.equals(updateUrl)) { | ||
291 | 102 | populateDisplay(response, true); | ||
292 | 103 | } else { | ||
293 | 104 | processUpdate(response, true); | ||
294 | 105 | } | ||
295 | 106 | } | ||
296 | 107 | }; | ||
297 | 108 | |||
298 | 109 | Response.ErrorListener errorListener = new Response.ErrorListener() { | ||
299 | 110 | @Override | ||
300 | 111 | public void onErrorResponse(VolleyError error) { | ||
301 | 112 | Log.d(LOG_TAG, String.format("Call response error = %s", error.toString())); | ||
302 | 113 | if (error instanceof NetworkError) { | ||
303 | 114 | } else if (error instanceof ClientError) { | ||
304 | 115 | } else if (error instanceof ServerError) { | ||
305 | 116 | } else if (error instanceof AuthFailureError) { | ||
306 | 117 | Toast.makeText(context, R.string.httpreturn_unauthorised, | ||
307 | 118 | Toast.LENGTH_LONG).show(); | ||
308 | 119 | } else if (error instanceof ParseError) { | ||
309 | 120 | } else if (error instanceof NoConnectionError) { | ||
310 | 121 | } else if (error instanceof TimeoutError) { | ||
311 | 122 | } | ||
312 | 123 | Toast.makeText(context, R.string.unable, | ||
313 | 124 | Toast.LENGTH_LONG).show(); | ||
314 | 125 | |||
315 | 126 | } | ||
316 | 127 | }; | ||
317 | 87 | 128 | ||
318 | 88 | public void next() { | 129 | public void next() { |
319 | 89 | Log.d(LOG_TAG, "Going to next slide"); | 130 | Log.d(LOG_TAG, "Going to next slide"); |
320 | 90 | 131 | ||
321 | === removed file 'app/src/main/java/org/openlp/android2/common/OpenLPSSLSocketFactory.java' | |||
322 | --- app/src/main/java/org/openlp/android2/common/OpenLPSSLSocketFactory.java 2015-01-19 21:09:12 +0000 | |||
323 | +++ app/src/main/java/org/openlp/android2/common/OpenLPSSLSocketFactory.java 1970-01-01 00:00:00 +0000 | |||
324 | @@ -1,66 +0,0 @@ | |||
325 | 1 | /****************************************************************************** | ||
326 | 2 | * OpenLP - Open Source Lyrics Projection * | ||
327 | 3 | * --------------------------------------------------------------------------- * | ||
328 | 4 | * Copyright (c) 2011-2015 OpenLP Android Developers * | ||
329 | 5 | * --------------------------------------------------------------------------- * | ||
330 | 6 | * This program is free software; you can redistribute it and/or modify it * | ||
331 | 7 | * under the terms of the GNU General Public License as published by the Free * | ||
332 | 8 | * Software Foundation; version 2 of the License. * | ||
333 | 9 | * * | ||
334 | 10 | * This program is distributed in the hope that it will be useful, but WITHOUT * | ||
335 | 11 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * | ||
336 | 12 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for * | ||
337 | 13 | * more details. * | ||
338 | 14 | * * | ||
339 | 15 | * You should have received a copy of the GNU General Public License along * | ||
340 | 16 | * with this program; if not, write to the Free Software Foundation, Inc., 59 * | ||
341 | 17 | * Temple Place, Suite 330, Boston, MA 02111-1307 USA * | ||
342 | 18 | *******************************************************************************/ | ||
343 | 19 | package org.openlp.android2.common; | ||
344 | 20 | |||
345 | 21 | import org.apache.http.conn.ssl.SSLSocketFactory; | ||
346 | 22 | |||
347 | 23 | import javax.net.ssl.SSLContext; | ||
348 | 24 | import javax.net.ssl.TrustManager; | ||
349 | 25 | import javax.net.ssl.X509TrustManager; | ||
350 | 26 | import java.io.IOException; | ||
351 | 27 | import java.net.Socket; | ||
352 | 28 | import java.net.UnknownHostException; | ||
353 | 29 | import java.security.*; | ||
354 | 30 | import java.security.cert.CertificateException; | ||
355 | 31 | import java.security.cert.X509Certificate; | ||
356 | 32 | |||
357 | 33 | /** | ||
358 | 34 | * Created by tim on 14/11/14. | ||
359 | 35 | */ | ||
360 | 36 | public class OpenLPSSLSocketFactory extends SSLSocketFactory { | ||
361 | 37 | SSLContext sslContext = SSLContext.getInstance("TLS"); | ||
362 | 38 | |||
363 | 39 | public OpenLPSSLSocketFactory(KeyStore truststore) throws NoSuchAlgorithmException, KeyManagementException, KeyStoreException, UnrecoverableKeyException { | ||
364 | 40 | super(truststore); | ||
365 | 41 | |||
366 | 42 | TrustManager tm = new X509TrustManager() { | ||
367 | 43 | public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException { | ||
368 | 44 | } | ||
369 | 45 | |||
370 | 46 | public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException { | ||
371 | 47 | } | ||
372 | 48 | |||
373 | 49 | public X509Certificate[] getAcceptedIssuers() { | ||
374 | 50 | return null; | ||
375 | 51 | } | ||
376 | 52 | }; | ||
377 | 53 | |||
378 | 54 | sslContext.init(null, new TrustManager[] { tm }, null); | ||
379 | 55 | } | ||
380 | 56 | |||
381 | 57 | @Override | ||
382 | 58 | public Socket createSocket(Socket socket, String host, int port, boolean autoClose) throws IOException, UnknownHostException { | ||
383 | 59 | return sslContext.getSocketFactory().createSocket(socket, host, port, autoClose); | ||
384 | 60 | } | ||
385 | 61 | |||
386 | 62 | @Override | ||
387 | 63 | public Socket createSocket() throws IOException { | ||
388 | 64 | return sslContext.getSocketFactory().createSocket(); | ||
389 | 65 | } | ||
390 | 66 | } | ||
391 | 67 | 0 | ||
392 | === added file 'app/src/main/java/org/openlp/android2/common/OpenLPURLBuilder.java' | |||
393 | --- app/src/main/java/org/openlp/android2/common/OpenLPURLBuilder.java 1970-01-01 00:00:00 +0000 | |||
394 | +++ app/src/main/java/org/openlp/android2/common/OpenLPURLBuilder.java 2016-11-10 19:40:57 +0000 | |||
395 | @@ -0,0 +1,86 @@ | |||
396 | 1 | /****************************************************************************** | ||
397 | 2 | * OpenLP - Open Source Lyrics Projection * | ||
398 | 3 | * --------------------------------------------------------------------------- * | ||
399 | 4 | * Copyright (c) 2011-2016 OpenLP Android Developers * | ||
400 | 5 | * --------------------------------------------------------------------------- * | ||
401 | 6 | * This program is free software; you can redistribute it and/or modify it * | ||
402 | 7 | * under the terms of the GNU General Public License as published by the Free * | ||
403 | 8 | * Software Foundation; version 2 of the License. * | ||
404 | 9 | * * | ||
405 | 10 | * This program is distributed in the hope that it will be useful, but WITHOUT * | ||
406 | 11 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * | ||
407 | 12 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for * | ||
408 | 13 | * more details. * | ||
409 | 14 | * * | ||
410 | 15 | * You should have received a copy of the GNU General Public License along * | ||
411 | 16 | * with this program; if not, write to the Free Software Foundation, Inc., 59 * | ||
412 | 17 | * Temple Place, Suite 330, Boston, MA 02111-1307 USA * | ||
413 | 18 | *******************************************************************************/ | ||
414 | 19 | package org.openlp.android2.common; | ||
415 | 20 | |||
416 | 21 | import android.content.Context; | ||
417 | 22 | import android.content.SharedPreferences; | ||
418 | 23 | import android.preference.PreferenceManager; | ||
419 | 24 | import android.util.Base64; | ||
420 | 25 | import android.util.Log; | ||
421 | 26 | |||
422 | 27 | import org.openlp.android2.R; | ||
423 | 28 | |||
424 | 29 | public class OpenLPURLBuilder { | ||
425 | 30 | private final String LOG_TAG = OpenLPURLBuilder.class.getName(); | ||
426 | 31 | private Context context; | ||
427 | 32 | |||
428 | 33 | private static OpenLPURLBuilder ourInstance = new OpenLPURLBuilder(); | ||
429 | 34 | |||
430 | 35 | public static OpenLPURLBuilder getInstance() { | ||
431 | 36 | return ourInstance; | ||
432 | 37 | } | ||
433 | 38 | |||
434 | 39 | private OpenLPURLBuilder() { | ||
435 | 40 | } | ||
436 | 41 | |||
437 | 42 | public void setContext(Context context) { | ||
438 | 43 | this.context = context; | ||
439 | 44 | } | ||
440 | 45 | |||
441 | 46 | public int getConnectionTimeout() { | ||
442 | 47 | |||
443 | 48 | SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context); | ||
444 | 49 | |||
445 | 50 | int connectionTimeout = context.getResources().getInteger( | ||
446 | 51 | R.integer.connectionTimeoutDefaultValue); | ||
447 | 52 | |||
448 | 53 | if (sharedPrefs.getBoolean(context.getString(R.string.key_enable_custom_timeout), false)) { | ||
449 | 54 | Log.d(LOG_TAG, "Overriding Connection and Socket timeouts"); | ||
450 | 55 | |||
451 | 56 | connectionTimeout = Integer.parseInt(sharedPrefs.getString(context.getString(R.string.key_connection_timeout), | ||
452 | 57 | String.valueOf(context.getResources().getInteger(R.integer.connectionTimeoutDefaultValue)) | ||
453 | 58 | )); | ||
454 | 59 | } | ||
455 | 60 | return connectionTimeout; | ||
456 | 61 | } | ||
457 | 62 | |||
458 | 63 | public String getBasicAuth(){ | ||
459 | 64 | |||
460 | 65 | SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context); | ||
461 | 66 | String userid = sharedPrefs.getString(context.getString(R.string.key_userid), "openlp"); | ||
462 | 67 | String password = sharedPrefs.getString(context.getString(R.string.key_password), "password"); | ||
463 | 68 | |||
464 | 69 | Log.d(LOG_TAG, "Credentials set to " + userid + " : " + password); | ||
465 | 70 | |||
466 | 71 | String credentials = userid + ":" + password; | ||
467 | 72 | return "Basic " + Base64.encodeToString(credentials.getBytes(), Base64.DEFAULT); | ||
468 | 73 | } | ||
469 | 74 | |||
470 | 75 | public String getBaseUrl(){ | ||
471 | 76 | |||
472 | 77 | SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context); | ||
473 | 78 | |||
474 | 79 | String host = sharedPrefs.getString(context.getString(R.string.key_host), | ||
475 | 80 | context.getString(R.string.host_default_value)); | ||
476 | 81 | String port = sharedPrefs.getString(context.getString(R.string.key_port), "4316"); | ||
477 | 82 | |||
478 | 83 | return String.format("http://%s:%s", host, port); | ||
479 | 84 | |||
480 | 85 | } | ||
481 | 86 | } | ||
482 | 0 | 87 | ||
483 | === added file 'app/src/main/java/org/openlp/android2/common/RequestQueueService.java' | |||
484 | --- app/src/main/java/org/openlp/android2/common/RequestQueueService.java 1970-01-01 00:00:00 +0000 | |||
485 | +++ app/src/main/java/org/openlp/android2/common/RequestQueueService.java 2016-11-10 19:40:57 +0000 | |||
486 | @@ -0,0 +1,99 @@ | |||
487 | 1 | /****************************************************************************** | ||
488 | 2 | * OpenLP - Open Source Lyrics Projection * | ||
489 | 3 | * --------------------------------------------------------------------------- * | ||
490 | 4 | * Copyright (c) 2011-2016 OpenLP Android Developers * | ||
491 | 5 | * --------------------------------------------------------------------------- * | ||
492 | 6 | * This program is free software; you can redistribute it and/or modify it * | ||
493 | 7 | * under the terms of the GNU General Public License as published by the Free * | ||
494 | 8 | * Software Foundation; version 2 of the License. * | ||
495 | 9 | * * | ||
496 | 10 | * This program is distributed in the hope that it will be useful, but WITHOUT * | ||
497 | 11 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * | ||
498 | 12 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for * | ||
499 | 13 | * more details. * | ||
500 | 14 | * * | ||
501 | 15 | * You should have received a copy of the GNU General Public License along * | ||
502 | 16 | * with this program; if not, write to the Free Software Foundation, Inc., 59 * | ||
503 | 17 | * Temple Place, Suite 330, Boston, MA 02111-1307 USA * | ||
504 | 18 | *******************************************************************************/ | ||
505 | 19 | package org.openlp.android2.common; | ||
506 | 20 | |||
507 | 21 | import android.content.Context; | ||
508 | 22 | import android.graphics.Bitmap; | ||
509 | 23 | import android.util.Base64; | ||
510 | 24 | import android.util.LruCache; | ||
511 | 25 | |||
512 | 26 | import com.android.volley.AuthFailureError; | ||
513 | 27 | import com.android.volley.Request; | ||
514 | 28 | import com.android.volley.RequestQueue; | ||
515 | 29 | import com.android.volley.toolbox.HurlStack; | ||
516 | 30 | import com.android.volley.toolbox.ImageLoader; | ||
517 | 31 | import com.android.volley.toolbox.Volley; | ||
518 | 32 | |||
519 | 33 | import java.util.HashMap; | ||
520 | 34 | import java.util.Map; | ||
521 | 35 | |||
522 | 36 | public class RequestQueueService { | ||
523 | 37 | |||
524 | 38 | private static RequestQueueService mInstance; | ||
525 | 39 | private RequestQueue mRequestQueue; | ||
526 | 40 | private ImageLoader mImageLoader; | ||
527 | 41 | private static Context mCtx; | ||
528 | 42 | |||
529 | 43 | private RequestQueueService(Context context) { | ||
530 | 44 | mCtx = context; | ||
531 | 45 | mRequestQueue = getRequestQueue(); | ||
532 | 46 | |||
533 | 47 | mImageLoader = new ImageLoader(mRequestQueue, | ||
534 | 48 | new ImageLoader.ImageCache() { | ||
535 | 49 | private final LruCache<String, Bitmap> cache = new LruCache<String, Bitmap>(20); | ||
536 | 50 | |||
537 | 51 | @Override | ||
538 | 52 | public Bitmap getBitmap(String url) { | ||
539 | 53 | return cache.get(url); | ||
540 | 54 | } | ||
541 | 55 | |||
542 | 56 | @Override | ||
543 | 57 | public void putBitmap(String url, Bitmap bitmap) { | ||
544 | 58 | cache.put(url, bitmap); | ||
545 | 59 | } | ||
546 | 60 | }); | ||
547 | 61 | } | ||
548 | 62 | |||
549 | 63 | public static synchronized RequestQueueService getInstance(Context context) { | ||
550 | 64 | if (mInstance == null) { | ||
551 | 65 | mInstance = new RequestQueueService(context); | ||
552 | 66 | } | ||
553 | 67 | return mInstance; | ||
554 | 68 | } | ||
555 | 69 | |||
556 | 70 | public RequestQueue getRequestQueue() { | ||
557 | 71 | if (mRequestQueue == null) { | ||
558 | 72 | // getApplicationContext() is key, it keeps you from leaking the | ||
559 | 73 | // Activity or BroadcastReceiver if someone passes one in. | ||
560 | 74 | mRequestQueue = Volley.newRequestQueue(mCtx.getApplicationContext()); | ||
561 | 75 | } | ||
562 | 76 | return mRequestQueue; | ||
563 | 77 | } | ||
564 | 78 | |||
565 | 79 | public String getUrl(String url){ | ||
566 | 80 | return String.format("%s%s", OpenLPURLBuilder.getInstance().getBaseUrl(), url ); | ||
567 | 81 | } | ||
568 | 82 | |||
569 | 83 | public String getBasicAuth(){ | ||
570 | 84 | return OpenLPURLBuilder.getInstance().getBasicAuth(); | ||
571 | 85 | } | ||
572 | 86 | |||
573 | 87 | public int getConnectionTimeout(){ | ||
574 | 88 | return OpenLPURLBuilder.getInstance().getConnectionTimeout(); | ||
575 | 89 | } | ||
576 | 90 | |||
577 | 91 | public <T> void addToRequestQueue(Request<T> req) { | ||
578 | 92 | getRequestQueue().add(req); | ||
579 | 93 | } | ||
580 | 94 | |||
581 | 95 | public ImageLoader getImageLoader() { | ||
582 | 96 | return mImageLoader; | ||
583 | 97 | } | ||
584 | 98 | } | ||
585 | 99 | |||
586 | 0 | 100 | ||
587 | === added file 'app/src/main/java/org/openlp/android2/common/StateHolder.java' | |||
588 | --- app/src/main/java/org/openlp/android2/common/StateHolder.java 1970-01-01 00:00:00 +0000 | |||
589 | +++ app/src/main/java/org/openlp/android2/common/StateHolder.java 2016-11-10 19:40:57 +0000 | |||
590 | @@ -0,0 +1,22 @@ | |||
591 | 1 | package org.openlp.android2.common; | ||
592 | 2 | |||
593 | 3 | import android.content.Context; | ||
594 | 4 | |||
595 | 5 | /** | ||
596 | 6 | * Created by tim on 14/08/16. | ||
597 | 7 | */ | ||
598 | 8 | public class StateHolder { | ||
599 | 9 | private static StateHolder ourInstance = new StateHolder(); | ||
600 | 10 | private static Context context; | ||
601 | 11 | |||
602 | 12 | public static StateHolder getInstance() { | ||
603 | 13 | return ourInstance; | ||
604 | 14 | } | ||
605 | 15 | |||
606 | 16 | private StateHolder() { | ||
607 | 17 | } | ||
608 | 18 | |||
609 | 19 | public void setContext(Context context) { | ||
610 | 20 | this.context = context; | ||
611 | 21 | } | ||
612 | 22 | } | ||
613 | 0 | 23 | ||
614 | === modified file 'app/src/main/java/org/openlp/android2/dialogs/AlertDisplayDialog.java' | |||
615 | --- app/src/main/java/org/openlp/android2/dialogs/AlertDisplayDialog.java 2015-01-19 21:09:12 +0000 | |||
616 | +++ app/src/main/java/org/openlp/android2/dialogs/AlertDisplayDialog.java 2016-11-10 19:40:57 +0000 | |||
617 | @@ -1,7 +1,7 @@ | |||
618 | 1 | /****************************************************************************** | 1 | /****************************************************************************** |
619 | 2 | * OpenLP - Open Source Lyrics Projection * | 2 | * OpenLP - Open Source Lyrics Projection * |
620 | 3 | * --------------------------------------------------------------------------- * | 3 | * --------------------------------------------------------------------------- * |
622 | 4 | * Copyright (c) 2011-2015 OpenLP Android Developers * | 4 | * Copyright (c) 2011-2016 OpenLP Android Developers * |
623 | 5 | * --------------------------------------------------------------------------- * | 5 | * --------------------------------------------------------------------------- * |
624 | 6 | * This program is free software; you can redistribute it and/or modify it * | 6 | * This program is free software; you can redistribute it and/or modify it * |
625 | 7 | * under the terms of the GNU General Public License as published by the Free * | 7 | * under the terms of the GNU General Public License as published by the Free * |
626 | @@ -32,7 +32,6 @@ | |||
627 | 32 | import org.openlp.android2.api.Api; | 32 | import org.openlp.android2.api.Api; |
628 | 33 | import org.openlp.android2.common.JsonHelpers; | 33 | import org.openlp.android2.common.JsonHelpers; |
629 | 34 | import org.openlp.android2.common.OpenLPDialog; | 34 | import org.openlp.android2.common.OpenLPDialog; |
630 | 35 | import org.openlp.android2.common.OpenLPHttpClient; | ||
631 | 36 | 35 | ||
632 | 37 | public class AlertDisplayDialog extends OpenLPDialog { | 36 | public class AlertDisplayDialog extends OpenLPDialog { |
633 | 38 | private final String LOG_TAG = AlertDisplayDialog.class.getName(); | 37 | private final String LOG_TAG = AlertDisplayDialog.class.getName(); |
634 | @@ -49,7 +48,6 @@ | |||
635 | 49 | // remove the dialog title, but you must call the superclass to get the Dialog. | 48 | // remove the dialog title, but you must call the superclass to get the Dialog. |
636 | 50 | 49 | ||
637 | 51 | context = getActivity(); | 50 | context = getActivity(); |
638 | 52 | httpClient = new OpenLPHttpClient(context); | ||
639 | 53 | 51 | ||
640 | 54 | AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); | 52 | AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); |
641 | 55 | // Get the layout inflater | 53 | // Get the layout inflater |
642 | 56 | 54 | ||
643 | === modified file 'app/src/main/java/org/openlp/android2/dialogs/BlankDisplayDialog.java' | |||
644 | --- app/src/main/java/org/openlp/android2/dialogs/BlankDisplayDialog.java 2015-09-20 21:02:37 +0000 | |||
645 | +++ app/src/main/java/org/openlp/android2/dialogs/BlankDisplayDialog.java 2016-11-10 19:40:57 +0000 | |||
646 | @@ -1,7 +1,7 @@ | |||
647 | 1 | /****************************************************************************** | 1 | /****************************************************************************** |
648 | 2 | * OpenLP - Open Source Lyrics Projection * | 2 | * OpenLP - Open Source Lyrics Projection * |
649 | 3 | * --------------------------------------------------------------------------- * | 3 | * --------------------------------------------------------------------------- * |
651 | 4 | * Copyright (c) 2011-2015 OpenLP Android Developers * | 4 | * Copyright (c) 2011-2016 OpenLP Android Developers * |
652 | 5 | * --------------------------------------------------------------------------- * | 5 | * --------------------------------------------------------------------------- * |
653 | 6 | * This program is free software; you can redistribute it and/or modify it * | 6 | * This program is free software; you can redistribute it and/or modify it * |
654 | 7 | * under the terms of the GNU General Public License as published by the Free * | 7 | * under the terms of the GNU General Public License as published by the Free * |
655 | @@ -35,10 +35,10 @@ | |||
656 | 35 | import org.openlp.android2.api.Api; | 35 | import org.openlp.android2.api.Api; |
657 | 36 | 36 | ||
658 | 37 | import org.openlp.android2.common.OpenLPDialog; | 37 | import org.openlp.android2.common.OpenLPDialog; |
659 | 38 | import org.openlp.android2.common.OpenLPHttpClient; | ||
660 | 39 | 38 | ||
661 | 40 | public class BlankDisplayDialog extends OpenLPDialog { | 39 | public class BlankDisplayDialog extends OpenLPDialog { |
662 | 41 | private final String LOG_TAG = BlankDisplayDialog.class.getName(); | 40 | private final String LOG_TAG = BlankDisplayDialog.class.getName(); |
663 | 41 | |||
664 | 42 | public AlertDialog dialog; | 42 | public AlertDialog dialog; |
665 | 43 | RadioButton desktop; | 43 | RadioButton desktop; |
666 | 44 | RadioButton screen; | 44 | RadioButton screen; |
667 | @@ -56,8 +56,6 @@ | |||
668 | 56 | // remove the dialog title, but you must call the superclass to get the Dialog. | 56 | // remove the dialog title, but you must call the superclass to get the Dialog. |
669 | 57 | 57 | ||
670 | 58 | context = getActivity(); | 58 | context = getActivity(); |
671 | 59 | httpClient = new OpenLPHttpClient(context); | ||
672 | 60 | |||
673 | 61 | AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); | 59 | AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); |
674 | 62 | // Get the layout inflater | 60 | // Get the layout inflater |
675 | 63 | LayoutInflater inflater = getActivity().getLayoutInflater(); | 61 | LayoutInflater inflater = getActivity().getLayoutInflater(); |
676 | @@ -147,8 +145,8 @@ | |||
677 | 147 | } | 145 | } |
678 | 148 | } | 146 | } |
679 | 149 | 147 | ||
682 | 150 | public void errorDisplay(int statusCode, String responseString) { | 148 | public void errorDisplay(String responseString) { |
683 | 151 | Log.d(LOG_TAG, String.format("URL Error status code %d text %s", statusCode, responseString)); | 149 | Log.d(LOG_TAG, String.format("URL Error text %s", responseString)); |
684 | 152 | reset_display(); | 150 | reset_display(); |
685 | 153 | } | 151 | } |
686 | 154 | 152 | ||
687 | 155 | 153 | ||
688 | === added file 'app/src/main/java/org/openlp/android2/dialogs/SearchSelectionDialog.java' | |||
689 | --- app/src/main/java/org/openlp/android2/dialogs/SearchSelectionDialog.java 1970-01-01 00:00:00 +0000 | |||
690 | +++ app/src/main/java/org/openlp/android2/dialogs/SearchSelectionDialog.java 2016-11-10 19:40:57 +0000 | |||
691 | @@ -0,0 +1,135 @@ | |||
692 | 1 | /****************************************************************************** | ||
693 | 2 | * OpenLP - Open Source Lyrics Projection * | ||
694 | 3 | * --------------------------------------------------------------------------- * | ||
695 | 4 | * Copyright (c) 2011-2015 OpenLP Android Developers * | ||
696 | 5 | * --------------------------------------------------------------------------- * | ||
697 | 6 | * This program is free software; you can redistribute it and/or modify it * | ||
698 | 7 | * under the terms of the GNU General Public License as published by the Free * | ||
699 | 8 | * Software Foundation; version 2 of the License. * | ||
700 | 9 | * * | ||
701 | 10 | * This program is distributed in the hope that it will be useful, but WITHOUT * | ||
702 | 11 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * | ||
703 | 12 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for * | ||
704 | 13 | * more details. * | ||
705 | 14 | * * | ||
706 | 15 | * You should have received a copy of the GNU General Public License along * | ||
707 | 16 | * with this program; if not, write to the Free Software Foundation, Inc., 59 * | ||
708 | 17 | * Temple Place, Suite 330, Boston, MA 02111-1307 USA * | ||
709 | 18 | *******************************************************************************/ | ||
710 | 19 | package org.openlp.android2.dialogs; | ||
711 | 20 | |||
712 | 21 | import android.app.AlertDialog; | ||
713 | 22 | import android.app.Dialog; | ||
714 | 23 | import android.content.DialogInterface; | ||
715 | 24 | import android.os.Bundle; | ||
716 | 25 | import android.util.Log; | ||
717 | 26 | import android.view.LayoutInflater; | ||
718 | 27 | import android.view.View; | ||
719 | 28 | import android.widget.Button; | ||
720 | 29 | import android.widget.RadioButton; | ||
721 | 30 | import android.widget.Toast; | ||
722 | 31 | import org.openlp.android2.R; | ||
723 | 32 | import org.openlp.android2.api.Api; | ||
724 | 33 | import org.openlp.android2.common.JsonHelpers; | ||
725 | 34 | import org.openlp.android2.common.OpenLPDialog; | ||
726 | 35 | |||
727 | 36 | public class SearchSelectionDialog extends OpenLPDialog { | ||
728 | 37 | private final String LOG_TAG = SearchSelectionDialog.class.getName(); | ||
729 | 38 | public AlertDialog dialog; | ||
730 | 39 | private String key; | ||
731 | 40 | private String plugin; | ||
732 | 41 | private String text; | ||
733 | 42 | private RadioButton sendLive; | ||
734 | 43 | private RadioButton addToService; | ||
735 | 44 | |||
736 | 45 | /** | ||
737 | 46 | * The system calls this only when creating the layout in a dialog. | ||
738 | 47 | */ | ||
739 | 48 | @Override | ||
740 | 49 | public Dialog onCreateDialog(Bundle savedInstanceState) { | ||
741 | 50 | // The only reason you might override this method when using onCreateView() is | ||
742 | 51 | // to modify any dialog characteristics. For example, the dialog includes a | ||
743 | 52 | // title by default, but your custom layout might not need it. So here you can | ||
744 | 53 | // remove the dialog title, but you must call the superclass to get the Dialog. | ||
745 | 54 | |||
746 | 55 | key = getArguments().getString("key"); | ||
747 | 56 | plugin = getArguments().getString("plugin"); | ||
748 | 57 | text = getArguments().getString("text"); | ||
749 | 58 | |||
750 | 59 | Log.d(LOG_TAG, String.format("onCreateDialog %s : %s : %s", key, plugin, text)); | ||
751 | 60 | |||
752 | 61 | context = getActivity(); | ||
753 | 62 | |||
754 | 63 | AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); | ||
755 | 64 | // Get the layout inflater | ||
756 | 65 | LayoutInflater inflater = getActivity().getLayoutInflater(); | ||
757 | 66 | |||
758 | 67 | // Inflate and set the layout for the dialog | ||
759 | 68 | // Pass null as the parent view because its going in the dialog layout | ||
760 | 69 | View view = inflater.inflate(R.layout.search_action_dialog, null); | ||
761 | 70 | builder.setView(view); | ||
762 | 71 | |||
763 | 72 | sendLive = (RadioButton) view.findViewById(R.id.buttonLive); | ||
764 | 73 | sendLive.setOnClickListener(new View.OnClickListener() { | ||
765 | 74 | @Override | ||
766 | 75 | public void onClick(View v) { | ||
767 | 76 | createLive(); | ||
768 | 77 | SearchSelectionDialog.this.getDialog().cancel(); | ||
769 | 78 | } | ||
770 | 79 | }); | ||
771 | 80 | |||
772 | 81 | addToService = (RadioButton) view.findViewById(R.id.buttonService); | ||
773 | 82 | addToService.setOnClickListener(new View.OnClickListener() { | ||
774 | 83 | @Override | ||
775 | 84 | public void onClick(View v) { | ||
776 | 85 | createService(); | ||
777 | 86 | SearchSelectionDialog.this.getDialog().cancel(); | ||
778 | 87 | } | ||
779 | 88 | }); | ||
780 | 89 | |||
781 | 90 | builder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { | ||
782 | 91 | public void onClick(DialogInterface dialog, int id) { | ||
783 | 92 | SearchSelectionDialog.this.getDialog().cancel(); | ||
784 | 93 | } | ||
785 | 94 | }); | ||
786 | 95 | dialog = builder.create(); | ||
787 | 96 | dialog.setOnShowListener(new DialogInterface.OnShowListener() { | ||
788 | 97 | @Override | ||
789 | 98 | public void onShow(DialogInterface dialogI) { | ||
790 | 99 | Button btnNegative = dialog.getButton(Dialog.BUTTON_NEGATIVE); | ||
791 | 100 | btnNegative.setTextSize(20); | ||
792 | 101 | } | ||
793 | 102 | }); | ||
794 | 103 | return dialog; | ||
795 | 104 | } | ||
796 | 105 | |||
797 | 106 | @Override | ||
798 | 107 | public void onResume() { | ||
799 | 108 | super.onResume(); | ||
800 | 109 | Log.d(LOG_TAG, "Resuming..."); | ||
801 | 110 | } | ||
802 | 111 | |||
803 | 112 | public void createLive() { | ||
804 | 113 | try { | ||
805 | 114 | String request = JsonHelpers.createRequestJSON("id", text); | ||
806 | 115 | String url = String.format(Api.SEARCH_PLUGIN_LIVE, plugin.toLowerCase()); | ||
807 | 116 | triggerTextRequest(String.format("%s%s", url, request)); | ||
808 | 117 | Log.d(LOG_TAG, String.format("Setting list data. apiBase(%s), text(%s)", Api.SEARCH_PLUGIN_LIVE, request)); | ||
809 | 118 | } catch (JsonHelpers.JSONHandlerException e) { | ||
810 | 119 | e.printStackTrace(); | ||
811 | 120 | Toast.makeText(context, "Request Failed", Toast.LENGTH_SHORT).show(); | ||
812 | 121 | } | ||
813 | 122 | } | ||
814 | 123 | |||
815 | 124 | public void createService() { | ||
816 | 125 | try { | ||
817 | 126 | String request = JsonHelpers.createRequestJSON("id", text); | ||
818 | 127 | String url = String.format(Api.SEARCH_PLUGIN_ADD, plugin.toLowerCase()); | ||
819 | 128 | triggerTextRequest(String.format("%s%s", url, request)); | ||
820 | 129 | Log.d(LOG_TAG, String.format("Setting list data. apiBase(%s), text(%s)", Api.SEARCH_PLUGIN_ADD, text)); | ||
821 | 130 | } catch (JsonHelpers.JSONHandlerException e) { | ||
822 | 131 | e.printStackTrace(); | ||
823 | 132 | Toast.makeText(context, "Request Failed", Toast.LENGTH_SHORT).show(); | ||
824 | 133 | } | ||
825 | 134 | } | ||
826 | 135 | } | ||
827 | 0 | 136 | ||
828 | === modified file 'app/src/main/java/org/openlp/android2/fragments/AboutFragment.java' | |||
829 | --- app/src/main/java/org/openlp/android2/fragments/AboutFragment.java 2015-10-08 20:52:22 +0000 | |||
830 | +++ app/src/main/java/org/openlp/android2/fragments/AboutFragment.java 2016-11-10 19:40:57 +0000 | |||
831 | @@ -1,7 +1,7 @@ | |||
832 | 1 | /****************************************************************************** | 1 | /****************************************************************************** |
833 | 2 | * OpenLP - Open Source Lyrics Projection * | 2 | * OpenLP - Open Source Lyrics Projection * |
834 | 3 | * --------------------------------------------------------------------------- * | 3 | * --------------------------------------------------------------------------- * |
836 | 4 | * Copyright (c) 2011-2015 OpenLP Android Developers * | 4 | * Copyright (c) 2011-2016 OpenLP Android Developers * |
837 | 5 | * --------------------------------------------------------------------------- * | 5 | * --------------------------------------------------------------------------- * |
838 | 6 | * This program is free software; you can redistribute it and/or modify it * | 6 | * This program is free software; you can redistribute it and/or modify it * |
839 | 7 | * under the terms of the GNU General Public License as published by the Free * | 7 | * under the terms of the GNU General Public License as published by the Free * |
840 | 8 | 8 | ||
841 | === modified file 'app/src/main/java/org/openlp/android2/fragments/HomeFragment.java' | |||
842 | --- app/src/main/java/org/openlp/android2/fragments/HomeFragment.java 2015-01-23 17:53:00 +0000 | |||
843 | +++ app/src/main/java/org/openlp/android2/fragments/HomeFragment.java 2016-11-10 19:40:57 +0000 | |||
844 | @@ -1,7 +1,7 @@ | |||
845 | 1 | /****************************************************************************** | 1 | /****************************************************************************** |
846 | 2 | * OpenLP - Open Source Lyrics Projection * | 2 | * OpenLP - Open Source Lyrics Projection * |
847 | 3 | * --------------------------------------------------------------------------- * | 3 | * --------------------------------------------------------------------------- * |
849 | 4 | * Copyright (c) 2011-2015 OpenLP Android Developers * | 4 | * Copyright (c) 2011-2016 OpenLP Android Developers * |
850 | 5 | * --------------------------------------------------------------------------- * | 5 | * --------------------------------------------------------------------------- * |
851 | 6 | * This program is free software; you can redistribute it and/or modify it * | 6 | * This program is free software; you can redistribute it and/or modify it * |
852 | 7 | * under the terms of the GNU General Public License as published by the Free * | 7 | * under the terms of the GNU General Public License as published by the Free * |
853 | 8 | 8 | ||
854 | === modified file 'app/src/main/java/org/openlp/android2/fragments/LiveListFragment.java' | |||
855 | --- app/src/main/java/org/openlp/android2/fragments/LiveListFragment.java 2015-10-04 21:02:13 +0000 | |||
856 | +++ app/src/main/java/org/openlp/android2/fragments/LiveListFragment.java 2016-11-10 19:40:57 +0000 | |||
857 | @@ -1,7 +1,7 @@ | |||
858 | 1 | /****************************************************************************** | 1 | /****************************************************************************** |
859 | 2 | * OpenLP - Open Source Lyrics Projection * | 2 | * OpenLP - Open Source Lyrics Projection * |
860 | 3 | * --------------------------------------------------------------------------- * | 3 | * --------------------------------------------------------------------------- * |
862 | 4 | * Copyright (c) 2011-2015 OpenLP Android Developers * | 4 | * Copyright (c) 2011-2016 OpenLP Android Developers * |
863 | 5 | * --------------------------------------------------------------------------- * | 5 | * --------------------------------------------------------------------------- * |
864 | 6 | * This program is free software; you can redistribute it and/or modify it * | 6 | * This program is free software; you can redistribute it and/or modify it * |
865 | 7 | * under the terms of the GNU General Public License as published by the Free * | 7 | * under the terms of the GNU General Public License as published by the Free * |
866 | @@ -42,7 +42,6 @@ | |||
867 | 42 | import org.openlp.android2.api.Api; | 42 | import org.openlp.android2.api.Api; |
868 | 43 | import org.openlp.android2.common.JsonHelpers; | 43 | import org.openlp.android2.common.JsonHelpers; |
869 | 44 | import org.openlp.android2.common.OpenLPFragment; | 44 | import org.openlp.android2.common.OpenLPFragment; |
870 | 45 | import org.openlp.android2.common.OpenLPHttpClient; | ||
871 | 46 | 45 | ||
872 | 47 | import java.util.ArrayList; | 46 | import java.util.ArrayList; |
873 | 48 | import java.util.HashMap; | 47 | import java.util.HashMap; |
874 | @@ -73,8 +72,7 @@ | |||
875 | 73 | @Override | 72 | @Override |
876 | 74 | public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { | 73 | public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { |
877 | 75 | context = getActivity(); | 74 | context = getActivity(); |
880 | 76 | updateUrl = Api.LIVE_TEXT; | 75 | urlcalled = Api.LIVE_TEXT; |
879 | 77 | httpClient = new OpenLPHttpClient(context); | ||
881 | 78 | return super.onCreateView(inflater, container, savedInstanceState); | 76 | return super.onCreateView(inflater, container, savedInstanceState); |
882 | 79 | } | 77 | } |
883 | 80 | 78 | ||
884 | @@ -106,10 +104,10 @@ | |||
885 | 106 | } | 104 | } |
886 | 107 | 105 | ||
887 | 108 | // Keys used in Hashmap | 106 | // Keys used in Hashmap |
889 | 109 | String[] from = {"tag", "liveListNormal", "liveListSelected"}; | 107 | String[] from = {"line", "tag", "liveListNormal", "liveListSelected"}; |
890 | 110 | 108 | ||
891 | 111 | // Ids of views in live_list_fragment | 109 | // Ids of views in live_list_fragment |
893 | 112 | int[] to = {R.id.tag, R.id.liveListNormal, R.id.liveListSelected}; | 110 | int[] to = {R.id.line, R.id.tag, R.id.liveListNormal, R.id.liveListSelected}; |
894 | 113 | 111 | ||
895 | 114 | SharedPreferences prefs = context.getSharedPreferences( | 112 | SharedPreferences prefs = context.getSharedPreferences( |
896 | 115 | context.getString(R.string.key_shared_preferences), | 113 | context.getString(R.string.key_shared_preferences), |
897 | @@ -125,15 +123,21 @@ | |||
898 | 125 | R.layout.fragment_livelist, from, to) { | 123 | R.layout.fragment_livelist, from, to) { |
899 | 126 | public View getView(int position, View convertView, ViewGroup parent) { | 124 | public View getView(int position, View convertView, ViewGroup parent) { |
900 | 127 | View view = super.getView(position, convertView, parent); | 125 | View view = super.getView(position, convertView, parent); |
901 | 126 | // TextView line = (TextView) view.findViewById(R.id.line); | ||
902 | 128 | TextView text1 = (TextView) view.findViewById(R.id.tag); | 127 | TextView text1 = (TextView) view.findViewById(R.id.tag); |
904 | 129 | text1.setTextSize(TypedValue.COMPLEX_UNIT_SP, size); | 128 | if (text1 != null) { |
905 | 129 | text1.setTextSize(TypedValue.COMPLEX_UNIT_SP, size); | ||
906 | 130 | } | ||
907 | 130 | TextView text2 = (TextView) view.findViewById(R.id.liveListNormal); | 131 | TextView text2 = (TextView) view.findViewById(R.id.liveListNormal); |
914 | 131 | text2.setTextSize(TypedValue.COMPLEX_UNIT_SP, size); | 132 | if (text2 != null) { |
915 | 132 | if (selected == position) { | 133 | text2.setTextSize(TypedValue.COMPLEX_UNIT_SP, size); |
916 | 133 | text2.setTextColor(Color.parseColor("#000000")); | 134 | if (selected == position) { |
917 | 134 | text2.setTypeface(null, Typeface.BOLD_ITALIC); | 135 | text2.setTypeface(null, Typeface.BOLD_ITALIC); |
918 | 135 | } else{ | 136 | // line.setBackgroundColor(0xffffff); |
919 | 136 | text2.setTypeface(null, Typeface.NORMAL); | 137 | } else { |
920 | 138 | text2.setTypeface(null, Typeface.NORMAL); | ||
921 | 139 | // line.setBackgroundColor(0xffffff); | ||
922 | 140 | } | ||
923 | 137 | } | 141 | } |
924 | 138 | return view; | 142 | return view; |
925 | 139 | 143 | ||
926 | 140 | 144 | ||
927 | === modified file 'app/src/main/java/org/openlp/android2/fragments/LiveWebFragment.java' | |||
928 | --- app/src/main/java/org/openlp/android2/fragments/LiveWebFragment.java 2015-01-23 17:53:00 +0000 | |||
929 | +++ app/src/main/java/org/openlp/android2/fragments/LiveWebFragment.java 2016-11-10 19:40:57 +0000 | |||
930 | @@ -1,7 +1,7 @@ | |||
931 | 1 | /****************************************************************************** | 1 | /****************************************************************************** |
932 | 2 | * OpenLP - Open Source Lyrics Projection * | 2 | * OpenLP - Open Source Lyrics Projection * |
933 | 3 | * --------------------------------------------------------------------------- * | 3 | * --------------------------------------------------------------------------- * |
935 | 4 | * Copyright (c) 2011-2015 OpenLP Android Developers * | 4 | * Copyright (c) 2011-2016 OpenLP Android Developers * |
936 | 5 | * --------------------------------------------------------------------------- * | 5 | * --------------------------------------------------------------------------- * |
937 | 6 | * This program is free software; you can redistribute it and/or modify it * | 6 | * This program is free software; you can redistribute it and/or modify it * |
938 | 7 | * under the terms of the GNU General Public License as published by the Free * | 7 | * under the terms of the GNU General Public License as published by the Free * |
939 | 8 | 8 | ||
940 | === modified file 'app/src/main/java/org/openlp/android2/fragments/NavigationDrawerFragment.java' | |||
941 | --- app/src/main/java/org/openlp/android2/fragments/NavigationDrawerFragment.java 2016-01-09 12:39:40 +0000 | |||
942 | +++ app/src/main/java/org/openlp/android2/fragments/NavigationDrawerFragment.java 2016-11-10 19:40:57 +0000 | |||
943 | @@ -1,7 +1,7 @@ | |||
944 | 1 | /****************************************************************************** | 1 | /****************************************************************************** |
945 | 2 | * OpenLP - Open Source Lyrics Projection * | 2 | * OpenLP - Open Source Lyrics Projection * |
946 | 3 | * --------------------------------------------------------------------------- * | 3 | * --------------------------------------------------------------------------- * |
948 | 4 | * Copyright (c) 2011-2015 OpenLP Android Developers * | 4 | * Copyright (c) 2011-2016 OpenLP Android Developers * |
949 | 5 | * --------------------------------------------------------------------------- * | 5 | * --------------------------------------------------------------------------- * |
950 | 6 | * This program is free software; you can redistribute it and/or modify it * | 6 | * This program is free software; you can redistribute it and/or modify it * |
951 | 7 | * under the terms of the GNU General Public License as published by the Free * | 7 | * under the terms of the GNU General Public License as published by the Free * |
952 | 8 | 8 | ||
953 | === added file 'app/src/main/java/org/openlp/android2/fragments/SearchFragment.java' | |||
954 | --- app/src/main/java/org/openlp/android2/fragments/SearchFragment.java 1970-01-01 00:00:00 +0000 | |||
955 | +++ app/src/main/java/org/openlp/android2/fragments/SearchFragment.java 2016-11-10 19:40:57 +0000 | |||
956 | @@ -0,0 +1,357 @@ | |||
957 | 1 | /****************************************************************************** | ||
958 | 2 | * OpenLP - Open Source Lyrics Projection * | ||
959 | 3 | * --------------------------------------------------------------------------- * | ||
960 | 4 | * Copyright (c) 2011-2016 OpenLP Android Developers * | ||
961 | 5 | * --------------------------------------------------------------------------- * | ||
962 | 6 | * This program is free software; you can redistribute it and/or modify it * | ||
963 | 7 | * under the terms of the GNU General Public License as published by the Free * | ||
964 | 8 | * Software Foundation; version 2 of the License. * | ||
965 | 9 | * * | ||
966 | 10 | * This program is distributed in the hope that it will be useful, but WITHOUT * | ||
967 | 11 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * | ||
968 | 12 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for * | ||
969 | 13 | * more details. * | ||
970 | 14 | * * | ||
971 | 15 | * You should have received a copy of the GNU General Public License along * | ||
972 | 16 | * with this program; if not, write to the Free Software Foundation, Inc., 59 * | ||
973 | 17 | * Temple Place, Suite 330, Boston, MA 02111-1307 USA * | ||
974 | 18 | *******************************************************************************/ | ||
975 | 19 | package org.openlp.android2.fragments; | ||
976 | 20 | |||
977 | 21 | import android.app.DialogFragment; | ||
978 | 22 | import android.app.Fragment; | ||
979 | 23 | import android.content.Context; | ||
980 | 24 | import android.os.Bundle; | ||
981 | 25 | import android.util.Log; | ||
982 | 26 | import android.view.KeyEvent; | ||
983 | 27 | import android.view.LayoutInflater; | ||
984 | 28 | import android.view.View; | ||
985 | 29 | import android.view.ViewGroup; | ||
986 | 30 | import android.view.inputmethod.EditorInfo; | ||
987 | 31 | import android.view.inputmethod.InputMethodManager; | ||
988 | 32 | import android.widget.AdapterView; | ||
989 | 33 | import android.widget.ArrayAdapter; | ||
990 | 34 | import android.widget.EditText; | ||
991 | 35 | import android.widget.ListView; | ||
992 | 36 | import android.widget.Spinner; | ||
993 | 37 | import android.widget.TextView; | ||
994 | 38 | import android.widget.Toast; | ||
995 | 39 | |||
996 | 40 | import com.android.volley.AuthFailureError; | ||
997 | 41 | import com.android.volley.ClientError; | ||
998 | 42 | import com.android.volley.DefaultRetryPolicy; | ||
999 | 43 | import com.android.volley.NetworkError; | ||
1000 | 44 | import com.android.volley.NoConnectionError; | ||
1001 | 45 | import com.android.volley.ParseError; | ||
1002 | 46 | import com.android.volley.Request; | ||
1003 | 47 | import com.android.volley.Response; | ||
1004 | 48 | import com.android.volley.ServerError; | ||
1005 | 49 | import com.android.volley.TimeoutError; | ||
1006 | 50 | import com.android.volley.VolleyError; | ||
1007 | 51 | import com.android.volley.toolbox.StringRequest; | ||
1008 | 52 | |||
1009 | 53 | import org.json.JSONArray; | ||
1010 | 54 | import org.json.JSONException; | ||
1011 | 55 | import org.json.JSONObject; | ||
1012 | 56 | import org.openlp.android2.R; | ||
1013 | 57 | import org.openlp.android2.api.Api; | ||
1014 | 58 | import org.openlp.android2.common.JsonHelpers; | ||
1015 | 59 | |||
1016 | 60 | import org.openlp.android2.common.RequestQueueService; | ||
1017 | 61 | import org.openlp.android2.dialogs.SearchSelectionDialog; | ||
1018 | 62 | |||
1019 | 63 | import java.util.ArrayList; | ||
1020 | 64 | import java.util.HashMap; | ||
1021 | 65 | import java.util.List; | ||
1022 | 66 | import java.util.Map; | ||
1023 | 67 | |||
1024 | 68 | /** | ||
1025 | 69 | |||
1026 | 70 | */ | ||
1027 | 71 | public class SearchFragment extends Fragment { | ||
1028 | 72 | |||
1029 | 73 | private final String LOG_TAG = SearchFragment.class.getName(); | ||
1030 | 74 | private Spinner spinner; | ||
1031 | 75 | public Context context; | ||
1032 | 76 | protected String calledURL; | ||
1033 | 77 | protected String updateUrl; | ||
1034 | 78 | protected String searchedPlugin; | ||
1035 | 79 | protected Map<String, String> pluginMap = new HashMap<String, String>(); | ||
1036 | 80 | |||
1037 | 81 | public SearchFragment() { | ||
1038 | 82 | Log.d(LOG_TAG, "Constructor"); | ||
1039 | 83 | } | ||
1040 | 84 | |||
1041 | 85 | public static SearchFragment newInstance() { | ||
1042 | 86 | SearchFragment fragment = new SearchFragment(); | ||
1043 | 87 | return fragment; | ||
1044 | 88 | } | ||
1045 | 89 | |||
1046 | 90 | @Override | ||
1047 | 91 | public void onCreate(Bundle savedInstanceState) { | ||
1048 | 92 | super.onCreate(savedInstanceState); | ||
1049 | 93 | } | ||
1050 | 94 | |||
1051 | 95 | @Override | ||
1052 | 96 | public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { | ||
1053 | 97 | context = getActivity(); | ||
1054 | 98 | updateUrl = Api.SEARCHABLE_PLUGINS; | ||
1055 | 99 | View view = inflater.inflate(R.layout.fragment_search, container, false); | ||
1056 | 100 | spinner = (Spinner) view.findViewById(R.id.search_spinner); | ||
1057 | 101 | triggerTextRequest(Api.SEARCHABLE_PLUGINS); | ||
1058 | 102 | |||
1059 | 103 | // Add search listener to text field | ||
1060 | 104 | final EditText editText = (EditText) view.findViewById(R.id.search_text); | ||
1061 | 105 | editText.setOnEditorActionListener(new TextView.OnEditorActionListener() { | ||
1062 | 106 | @Override | ||
1063 | 107 | public boolean onEditorAction(TextView tv, int actionId, KeyEvent event) { | ||
1064 | 108 | if (actionId == EditorInfo.IME_ACTION_SEARCH) { | ||
1065 | 109 | // Now close the keyboard as finished with | ||
1066 | 110 | View view = getActivity().getCurrentFocus(); | ||
1067 | 111 | if (view != null) { | ||
1068 | 112 | InputMethodManager imm = | ||
1069 | 113 | (InputMethodManager) getActivity().getSystemService(Context.INPUT_METHOD_SERVICE); | ||
1070 | 114 | imm.hideSoftInputFromWindow(view.getWindowToken(), 0); | ||
1071 | 115 | } | ||
1072 | 116 | searchedPlugin = pluginMap.get(spinner.getSelectedItem().toString()); | ||
1073 | 117 | requestSearch(tv.getText().toString()); | ||
1074 | 118 | return true; | ||
1075 | 119 | } | ||
1076 | 120 | return false; | ||
1077 | 121 | } | ||
1078 | 122 | }); | ||
1079 | 123 | spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { | ||
1080 | 124 | /** | ||
1081 | 125 | * Called when a new item is selected (in the Spinner) | ||
1082 | 126 | */ | ||
1083 | 127 | public void onItemSelected(AdapterView<?> parent, View view, | ||
1084 | 128 | int pos, long id) { | ||
1085 | 129 | editText.setText(""); | ||
1086 | 130 | } | ||
1087 | 131 | public void onNothingSelected(AdapterView<?> parent) { | ||
1088 | 132 | // Do nothing, just another required interface callback | ||
1089 | 133 | } | ||
1090 | 134 | |||
1091 | 135 | }); | ||
1092 | 136 | return view; | ||
1093 | 137 | } | ||
1094 | 138 | |||
1095 | 139 | @Override | ||
1096 | 140 | public void onDetach() { | ||
1097 | 141 | super.onDetach(); | ||
1098 | 142 | } | ||
1099 | 143 | |||
1100 | 144 | private void populatePluginList(String response, Boolean notInError) { | ||
1101 | 145 | Log.i(LOG_TAG, "populatePluginList - entry"); | ||
1102 | 146 | List<String> categories = new ArrayList<String>(); | ||
1103 | 147 | pluginMap.clear(); | ||
1104 | 148 | |||
1105 | 149 | if (notInError) { | ||
1106 | 150 | try { | ||
1107 | 151 | JSONArray items = new JSONObject(response).getJSONObject("results").getJSONArray("items"); | ||
1108 | 152 | for (int i = 0; i < items.length(); ++i) { | ||
1109 | 153 | JSONArray item = items.getJSONArray(i); | ||
1110 | 154 | categories.add(item.get(1).toString()); | ||
1111 | 155 | pluginMap.put(item.get(1).toString(), item.get(0).toString()); | ||
1112 | 156 | } | ||
1113 | 157 | } catch (JSONException e) { | ||
1114 | 158 | Log.e(LOG_TAG, response); | ||
1115 | 159 | e.printStackTrace(); | ||
1116 | 160 | } | ||
1117 | 161 | ArrayAdapter<String> LTRadapter = new ArrayAdapter<String>(getActivity(), | ||
1118 | 162 | R.layout.spinner_list_item, categories); | ||
1119 | 163 | LTRadapter.setDropDownViewResource(R.layout.spinner_dropdown_item); | ||
1120 | 164 | spinner.setAdapter(LTRadapter); | ||
1121 | 165 | Log.i(LOG_TAG, "populatePluginList - exit"); | ||
1122 | 166 | } | ||
1123 | 167 | } | ||
1124 | 168 | |||
1125 | 169 | protected void triggerTextRequest(String urlbase) { | ||
1126 | 170 | Log.d(LOG_TAG, "Trigger Request for url " + urlbase); | ||
1127 | 171 | String url = RequestQueueService.getInstance(this.context).getUrl(urlbase); | ||
1128 | 172 | calledURL = urlbase; | ||
1129 | 173 | |||
1130 | 174 | StringRequest request = new StringRequest( | ||
1131 | 175 | Request.Method.GET, | ||
1132 | 176 | url, | ||
1133 | 177 | listener, | ||
1134 | 178 | errorListener) { | ||
1135 | 179 | |||
1136 | 180 | @Override | ||
1137 | 181 | public Map<String, String> getHeaders() throws AuthFailureError { | ||
1138 | 182 | return createBasicAuthHeader("user", "passwd"); | ||
1139 | 183 | } | ||
1140 | 184 | }; | ||
1141 | 185 | //Set a retry policy in case of SocketTimeout & ConnectionTimeout Exceptions. | ||
1142 | 186 | // Volley does retry for you if you have specified the policy. | ||
1143 | 187 | request.setRetryPolicy(new DefaultRetryPolicy( | ||
1144 | 188 | RequestQueueService.getInstance(this.context).getConnectionTimeout(), | ||
1145 | 189 | DefaultRetryPolicy.DEFAULT_MAX_RETRIES, DefaultRetryPolicy.DEFAULT_BACKOFF_MULT)); | ||
1146 | 190 | request.setTag("OpenLP"); | ||
1147 | 191 | RequestQueueService.getInstance(this.context).addToRequestQueue(request); | ||
1148 | 192 | } | ||
1149 | 193 | |||
1150 | 194 | Map<String, String> createBasicAuthHeader(String username, String password) { | ||
1151 | 195 | Map<String, String> headers = new HashMap<String, String>(); | ||
1152 | 196 | headers.put("Authorization", RequestQueueService.getInstance(context).getBasicAuth()); | ||
1153 | 197 | |||
1154 | 198 | return headers; | ||
1155 | 199 | } | ||
1156 | 200 | |||
1157 | 201 | Response.Listener<String> listener = new Response.Listener<String>() { | ||
1158 | 202 | @Override | ||
1159 | 203 | public void onResponse(String response) { | ||
1160 | 204 | if (calledURL.equals(updateUrl)) { | ||
1161 | 205 | populatePluginList(response, true); | ||
1162 | 206 | } else { | ||
1163 | 207 | populateListDisplay(response, true); | ||
1164 | 208 | } | ||
1165 | 209 | } | ||
1166 | 210 | }; | ||
1167 | 211 | |||
1168 | 212 | Response.ErrorListener errorListener = new Response.ErrorListener() { | ||
1169 | 213 | @Override | ||
1170 | 214 | public void onErrorResponse(VolleyError error) { | ||
1171 | 215 | Log.d(LOG_TAG, String.format("Call response error = %s", error.toString())); | ||
1172 | 216 | if (error instanceof NetworkError) { | ||
1173 | 217 | } else if (error instanceof ClientError) { | ||
1174 | 218 | } else if (error instanceof ServerError) { | ||
1175 | 219 | } else if (error instanceof AuthFailureError) { | ||
1176 | 220 | Toast.makeText(context, R.string.httpreturn_unauthorised, | ||
1177 | 221 | Toast.LENGTH_LONG).show(); | ||
1178 | 222 | } else if (error instanceof ParseError) { | ||
1179 | 223 | } else if (error instanceof NoConnectionError) { | ||
1180 | 224 | } else if (error instanceof TimeoutError) { | ||
1181 | 225 | } | ||
1182 | 226 | Toast.makeText(context, R.string.unable, | ||
1183 | 227 | Toast.LENGTH_LONG).show(); | ||
1184 | 228 | |||
1185 | 229 | } | ||
1186 | 230 | }; | ||
1187 | 231 | |||
1188 | 232 | public void requestSearch(String text) { | ||
1189 | 233 | updateUrl = Api.SEARCH_PLUGIN_FORMATTED; | ||
1190 | 234 | try { | ||
1191 | 235 | String request = JsonHelpers.createRequestJSON("text", text); | ||
1192 | 236 | String url = String.format(Api.SEARCH_PLUGIN_FORMATTED, searchedPlugin); | ||
1193 | 237 | triggerTextRequest(String.format("%s%s", url, request)); | ||
1194 | 238 | Log.d(LOG_TAG, String.format("Search request. apiBase(%s), text(%s)", searchedPlugin, text)); | ||
1195 | 239 | } catch (JsonHelpers.JSONHandlerException e) { | ||
1196 | 240 | e.printStackTrace(); | ||
1197 | 241 | Toast.makeText(context, "Search Request Failed", Toast.LENGTH_SHORT).show(); | ||
1198 | 242 | } | ||
1199 | 243 | } | ||
1200 | 244 | |||
1201 | 245 | public void populateListDisplay(String json, boolean notInError) { | ||
1202 | 246 | Log.i(LOG_TAG, "populateListDisplay - entry"); | ||
1203 | 247 | ListView list = (ListView) getActivity().findViewById(R.id.searchListView); | ||
1204 | 248 | final ArrayList<JSONArray> listitems = new ArrayList<JSONArray>(); | ||
1205 | 249 | if (notInError) { | ||
1206 | 250 | try { | ||
1207 | 251 | JSONArray items = new JSONObject(json).getJSONObject("results").getJSONArray("items"); | ||
1208 | 252 | Log.d(LOG_TAG,items.toString()); | ||
1209 | 253 | for (int i = 0; i < items.length(); ++i) { | ||
1210 | 254 | JSONArray item = items.getJSONArray(i); | ||
1211 | 255 | listitems.add(item); | ||
1212 | 256 | } | ||
1213 | 257 | } catch (JSONException e) { | ||
1214 | 258 | Log.e(LOG_TAG, json); | ||
1215 | 259 | e.printStackTrace(); | ||
1216 | 260 | } | ||
1217 | 261 | } | ||
1218 | 262 | |||
1219 | 263 | final StableArrayAdapter adapter = new StableArrayAdapter(context, | ||
1220 | 264 | android.R.layout.simple_list_item_1, | ||
1221 | 265 | listitems); | ||
1222 | 266 | |||
1223 | 267 | |||
1224 | 268 | list.setAdapter(adapter); | ||
1225 | 269 | list.setOnItemClickListener(new AdapterView.OnItemClickListener() { | ||
1226 | 270 | |||
1227 | 271 | @Override | ||
1228 | 272 | public void onItemClick(AdapterView<?> parent, final View view, | ||
1229 | 273 | int position, long id) { | ||
1230 | 274 | final JSONArray item = (JSONArray) parent.getItemAtPosition(position); | ||
1231 | 275 | //Toast.makeText(context, "Item Pressed " + String.valueOf(position) + item, | ||
1232 | 276 | // Toast.LENGTH_SHORT).show(); | ||
1233 | 277 | String it = ""; | ||
1234 | 278 | try { | ||
1235 | 279 | Log.i(LOG_TAG, "list.setOnItemClickListener" + item); | ||
1236 | 280 | it = item.get(0).toString(); | ||
1237 | 281 | } catch (JSONException e) { | ||
1238 | 282 | e.printStackTrace(); | ||
1239 | 283 | } | ||
1240 | 284 | Bundle args = new Bundle(); | ||
1241 | 285 | args.putString("plugin", searchedPlugin); | ||
1242 | 286 | args.putString("text", it); | ||
1243 | 287 | args.putString("key", Long.toString(id)); | ||
1244 | 288 | DialogFragment SSDFragment = new SearchSelectionDialog(); | ||
1245 | 289 | SSDFragment.setArguments(args); | ||
1246 | 290 | SSDFragment.show(getFragmentManager(), "TAG"); | ||
1247 | 291 | |||
1248 | 292 | } | ||
1249 | 293 | }); | ||
1250 | 294 | Log.i(LOG_TAG, "populateListDisplay - exit"); | ||
1251 | 295 | } | ||
1252 | 296 | |||
1253 | 297 | public class StableArrayAdapter extends ArrayAdapter<JSONArray> { | ||
1254 | 298 | |||
1255 | 299 | HashMap<String, Integer> mIdMap = new HashMap<String, Integer>(); | ||
1256 | 300 | |||
1257 | 301 | public StableArrayAdapter(Context context, | ||
1258 | 302 | int textViewResourceId, | ||
1259 | 303 | List<JSONArray> objects) { | ||
1260 | 304 | super(context, textViewResourceId, objects); | ||
1261 | 305 | |||
1262 | 306 | for (int i = 0; i < objects.size(); ++i) { | ||
1263 | 307 | JSONArray item = objects.get(i); | ||
1264 | 308 | try { | ||
1265 | 309 | mIdMap.put(item.get(1).toString(), i); | ||
1266 | 310 | } catch (JSONException e) { | ||
1267 | 311 | e.printStackTrace(); | ||
1268 | 312 | } | ||
1269 | 313 | } | ||
1270 | 314 | } | ||
1271 | 315 | |||
1272 | 316 | @Override | ||
1273 | 317 | public View getView(int position, View convertView, ViewGroup parent) { | ||
1274 | 318 | // Get the data item for this position | ||
1275 | 319 | //User user = getItem(position); | ||
1276 | 320 | String item = null; | ||
1277 | 321 | try { | ||
1278 | 322 | item = getItem(position).get(1).toString(); | ||
1279 | 323 | } catch (JSONException e) { | ||
1280 | 324 | e.printStackTrace(); | ||
1281 | 325 | } | ||
1282 | 326 | // Check if an existing view is being reused, otherwise inflate the view | ||
1283 | 327 | if (convertView == null) { | ||
1284 | 328 | convertView = LayoutInflater.from(getContext()).inflate(R.layout.search_result_row, | ||
1285 | 329 | parent, false); | ||
1286 | 330 | } | ||
1287 | 331 | // Lookup view for data population | ||
1288 | 332 | TextView tvItem = (TextView) convertView.findViewById(R.id.searchListRow); | ||
1289 | 333 | // Populate the data into the template view using the data object | ||
1290 | 334 | tvItem.setText(item); | ||
1291 | 335 | // Return the completed view to render on screen | ||
1292 | 336 | return convertView; | ||
1293 | 337 | } | ||
1294 | 338 | |||
1295 | 339 | @Override | ||
1296 | 340 | public long getItemId(int position) { | ||
1297 | 341 | String item = null; | ||
1298 | 342 | try { | ||
1299 | 343 | item = getItem(position).get(1).toString(); | ||
1300 | 344 | } catch (JSONException e) { | ||
1301 | 345 | e.printStackTrace(); | ||
1302 | 346 | } | ||
1303 | 347 | return mIdMap.get(item); | ||
1304 | 348 | } | ||
1305 | 349 | |||
1306 | 350 | @Override | ||
1307 | 351 | public boolean hasStableIds() { | ||
1308 | 352 | return true; | ||
1309 | 353 | } | ||
1310 | 354 | |||
1311 | 355 | } | ||
1312 | 356 | |||
1313 | 357 | } | ||
1314 | 0 | 358 | ||
1315 | === modified file 'app/src/main/java/org/openlp/android2/fragments/ServiceListFragment.java' | |||
1316 | --- app/src/main/java/org/openlp/android2/fragments/ServiceListFragment.java 2015-10-04 21:02:13 +0000 | |||
1317 | +++ app/src/main/java/org/openlp/android2/fragments/ServiceListFragment.java 2016-11-10 19:40:57 +0000 | |||
1318 | @@ -1,7 +1,7 @@ | |||
1319 | 1 | /****************************************************************************** | 1 | /****************************************************************************** |
1320 | 2 | * OpenLP - Open Source Lyrics Projection * | 2 | * OpenLP - Open Source Lyrics Projection * |
1321 | 3 | * --------------------------------------------------------------------------- * | 3 | * --------------------------------------------------------------------------- * |
1323 | 4 | * Copyright (c) 2011-2015 OpenLP Android Developers * | 4 | * Copyright (c) 2011-2016 OpenLP Android Developers * |
1324 | 5 | * --------------------------------------------------------------------------- * | 5 | * --------------------------------------------------------------------------- * |
1325 | 6 | * This program is free software; you can redistribute it and/or modify it * | 6 | * This program is free software; you can redistribute it and/or modify it * |
1326 | 7 | * under the terms of the GNU General Public License as published by the Free * | 7 | * under the terms of the GNU General Public License as published by the Free * |
1327 | @@ -40,12 +40,10 @@ | |||
1328 | 40 | import org.openlp.android2.api.Api; | 40 | import org.openlp.android2.api.Api; |
1329 | 41 | import org.openlp.android2.common.JsonHelpers; | 41 | import org.openlp.android2.common.JsonHelpers; |
1330 | 42 | import org.openlp.android2.common.OpenLPFragment; | 42 | import org.openlp.android2.common.OpenLPFragment; |
1331 | 43 | import org.openlp.android2.common.OpenLPHttpClient; | ||
1332 | 44 | 43 | ||
1333 | 45 | import java.util.ArrayList; | 44 | import java.util.ArrayList; |
1334 | 46 | import java.util.HashMap; | 45 | import java.util.HashMap; |
1335 | 47 | import java.util.List; | 46 | import java.util.List; |
1336 | 48 | import java.util.Map; | ||
1337 | 49 | 47 | ||
1338 | 50 | 48 | ||
1339 | 51 | public class ServiceListFragment extends OpenLPFragment { | 49 | public class ServiceListFragment extends OpenLPFragment { |
1340 | @@ -64,8 +62,7 @@ | |||
1341 | 64 | @Override | 62 | @Override |
1342 | 65 | public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { | 63 | public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { |
1343 | 66 | context = getActivity(); | 64 | context = getActivity(); |
1346 | 67 | updateUrl = Api.SERVICE_LIST; | 65 | urlcalled = Api.SERVICE_LIST; |
1345 | 68 | httpClient = new OpenLPHttpClient(context); | ||
1347 | 69 | return super.onCreateView(inflater, container, savedInstanceState); | 66 | return super.onCreateView(inflater, container, savedInstanceState); |
1348 | 70 | } | 67 | } |
1349 | 71 | 68 | ||
1350 | @@ -141,10 +138,10 @@ | |||
1351 | 141 | } | 138 | } |
1352 | 142 | 139 | ||
1353 | 143 | // Keys used in Hashmap | 140 | // Keys used in Hashmap |
1355 | 144 | String[] from = {"icon", "title"}; | 141 | String[] from = {"line","icon", "title"}; |
1356 | 145 | 142 | ||
1357 | 146 | // Ids of views in service_list_fragment | 143 | // Ids of views in service_list_fragment |
1359 | 147 | int[] to = {R.id.icon, R.id.serviceListText}; | 144 | int[] to = {R.id.servicelistLine, R.id.icon, R.id.serviceListText}; |
1360 | 148 | 145 | ||
1361 | 149 | SharedPreferences prefs = context.getSharedPreferences( | 146 | SharedPreferences prefs = context.getSharedPreferences( |
1362 | 150 | context.getString(R.string.key_shared_preferences), | 147 | context.getString(R.string.key_shared_preferences), |
1363 | @@ -158,19 +155,26 @@ | |||
1364 | 158 | // Instantiating an adapter to store each items | 155 | // Instantiating an adapter to store each items |
1365 | 159 | ListAdapter adapter = new SimpleAdapter(getActivity().getBaseContext(), aList, | 156 | ListAdapter adapter = new SimpleAdapter(getActivity().getBaseContext(), aList, |
1366 | 160 | R.layout.fragment_service_list, from, to) { | 157 | R.layout.fragment_service_list, from, to) { |
1367 | 158 | |||
1368 | 161 | public View getView(int position, View convertView, ViewGroup parent) { | 159 | public View getView(int position, View convertView, ViewGroup parent) { |
1369 | 160 | |||
1370 | 162 | View view = super.getView(position, convertView, parent); | 161 | View view = super.getView(position, convertView, parent); |
1371 | 162 | |||
1372 | 163 | TextView line = (TextView) view.findViewById(R.id.servicelistLine); | ||
1373 | 163 | TextView text1 = (TextView) view.findViewById(R.id.serviceListText); | 164 | TextView text1 = (TextView) view.findViewById(R.id.serviceListText); |
1374 | 164 | text1.setTextSize(TypedValue.COMPLEX_UNIT_SP, size); | 165 | text1.setTextSize(TypedValue.COMPLEX_UNIT_SP, size); |
1375 | 165 | if (selected == position) { | 166 | if (selected == position) { |
1376 | 166 | text1.setTextColor(Color.parseColor("#000000")); | 167 | text1.setTextColor(Color.parseColor("#000000")); |
1377 | 167 | text1.setTypeface(null, Typeface.BOLD_ITALIC); | 168 | text1.setTypeface(null, Typeface.BOLD_ITALIC); |
1378 | 169 | line.setBackgroundColor(0xffffff); | ||
1379 | 168 | } else{ | 170 | } else{ |
1380 | 169 | text1.setTypeface(null, Typeface.NORMAL); | 171 | text1.setTypeface(null, Typeface.NORMAL); |
1381 | 172 | line.setBackgroundColor(0xffffff); | ||
1382 | 170 | } | 173 | } |
1383 | 171 | return view; | 174 | return view; |
1384 | 172 | } | 175 | } |
1385 | 173 | }; | 176 | }; |
1386 | 177 | |||
1387 | 174 | setListAdapter(adapter); | 178 | setListAdapter(adapter); |
1388 | 175 | 179 | ||
1389 | 176 | SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context); | 180 | SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context); |
1390 | 177 | 181 | ||
1391 | === modified file 'app/src/main/java/org/openlp/android2/fragments/StageWebFragment.java' | |||
1392 | --- app/src/main/java/org/openlp/android2/fragments/StageWebFragment.java 2015-01-23 17:53:00 +0000 | |||
1393 | +++ app/src/main/java/org/openlp/android2/fragments/StageWebFragment.java 2016-11-10 19:40:57 +0000 | |||
1394 | @@ -1,7 +1,7 @@ | |||
1395 | 1 | /****************************************************************************** | 1 | /****************************************************************************** |
1396 | 2 | * OpenLP - Open Source Lyrics Projection * | 2 | * OpenLP - Open Source Lyrics Projection * |
1397 | 3 | * --------------------------------------------------------------------------- * | 3 | * --------------------------------------------------------------------------- * |
1399 | 4 | * Copyright (c) 2011-2015 OpenLP Android Developers * | 4 | * Copyright (c) 2011-2016 OpenLP Android Developers * |
1400 | 5 | * --------------------------------------------------------------------------- * | 5 | * --------------------------------------------------------------------------- * |
1401 | 6 | * This program is free software; you can redistribute it and/or modify it * | 6 | * This program is free software; you can redistribute it and/or modify it * |
1402 | 7 | * under the terms of the GNU General Public License as published by the Free * | 7 | * under the terms of the GNU General Public License as published by the Free * |
1403 | 8 | 8 | ||
1404 | === modified file 'app/src/main/java/org/openlp/android2/fragments/WebFragment.java' | |||
1405 | --- app/src/main/java/org/openlp/android2/fragments/WebFragment.java 2015-01-19 21:09:12 +0000 | |||
1406 | +++ app/src/main/java/org/openlp/android2/fragments/WebFragment.java 2016-11-10 19:40:57 +0000 | |||
1407 | @@ -1,7 +1,7 @@ | |||
1408 | 1 | /****************************************************************************** | 1 | /****************************************************************************** |
1409 | 2 | * OpenLP - Open Source Lyrics Projection * | 2 | * OpenLP - Open Source Lyrics Projection * |
1410 | 3 | * --------------------------------------------------------------------------- * | 3 | * --------------------------------------------------------------------------- * |
1412 | 4 | * Copyright (c) 2011-2015 OpenLP Android Developers * | 4 | * Copyright (c) 2011-2016 OpenLP Android Developers * |
1413 | 5 | * --------------------------------------------------------------------------- * | 5 | * --------------------------------------------------------------------------- * |
1414 | 6 | * This program is free software; you can redistribute it and/or modify it * | 6 | * This program is free software; you can redistribute it and/or modify it * |
1415 | 7 | * under the terms of the GNU General Public License as published by the Free * | 7 | * under the terms of the GNU General Public License as published by the Free * |
1416 | @@ -19,21 +19,18 @@ | |||
1417 | 19 | package org.openlp.android2.fragments; | 19 | package org.openlp.android2.fragments; |
1418 | 20 | 20 | ||
1419 | 21 | import android.app.Fragment; | 21 | import android.app.Fragment; |
1420 | 22 | import android.net.http.SslError; | ||
1421 | 23 | import android.os.Bundle; | 22 | import android.os.Bundle; |
1422 | 24 | import android.view.LayoutInflater; | 23 | import android.view.LayoutInflater; |
1423 | 25 | import android.view.View; | 24 | import android.view.View; |
1424 | 26 | import android.view.ViewGroup; | 25 | import android.view.ViewGroup; |
1425 | 27 | import android.webkit.SslErrorHandler; | ||
1426 | 28 | import android.webkit.WebView; | 26 | import android.webkit.WebView; |
1427 | 29 | import android.webkit.WebViewClient; | 27 | import android.webkit.WebViewClient; |
1428 | 30 | import org.openlp.android2.R; | 28 | import org.openlp.android2.R; |
1430 | 31 | import org.openlp.android2.common.OpenLPHttpClient; | 29 | import org.openlp.android2.common.OpenLPURLBuilder; |
1431 | 32 | 30 | ||
1432 | 33 | public class WebFragment extends Fragment { | 31 | public class WebFragment extends Fragment { |
1433 | 34 | 32 | ||
1434 | 35 | protected String curURL; | 33 | protected String curURL; |
1435 | 36 | private OpenLPHttpClient httpClient; | ||
1436 | 37 | private WebView webview; | 34 | private WebView webview; |
1437 | 38 | 35 | ||
1438 | 39 | public WebFragment(){ | 36 | public WebFragment(){ |
1439 | @@ -47,7 +44,7 @@ | |||
1440 | 47 | 44 | ||
1441 | 48 | @Override | 45 | @Override |
1442 | 49 | public View onCreateView(LayoutInflater inflater, ViewGroup container,Bundle savedInstanceState) { | 46 | public View onCreateView(LayoutInflater inflater, ViewGroup container,Bundle savedInstanceState) { |
1444 | 50 | httpClient = new OpenLPHttpClient(getActivity()); | 47 | |
1445 | 51 | View view = inflater.inflate(R.layout.fragment_web, container, false); | 48 | View view = inflater.inflate(R.layout.fragment_web, container, false); |
1446 | 52 | 49 | ||
1447 | 53 | if (curURL != null) { | 50 | if (curURL != null) { |
1448 | @@ -59,7 +56,7 @@ | |||
1449 | 59 | webview.setScrollBarStyle(WebView.SCROLLBARS_OUTSIDE_OVERLAY); | 56 | webview.setScrollBarStyle(WebView.SCROLLBARS_OUTSIDE_OVERLAY); |
1450 | 60 | webview.setScrollbarFadingEnabled(true); | 57 | webview.setScrollbarFadingEnabled(true); |
1451 | 61 | webview.setWebViewClient(new webClient()); | 58 | webview.setWebViewClient(new webClient()); |
1453 | 62 | webview.loadUrl(String.format("%s%s", httpClient.getBaseUrl(), curURL)); | 59 | webview.loadUrl(String.format("%s%s", OpenLPURLBuilder.getInstance().getBaseUrl(), curURL)); |
1454 | 63 | } | 60 | } |
1455 | 64 | return view; | 61 | return view; |
1456 | 65 | } | 62 | } |
1457 | @@ -72,14 +69,10 @@ | |||
1458 | 72 | super.onDestroyView(); | 69 | super.onDestroyView(); |
1459 | 73 | } | 70 | } |
1460 | 74 | 71 | ||
1462 | 75 | private class webClient extends WebViewClient { | 72 | public class webClient extends WebViewClient { |
1463 | 76 | @Override | 73 | @Override |
1464 | 77 | public boolean shouldOverrideUrlLoading(WebView view, String url) { | 74 | public boolean shouldOverrideUrlLoading(WebView view, String url) { |
1465 | 78 | return false; | 75 | return false; |
1466 | 79 | } | 76 | } |
1467 | 80 | @Override | ||
1468 | 81 | public void onReceivedSslError(WebView view, SslErrorHandler handler, SslError error) { | ||
1469 | 82 | handler.proceed(); // Ignore SSL certificate errors | ||
1470 | 83 | } | ||
1471 | 84 | } | 77 | } |
1472 | 85 | } | 78 | } |
1473 | 86 | 79 | ||
1474 | === added file 'app/src/main/res/drawable-hdpi/ic_search_black.png' | |||
1475 | 87 | Binary files app/src/main/res/drawable-hdpi/ic_search_black.png 1970-01-01 00:00:00 +0000 and app/src/main/res/drawable-hdpi/ic_search_black.png 2016-11-10 19:40:57 +0000 differ | 80 | Binary files app/src/main/res/drawable-hdpi/ic_search_black.png 1970-01-01 00:00:00 +0000 and app/src/main/res/drawable-hdpi/ic_search_black.png 2016-11-10 19:40:57 +0000 differ |
1476 | === modified file 'app/src/main/res/drawable-hdpi/openlp_splash_screen.png' | |||
1477 | 88 | Binary files app/src/main/res/drawable-hdpi/openlp_splash_screen.png 2014-11-16 08:57:03 +0000 and app/src/main/res/drawable-hdpi/openlp_splash_screen.png 2016-11-10 19:40:57 +0000 differ | 81 | Binary files app/src/main/res/drawable-hdpi/openlp_splash_screen.png 2014-11-16 08:57:03 +0000 and app/src/main/res/drawable-hdpi/openlp_splash_screen.png 2016-11-10 19:40:57 +0000 differ |
1478 | === added file 'app/src/main/res/drawable-mdpi/ic_search_black.png' | |||
1479 | 89 | Binary files app/src/main/res/drawable-mdpi/ic_search_black.png 1970-01-01 00:00:00 +0000 and app/src/main/res/drawable-mdpi/ic_search_black.png 2016-11-10 19:40:57 +0000 differ | 82 | Binary files app/src/main/res/drawable-mdpi/ic_search_black.png 1970-01-01 00:00:00 +0000 and app/src/main/res/drawable-mdpi/ic_search_black.png 2016-11-10 19:40:57 +0000 differ |
1480 | === added file 'app/src/main/res/drawable-xhdpi/ic_search_black.png' | |||
1481 | 90 | Binary files app/src/main/res/drawable-xhdpi/ic_search_black.png 1970-01-01 00:00:00 +0000 and app/src/main/res/drawable-xhdpi/ic_search_black.png 2016-11-10 19:40:57 +0000 differ | 83 | Binary files app/src/main/res/drawable-xhdpi/ic_search_black.png 1970-01-01 00:00:00 +0000 and app/src/main/res/drawable-xhdpi/ic_search_black.png 2016-11-10 19:40:57 +0000 differ |
1482 | === added file 'app/src/main/res/drawable-xxhdpi/ic_search_black.png' | |||
1483 | 91 | Binary files app/src/main/res/drawable-xxhdpi/ic_search_black.png 1970-01-01 00:00:00 +0000 and app/src/main/res/drawable-xxhdpi/ic_search_black.png 2016-11-10 19:40:57 +0000 differ | 84 | Binary files app/src/main/res/drawable-xxhdpi/ic_search_black.png 1970-01-01 00:00:00 +0000 and app/src/main/res/drawable-xxhdpi/ic_search_black.png 2016-11-10 19:40:57 +0000 differ |
1484 | === added file 'app/src/main/res/drawable/custom_border.xml' | |||
1485 | --- app/src/main/res/drawable/custom_border.xml 1970-01-01 00:00:00 +0000 | |||
1486 | +++ app/src/main/res/drawable/custom_border.xml 2016-11-10 19:40:57 +0000 | |||
1487 | @@ -0,0 +1,11 @@ | |||
1488 | 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
1489 | 2 | <shape xmlns:android="http://schemas.android.com/apk/res/android" | ||
1490 | 3 | android:shape="rectangle"> | ||
1491 | 4 | |||
1492 | 5 | <padding android:left="10dp" | ||
1493 | 6 | android:right="10dp" | ||
1494 | 7 | android:top="10dp" | ||
1495 | 8 | android:bottom="10dp"/> | ||
1496 | 9 | <solid android:color="#FFF"/> | ||
1497 | 10 | <stroke android:width="2px" android:color="#ffffff"/> | ||
1498 | 11 | </shape> | ||
1499 | 0 | \ No newline at end of file | 12 | \ No newline at end of file |
1500 | 1 | 13 | ||
1501 | === removed file 'app/src/main/res/drawable/customborder.xml' | |||
1502 | --- app/src/main/res/drawable/customborder.xml 2015-09-20 21:02:37 +0000 | |||
1503 | +++ app/src/main/res/drawable/customborder.xml 1970-01-01 00:00:00 +0000 | |||
1504 | @@ -1,11 +0,0 @@ | |||
1505 | 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
1506 | 2 | <shape xmlns:android="http://schemas.android.com/apk/res/android" | ||
1507 | 3 | android:shape="rectangle"> | ||
1508 | 4 | |||
1509 | 5 | <padding android:left="10dp" | ||
1510 | 6 | android:right="10dp" | ||
1511 | 7 | android:top="10dp" | ||
1512 | 8 | android:bottom="10dp"/> | ||
1513 | 9 | <solid android:color="#c4c4c4"/> | ||
1514 | 10 | <stroke android:width="2px" android:color="#ffffff"/> | ||
1515 | 11 | </shape> | ||
1516 | 12 | \ No newline at end of file | 0 | \ No newline at end of file |
1517 | 13 | 1 | ||
1518 | === added file 'app/src/main/res/drawable/search_list.xml' | |||
1519 | --- app/src/main/res/drawable/search_list.xml 1970-01-01 00:00:00 +0000 | |||
1520 | +++ app/src/main/res/drawable/search_list.xml 2016-11-10 19:40:57 +0000 | |||
1521 | @@ -0,0 +1,11 @@ | |||
1522 | 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
1523 | 2 | <shape xmlns:android="http://schemas.android.com/apk/res/android" | ||
1524 | 3 | android:shape="rectangle"> | ||
1525 | 4 | |||
1526 | 5 | <padding android:left="10dp" | ||
1527 | 6 | android:right="10dp" | ||
1528 | 7 | android:top="10dp" | ||
1529 | 8 | android:bottom="10dp"/> | ||
1530 | 9 | <solid android:color="#FFF"/> | ||
1531 | 10 | <stroke android:width="20px" android:color="#ffffff"/> | ||
1532 | 11 | </shape> | ||
1533 | 0 | \ No newline at end of file | 12 | \ No newline at end of file |
1534 | 1 | 13 | ||
1535 | === modified file 'app/src/main/res/layout-xlarge/fragment_livelist_list.xml' | |||
1536 | --- app/src/main/res/layout-xlarge/fragment_livelist_list.xml 2015-04-19 20:12:18 +0000 | |||
1537 | +++ app/src/main/res/layout-xlarge/fragment_livelist_list.xml 2016-11-10 19:40:57 +0000 | |||
1538 | @@ -9,7 +9,16 @@ | |||
1539 | 9 | android:smoothScrollbar="true" | 9 | android:smoothScrollbar="true" |
1540 | 10 | android:clickable="false" | 10 | android:clickable="false" |
1541 | 11 | android:longClickable="false" | 11 | android:longClickable="false" |
1543 | 12 | android:background="@drawable/customborder"> | 12 | android:background="@drawable/custom_border"> |
1544 | 13 | <TextView | ||
1545 | 14 | android:id="@+id/line" | ||
1546 | 15 | android:layout_width="4dp" | ||
1547 | 16 | android:layout_height="fill_parent" | ||
1548 | 17 | android:paddingTop="1dp" | ||
1549 | 18 | android:paddingRight="1dp" | ||
1550 | 19 | android:paddingLeft="1dp" | ||
1551 | 20 | android:paddingBottom="1dp" | ||
1552 | 21 | android:background="#4d7bd8"/> | ||
1553 | 13 | <TextView | 22 | <TextView |
1554 | 14 | android:id="@+id/tag" | 23 | android:id="@+id/tag" |
1555 | 15 | android:layout_width="0dp" | 24 | android:layout_width="0dp" |
1556 | 16 | 25 | ||
1557 | === modified file 'app/src/main/res/layout/activity_main.xml' | |||
1558 | --- app/src/main/res/layout/activity_main.xml 2015-10-08 18:25:59 +0000 | |||
1559 | +++ app/src/main/res/layout/activity_main.xml 2016-11-10 19:40:57 +0000 | |||
1560 | @@ -4,7 +4,7 @@ | |||
1561 | 4 | android:id="@+id/drawer_layout" | 4 | android:id="@+id/drawer_layout" |
1562 | 5 | android:layout_width="match_parent" | 5 | android:layout_width="match_parent" |
1563 | 6 | android:layout_height="match_parent" | 6 | android:layout_height="match_parent" |
1565 | 7 | tools:context=".MainActivity"> | 7 | tools:context=".OpenLP"> |
1566 | 8 | 8 | ||
1567 | 9 | <!-- As the main content view, the view below consumes the entire | 9 | <!-- As the main content view, the view below consumes the entire |
1568 | 10 | space available using match_parent in both dimensions. --> | 10 | space available using match_parent in both dimensions. --> |
1569 | 11 | 11 | ||
1570 | === removed file 'app/src/main/res/layout/fragment_item_grid.xml' | |||
1571 | --- app/src/main/res/layout/fragment_item_grid.xml 2015-05-27 20:05:55 +0000 | |||
1572 | +++ app/src/main/res/layout/fragment_item_grid.xml 1970-01-01 00:00:00 +0000 | |||
1573 | @@ -1,12 +0,0 @@ | |||
1574 | 1 | <?xml version="1.0" encoding="utf-8"?> | ||
1575 | 2 | <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
1576 | 3 | xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" | ||
1577 | 4 | android:layout_height="match_parent" tools:context="org.openlp.android2.emptyFragment"> | ||
1578 | 5 | |||
1579 | 6 | <GridView android:id="@android:id/list" android:layout_width="match_parent" | ||
1580 | 7 | android:layout_height="match_parent" android:numColumns="2" /> | ||
1581 | 8 | |||
1582 | 9 | <TextView android:id="@android:id/empty" android:layout_width="match_parent" | ||
1583 | 10 | android:layout_height="match_parent" android:gravity="center" /> | ||
1584 | 11 | |||
1585 | 12 | </FrameLayout> | ||
1586 | 13 | 0 | ||
1587 | === removed file 'app/src/main/res/layout/fragment_livelist_grid.xml' | |||
1588 | --- app/src/main/res/layout/fragment_livelist_grid.xml 2015-01-19 20:26:35 +0000 | |||
1589 | +++ app/src/main/res/layout/fragment_livelist_grid.xml 1970-01-01 00:00:00 +0000 | |||
1590 | @@ -1,45 +0,0 @@ | |||
1591 | 1 | <?xml version="1.0" encoding="utf-8"?> | ||
1592 | 2 | <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
1593 | 3 | xmlns:tools="http://schemas.android.com/tools" | ||
1594 | 4 | android:layout_width="match_parent" | ||
1595 | 5 | android:layout_height="match_parent" | ||
1596 | 6 | tools:context="org.openlp.android2.fragments.LiveListFragment"> | ||
1597 | 7 | |||
1598 | 8 | <GridView | ||
1599 | 9 | android:id="@android:id/list" | ||
1600 | 10 | android:layout_width="match_parent" | ||
1601 | 11 | android:layout_height="match_parent" | ||
1602 | 12 | android:numColumns="2" /> | ||
1603 | 13 | |||
1604 | 14 | <LinearLayout | ||
1605 | 15 | xmlns:android="http://schemas.android.com/apk/res/android" | ||
1606 | 16 | android:id="@+id/fragment_live_list_layout" | ||
1607 | 17 | android:layout_width="match_parent" | ||
1608 | 18 | android:layout_height="match_parent" | ||
1609 | 19 | android:orientation="horizontal" | ||
1610 | 20 | android:smoothScrollbar="true" | ||
1611 | 21 | android:clickable="false" | ||
1612 | 22 | android:longClickable="false"> | ||
1613 | 23 | <TextView | ||
1614 | 24 | android:id="@+id/tag" | ||
1615 | 25 | android:layout_width="0dp" | ||
1616 | 26 | android:layout_height="wrap_content" | ||
1617 | 27 | android:textSize="14sp" | ||
1618 | 28 | android:paddingTop="10dp" | ||
1619 | 29 | android:paddingRight="5dp" | ||
1620 | 30 | android:paddingLeft="5dp" | ||
1621 | 31 | android:paddingBottom="10dp" | ||
1622 | 32 | android:layout_weight="1"/> | ||
1623 | 33 | <TextView | ||
1624 | 34 | android:id="@+id/liveListNormal" | ||
1625 | 35 | android:layout_width="0dp" | ||
1626 | 36 | android:layout_height="wrap_content" | ||
1627 | 37 | android:textColor="#ff2a2a2a" | ||
1628 | 38 | android:textSize="14sp" | ||
1629 | 39 | android:paddingTop="10dp" | ||
1630 | 40 | android:paddingBottom="10dp" | ||
1631 | 41 | android:textStyle="normal" | ||
1632 | 42 | android:layout_weight="1"/> | ||
1633 | 43 | </LinearLayout> | ||
1634 | 44 | |||
1635 | 45 | </FrameLayout> | ||
1636 | 46 | 0 | ||
1637 | === modified file 'app/src/main/res/layout/fragment_livelist_list.xml' | |||
1638 | --- app/src/main/res/layout/fragment_livelist_list.xml 2015-10-08 15:27:56 +0000 | |||
1639 | +++ app/src/main/res/layout/fragment_livelist_list.xml 2016-11-10 19:40:57 +0000 | |||
1640 | @@ -9,10 +9,19 @@ | |||
1641 | 9 | android:smoothScrollbar="true" | 9 | android:smoothScrollbar="true" |
1642 | 10 | android:clickable="false" | 10 | android:clickable="false" |
1643 | 11 | android:longClickable="false" | 11 | android:longClickable="false" |
1648 | 12 | android:background="@drawable/customborder"> | 12 | android:background="@drawable/custom_border"> |
1649 | 13 | 13 | <TextView | |
1650 | 14 | <TextView | 14 | android:id="@+id/liveListLine" |
1651 | 15 | android:id="@+id/tag" | 15 | android:layout_width="75sp" |
1652 | 16 | android:layout_height="wrap_content" | ||
1653 | 17 | android:textSize="14sp" | ||
1654 | 18 | android:paddingTop="10dp" | ||
1655 | 19 | android:paddingRight="5dp" | ||
1656 | 20 | android:paddingLeft="5dp" | ||
1657 | 21 | android:paddingBottom="10dp" | ||
1658 | 22 | android:layout_weight="1"/> | ||
1659 | 23 | <TextView | ||
1660 | 24 | android:id="@+id/liveListTag" | ||
1661 | 16 | android:layout_width="75sp" | 25 | android:layout_width="75sp" |
1662 | 17 | android:layout_height="wrap_content" | 26 | android:layout_height="wrap_content" |
1663 | 18 | android:textSize="14sp" | 27 | android:textSize="14sp" |
1664 | @@ -31,15 +40,4 @@ | |||
1665 | 31 | android:paddingBottom="10dp" | 40 | android:paddingBottom="10dp" |
1666 | 32 | android:textStyle="normal" | 41 | android:textStyle="normal" |
1667 | 33 | android:layout_weight="1"/> | 42 | android:layout_weight="1"/> |
1668 | 34 | <TextView | ||
1669 | 35 | android:id="@+id/liveListSelected" | ||
1670 | 36 | android:layout_width="0dp" | ||
1671 | 37 | android:layout_height="wrap_content" | ||
1672 | 38 | android:textColor="#000000" | ||
1673 | 39 | android:textSize="14sp" | ||
1674 | 40 | android:paddingTop="10dp" | ||
1675 | 41 | android:paddingBottom="10dp" | ||
1676 | 42 | android:textStyle="bold|italic" | ||
1677 | 43 | android:layout_weight="1" | ||
1678 | 44 | android:visibility="gone"/> | ||
1679 | 45 | </LinearLayout> | 43 | </LinearLayout> |
1680 | 46 | 44 | ||
1681 | === added file 'app/src/main/res/layout/fragment_search.xml' | |||
1682 | --- app/src/main/res/layout/fragment_search.xml 1970-01-01 00:00:00 +0000 | |||
1683 | +++ app/src/main/res/layout/fragment_search.xml 2016-11-10 19:40:57 +0000 | |||
1684 | @@ -0,0 +1,77 @@ | |||
1685 | 1 | <?xml version="1.0" encoding="utf-8"?> | ||
1686 | 2 | <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
1687 | 3 | android:orientation="vertical" android:layout_width="match_parent" | ||
1688 | 4 | android:layout_height="match_parent" | ||
1689 | 5 | android:paddingLeft="15dp" | ||
1690 | 6 | android:paddingTop="15dp" | ||
1691 | 7 | android:paddingRight="15dp" | ||
1692 | 8 | > | ||
1693 | 9 | |||
1694 | 10 | <LinearLayout | ||
1695 | 11 | android:orientation="vertical" | ||
1696 | 12 | android:layout_width="match_parent" | ||
1697 | 13 | android:layout_height="wrap_content"> | ||
1698 | 14 | |||
1699 | 15 | <GridLayout | ||
1700 | 16 | android:layout_width="match_parent" | ||
1701 | 17 | android:layout_height="wrap_content"> | ||
1702 | 18 | |||
1703 | 19 | <TextView | ||
1704 | 20 | android:text="@string/select_plugin" | ||
1705 | 21 | android:id="@+id/search_title" | ||
1706 | 22 | android:textSize="20sp" | ||
1707 | 23 | android:paddingLeft="30dp" | ||
1708 | 24 | android:paddingRight="30dp" | ||
1709 | 25 | android:layout_row="0" | ||
1710 | 26 | android:layout_column="0"/> | ||
1711 | 27 | |||
1712 | 28 | <Spinner | ||
1713 | 29 | android:textSize="20sp" | ||
1714 | 30 | android:paddingLeft="30dp" | ||
1715 | 31 | android:paddingStart="30dp" | ||
1716 | 32 | android:id="@+id/search_spinner" | ||
1717 | 33 | android:layout_row="0" | ||
1718 | 34 | android:layout_column="1"/> | ||
1719 | 35 | |||
1720 | 36 | <TextView | ||
1721 | 37 | android:text="@string/search_text" | ||
1722 | 38 | android:textSize="20sp" | ||
1723 | 39 | android:id="@+id/search_value_desc" | ||
1724 | 40 | android:paddingLeft="30dp" | ||
1725 | 41 | android:paddingRight="30dp" | ||
1726 | 42 | android:layout_row="1" | ||
1727 | 43 | android:layout_column="0"/> | ||
1728 | 44 | |||
1729 | 45 | <EditText | ||
1730 | 46 | android:imeOptions="actionSearch" | ||
1731 | 47 | android:id="@+id/search_text" | ||
1732 | 48 | style="@android:style/Animation.InputMethod" | ||
1733 | 49 | android:inputType="text" | ||
1734 | 50 | android:textSize="22sp" | ||
1735 | 51 | android:layout_row="1" | ||
1736 | 52 | android:layout_column="1" | ||
1737 | 53 | android:layout_width="fill_parent" /> | ||
1738 | 54 | |||
1739 | 55 | </GridLayout> | ||
1740 | 56 | |||
1741 | 57 | <LinearLayout | ||
1742 | 58 | android:orientation="horizontal" | ||
1743 | 59 | android:layout_width="match_parent" | ||
1744 | 60 | android:layout_height="match_parent" | ||
1745 | 61 | android:weightSum="1"> | ||
1746 | 62 | |||
1747 | 63 | <ListView | ||
1748 | 64 | android:layout_width="match_parent" | ||
1749 | 65 | android:layout_height="fill_parent" | ||
1750 | 66 | android:id="@+id/searchListView" | ||
1751 | 67 | android:paddingLeft="30dp" | ||
1752 | 68 | android:paddingRight="30dp" | ||
1753 | 69 | android:textSize="15sp" | ||
1754 | 70 | android:height="70dp" | ||
1755 | 71 | android:layout_weight="0.8" | ||
1756 | 72 | android:background="@drawable/search_list"/> | ||
1757 | 73 | |||
1758 | 74 | </LinearLayout> | ||
1759 | 75 | </LinearLayout> | ||
1760 | 76 | |||
1761 | 77 | </LinearLayout> | ||
1762 | 0 | \ No newline at end of file | 78 | \ No newline at end of file |
1763 | 1 | 79 | ||
1764 | === modified file 'app/src/main/res/layout/fragment_service_list.xml' | |||
1765 | --- app/src/main/res/layout/fragment_service_list.xml 2015-04-19 20:12:18 +0000 | |||
1766 | +++ app/src/main/res/layout/fragment_service_list.xml 2016-11-10 19:40:57 +0000 | |||
1767 | @@ -9,11 +9,23 @@ | |||
1768 | 9 | android:smoothScrollbar="true" | 9 | android:smoothScrollbar="true" |
1769 | 10 | android:clickable="false" | 10 | android:clickable="false" |
1770 | 11 | android:longClickable="false" | 11 | android:longClickable="false" |
1772 | 12 | android:background="@drawable/customborder"> | 12 | android:background="@drawable/custom_border"> |
1773 | 13 | |||
1774 | 14 | <TextView | ||
1775 | 15 | android:id="@+id/servicelistLine" | ||
1776 | 16 | android:layout_width="4dp" | ||
1777 | 17 | android:layout_height="36dp" | ||
1778 | 18 | android:paddingTop="10dp" | ||
1779 | 19 | android:paddingRight="5dp" | ||
1780 | 20 | android:paddingEnd="5dp" | ||
1781 | 21 | android:paddingLeft="5dp" | ||
1782 | 22 | android:paddingBottom="10dp" | ||
1783 | 23 | android:background="#4d7bd8"/> | ||
1784 | 24 | |||
1785 | 13 | <ImageView | 25 | <ImageView |
1786 | 14 | android:id="@+id/icon" | 26 | android:id="@+id/icon" |
1787 | 15 | android:layout_width="wrap_content" | 27 | android:layout_width="wrap_content" |
1789 | 16 | android:layout_height="wrap_content" | 28 | android:layout_height="36dp" |
1790 | 17 | android:paddingTop="10dp" | 29 | android:paddingTop="10dp" |
1791 | 18 | android:paddingRight="5dp" | 30 | android:paddingRight="5dp" |
1792 | 19 | android:paddingEnd="5dp" | 31 | android:paddingEnd="5dp" |
1793 | @@ -24,7 +36,7 @@ | |||
1794 | 24 | android:id="@+id/serviceListText" | 36 | android:id="@+id/serviceListText" |
1795 | 25 | android:layout_width="wrap_content" | 37 | android:layout_width="wrap_content" |
1796 | 26 | android:layout_height="wrap_content" | 38 | android:layout_height="wrap_content" |
1798 | 27 | android:textStyle="bold" | 39 | android:textStyle="normal" |
1799 | 28 | android:textColor="#000000" | 40 | android:textColor="#000000" |
1800 | 29 | android:textSize="14sp" | 41 | android:textSize="14sp" |
1801 | 30 | android:paddingTop="10dp" | 42 | android:paddingTop="10dp" |
1802 | 31 | 43 | ||
1803 | === removed file 'app/src/main/res/layout/fragment_servicelist_grid.xml' | |||
1804 | --- app/src/main/res/layout/fragment_servicelist_grid.xml 2014-11-15 22:03:01 +0000 | |||
1805 | +++ app/src/main/res/layout/fragment_servicelist_grid.xml 1970-01-01 00:00:00 +0000 | |||
1806 | @@ -1,20 +0,0 @@ | |||
1807 | 1 | <?xml version="1.0" encoding="utf-8"?> | ||
1808 | 2 | <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
1809 | 3 | xmlns:tools="http://schemas.android.com/tools" | ||
1810 | 4 | android:layout_width="match_parent" | ||
1811 | 5 | android:layout_height="match_parent" | ||
1812 | 6 | tools:context="org.openlp.android2.fragments.ServiceListFragment"> | ||
1813 | 7 | |||
1814 | 8 | <GridView | ||
1815 | 9 | android:id="@android:id/list" | ||
1816 | 10 | android:layout_width="match_parent" | ||
1817 | 11 | android:layout_height="match_parent" | ||
1818 | 12 | android:numColumns="2" /> | ||
1819 | 13 | |||
1820 | 14 | <TextView | ||
1821 | 15 | android:id="@android:id/empty" | ||
1822 | 16 | android:layout_width="match_parent" | ||
1823 | 17 | android:layout_height="match_parent" | ||
1824 | 18 | android:gravity="center" /> | ||
1825 | 19 | |||
1826 | 20 | </FrameLayout> | ||
1827 | 21 | 0 | ||
1828 | === added file 'app/src/main/res/layout/search_action_dialog.xml' | |||
1829 | --- app/src/main/res/layout/search_action_dialog.xml 1970-01-01 00:00:00 +0000 | |||
1830 | +++ app/src/main/res/layout/search_action_dialog.xml 2016-11-10 19:40:57 +0000 | |||
1831 | @@ -0,0 +1,40 @@ | |||
1832 | 1 | <?xml version="1.0" encoding="utf-8"?> | ||
1833 | 2 | |||
1834 | 3 | <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
1835 | 4 | |||
1836 | 5 | android:orientation="vertical" | ||
1837 | 6 | android:layout_width="fill_parent" | ||
1838 | 7 | android:layout_height="fill_parent" | ||
1839 | 8 | android:weightSum="1"> | ||
1840 | 9 | <TextView | ||
1841 | 10 | android:layout_width="315dp" | ||
1842 | 11 | android:layout_height="wrap_content" | ||
1843 | 12 | android:textAppearance="?android:attr/textAppearanceMedium" | ||
1844 | 13 | android:text="@string/searchResults" | ||
1845 | 14 | android:id="@+id/textView" | ||
1846 | 15 | android:textStyle="bold|italic" | ||
1847 | 16 | android:textSize="40px" | ||
1848 | 17 | android:height="70px" | ||
1849 | 18 | android:layout_marginTop="10dp" | ||
1850 | 19 | android:layout_marginBottom="10dp"/> | ||
1851 | 20 | <RadioButton | ||
1852 | 21 | android:layout_width="match_parent" | ||
1853 | 22 | android:layout_height="wrap_content" | ||
1854 | 23 | android:text="@string/searchSendLive" | ||
1855 | 24 | android:id="@+id/buttonLive" | ||
1856 | 25 | android:textSize="20sp" | ||
1857 | 26 | android:height="30dp" | ||
1858 | 27 | android:clickable="true" | ||
1859 | 28 | android:layout_marginTop="20dp" | ||
1860 | 29 | android:layout_marginBottom="20dp"/> | ||
1861 | 30 | <RadioButton | ||
1862 | 31 | android:layout_width="match_parent" | ||
1863 | 32 | android:layout_height="wrap_content" | ||
1864 | 33 | android:text="@string/searchAddToService" | ||
1865 | 34 | android:id="@+id/buttonService" | ||
1866 | 35 | android:textSize="20sp" | ||
1867 | 36 | android:height="40dp" | ||
1868 | 37 | android:clickable="true" | ||
1869 | 38 | android:layout_marginTop="20dp" | ||
1870 | 39 | android:layout_marginBottom="20dp"/> | ||
1871 | 40 | </LinearLayout> | ||
1872 | 0 | \ No newline at end of file | 41 | \ No newline at end of file |
1873 | 1 | 42 | ||
1874 | === added file 'app/src/main/res/layout/search_result_row.xml' | |||
1875 | --- app/src/main/res/layout/search_result_row.xml 1970-01-01 00:00:00 +0000 | |||
1876 | +++ app/src/main/res/layout/search_result_row.xml 2016-11-10 19:40:57 +0000 | |||
1877 | @@ -0,0 +1,18 @@ | |||
1878 | 1 | <?xml version="1.0" encoding="utf-8"?> | ||
1879 | 2 | <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
1880 | 3 | android:layout_width="match_parent" | ||
1881 | 4 | android:layout_height="match_parent" | ||
1882 | 5 | android:orientation="vertical" > | ||
1883 | 6 | |||
1884 | 7 | <TextView android:layout_width="wrap_content" | ||
1885 | 8 | android:layout_height="wrap_content" | ||
1886 | 9 | android:textStyle="bold" | ||
1887 | 10 | android:textColor="#000000" | ||
1888 | 11 | android:textSize="25sp" | ||
1889 | 12 | android:paddingTop="10dp" | ||
1890 | 13 | android:paddingRight="5dp" | ||
1891 | 14 | android:paddingLeft="5dp" | ||
1892 | 15 | android:paddingEnd="5dp" | ||
1893 | 16 | android:paddingBottom="10dp" | ||
1894 | 17 | android:id="@+id/searchListRow"/> | ||
1895 | 18 | </LinearLayout> | ||
1896 | 0 | \ No newline at end of file | 19 | \ No newline at end of file |
1897 | 1 | 20 | ||
1898 | === added file 'app/src/main/res/layout/spinner_dropdown_item.xml' | |||
1899 | --- app/src/main/res/layout/spinner_dropdown_item.xml 1970-01-01 00:00:00 +0000 | |||
1900 | +++ app/src/main/res/layout/spinner_dropdown_item.xml 2016-11-10 19:40:57 +0000 | |||
1901 | @@ -0,0 +1,11 @@ | |||
1902 | 1 | <?xml version="1.0" encoding="utf-8"?> | ||
1903 | 2 | <CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android" | ||
1904 | 3 | android:id="@android:id/text1" | ||
1905 | 4 | style="?android:attr/spinnerDropDownItemStyle" | ||
1906 | 5 | android:singleLine="true" | ||
1907 | 6 | android:layout_width="match_parent" | ||
1908 | 7 | android:layout_height="?android:attr/listPreferredItemHeight" | ||
1909 | 8 | android:ellipsize="marquee" | ||
1910 | 9 | android:textColor="#000" | ||
1911 | 10 | android:textStyle="bold|italic" | ||
1912 | 11 | android:textAppearance="?android:attr/textAppearanceLarge"/> | ||
1913 | 0 | \ No newline at end of file | 12 | \ No newline at end of file |
1914 | 1 | 13 | ||
1915 | === added file 'app/src/main/res/layout/spinner_list_item.xml' | |||
1916 | --- app/src/main/res/layout/spinner_list_item.xml 1970-01-01 00:00:00 +0000 | |||
1917 | +++ app/src/main/res/layout/spinner_list_item.xml 2016-11-10 19:40:57 +0000 | |||
1918 | @@ -0,0 +1,11 @@ | |||
1919 | 1 | <?xml version="1.0" encoding="utf-8"?> | ||
1920 | 2 | <TextView xmlns:android="http://schemas.android.com/apk/res/android" | ||
1921 | 3 | android:id="@android:id/text1" | ||
1922 | 4 | style="?android:attr/spinnerItemStyle" | ||
1923 | 5 | android:singleLine="true" | ||
1924 | 6 | android:layout_width="match_parent" | ||
1925 | 7 | android:layout_height="wrap_content" | ||
1926 | 8 | android:textColor="#000" | ||
1927 | 9 | android:textAppearance="?android:attr/textAppearanceLarge" | ||
1928 | 10 | android:ellipsize="marquee" | ||
1929 | 11 | android:textStyle="bold|italic" /> | ||
1930 | 0 | \ No newline at end of file | 12 | \ No newline at end of file |
1931 | 1 | 13 | ||
1932 | === modified file 'app/src/main/res/menu/open_l.xml' | |||
1933 | --- app/src/main/res/menu/open_l.xml 2015-05-27 20:05:55 +0000 | |||
1934 | +++ app/src/main/res/menu/open_l.xml 2016-11-10 19:40:57 +0000 | |||
1935 | @@ -16,10 +16,6 @@ | |||
1936 | 16 | android:icon="@drawable/ic_refresh_white" | 16 | android:icon="@drawable/ic_refresh_white" |
1937 | 17 | android:title="@string/action_refresh" | 17 | android:title="@string/action_refresh" |
1938 | 18 | app:showAsAction="ifRoom" /> | 18 | app:showAsAction="ifRoom" /> |
1939 | 19 | <item android:id="@+id/action_search" | ||
1940 | 20 | android:icon="@drawable/ic_search_white" | ||
1941 | 21 | android:title="@string/action_search" | ||
1942 | 22 | app:showAsAction="never|withText" /> | ||
1943 | 23 | <item android:id="@+id/action_preferences" | 19 | <item android:id="@+id/action_preferences" |
1944 | 24 | android:icon="@android:drawable/ic_menu_preferences" | 20 | android:icon="@android:drawable/ic_menu_preferences" |
1945 | 25 | android:title="@string/action_preferences" | 21 | android:title="@string/action_preferences" |
1946 | 26 | 22 | ||
1947 | === modified file 'app/src/main/res/values-af/strings.xml' | |||
1948 | --- app/src/main/res/values-af/strings.xml 2015-05-30 05:53:10 +0000 | |||
1949 | +++ app/src/main/res/values-af/strings.xml 2016-11-10 19:40:57 +0000 | |||
1950 | @@ -1,8 +1,12 @@ | |||
1951 | 1 | <?xml version='1.0' encoding='UTF-8'?> | 1 | <?xml version='1.0' encoding='UTF-8'?> |
1952 | 2 | <resources> | 2 | <resources> |
1953 | 3 | <string name="about_display_1">OpenLP is \'n gratis kerk skyfievertoning sagteware</string> | ||
1954 | 4 | <string name="about_display_2">Besoek die OpenLP webwerf vir meer inligting</string> | ||
1955 | 3 | <string name="about_display_4">Kopiereg</string> | 5 | <string name="about_display_4">Kopiereg</string> |
1956 | 4 | <string name="about_display_5">Gedeeltelike kopiereg</string> | 6 | <string name="about_display_5">Gedeeltelike kopiereg</string> |
1957 | 5 | <string name="about_display_6">Lisensie</string> | 7 | <string name="about_display_6">Lisensie</string> |
1958 | 8 | <string name="about_display_7">Hierdie program is gratis; jy kan dit herversprei of verander volgens die GNU Algemene Publieke Lisensie se voorwaardes, wat gepubliseer is deur die Free Software Foundation; weergawe 2 van die lisensie.</string> | ||
1959 | 9 | <string name="about_display_8">Hierdie program word versprei met die hoop dat dit nuttig sal wees, maar SONDER ENIGE WAARBORG; selfs sonder \'n geimpliseerde waarborg dat dit TOEPASLIK IS VIR \'N SPESIFIEKE DOEL</string> | ||
1960 | 6 | <string name="action_settings">Instellings</string> | 10 | <string name="action_settings">Instellings</string> |
1961 | 7 | <string name="action_about">Aangaande</string> | 11 | <string name="action_about">Aangaande</string> |
1962 | 8 | <string name="action_alert">Waarskuwing</string> | 12 | <string name="action_alert">Waarskuwing</string> |
1963 | @@ -12,14 +16,39 @@ | |||
1964 | 12 | <string name="action_search">Soek</string> | 16 | <string name="action_search">Soek</string> |
1965 | 13 | <string name="app_name">OpenLP</string> | 17 | <string name="app_name">OpenLP</string> |
1966 | 14 | <string name="cancel">Kanselleer</string> | 18 | <string name="cancel">Kanselleer</string> |
1967 | 19 | <string name="connection_configuration">Konfigureer Netwerk</string> | ||
1968 | 20 | <string name="connection_password">Wagwoord</string> | ||
1969 | 21 | <string name="connection_profile">Bediener Inligting</string> | ||
1970 | 15 | <string name="connection_timeout">Konneksie Tyd-uitloop</string> | 22 | <string name="connection_timeout">Konneksie Tyd-uitloop</string> |
1971 | 16 | <string name="connection_timeout_summary">Kies \'n waarde (millisekondes)</string> | 23 | <string name="connection_timeout_summary">Kies \'n waarde (millisekondes)</string> |
1973 | 17 | <string name="display_blank_summary">Kies die gevraagde blanko tipe</string> | 24 | <string name="connection_userid">Gebruikernaame</string> |
1974 | 25 | <string name="custom_timeout">Stel pasgemaakte tyd afsnypunt</string> | ||
1975 | 26 | <string name="display_blank_summary">Kies die verlangde skerm</string> | ||
1976 | 27 | <string name="display_desktop">Vertoon Werkvlak agtergrond</string> | ||
1977 | 28 | <string name="display_list_autoscroll">Laat die gekose item toe om na die middel van die lys te beweeg</string> | ||
1978 | 29 | <string name="display_reset">Vertoon lewendige skerm</string> | ||
1979 | 30 | <string name="display_settings">Vertoon Verstelling</string> | ||
1980 | 31 | <string name="display_screen">Vertoon slegs Swart skerm</string> | ||
1981 | 32 | <string name="display_theme">Vertoon slegs Tema</string> | ||
1982 | 18 | <string name="enable_custom_timeouts">Bekragtig Aangepasde Tyd-uitlope</string> | 33 | <string name="enable_custom_timeouts">Bekragtig Aangepasde Tyd-uitlope</string> |
1983 | 34 | <string name="enter_alert_text">Voer Afkondiging teks in</string> | ||
1984 | 35 | <string name="enable_autoscroll">Laat skerms toe op outomatiese te sentreer</string> | ||
1985 | 19 | <string name="home">Tuis</string> | 36 | <string name="home">Tuis</string> |
1986 | 37 | <string name="httpreturn_unauthorised">Ongemagtigde Toegang, voer asb \'n geldige gebruikernaam en wagwoord in.</string> | ||
1987 | 38 | <string name="live_list">Lewendige Vertoonlys</string> | ||
1988 | 39 | <string name="live_view">Lewendige Kykskerm</string> | ||
1989 | 40 | <string name="navigation_drawer_open">Maak navigeer vouer oop</string> | ||
1990 | 41 | <string name="navigation_drawer_close">Sluit navigeer vouer</string> | ||
1991 | 42 | <string name="next">Volgende</string> | ||
1992 | 20 | <string name="none">Geen</string> | 43 | <string name="none">Geen</string> |
1993 | 21 | <string name="port">Poort</string> | 44 | <string name="port">Poort</string> |
1994 | 45 | <string name="previous">Vorige</string> | ||
1995 | 46 | <string name="process">Voer uit</string> | ||
1996 | 47 | <string name="service_list">Orde van diens</string> | ||
1997 | 48 | <string name="stage_view">Verhoog skerm</string> | ||
1998 | 49 | <string name="text_size">Kies die grootte van die vertoning-teks</string> | ||
1999 | 22 | <string name="text_size_summary">Verander die Diens teks grootte</string> | 50 | <string name="text_size_summary">Verander die Diens teks grootte</string> |
2000 | 23 | <string name="title_activity_settings">Instellings</string> | 51 | <string name="title_activity_settings">Instellings</string> |
2001 | 24 | <string name="url_hint">Gasheer naam of IP</string> | 52 | <string name="url_hint">Gasheer naam of IP</string> |
2002 | 53 | <string name="unable">Kan nie die versoek uitvoer nie - gaan jou netwerk verstellings na</string> | ||
2003 | 25 | </resources> | 54 | </resources> |
2004 | 26 | 55 | ||
2005 | === modified file 'app/src/main/res/values-bg/strings.xml' | |||
2006 | --- app/src/main/res/values-bg/strings.xml 2015-05-30 05:53:10 +0000 | |||
2007 | +++ app/src/main/res/values-bg/strings.xml 2016-11-10 19:40:57 +0000 | |||
2008 | @@ -13,11 +13,12 @@ | |||
2009 | 13 | <string name="cancel">Откажи</string> | 13 | <string name="cancel">Откажи</string> |
2010 | 14 | <string name="connection_timeout">Времето за изчакване на свързването</string> | 14 | <string name="connection_timeout">Времето за изчакване на свързването</string> |
2011 | 15 | <string name="connection_timeout_summary">Избери стойност (в милисекунди)</string> | 15 | <string name="connection_timeout_summary">Избери стойност (в милисекунди)</string> |
2012 | 16 | <string name="display_blank_summary">Избери изисквания тип на празнота</string> | ||
2013 | 17 | <string name="enable_custom_timeouts">Активирай клиентски срокове</string> | 16 | <string name="enable_custom_timeouts">Активирай клиентски срокове</string> |
2014 | 18 | <string name="home">Начало</string> | 17 | <string name="home">Начало</string> |
2015 | 18 | <string name="next">След.</string> | ||
2016 | 19 | <string name="none">Нищо</string> | 19 | <string name="none">Нищо</string> |
2017 | 20 | <string name="port">Порт</string> | 20 | <string name="port">Порт</string> |
2018 | 21 | <string name="previous">назад</string> | ||
2019 | 21 | <string name="text_size_summary">Промени размера на текста за Службата</string> | 22 | <string name="text_size_summary">Промени размера на текста за Службата</string> |
2020 | 22 | <string name="title_activity_settings">Настройки</string> | 23 | <string name="title_activity_settings">Настройки</string> |
2021 | 23 | <string name="url_hint">Hostname или IP</string> | 24 | <string name="url_hint">Hostname или IP</string> |
2022 | 24 | 25 | ||
2023 | === modified file 'app/src/main/res/values-cs/strings.xml' | |||
2024 | --- app/src/main/res/values-cs/strings.xml 2015-10-16 19:32:04 +0000 | |||
2025 | +++ app/src/main/res/values-cs/strings.xml 2016-11-10 19:40:57 +0000 | |||
2026 | @@ -20,8 +20,6 @@ | |||
2027 | 20 | <string name="connection_configuration">Nastavení sítě</string> | 20 | <string name="connection_configuration">Nastavení sítě</string> |
2028 | 21 | <string name="connection_password">Heslo</string> | 21 | <string name="connection_password">Heslo</string> |
2029 | 22 | <string name="connection_profile">Podrobnosti serveru</string> | 22 | <string name="connection_profile">Podrobnosti serveru</string> |
2030 | 23 | <string name="connection_profile_ssl_use">Použít HTTPS</string> | ||
2031 | 24 | <string name="connection_profile_ssl_summary">Upřesnit jestli použít HTTPS</string> | ||
2032 | 25 | <string name="connection_timeout">Časový limit spojení</string> | 23 | <string name="connection_timeout">Časový limit spojení</string> |
2033 | 26 | <string name="connection_timeout_summary">Vybrat hodnotu (milisekundy)</string> | 24 | <string name="connection_timeout_summary">Vybrat hodnotu (milisekundy)</string> |
2034 | 27 | <string name="connection_userid">Uživatelské jméno</string> | 25 | <string name="connection_userid">Uživatelské jméno</string> |
2035 | 28 | 26 | ||
2036 | === modified file 'app/src/main/res/values-da/strings.xml' | |||
2037 | --- app/src/main/res/values-da/strings.xml 2015-10-16 19:32:04 +0000 | |||
2038 | +++ app/src/main/res/values-da/strings.xml 2016-11-10 19:40:57 +0000 | |||
2039 | @@ -20,22 +20,24 @@ | |||
2040 | 20 | <string name="connection_configuration">Konfigurér netværk</string> | 20 | <string name="connection_configuration">Konfigurér netværk</string> |
2041 | 21 | <string name="connection_password">Adgangskode</string> | 21 | <string name="connection_password">Adgangskode</string> |
2042 | 22 | <string name="connection_profile">Serverdetaljer</string> | 22 | <string name="connection_profile">Serverdetaljer</string> |
2043 | 23 | <string name="connection_profile_ssl_use">Benyt HTTPS</string> | ||
2044 | 24 | <string name="connection_profile_ssl_summary">Angiv om HTTPS skal benyttes</string> | ||
2045 | 25 | <string name="connection_timeout">Timeout for forbindelse</string> | 23 | <string name="connection_timeout">Timeout for forbindelse</string> |
2046 | 26 | <string name="connection_timeout_summary">Vælg en værdi (millisekunder)</string> | 24 | <string name="connection_timeout_summary">Vælg en værdi (millisekunder)</string> |
2047 | 27 | <string name="connection_userid">Brugernavn</string> | 25 | <string name="connection_userid">Brugernavn</string> |
2048 | 28 | <string name="custom_timeout">Sæt brugerdefineret timeout</string> | 26 | <string name="custom_timeout">Sæt brugerdefineret timeout</string> |
2049 | 29 | <string name="display_blank_summary">Vælg den ønskede skærm</string> | 27 | <string name="display_blank_summary">Vælg den ønskede skærm</string> |
2050 | 30 | <string name="display_desktop">Vis skrivebordsbaggrund</string> | 28 | <string name="display_desktop">Vis skrivebordsbaggrund</string> |
2051 | 29 | <string name="display_list_autoscroll">Tillad centrering af det valgte element</string> | ||
2052 | 31 | <string name="display_reset">Vis fremvisningsskærm</string> | 30 | <string name="display_reset">Vis fremvisningsskærm</string> |
2053 | 31 | <string name="display_settings">Visningsindstillinger</string> | ||
2054 | 32 | <string name="display_screen">Vis kun sort</string> | 32 | <string name="display_screen">Vis kun sort</string> |
2055 | 33 | <string name="display_theme">Vis kun temabaggrund</string> | 33 | <string name="display_theme">Vis kun temabaggrund</string> |
2056 | 34 | <string name="enable_custom_timeouts">Aktiver brugerdefinerede timeouts</string> | 34 | <string name="enable_custom_timeouts">Aktiver brugerdefinerede timeouts</string> |
2057 | 35 | <string name="enter_alert_text">Indtast meddelelsestekst</string> | 35 | <string name="enter_alert_text">Indtast meddelelsestekst</string> |
2058 | 36 | <string name="enable_autoscroll">Tiilad autocentrering</string> | ||
2059 | 36 | <string name="home">Hjem</string> | 37 | <string name="home">Hjem</string> |
2060 | 37 | <string name="httpreturn_unauthorised">Adgang ikke godkendt. Indtast gyldigt brugernavn og adgangskode</string> | 38 | <string name="httpreturn_unauthorised">Adgang ikke godkendt. Indtast gyldigt brugernavn og adgangskode</string> |
2061 | 38 | <string name="live_list">Fremvisningsliste</string> | 39 | <string name="live_list">Fremvisningsliste</string> |
2062 | 40 | <string name="live_view">Præsentationsvisning</string> | ||
2063 | 39 | <string name="navigation_drawer_open">Åbn navigationsskuffe</string> | 41 | <string name="navigation_drawer_open">Åbn navigationsskuffe</string> |
2064 | 40 | <string name="navigation_drawer_close">Luk navigationsskuffe</string> | 42 | <string name="navigation_drawer_close">Luk navigationsskuffe</string> |
2065 | 41 | <string name="next">Næste</string> | 43 | <string name="next">Næste</string> |
2066 | 42 | 44 | ||
2067 | === modified file 'app/src/main/res/values-de/strings.xml' | |||
2068 | --- app/src/main/res/values-de/strings.xml 2015-10-16 19:32:04 +0000 | |||
2069 | +++ app/src/main/res/values-de/strings.xml 2016-11-10 19:40:57 +0000 | |||
2070 | @@ -1,8 +1,8 @@ | |||
2071 | 1 | <?xml version='1.0' encoding='UTF-8'?> | 1 | <?xml version='1.0' encoding='UTF-8'?> |
2072 | 2 | <resources> | 2 | <resources> |
2074 | 3 | <string name="about_display_1">OpenLP ist eine freie Präsentationssoftware für Kirchen und Gemeinden. Erfahre mehr über OpenLP.</string> | 3 | <string name="about_display_1">OpenLP ist eine freie Präsentationssoftware für Kirchen und Gemeinden.</string> |
2075 | 4 | <string name="about_display_2">Weitere Informationen sind auf der OpenLP Webseite zu finden.</string> | 4 | <string name="about_display_2">Weitere Informationen sind auf der OpenLP Webseite zu finden.</string> |
2077 | 5 | <string name="about_display_4">Copyright</string> | 5 | <string name="about_display_4">Urheberrecht</string> |
2078 | 6 | <string name="about_display_5">Anteiliges Urheberrecht</string> | 6 | <string name="about_display_5">Anteiliges Urheberrecht</string> |
2079 | 7 | <string name="about_display_6">Lizenz</string> | 7 | <string name="about_display_6">Lizenz</string> |
2080 | 8 | <string name="about_display_7">Dieses Programm ist freie Software. Sie können es unter den Bedingungen der GNU General Public License Version 2, herausgegeben von der Free Software Foundation, weitergeben und/oder modifizieren.</string> | 8 | <string name="about_display_7">Dieses Programm ist freie Software. Sie können es unter den Bedingungen der GNU General Public License Version 2, herausgegeben von der Free Software Foundation, weitergeben und/oder modifizieren.</string> |
2081 | @@ -12,7 +12,7 @@ | |||
2082 | 12 | <string name="action_alert">Hinweis</string> | 12 | <string name="action_alert">Hinweis</string> |
2083 | 13 | <string name="action_back">Zurück</string> | 13 | <string name="action_back">Zurück</string> |
2084 | 14 | <string name="action_blank">Anzeige umschalten</string> | 14 | <string name="action_blank">Anzeige umschalten</string> |
2086 | 15 | <string name="action_preferences">Voreinstellungen</string> | 15 | <string name="action_preferences">Einstellungen</string> |
2087 | 16 | <string name="action_refresh">Aktualisieren</string> | 16 | <string name="action_refresh">Aktualisieren</string> |
2088 | 17 | <string name="action_search">Suche</string> | 17 | <string name="action_search">Suche</string> |
2089 | 18 | <string name="app_name">OpenLP</string> | 18 | <string name="app_name">OpenLP</string> |
2090 | @@ -20,20 +20,20 @@ | |||
2091 | 20 | <string name="connection_configuration">Netzwerk einrichten</string> | 20 | <string name="connection_configuration">Netzwerk einrichten</string> |
2092 | 21 | <string name="connection_password">Passwort</string> | 21 | <string name="connection_password">Passwort</string> |
2093 | 22 | <string name="connection_profile">Server-Einstellungen</string> | 22 | <string name="connection_profile">Server-Einstellungen</string> |
2094 | 23 | <string name="connection_profile_ssl_use">HTTPS benutzen</string> | ||
2095 | 24 | <string name="connection_profile_ssl_summary">Festlegen, ob HTTPS verwendet werden soll</string> | ||
2096 | 25 | <string name="connection_timeout">Verbindungzeit überschritten</string> | 23 | <string name="connection_timeout">Verbindungzeit überschritten</string> |
2097 | 26 | <string name="connection_timeout_summary">Wähle einen Wert (in Millisekunden)</string> | 24 | <string name="connection_timeout_summary">Wähle einen Wert (in Millisekunden)</string> |
2098 | 27 | <string name="connection_userid">Benutzername</string> | 25 | <string name="connection_userid">Benutzername</string> |
2100 | 28 | <string name="custom_timeout">Setze eigenes Zeitlimit</string> | 26 | <string name="custom_timeout">Setze benutzerdefiniertes Zeitlimit</string> |
2101 | 29 | <string name="display_blank_summary">Wähle die erforderlichen Ansicht</string> | 27 | <string name="display_blank_summary">Wähle die erforderlichen Ansicht</string> |
2102 | 30 | <string name="display_desktop">Bildschirmhintergrund anzeigen</string> | 28 | <string name="display_desktop">Bildschirmhintergrund anzeigen</string> |
2103 | 29 | <string name="display_list_autoscroll">Ausgewähltes Item mittig in Liste</string> | ||
2104 | 31 | <string name="display_reset">Live-Ansicht anzeigen</string> | 30 | <string name="display_reset">Live-Ansicht anzeigen</string> |
2105 | 32 | <string name="display_settings">Anzeigeeinstellung</string> | 31 | <string name="display_settings">Anzeigeeinstellung</string> |
2106 | 33 | <string name="display_screen">Abdunkeln</string> | 32 | <string name="display_screen">Abdunkeln</string> |
2107 | 34 | <string name="display_theme">Nur Design anzeigen</string> | 33 | <string name="display_theme">Nur Design anzeigen</string> |
2108 | 35 | <string name="enable_custom_timeouts">Aktiviere eigene Time-outs</string> | 34 | <string name="enable_custom_timeouts">Aktiviere eigene Time-outs</string> |
2109 | 36 | <string name="enter_alert_text">Hinweis eingeben</string> | 35 | <string name="enter_alert_text">Hinweis eingeben</string> |
2110 | 36 | <string name="enable_autoscroll">Anzeigen automatisch zentrieren</string> | ||
2111 | 37 | <string name="home">Start</string> | 37 | <string name="home">Start</string> |
2112 | 38 | <string name="httpreturn_unauthorised">Zugriff nicht erlaubt, bitte einen gültigen Benutzernamen und das korrekte Passwort eingeben</string> | 38 | <string name="httpreturn_unauthorised">Zugriff nicht erlaubt, bitte einen gültigen Benutzernamen und das korrekte Passwort eingeben</string> |
2113 | 39 | <string name="live_list">Live Liste</string> | 39 | <string name="live_list">Live Liste</string> |
2114 | 40 | 40 | ||
2115 | === modified file 'app/src/main/res/values-en-rGB/strings.xml' | |||
2116 | --- app/src/main/res/values-en-rGB/strings.xml 2015-10-16 19:32:04 +0000 | |||
2117 | +++ app/src/main/res/values-en-rGB/strings.xml 2016-11-10 19:40:57 +0000 | |||
2118 | @@ -20,8 +20,6 @@ | |||
2119 | 20 | <string name="connection_configuration">Configure Network</string> | 20 | <string name="connection_configuration">Configure Network</string> |
2120 | 21 | <string name="connection_password">Password</string> | 21 | <string name="connection_password">Password</string> |
2121 | 22 | <string name="connection_profile">Server Details</string> | 22 | <string name="connection_profile">Server Details</string> |
2122 | 23 | <string name="connection_profile_ssl_use">Use HTTPS</string> | ||
2123 | 24 | <string name="connection_profile_ssl_summary">Specify whether HTTPS should be used</string> | ||
2124 | 25 | <string name="connection_timeout">Connection Timeout</string> | 23 | <string name="connection_timeout">Connection Timeout</string> |
2125 | 26 | <string name="connection_timeout_summary">Select a value (milliseconds)</string> | 24 | <string name="connection_timeout_summary">Select a value (milliseconds)</string> |
2126 | 27 | <string name="connection_userid">Username</string> | 25 | <string name="connection_userid">Username</string> |
2127 | 28 | 26 | ||
2128 | === modified file 'app/src/main/res/values-en-rZA/strings.xml' | |||
2129 | --- app/src/main/res/values-en-rZA/strings.xml 2015-10-16 19:32:04 +0000 | |||
2130 | +++ app/src/main/res/values-en-rZA/strings.xml 2016-11-10 19:40:57 +0000 | |||
2131 | @@ -20,8 +20,6 @@ | |||
2132 | 20 | <string name="connection_configuration">Configure Network</string> | 20 | <string name="connection_configuration">Configure Network</string> |
2133 | 21 | <string name="connection_password">Password</string> | 21 | <string name="connection_password">Password</string> |
2134 | 22 | <string name="connection_profile">Server Details</string> | 22 | <string name="connection_profile">Server Details</string> |
2135 | 23 | <string name="connection_profile_ssl_use">Use HTTPS</string> | ||
2136 | 24 | <string name="connection_profile_ssl_summary">Specify whether HTTPS should be used</string> | ||
2137 | 25 | <string name="connection_timeout">Connection Timeout</string> | 23 | <string name="connection_timeout">Connection Timeout</string> |
2138 | 26 | <string name="connection_timeout_summary">Select a value (milliseconds)</string> | 24 | <string name="connection_timeout_summary">Select a value (milliseconds)</string> |
2139 | 27 | <string name="connection_userid">Username</string> | 25 | <string name="connection_userid">Username</string> |
2140 | 28 | 26 | ||
2141 | === modified file 'app/src/main/res/values-es/strings.xml' | |||
2142 | --- app/src/main/res/values-es/strings.xml 2015-10-16 19:32:04 +0000 | |||
2143 | +++ app/src/main/res/values-es/strings.xml 2016-11-10 19:40:57 +0000 | |||
2144 | @@ -20,23 +20,24 @@ | |||
2145 | 20 | <string name="connection_configuration">Configurar Red</string> | 20 | <string name="connection_configuration">Configurar Red</string> |
2146 | 21 | <string name="connection_password">Clave</string> | 21 | <string name="connection_password">Clave</string> |
2147 | 22 | <string name="connection_profile">Detalles de Servidor</string> | 22 | <string name="connection_profile">Detalles de Servidor</string> |
2148 | 23 | <string name="connection_profile_ssl_use">Usar HTTPS</string> | ||
2149 | 24 | <string name="connection_profile_ssl_summary">Especificar si se debe usar HTTPS</string> | ||
2150 | 25 | <string name="connection_timeout">Tiempo de espera de conexión</string> | 23 | <string name="connection_timeout">Tiempo de espera de conexión</string> |
2151 | 26 | <string name="connection_timeout_summary">Seleccione un valor (en milisegundos)</string> | 24 | <string name="connection_timeout_summary">Seleccione un valor (en milisegundos)</string> |
2152 | 27 | <string name="connection_userid">Usuario</string> | 25 | <string name="connection_userid">Usuario</string> |
2153 | 28 | <string name="custom_timeout">Tiempo de espera personalizado</string> | 26 | <string name="custom_timeout">Tiempo de espera personalizado</string> |
2154 | 29 | <string name="display_blank_summary">Seleccionar la pantalla requerida</string> | 27 | <string name="display_blank_summary">Seleccionar la pantalla requerida</string> |
2155 | 30 | <string name="display_desktop">Mostrar Fondo del Escritorio</string> | 28 | <string name="display_desktop">Mostrar Fondo del Escritorio</string> |
2156 | 29 | <string name="display_list_autoscroll">Permitir que el elemento actual se desplace hacia el centro de la lista</string> | ||
2157 | 31 | <string name="display_reset">Mostrar pantalla En Vivo</string> | 30 | <string name="display_reset">Mostrar pantalla En Vivo</string> |
2158 | 32 | <string name="display_settings">Preferencias de pantalla</string> | 31 | <string name="display_settings">Preferencias de pantalla</string> |
2159 | 33 | <string name="display_screen">Mostrar Negro solamente</string> | 32 | <string name="display_screen">Mostrar Negro solamente</string> |
2160 | 34 | <string name="display_theme">Mostrar Tema solamente</string> | 33 | <string name="display_theme">Mostrar Tema solamente</string> |
2161 | 35 | <string name="enable_custom_timeouts">Permitir tiempos de espera personalizados</string> | 34 | <string name="enable_custom_timeouts">Permitir tiempos de espera personalizados</string> |
2162 | 36 | <string name="enter_alert_text">Ingrese Texto de Alerta</string> | 35 | <string name="enter_alert_text">Ingrese Texto de Alerta</string> |
2163 | 36 | <string name="enable_autoscroll">Permitir auto centrado de pantalla</string> | ||
2164 | 37 | <string name="home">Inicio</string> | 37 | <string name="home">Inicio</string> |
2165 | 38 | <string name="httpreturn_unauthorised">Acceso No Autorizado, ingrese usuario y clave válidos</string> | 38 | <string name="httpreturn_unauthorised">Acceso No Autorizado, ingrese usuario y clave válidos</string> |
2166 | 39 | <string name="live_list">Lista En Vivo</string> | 39 | <string name="live_list">Lista En Vivo</string> |
2167 | 40 | <string name="live_view">Vista En Vivo</string> | ||
2168 | 40 | <string name="navigation_drawer_open">Abrir cajón de navegación</string> | 41 | <string name="navigation_drawer_open">Abrir cajón de navegación</string> |
2169 | 41 | <string name="navigation_drawer_close">Cerrar cajón de navegación</string> | 42 | <string name="navigation_drawer_close">Cerrar cajón de navegación</string> |
2170 | 42 | <string name="next">Siguiente</string> | 43 | <string name="next">Siguiente</string> |
2171 | 43 | 44 | ||
2172 | === modified file 'app/src/main/res/values-et/strings.xml' | |||
2173 | --- app/src/main/res/values-et/strings.xml 2015-10-16 19:32:04 +0000 | |||
2174 | +++ app/src/main/res/values-et/strings.xml 2016-11-10 19:40:57 +0000 | |||
2175 | @@ -18,8 +18,6 @@ | |||
2176 | 18 | <string name="connection_configuration">Seadista võrk</string> | 18 | <string name="connection_configuration">Seadista võrk</string> |
2177 | 19 | <string name="connection_password">Parool</string> | 19 | <string name="connection_password">Parool</string> |
2178 | 20 | <string name="connection_profile">Serveri andmed</string> | 20 | <string name="connection_profile">Serveri andmed</string> |
2179 | 21 | <string name="connection_profile_ssl_use">HTTPSi kasutamine</string> | ||
2180 | 22 | <string name="connection_profile_ssl_summary">Määra, kas kasutada tuleks HTTPSi kaudu ühendust</string> | ||
2181 | 23 | <string name="connection_timeout">Ühenduse aegumine</string> | 21 | <string name="connection_timeout">Ühenduse aegumine</string> |
2182 | 24 | <string name="connection_timeout_summary">Vali kestus (millisekundid)</string> | 22 | <string name="connection_timeout_summary">Vali kestus (millisekundid)</string> |
2183 | 25 | <string name="connection_userid">Kasutajanimi</string> | 23 | <string name="connection_userid">Kasutajanimi</string> |
2184 | @@ -36,6 +34,7 @@ | |||
2185 | 36 | <string name="home">Kodu</string> | 34 | <string name="home">Kodu</string> |
2186 | 37 | <string name="httpreturn_unauthorised">Lubamatu ligipääs, palun sisesta õiged kasutajanimi ja parool.</string> | 35 | <string name="httpreturn_unauthorised">Lubamatu ligipääs, palun sisesta õiged kasutajanimi ja parool.</string> |
2187 | 38 | <string name="live_list">Ekraanil</string> | 36 | <string name="live_list">Ekraanil</string> |
2188 | 37 | <string name="live_view">Ekraan</string> | ||
2189 | 39 | <string name="navigation_drawer_open">Ava navisahtel</string> | 38 | <string name="navigation_drawer_open">Ava navisahtel</string> |
2190 | 40 | <string name="navigation_drawer_close">Sulge navisahtel</string> | 39 | <string name="navigation_drawer_close">Sulge navisahtel</string> |
2191 | 41 | <string name="next">Järgmine</string> | 40 | <string name="next">Järgmine</string> |
2192 | 42 | 41 | ||
2193 | === modified file 'app/src/main/res/values-fi/strings.xml' | |||
2194 | --- app/src/main/res/values-fi/strings.xml 2015-10-16 19:32:04 +0000 | |||
2195 | +++ app/src/main/res/values-fi/strings.xml 2016-11-10 19:40:57 +0000 | |||
2196 | @@ -20,8 +20,6 @@ | |||
2197 | 20 | <string name="connection_configuration">Verkon asetukset</string> | 20 | <string name="connection_configuration">Verkon asetukset</string> |
2198 | 21 | <string name="connection_password">Salasana</string> | 21 | <string name="connection_password">Salasana</string> |
2199 | 22 | <string name="connection_profile">Palvelimen asetukset</string> | 22 | <string name="connection_profile">Palvelimen asetukset</string> |
2200 | 23 | <string name="connection_profile_ssl_use">Käytä HTTPS</string> | ||
2201 | 24 | <string name="connection_profile_ssl_summary">Määrittele tahdotaanko HTTPS ottaa käyttöön</string> | ||
2202 | 25 | <string name="connection_timeout">Yhteyden aikakatkaisu</string> | 23 | <string name="connection_timeout">Yhteyden aikakatkaisu</string> |
2203 | 26 | <string name="connection_timeout_summary">Valitse arvo (millisekuntia)</string> | 24 | <string name="connection_timeout_summary">Valitse arvo (millisekuntia)</string> |
2204 | 27 | <string name="connection_userid">Käyttäjätunnus</string> | 25 | <string name="connection_userid">Käyttäjätunnus</string> |
2205 | 28 | 26 | ||
2206 | === modified file 'app/src/main/res/values-fr/strings.xml' | |||
2207 | --- app/src/main/res/values-fr/strings.xml 2015-05-30 05:53:10 +0000 | |||
2208 | +++ app/src/main/res/values-fr/strings.xml 2016-11-10 19:40:57 +0000 | |||
2209 | @@ -1,25 +1,55 @@ | |||
2210 | 1 | <?xml version='1.0' encoding='UTF-8'?> | 1 | <?xml version='1.0' encoding='UTF-8'?> |
2211 | 2 | <resources> | 2 | <resources> |
2212 | 3 | <string name="about_display_1">OpenLP est un logiciel de projection libre</string> | ||
2213 | 4 | <string name="about_display_2">Pour en savoir plus visitez le site web d\'OpenLP</string> | ||
2214 | 3 | <string name="about_display_4">Copyright</string> | 5 | <string name="about_display_4">Copyright</string> |
2215 | 4 | <string name="about_display_5">Copyright partiel</string> | 6 | <string name="about_display_5">Copyright partiel</string> |
2216 | 5 | <string name="about_display_6">Licence</string> | 7 | <string name="about_display_6">Licence</string> |
2217 | 8 | <string name="about_display_7">Ce programme est un logiciel libre; vous pouvez le redistribuer et/ou le modifier au titre des clauses de la Licence Publique Générale GNU, telle que publiée par la Free Software Foundation; version 2 de la Licence.</string> | ||
2218 | 9 | <string name="about_display_8">Ce programme est distribué dans l\'espoir qu\'il sera utile, mais SANS AUCUNE GARANTIE ; sans même une garantie implicite de COMMERCIABILITÉ ou DE CONFORMITÉ À UNE UTILISATION PARTICULIÈRE.</string> | ||
2219 | 6 | <string name="action_settings">Paramètres</string> | 10 | <string name="action_settings">Paramètres</string> |
2220 | 7 | <string name="action_about">A propos de</string> | 11 | <string name="action_about">A propos de</string> |
2221 | 8 | <string name="action_alert">Alerte</string> | 12 | <string name="action_alert">Alerte</string> |
2222 | 9 | <string name="action_back">Arrière</string> | 13 | <string name="action_back">Arrière</string> |
2223 | 14 | <string name="action_blank">Afficher/Masquer</string> | ||
2224 | 10 | <string name="action_preferences">Préférences</string> | 15 | <string name="action_preferences">Préférences</string> |
2225 | 11 | <string name="action_refresh">Rafraîchir</string> | 16 | <string name="action_refresh">Rafraîchir</string> |
2226 | 12 | <string name="action_search">Recherche</string> | 17 | <string name="action_search">Recherche</string> |
2227 | 13 | <string name="app_name">OpenLP</string> | 18 | <string name="app_name">OpenLP</string> |
2228 | 14 | <string name="cancel">Annuler</string> | 19 | <string name="cancel">Annuler</string> |
2229 | 20 | <string name="connection_configuration">Configuration du réseau</string> | ||
2230 | 21 | <string name="connection_password">Mot de passe</string> | ||
2231 | 22 | <string name="connection_profile">Détails du serveur</string> | ||
2232 | 15 | <string name="connection_timeout">Délai de connexion</string> | 23 | <string name="connection_timeout">Délai de connexion</string> |
2233 | 16 | <string name="connection_timeout_summary">Sélectionnez une valeur (millisecondes)</string> | 24 | <string name="connection_timeout_summary">Sélectionnez une valeur (millisecondes)</string> |
2235 | 17 | <string name="display_blank_summary">Sélectionnez le type vide requis</string> | 25 | <string name="connection_userid">Nom d\'utilisateur</string> |
2236 | 26 | <string name="custom_timeout">Définir un délai personnalisé</string> | ||
2237 | 27 | <string name="display_blank_summary">Sélectionner l\'affichage souhaité</string> | ||
2238 | 28 | <string name="display_desktop">Afficher le fond du bureau</string> | ||
2239 | 29 | <string name="display_list_autoscroll">Permettre à l\'élément sélectionné de défiler au centre de la liste</string> | ||
2240 | 30 | <string name="display_reset">Afficher le direct</string> | ||
2241 | 31 | <string name="display_settings">Paramètres d\'affichage</string> | ||
2242 | 32 | <string name="display_screen">Afficher un écran noir</string> | ||
2243 | 33 | <string name="display_theme">Afficher uniquement le thème</string> | ||
2244 | 18 | <string name="enable_custom_timeouts">Activer le délai personnalisé</string> | 34 | <string name="enable_custom_timeouts">Activer le délai personnalisé</string> |
2245 | 35 | <string name="enter_alert_text">Entrer le message d\'alerte</string> | ||
2246 | 36 | <string name="enable_autoscroll">Permettre les affichages au centre</string> | ||
2247 | 19 | <string name="home">Accueil</string> | 37 | <string name="home">Accueil</string> |
2248 | 38 | <string name="httpreturn_unauthorised">Accès refusé, veuillez entrer un nom d\'utilisateur et un mot de passe valide</string> | ||
2249 | 39 | <string name="live_list">Liste du direct</string> | ||
2250 | 40 | <string name="live_view">Vue du direct</string> | ||
2251 | 41 | <string name="navigation_drawer_open">Ouvrir le tiroir de navigation</string> | ||
2252 | 42 | <string name="navigation_drawer_close">Fermer le tiroir de navigation</string> | ||
2253 | 43 | <string name="next">Suivant</string> | ||
2254 | 20 | <string name="none">Rien</string> | 44 | <string name="none">Rien</string> |
2255 | 21 | <string name="port">Port</string> | 45 | <string name="port">Port</string> |
2256 | 46 | <string name="previous">Précédent</string> | ||
2257 | 47 | <string name="process">Processus</string> | ||
2258 | 48 | <string name="service_list">Liste du service</string> | ||
2259 | 49 | <string name="stage_view">Prompteur</string> | ||
2260 | 50 | <string name="text_size">Sélectionner la taille du texte</string> | ||
2261 | 22 | <string name="text_size_summary">Modifier la taille du texte du service</string> | 51 | <string name="text_size_summary">Modifier la taille du texte du service</string> |
2262 | 23 | <string name="title_activity_settings">Paramètres</string> | 52 | <string name="title_activity_settings">Paramètres</string> |
2263 | 24 | <string name="url_hint">Nom d\'hôte ou IP</string> | 53 | <string name="url_hint">Nom d\'hôte ou IP</string> |
2264 | 54 | <string name="unable">Impossible d\'effectuer la demande - vérifiez les paramètres réseau</string> | ||
2265 | 25 | </resources> | 55 | </resources> |
2266 | 26 | 56 | ||
2267 | === modified file 'app/src/main/res/values-hu/strings.xml' | |||
2268 | --- app/src/main/res/values-hu/strings.xml 2015-10-16 19:32:04 +0000 | |||
2269 | +++ app/src/main/res/values-hu/strings.xml 2016-11-10 19:40:57 +0000 | |||
2270 | @@ -20,13 +20,11 @@ | |||
2271 | 20 | <string name="connection_configuration">Hálózat beállítása</string> | 20 | <string name="connection_configuration">Hálózat beállítása</string> |
2272 | 21 | <string name="connection_password">Jelszó</string> | 21 | <string name="connection_password">Jelszó</string> |
2273 | 22 | <string name="connection_profile">Szerver részletek</string> | 22 | <string name="connection_profile">Szerver részletek</string> |
2274 | 23 | <string name="connection_profile_ssl_use">HTTPS alkalmazása</string> | ||
2275 | 24 | <string name="connection_profile_ssl_summary">HTTPS alkalmazásának meghatározása</string> | ||
2276 | 25 | <string name="connection_timeout">Kapcsolódási időtúllépés</string> | 23 | <string name="connection_timeout">Kapcsolódási időtúllépés</string> |
2278 | 26 | <string name="connection_timeout_summary">Válassz egy értéket (milliszekundum)</string> | 24 | <string name="connection_timeout_summary">Érték választása (milliszekundum)</string> |
2279 | 27 | <string name="connection_userid">Felhasználói név</string> | 25 | <string name="connection_userid">Felhasználói név</string> |
2280 | 28 | <string name="custom_timeout">Egyéni időtúllépés beállítása</string> | 26 | <string name="custom_timeout">Egyéni időtúllépés beállítása</string> |
2282 | 29 | <string name="display_blank_summary">Válaszd ki a kívánt megjelenést</string> | 27 | <string name="display_blank_summary">Kívánt megjelenés kiválasztása</string> |
2283 | 30 | <string name="display_desktop">Asztal hátterének megjelenítése</string> | 28 | <string name="display_desktop">Asztal hátterének megjelenítése</string> |
2284 | 31 | <string name="display_list_autoscroll">Görgetés a lista közepére a kijelölt elemhez</string> | 29 | <string name="display_list_autoscroll">Görgetés a lista közepére a kijelölt elemhez</string> |
2285 | 32 | <string name="display_reset">Élő adás megjelenítése</string> | 30 | <string name="display_reset">Élő adás megjelenítése</string> |
2286 | @@ -37,7 +35,7 @@ | |||
2287 | 37 | <string name="enter_alert_text">Riasztási üzenet megadása</string> | 35 | <string name="enter_alert_text">Riasztási üzenet megadása</string> |
2288 | 38 | <string name="enable_autoscroll">Megjelenés automatikus középre igazítása</string> | 36 | <string name="enable_autoscroll">Megjelenés automatikus középre igazítása</string> |
2289 | 39 | <string name="home">Kezdőlap</string> | 37 | <string name="home">Kezdőlap</string> |
2291 | 40 | <string name="httpreturn_unauthorised">Engedély nélküli hozzáférés, adjon meg érvényes felhasználói nevet és jelszót</string> | 38 | <string name="httpreturn_unauthorised">Engedély nélküli hozzáférés, érvényes a felhasználói név és a jelszó?</string> |
2292 | 41 | <string name="live_list">Élő lista</string> | 39 | <string name="live_list">Élő lista</string> |
2293 | 42 | <string name="live_view">Élő nézet</string> | 40 | <string name="live_view">Élő nézet</string> |
2294 | 43 | <string name="navigation_drawer_open">Menü megnyitása</string> | 41 | <string name="navigation_drawer_open">Menü megnyitása</string> |
2295 | @@ -53,5 +51,5 @@ | |||
2296 | 53 | <string name="text_size_summary">Sorrend betűméretének módosítása</string> | 51 | <string name="text_size_summary">Sorrend betűméretének módosítása</string> |
2297 | 54 | <string name="title_activity_settings">Beállítások</string> | 52 | <string name="title_activity_settings">Beállítások</string> |
2298 | 55 | <string name="url_hint">Gépnév vagy IP-cím</string> | 53 | <string name="url_hint">Gépnév vagy IP-cím</string> |
2300 | 56 | <string name="unable">A kérés feldolgozhatatlan - ellenőrizzük a hálózati beállításokat</string> | 54 | <string name="unable">A kérés feldolgozhatatlan ‒ a hálózati beállítások ellenőrzése javasolt</string> |
2301 | 57 | </resources> | 55 | </resources> |
2302 | 58 | 56 | ||
2303 | === modified file 'app/src/main/res/values-id/strings.xml' | |||
2304 | --- app/src/main/res/values-id/strings.xml 2015-10-16 19:32:04 +0000 | |||
2305 | +++ app/src/main/res/values-id/strings.xml 2016-11-10 19:40:57 +0000 | |||
2306 | @@ -20,22 +20,24 @@ | |||
2307 | 20 | <string name="connection_configuration">Mengkonfigurasi Jaringan</string> | 20 | <string name="connection_configuration">Mengkonfigurasi Jaringan</string> |
2308 | 21 | <string name="connection_password">Kata sandi</string> | 21 | <string name="connection_password">Kata sandi</string> |
2309 | 22 | <string name="connection_profile">Rincian Server</string> | 22 | <string name="connection_profile">Rincian Server</string> |
2310 | 23 | <string name="connection_profile_ssl_use">Gunakan HTTPS</string> | ||
2311 | 24 | <string name="connection_profile_ssl_summary">Tentukan apakah HTTPS seharusnya digunakan</string> | ||
2312 | 25 | <string name="connection_timeout">Batas-Waktu Sambungan</string> | 23 | <string name="connection_timeout">Batas-Waktu Sambungan</string> |
2313 | 26 | <string name="connection_timeout_summary">Pilih sebuah nilai (milidetik)</string> | 24 | <string name="connection_timeout_summary">Pilih sebuah nilai (milidetik)</string> |
2314 | 27 | <string name="connection_userid">Nama Pengguna</string> | 25 | <string name="connection_userid">Nama Pengguna</string> |
2315 | 28 | <string name="custom_timeout">Setel Batas-waktu Kustom</string> | 26 | <string name="custom_timeout">Setel Batas-waktu Kustom</string> |
2316 | 29 | <string name="display_blank_summary">Pilih tampilan yang dibutuhkan</string> | 27 | <string name="display_blank_summary">Pilih tampilan yang dibutuhkan</string> |
2317 | 30 | <string name="display_desktop">Tampilkan latar Desktop</string> | 28 | <string name="display_desktop">Tampilkan latar Desktop</string> |
2318 | 29 | <string name="display_list_autoscroll">Izinkan butir terpilih untuk digulir ke tengah daftar</string> | ||
2319 | 31 | <string name="display_reset">Tampilkan tampilan Tayang</string> | 30 | <string name="display_reset">Tampilkan tampilan Tayang</string> |
2320 | 31 | <string name="display_settings">Setelan Tampilan</string> | ||
2321 | 32 | <string name="display_screen">Tampilkan Layar Hitam saja</string> | 32 | <string name="display_screen">Tampilkan Layar Hitam saja</string> |
2322 | 33 | <string name="display_theme">Tampilkan Tema saja</string> | 33 | <string name="display_theme">Tampilkan Tema saja</string> |
2323 | 34 | <string name="enable_custom_timeouts">Aktifkan Batas-Waktu Kustom</string> | 34 | <string name="enable_custom_timeouts">Aktifkan Batas-Waktu Kustom</string> |
2324 | 35 | <string name="enter_alert_text">Masukkan Teks Peringatan</string> | 35 | <string name="enter_alert_text">Masukkan Teks Peringatan</string> |
2325 | 36 | <string name="enable_autoscroll">Izinkan semua tampilan diposisikan ke tengah secara otomatis</string> | ||
2326 | 36 | <string name="home">Beranda</string> | 37 | <string name="home">Beranda</string> |
2327 | 37 | <string name="httpreturn_unauthorised">Akses Tidak sah, silakan masukkan nama pengguna dan kata sandi yang valid</string> | 38 | <string name="httpreturn_unauthorised">Akses Tidak sah, silakan masukkan nama pengguna dan kata sandi yang valid</string> |
2328 | 38 | <string name="live_list">Daftar Tayang</string> | 39 | <string name="live_list">Daftar Tayang</string> |
2329 | 40 | <string name="live_view">Tinjauan Tayang</string> | ||
2330 | 39 | <string name="navigation_drawer_open">Buka penarik navigasi</string> | 41 | <string name="navigation_drawer_open">Buka penarik navigasi</string> |
2331 | 40 | <string name="navigation_drawer_close">Tutup penarik navigasi</string> | 42 | <string name="navigation_drawer_close">Tutup penarik navigasi</string> |
2332 | 41 | <string name="next">Selanjutnya</string> | 43 | <string name="next">Selanjutnya</string> |
2333 | 42 | 44 | ||
2334 | === modified file 'app/src/main/res/values-it/strings.xml' | |||
2335 | --- app/src/main/res/values-it/strings.xml 2015-05-30 05:53:10 +0000 | |||
2336 | +++ app/src/main/res/values-it/strings.xml 2016-11-10 19:40:57 +0000 | |||
2337 | @@ -1,6 +1,55 @@ | |||
2338 | 1 | <?xml version='1.0' encoding='UTF-8'?> | 1 | <?xml version='1.0' encoding='UTF-8'?> |
2339 | 2 | <resources> | 2 | <resources> |
2342 | 3 | <string name="about_display_6">Licensa</string> | 3 | <string name="about_display_1">OpenLP è un software libero di presentazione per le Chiese</string> |
2343 | 4 | <string name="action_alert">Allerta</string> | 4 | <string name="about_display_2">Per saperne di più visita il sito Web OpenLP</string> |
2344 | 5 | <string name="about_display_4">Copyright</string> | ||
2345 | 6 | <string name="about_display_5">Porzioni di copyright</string> | ||
2346 | 7 | <string name="about_display_6">Licenza</string> | ||
2347 | 8 | <string name="about_display_7">Questo è un software libero; può essere redistribuito e/o modificato nei termini della GNU General Public License come pubblicato dalla Free Software Foundation; vesione 2 della licenza</string> | ||
2348 | 9 | <string name="about_display_8">Questo programma è distribuito nella speranza che sia utile, ma SENZA ALCUNA GARANZIA, senza neppure l\'implicita garanzia della COMMERCIABILITA\' o IDONEITA\' PER UN PARTICOLARE SCOPO</string> | ||
2349 | 10 | <string name="action_settings">Impostazioni</string> | ||
2350 | 11 | <string name="action_about">Informazioni</string> | ||
2351 | 12 | <string name="action_alert">Avviso</string> | ||
2352 | 13 | <string name="action_back">Indietro</string> | ||
2353 | 14 | <string name="action_blank">Attiva/disattiva visualizzazione</string> | ||
2354 | 15 | <string name="action_preferences">Preferenze</string> | ||
2355 | 16 | <string name="action_refresh">Aggiorna</string> | ||
2356 | 5 | <string name="action_search">Ricerca</string> | 17 | <string name="action_search">Ricerca</string> |
2357 | 18 | <string name="app_name">OpenLP</string> | ||
2358 | 19 | <string name="cancel">Annulla</string> | ||
2359 | 20 | <string name="connection_configuration">Configura Rete</string> | ||
2360 | 21 | <string name="connection_password">Password</string> | ||
2361 | 22 | <string name="connection_profile">Dettagli Server</string> | ||
2362 | 23 | <string name="connection_timeout">Timeout Connessione</string> | ||
2363 | 24 | <string name="connection_timeout_summary">Seleziona un valore (millisecondi)</string> | ||
2364 | 25 | <string name="connection_userid">Nome Utente</string> | ||
2365 | 26 | <string name="custom_timeout">Imposta Timeout personalizzato</string> | ||
2366 | 27 | <string name="display_blank_summary">Selezionare il monitor desiderato</string> | ||
2367 | 28 | <string name="display_desktop">Visualizza sfondo Desktop</string> | ||
2368 | 29 | <string name="display_list_autoscroll">Consentire l\'elemento selezionato di scorrere al centro dell\'elenco</string> | ||
2369 | 30 | <string name="display_reset">Visualizzazione Live Show</string> | ||
2370 | 31 | <string name="display_settings">Impostazione Visualizzazione</string> | ||
2371 | 32 | <string name="display_screen">Solo Schermo Nero</string> | ||
2372 | 33 | <string name="display_theme">Visualizza solo il Tema</string> | ||
2373 | 34 | <string name="enable_custom_timeouts">Abilitare i timeout personalizzati</string> | ||
2374 | 35 | <string name="enter_alert_text">Inserisci il testo Avviso</string> | ||
2375 | 36 | <string name="enable_autoscroll">Consenti la visualizzazione al centro automaticamente</string> | ||
2376 | 37 | <string name="home">Inizio</string> | ||
2377 | 38 | <string name="httpreturn_unauthorised">Accesso non consentito, prego inserire un nome utente e password valida</string> | ||
2378 | 39 | <string name="live_list">Elenco LIVE</string> | ||
2379 | 40 | <string name="live_view">Visualizza LIVE</string> | ||
2380 | 41 | <string name="navigation_drawer_open">Apri sezione navigazione</string> | ||
2381 | 42 | <string name="navigation_drawer_close">Chiudi sezione navigazione</string> | ||
2382 | 43 | <string name="next">Successivo</string> | ||
2383 | 44 | <string name="none">Nessuno</string> | ||
2384 | 45 | <string name="port">Porta</string> | ||
2385 | 46 | <string name="previous">Precedente</string> | ||
2386 | 47 | <string name="process">Elabora</string> | ||
2387 | 48 | <string name="service_list">Elenco Servizio</string> | ||
2388 | 49 | <string name="stage_view">Visualizza Palco</string> | ||
2389 | 50 | <string name="text_size">Selezionare la dimensione testo di visualizzazione</string> | ||
2390 | 51 | <string name="text_size_summary">Modificare le dimensioni del testo di servizio</string> | ||
2391 | 52 | <string name="title_activity_settings">Impostazioni</string> | ||
2392 | 53 | <string name="url_hint">Hostname o IP</string> | ||
2393 | 54 | <string name="unable">Impossibile elaborare la richiesta - controllare le impostazioni di rete</string> | ||
2394 | 6 | </resources> | 55 | </resources> |
2395 | 7 | 56 | ||
2396 | === modified file 'app/src/main/res/values-ja/strings.xml' | |||
2397 | --- app/src/main/res/values-ja/strings.xml 2015-05-30 05:53:10 +0000 | |||
2398 | +++ app/src/main/res/values-ja/strings.xml 2016-11-10 19:40:57 +0000 | |||
2399 | @@ -1,8 +1,12 @@ | |||
2400 | 1 | <?xml version='1.0' encoding='UTF-8'?> | 1 | <?xml version='1.0' encoding='UTF-8'?> |
2401 | 2 | <resources> | 2 | <resources> |
2402 | 3 | <string name="about_display_1">OpenLPは無償の教会プレゼンテーション用ソフトです。</string> | ||
2403 | 4 | <string name="about_display_2">詳しくはOpenLPウェブサイトをご覧ください。</string> | ||
2404 | 3 | <string name="about_display_4">著作権</string> | 5 | <string name="about_display_4">著作権</string> |
2405 | 4 | <string name="about_display_5">追加の著作権</string> | 6 | <string name="about_display_5">追加の著作権</string> |
2406 | 5 | <string name="about_display_6">ライセンス</string> | 7 | <string name="about_display_6">ライセンス</string> |
2407 | 8 | <string name="about_display_7">このプログラムはフリーソフトウェアです。あなたはこれを、フリーソフトウェア財団によって発行された GNU 一般公衆利用許諾契約書バージョン2の定める条件の下で再頒布または改変することができます。</string> | ||
2408 | 9 | <string name="about_display_8">このプログラムは有用であることを願って頒布されますが、*全くの無保証* です。商業可能性の保証や特定の目的への適合性は、言外に示されたものも含め全く存在しません。</string> | ||
2409 | 6 | <string name="action_settings">設定</string> | 10 | <string name="action_settings">設定</string> |
2410 | 7 | <string name="action_about">情報</string> | 11 | <string name="action_about">情報</string> |
2411 | 8 | <string name="action_alert">警告</string> | 12 | <string name="action_alert">警告</string> |
2412 | @@ -12,13 +16,23 @@ | |||
2413 | 12 | <string name="action_search">検索</string> | 16 | <string name="action_search">検索</string> |
2414 | 13 | <string name="app_name">OpenLP</string> | 17 | <string name="app_name">OpenLP</string> |
2415 | 14 | <string name="cancel">キャンセル</string> | 18 | <string name="cancel">キャンセル</string> |
2416 | 19 | <string name="connection_configuration">ネットワーク設定</string> | ||
2417 | 20 | <string name="connection_password">パスワード</string> | ||
2418 | 21 | <string name="connection_profile">サーバの詳細</string> | ||
2419 | 15 | <string name="connection_timeout">接続タイムアウト</string> | 22 | <string name="connection_timeout">接続タイムアウト</string> |
2420 | 16 | <string name="connection_timeout_summary">値を選択 (ミリ秒)</string> | 23 | <string name="connection_timeout_summary">値を選択 (ミリ秒)</string> |
2422 | 17 | <string name="display_blank_summary">ブランクの種類を選択してください</string> | 24 | <string name="connection_userid">ユーザ名</string> |
2423 | 25 | <string name="custom_timeout">任意のタイムアウト時間を設定する</string> | ||
2424 | 18 | <string name="enable_custom_timeouts">任意のタイムアウトを有効にする</string> | 26 | <string name="enable_custom_timeouts">任意のタイムアウトを有効にする</string> |
2425 | 27 | <string name="enter_alert_text">警告文を入力</string> | ||
2426 | 19 | <string name="home">ホーム</string> | 28 | <string name="home">ホーム</string> |
2427 | 29 | <string name="httpreturn_unauthorised">認証が必要です。ユーザ名とパスワードを入力してください。</string> | ||
2428 | 30 | <string name="live_list">ライブ一覧</string> | ||
2429 | 31 | <string name="next">次</string> | ||
2430 | 20 | <string name="none">無し</string> | 32 | <string name="none">無し</string> |
2431 | 21 | <string name="port">ポート</string> | 33 | <string name="port">ポート</string> |
2432 | 34 | <string name="previous">前</string> | ||
2433 | 35 | <string name="text_size">文字の大きさを選択</string> | ||
2434 | 22 | <string name="text_size_summary">礼拝テキストの大きさを変更します</string> | 36 | <string name="text_size_summary">礼拝テキストの大きさを変更します</string> |
2435 | 23 | <string name="title_activity_settings">設定</string> | 37 | <string name="title_activity_settings">設定</string> |
2436 | 24 | <string name="url_hint">ホスト名またはIPアドレス</string> | 38 | <string name="url_hint">ホスト名またはIPアドレス</string> |
2437 | 25 | 39 | ||
2438 | === modified file 'app/src/main/res/values-ko/strings.xml' | |||
2439 | --- app/src/main/res/values-ko/strings.xml 2015-05-30 05:53:10 +0000 | |||
2440 | +++ app/src/main/res/values-ko/strings.xml 2016-11-10 19:40:57 +0000 | |||
2441 | @@ -2,9 +2,14 @@ | |||
2442 | 2 | <resources> | 2 | <resources> |
2443 | 3 | <string name="about_display_6">라이선스</string> | 3 | <string name="about_display_6">라이선스</string> |
2444 | 4 | <string name="action_settings">설정</string> | 4 | <string name="action_settings">설정</string> |
2445 | 5 | <string name="action_about">정보</string> | ||
2446 | 5 | <string name="action_alert">알림</string> | 6 | <string name="action_alert">알림</string> |
2447 | 7 | <string name="action_back">뒤로</string> | ||
2448 | 8 | <string name="action_refresh">새로 고침</string> | ||
2449 | 6 | <string name="action_search">검색</string> | 9 | <string name="action_search">검색</string> |
2450 | 7 | <string name="cancel">취소</string> | 10 | <string name="cancel">취소</string> |
2451 | 11 | <string name="home">처음</string> | ||
2452 | 12 | <string name="next">다음</string> | ||
2453 | 8 | <string name="port">포트</string> | 13 | <string name="port">포트</string> |
2454 | 9 | <string name="title_activity_settings">설정</string> | 14 | <string name="title_activity_settings">설정</string> |
2455 | 10 | </resources> | 15 | </resources> |
2456 | 11 | 16 | ||
2457 | === modified file 'app/src/main/res/values-large/refs.xml' | |||
2458 | --- app/src/main/res/values-large/refs.xml 2015-05-27 20:05:55 +0000 | |||
2459 | +++ app/src/main/res/values-large/refs.xml 2016-11-10 19:40:57 +0000 | |||
2460 | @@ -7,6 +7,5 @@ | |||
2461 | 7 | For more on layout aliases, see: | 7 | For more on layout aliases, see: |
2462 | 8 | http://developer.android.com/training/multiscreen/screensizes.html#TaskUseAliasFilters | 8 | http://developer.android.com/training/multiscreen/screensizes.html#TaskUseAliasFilters |
2463 | 9 | --> | 9 | --> |
2464 | 10 | <item name="fragment_item" type="layout">@layout/fragment_item_grid</item> | ||
2465 | 11 | 10 | ||
2466 | 12 | </resources> | 11 | </resources> |
2467 | 13 | \ No newline at end of file | 12 | \ No newline at end of file |
2468 | 14 | 13 | ||
2469 | === modified file 'app/src/main/res/values-lt/strings.xml' | |||
2470 | --- app/src/main/res/values-lt/strings.xml 2015-10-16 19:32:04 +0000 | |||
2471 | +++ app/src/main/res/values-lt/strings.xml 2016-11-10 19:40:57 +0000 | |||
2472 | @@ -20,8 +20,6 @@ | |||
2473 | 20 | <string name="connection_configuration">Konfigūruoti Tinklą</string> | 20 | <string name="connection_configuration">Konfigūruoti Tinklą</string> |
2474 | 21 | <string name="connection_password">Slaptažodis</string> | 21 | <string name="connection_password">Slaptažodis</string> |
2475 | 22 | <string name="connection_profile">Išsamiau apie Serverį</string> | 22 | <string name="connection_profile">Išsamiau apie Serverį</string> |
2476 | 23 | <string name="connection_profile_ssl_use">Naudoti HTTPS</string> | ||
2477 | 24 | <string name="connection_profile_ssl_summary">Nurodykite ar turėtų būti naudojamas HTTPS</string> | ||
2478 | 25 | <string name="connection_timeout">Sujungimo Laiko Limitas</string> | 23 | <string name="connection_timeout">Sujungimo Laiko Limitas</string> |
2479 | 26 | <string name="connection_timeout_summary">Pasirinkite reikšmę (milisekundėmis)</string> | 24 | <string name="connection_timeout_summary">Pasirinkite reikšmę (milisekundėmis)</string> |
2480 | 27 | <string name="connection_userid">Vartotojo vardas</string> | 25 | <string name="connection_userid">Vartotojo vardas</string> |
2481 | 28 | 26 | ||
2482 | === modified file 'app/src/main/res/values-lv/strings.xml' | |||
2483 | --- app/src/main/res/values-lv/strings.xml 2015-05-30 05:53:10 +0000 | |||
2484 | +++ app/src/main/res/values-lv/strings.xml 2016-11-10 19:40:57 +0000 | |||
2485 | @@ -1,8 +1,55 @@ | |||
2486 | 1 | <?xml version='1.0' encoding='UTF-8'?> | 1 | <?xml version='1.0' encoding='UTF-8'?> |
2487 | 2 | <resources> | 2 | <resources> |
2488 | 3 | <string name="about_display_1">OpenLP ir bezmaksas prezentāciju programma baznīcām</string> | ||
2489 | 4 | <string name="about_display_2">Lai uzzinātu vairāk, apmeklējiet mājaslapu</string> | ||
2490 | 5 | <string name="about_display_4">Autortiesības</string> | ||
2491 | 6 | <string name="about_display_5">Daļu autortiesības</string> | ||
2492 | 7 | <string name="about_display_6">Licence</string> | ||
2493 | 8 | <string name="about_display_7">Šī ir bezmaksas programma. Jūs varat to izplatīt vai mainīt pēc GNU publiskās licences noteikumiem, kas publicēti Free Software Foundation, 2. versijas licencē.</string> | ||
2494 | 9 | <string name="about_display_8">Šī programma ir izplatīta ar cerību, ka tā būs noderīga, bet be jebkādām garantijām par tās noderīgumu mērķim vai ienesīgumu.</string> | ||
2495 | 3 | <string name="action_settings">Iestatījumi</string> | 10 | <string name="action_settings">Iestatījumi</string> |
2496 | 11 | <string name="action_about">Par</string> | ||
2497 | 12 | <string name="action_alert">Ziņojums</string> | ||
2498 | 13 | <string name="action_back">Atgriezties</string> | ||
2499 | 14 | <string name="action_blank">Pārslēgt displeju</string> | ||
2500 | 15 | <string name="action_preferences">Iestatījumi</string> | ||
2501 | 16 | <string name="action_refresh">Atsvaidzināt</string> | ||
2502 | 17 | <string name="action_search">Meklēt</string> | ||
2503 | 4 | <string name="app_name">OpenLP</string> | 18 | <string name="app_name">OpenLP</string> |
2505 | 5 | <string name="connection_timeout">Savienojuma laika beigas</string> | 19 | <string name="cancel">Atcelt</string> |
2506 | 20 | <string name="connection_configuration">Tīkla konfigurācija</string> | ||
2507 | 21 | <string name="connection_password">Parole</string> | ||
2508 | 22 | <string name="connection_profile">Servera iestatījumi</string> | ||
2509 | 23 | <string name="connection_timeout">Savienojuma noildze</string> | ||
2510 | 6 | <string name="connection_timeout_summary">Izvēlieties vērtību (milisekundes)</string> | 24 | <string name="connection_timeout_summary">Izvēlieties vērtību (milisekundes)</string> |
2511 | 25 | <string name="connection_userid">Lietotājvārds</string> | ||
2512 | 26 | <string name="custom_timeout">Izvēlieties vēlamo noildzi</string> | ||
2513 | 27 | <string name="display_blank_summary">Izvēlieties nepieciešamo displeju</string> | ||
2514 | 28 | <string name="display_desktop">Parādīt fona attēlu</string> | ||
2515 | 29 | <string name="display_list_autoscroll">Atļaut šim elementa pārvietoties uz saraksta centru</string> | ||
2516 | 30 | <string name="display_reset">Parādīt displeju</string> | ||
2517 | 31 | <string name="display_settings">Ekrāna iestatījumi</string> | ||
2518 | 32 | <string name="display_screen">Attēlot melnu ekrānu</string> | ||
2519 | 33 | <string name="display_theme">Attēlot tēmas attēlu</string> | ||
2520 | 34 | <string name="enable_custom_timeouts">Iespējot pielāgotās noildzes</string> | ||
2521 | 35 | <string name="enter_alert_text">Ievadiet ziņojuma tekstu</string> | ||
2522 | 36 | <string name="enable_autoscroll">Atļaut ekrānam iecentrēties automatiski.</string> | ||
2523 | 37 | <string name="home">Sākums</string> | ||
2524 | 38 | <string name="httpreturn_unauthorised">Pieeja liegta! Lūdzu ievadiet pareizu lietotājvārdu un paroli.</string> | ||
2525 | 39 | <string name="live_list">Saraksts demonstrēšanai</string> | ||
2526 | 40 | <string name="live_view">Attēls ekrānā</string> | ||
2527 | 41 | <string name="navigation_drawer_open">Atvērt navigācijas slaidni</string> | ||
2528 | 42 | <string name="navigation_drawer_close">Aizvērt navigācijas slaidni</string> | ||
2529 | 43 | <string name="next">Nākamais</string> | ||
2530 | 44 | <string name="none">Nekas</string> | ||
2531 | 45 | <string name="port">Ports</string> | ||
2532 | 46 | <string name="previous">Iepriekšējais</string> | ||
2533 | 47 | <string name="process">Process</string> | ||
2534 | 48 | <string name="service_list">Saraksts</string> | ||
2535 | 49 | <string name="stage_view">Skatuves ekrāns</string> | ||
2536 | 50 | <string name="text_size">Izvēlieties teksta lielumu</string> | ||
2537 | 51 | <string name="text_size_summary">Izvēlieties dievkalpojuma teksta lielumu</string> | ||
2538 | 7 | <string name="title_activity_settings">Iestatījumi</string> | 52 | <string name="title_activity_settings">Iestatījumi</string> |
2539 | 53 | <string name="url_hint">Vārds vai IP adrese</string> | ||
2540 | 54 | <string name="unable">Nav iespējams apstrādāt pieprasījumu - pārbaudiet tīkla iestatījumus.</string> | ||
2541 | 8 | </resources> | 55 | </resources> |
2542 | 9 | 56 | ||
2543 | === modified file 'app/src/main/res/values-nb/strings.xml' | |||
2544 | --- app/src/main/res/values-nb/strings.xml 2015-10-16 19:32:04 +0000 | |||
2545 | +++ app/src/main/res/values-nb/strings.xml 2016-11-10 19:40:57 +0000 | |||
2546 | @@ -20,8 +20,6 @@ | |||
2547 | 20 | <string name="connection_configuration">Konfigurer nettverk</string> | 20 | <string name="connection_configuration">Konfigurer nettverk</string> |
2548 | 21 | <string name="connection_password">Passord</string> | 21 | <string name="connection_password">Passord</string> |
2549 | 22 | <string name="connection_profile">Serverditaljer</string> | 22 | <string name="connection_profile">Serverditaljer</string> |
2550 | 23 | <string name="connection_profile_ssl_use">Bruk HTTPS</string> | ||
2551 | 24 | <string name="connection_profile_ssl_summary">Angi om HTTPS skal brukes</string> | ||
2552 | 25 | <string name="connection_timeout">Tidsavbrudd for tilkobling</string> | 23 | <string name="connection_timeout">Tidsavbrudd for tilkobling</string> |
2553 | 26 | <string name="connection_timeout_summary">Velg en verdi (millisekund)</string> | 24 | <string name="connection_timeout_summary">Velg en verdi (millisekund)</string> |
2554 | 27 | <string name="connection_userid">Brukernavn</string> | 25 | <string name="connection_userid">Brukernavn</string> |
2555 | 28 | 26 | ||
2556 | === modified file 'app/src/main/res/values-nl/strings.xml' | |||
2557 | --- app/src/main/res/values-nl/strings.xml 2015-10-16 19:32:04 +0000 | |||
2558 | +++ app/src/main/res/values-nl/strings.xml 2016-11-10 19:40:57 +0000 | |||
2559 | @@ -20,22 +20,24 @@ | |||
2560 | 20 | <string name="connection_configuration">Netwerk instellen</string> | 20 | <string name="connection_configuration">Netwerk instellen</string> |
2561 | 21 | <string name="connection_password">Wachtwoord</string> | 21 | <string name="connection_password">Wachtwoord</string> |
2562 | 22 | <string name="connection_profile">Serverdetails</string> | 22 | <string name="connection_profile">Serverdetails</string> |
2563 | 23 | <string name="connection_profile_ssl_use">Gebruik HTTPS</string> | ||
2564 | 24 | <string name="connection_profile_ssl_summary">Geef aan of HTTPS gebruikt moet worden</string> | ||
2565 | 25 | <string name="connection_timeout">Verbindingstimeout</string> | 23 | <string name="connection_timeout">Verbindingstimeout</string> |
2566 | 26 | <string name="connection_timeout_summary">Selecteer een waarde (milliseconden)</string> | 24 | <string name="connection_timeout_summary">Selecteer een waarde (milliseconden)</string> |
2567 | 27 | <string name="connection_userid">Gebruikersnaam</string> | 25 | <string name="connection_userid">Gebruikersnaam</string> |
2568 | 28 | <string name="custom_timeout">Aangepaste timeout instellen</string> | 26 | <string name="custom_timeout">Aangepaste timeout instellen</string> |
2569 | 29 | <string name="display_blank_summary">Selecteer het verplichte scherm</string> | 27 | <string name="display_blank_summary">Selecteer het verplichte scherm</string> |
2570 | 30 | <string name="display_desktop">Toon Desktop achtergrond</string> | 28 | <string name="display_desktop">Toon Desktop achtergrond</string> |
2571 | 29 | <string name="display_list_autoscroll">Toegang geven aan geselecteerde items om naar het midden van de lijst te scrollen</string> | ||
2572 | 31 | <string name="display_reset">Toon live scherm</string> | 30 | <string name="display_reset">Toon live scherm</string> |
2573 | 31 | <string name="display_settings">Beeldscherminstellingen</string> | ||
2574 | 32 | <string name="display_screen">Toon alleen zwart</string> | 32 | <string name="display_screen">Toon alleen zwart</string> |
2575 | 33 | <string name="display_theme">Toon alleen thema</string> | 33 | <string name="display_theme">Toon alleen thema</string> |
2576 | 34 | <string name="enable_custom_timeouts"> Aangepaste timeouts toestaan</string> | 34 | <string name="enable_custom_timeouts"> Aangepaste timeouts toestaan</string> |
2577 | 35 | <string name="enter_alert_text">Voer waarschuwingstekst in</string> | 35 | <string name="enter_alert_text">Voer waarschuwingstekst in</string> |
2578 | 36 | <string name="enable_autoscroll">Schermen toegang geven tot auto center</string> | ||
2579 | 36 | <string name="home">Startpagina</string> | 37 | <string name="home">Startpagina</string> |
2580 | 37 | <string name="httpreturn_unauthorised">Geen toegang, voer juiste gebruikersnaam en wachtwoord in</string> | 38 | <string name="httpreturn_unauthorised">Geen toegang, voer juiste gebruikersnaam en wachtwoord in</string> |
2581 | 38 | <string name="live_list">Live lijst</string> | 39 | <string name="live_list">Live lijst</string> |
2582 | 40 | <string name="live_view">Live kijken</string> | ||
2583 | 39 | <string name="navigation_drawer_open">Open navigatiemenu</string> | 41 | <string name="navigation_drawer_open">Open navigatiemenu</string> |
2584 | 40 | <string name="navigation_drawer_close">Sluit navigatiemenu</string> | 42 | <string name="navigation_drawer_close">Sluit navigatiemenu</string> |
2585 | 41 | <string name="next">Volgende</string> | 43 | <string name="next">Volgende</string> |
2586 | 42 | 44 | ||
2587 | === modified file 'app/src/main/res/values-nn/strings.xml' | |||
2588 | --- app/src/main/res/values-nn/strings.xml 2015-05-30 05:53:10 +0000 | |||
2589 | +++ app/src/main/res/values-nn/strings.xml 2016-11-10 19:40:57 +0000 | |||
2590 | @@ -5,6 +5,8 @@ | |||
2591 | 5 | <string name="app_name">OpenLP</string> | 5 | <string name="app_name">OpenLP</string> |
2592 | 6 | <string name="connection_timeout">Tidsavbrot for tilkopling</string> | 6 | <string name="connection_timeout">Tidsavbrot for tilkopling</string> |
2593 | 7 | <string name="connection_timeout_summary">Oppgje ein verdi i millisekund</string> | 7 | <string name="connection_timeout_summary">Oppgje ein verdi i millisekund</string> |
2594 | 8 | <string name="next">Neste</string> | ||
2595 | 8 | <string name="port">Port</string> | 9 | <string name="port">Port</string> |
2596 | 10 | <string name="previous">Førre</string> | ||
2597 | 9 | <string name="title_activity_settings">Innstillingar.</string> | 11 | <string name="title_activity_settings">Innstillingar.</string> |
2598 | 10 | </resources> | 12 | </resources> |
2599 | 11 | 13 | ||
2600 | === modified file 'app/src/main/res/values-pap/strings.xml' | |||
2601 | --- app/src/main/res/values-pap/strings.xml 2015-05-30 05:53:10 +0000 | |||
2602 | +++ app/src/main/res/values-pap/strings.xml 2016-11-10 19:40:57 +0000 | |||
2603 | @@ -8,10 +8,11 @@ | |||
2604 | 8 | <string name="action_preferences">Preferensia</string> | 8 | <string name="action_preferences">Preferensia</string> |
2605 | 9 | <string name="action_search">Buska</string> | 9 | <string name="action_search">Buska</string> |
2606 | 10 | <string name="app_name">OpenLP</string> | 10 | <string name="app_name">OpenLP</string> |
2607 | 11 | <string name="display_blank_summary">Selekta e tipo blanko nesesario</string> | ||
2608 | 12 | <string name="enable_custom_timeouts">Permití Timeout adaptá</string> | 11 | <string name="enable_custom_timeouts">Permití Timeout adaptá</string> |
2609 | 12 | <string name="next">Sigiente</string> | ||
2610 | 13 | <string name="none">Niun</string> | 13 | <string name="none">Niun</string> |
2611 | 14 | <string name="port">Port</string> | 14 | <string name="port">Port</string> |
2612 | 15 | <string name="previous">Bai bèk</string> | ||
2613 | 15 | <string name="title_activity_settings">Konfigurashon</string> | 16 | <string name="title_activity_settings">Konfigurashon</string> |
2614 | 16 | <string name="url_hint">Hostname òf IP</string> | 17 | <string name="url_hint">Hostname òf IP</string> |
2615 | 17 | </resources> | 18 | </resources> |
2616 | 18 | 19 | ||
2617 | === modified file 'app/src/main/res/values-pl/strings.xml' | |||
2618 | --- app/src/main/res/values-pl/strings.xml 2015-10-16 19:32:04 +0000 | |||
2619 | +++ app/src/main/res/values-pl/strings.xml 2016-11-10 19:40:57 +0000 | |||
2620 | @@ -11,6 +11,7 @@ | |||
2621 | 11 | <string name="action_about">O programie</string> | 11 | <string name="action_about">O programie</string> |
2622 | 12 | <string name="action_alert">Komunikat</string> | 12 | <string name="action_alert">Komunikat</string> |
2623 | 13 | <string name="action_back">Wróć</string> | 13 | <string name="action_back">Wróć</string> |
2624 | 14 | <string name="action_blank">Przełącz Ekran</string> | ||
2625 | 14 | <string name="action_preferences">Preferencje</string> | 15 | <string name="action_preferences">Preferencje</string> |
2626 | 15 | <string name="action_refresh">Odśwież</string> | 16 | <string name="action_refresh">Odśwież</string> |
2627 | 16 | <string name="action_search">Szukaj</string> | 17 | <string name="action_search">Szukaj</string> |
2628 | @@ -19,23 +20,26 @@ | |||
2629 | 19 | <string name="connection_configuration">Konfiguruj sieć</string> | 20 | <string name="connection_configuration">Konfiguruj sieć</string> |
2630 | 20 | <string name="connection_password">Hasło</string> | 21 | <string name="connection_password">Hasło</string> |
2631 | 21 | <string name="connection_profile">Szczegóły serwera</string> | 22 | <string name="connection_profile">Szczegóły serwera</string> |
2632 | 22 | <string name="connection_profile_ssl_use">Używaj HTTPS</string> | ||
2633 | 23 | <string name="connection_profile_ssl_summary">Sprecyzuj czy HTTPS powinno być używane</string> | ||
2634 | 24 | <string name="connection_timeout">Limit czasowy połączenia</string> | 23 | <string name="connection_timeout">Limit czasowy połączenia</string> |
2635 | 25 | <string name="connection_timeout_summary">Wybierz wartość (milisekundy)</string> | 24 | <string name="connection_timeout_summary">Wybierz wartość (milisekundy)</string> |
2636 | 26 | <string name="connection_userid">Nazwa użytkownika</string> | 25 | <string name="connection_userid">Nazwa użytkownika</string> |
2637 | 27 | <string name="custom_timeout">Ustaw inny limit czasowy</string> | 26 | <string name="custom_timeout">Ustaw inny limit czasowy</string> |
2638 | 28 | <string name="display_blank_summary">Wybierz wyświetlacz</string> | 27 | <string name="display_blank_summary">Wybierz wyświetlacz</string> |
2639 | 29 | <string name="display_desktop">Wyświetl tło ekranu</string> | 28 | <string name="display_desktop">Wyświetl tło ekranu</string> |
2640 | 29 | <string name="display_list_autoscroll">Pozwól wybranemu elementowi przewinąć do środka listy</string> | ||
2641 | 30 | <string name="display_reset">Pokaż Ekran</string> | 30 | <string name="display_reset">Pokaż Ekran</string> |
2642 | 31 | <string name="display_settings">Ustawienia wyświetlania</string> | ||
2643 | 31 | <string name="display_screen">Wyświetl czarny ekran</string> | 32 | <string name="display_screen">Wyświetl czarny ekran</string> |
2644 | 32 | <string name="display_theme">Wyświetl tylko motyw</string> | 33 | <string name="display_theme">Wyświetl tylko motyw</string> |
2645 | 33 | <string name="enable_custom_timeouts">Niestandardowy limit czasu</string> | 34 | <string name="enable_custom_timeouts">Niestandardowy limit czasu</string> |
2646 | 34 | <string name="enter_alert_text">Wpisz tekst komunikatu</string> | 35 | <string name="enter_alert_text">Wpisz tekst komunikatu</string> |
2647 | 36 | <string name="enable_autoscroll">Pozwól na autowyśrodkowanie </string> | ||
2648 | 35 | <string name="home">Home</string> | 37 | <string name="home">Home</string> |
2649 | 36 | <string name="httpreturn_unauthorised">Nieuprawniony dostęp, proszę wprowadź nazwę użytkownika oraz hasło.</string> | 38 | <string name="httpreturn_unauthorised">Nieuprawniony dostęp, proszę wprowadź nazwę użytkownika oraz hasło.</string> |
2650 | 37 | <string name="live_list">Plan nabożeństwa</string> | 39 | <string name="live_list">Plan nabożeństwa</string> |
2651 | 38 | <string name="live_view">Ekran</string> | 40 | <string name="live_view">Ekran</string> |
2652 | 41 | <string name="navigation_drawer_open">Otwórz zakładkę nawigacji</string> | ||
2653 | 42 | <string name="navigation_drawer_close">Zamknij zakładkę nawigacji</string> | ||
2654 | 39 | <string name="next">Następny</string> | 43 | <string name="next">Następny</string> |
2655 | 40 | <string name="none">Nic</string> | 44 | <string name="none">Nic</string> |
2656 | 41 | <string name="port">Port</string> | 45 | <string name="port">Port</string> |
2657 | 42 | 46 | ||
2658 | === modified file 'app/src/main/res/values-pt-rBR/strings.xml' | |||
2659 | --- app/src/main/res/values-pt-rBR/strings.xml 2015-10-16 19:32:04 +0000 | |||
2660 | +++ app/src/main/res/values-pt-rBR/strings.xml 2016-11-10 19:40:57 +0000 | |||
2661 | @@ -11,7 +11,7 @@ | |||
2662 | 11 | <string name="action_about">Sobre</string> | 11 | <string name="action_about">Sobre</string> |
2663 | 12 | <string name="action_alert">Alertar</string> | 12 | <string name="action_alert">Alertar</string> |
2664 | 13 | <string name="action_back">Voltar</string> | 13 | <string name="action_back">Voltar</string> |
2666 | 14 | <string name="action_blank">Altenar Monitor</string> | 14 | <string name="action_blank">Alternar Monitor</string> |
2667 | 15 | <string name="action_preferences">Preferências</string> | 15 | <string name="action_preferences">Preferências</string> |
2668 | 16 | <string name="action_refresh">Atualizar</string> | 16 | <string name="action_refresh">Atualizar</string> |
2669 | 17 | <string name="action_search">Busca</string> | 17 | <string name="action_search">Busca</string> |
2670 | @@ -20,30 +20,33 @@ | |||
2671 | 20 | <string name="connection_configuration">Configurar Rede</string> | 20 | <string name="connection_configuration">Configurar Rede</string> |
2672 | 21 | <string name="connection_password">Senha</string> | 21 | <string name="connection_password">Senha</string> |
2673 | 22 | <string name="connection_profile">Detalhes do Servidor</string> | 22 | <string name="connection_profile">Detalhes do Servidor</string> |
2674 | 23 | <string name="connection_profile_ssl_use">Usar HTTPS</string> | ||
2675 | 24 | <string name="connection_profile_ssl_summary">Especifique se o HTTPS deve ser usado</string> | ||
2676 | 25 | <string name="connection_timeout">Tempo limite de conexão</string> | 23 | <string name="connection_timeout">Tempo limite de conexão</string> |
2677 | 26 | <string name="connection_timeout_summary">Selecione um valor (em milissegundos)</string> | 24 | <string name="connection_timeout_summary">Selecione um valor (em milissegundos)</string> |
2678 | 27 | <string name="connection_userid">Usuário</string> | 25 | <string name="connection_userid">Usuário</string> |
2679 | 28 | <string name="custom_timeout">Ativar Timeout Personalizado</string> | 26 | <string name="custom_timeout">Ativar Timeout Personalizado</string> |
2680 | 29 | <string name="display_blank_summary">Selecione o monitor requerido</string> | 27 | <string name="display_blank_summary">Selecione o monitor requerido</string> |
2681 | 30 | <string name="display_desktop">Exibir Plano de Fundo da Área de Trabalho</string> | 28 | <string name="display_desktop">Exibir Plano de Fundo da Área de Trabalho</string> |
2682 | 29 | <string name="display_list_autoscroll">Permitir ao item selecionado se deslocar ao centro da lista</string> | ||
2683 | 31 | <string name="display_reset">Mostrar Visualização Ao Vivo</string> | 30 | <string name="display_reset">Mostrar Visualização Ao Vivo</string> |
2684 | 32 | <string name="display_settings">Configurações de Exibição</string> | 31 | <string name="display_settings">Configurações de Exibição</string> |
2685 | 33 | <string name="display_screen">Exibir Tela Preta</string> | 32 | <string name="display_screen">Exibir Tela Preta</string> |
2686 | 34 | <string name="display_theme">Exibir Tema</string> | 33 | <string name="display_theme">Exibir Tema</string> |
2687 | 35 | <string name="enable_custom_timeouts">Habilitar Timeouts personalizados</string> | 34 | <string name="enable_custom_timeouts">Habilitar Timeouts personalizados</string> |
2688 | 36 | <string name="enter_alert_text">Digitar Texto de Alerta</string> | 35 | <string name="enter_alert_text">Digitar Texto de Alerta</string> |
2689 | 36 | <string name="enable_autoscroll">Auto-centralizar slides na tela</string> | ||
2690 | 37 | <string name="home">Home</string> | 37 | <string name="home">Home</string> |
2691 | 38 | <string name="httpreturn_unauthorised">Acesso não autorizado, por favor, digite usuário e senha válidos</string> | 38 | <string name="httpreturn_unauthorised">Acesso não autorizado, por favor, digite usuário e senha válidos</string> |
2692 | 39 | <string name="live_list">Lista Ao Vivo</string> | 39 | <string name="live_list">Lista Ao Vivo</string> |
2693 | 40 | <string name="live_view">Ao vivo</string> | ||
2694 | 41 | <string name="navigation_drawer_open">Abrir painel de navegação</string> | ||
2695 | 42 | <string name="navigation_drawer_close">Fechar painel de navegação</string> | ||
2696 | 40 | <string name="next">Próximo</string> | 43 | <string name="next">Próximo</string> |
2697 | 41 | <string name="none">Nenhum</string> | 44 | <string name="none">Nenhum</string> |
2698 | 42 | <string name="port">Porta</string> | 45 | <string name="port">Porta</string> |
2699 | 43 | <string name="previous">Anterior</string> | 46 | <string name="previous">Anterior</string> |
2700 | 44 | <string name="process">Processo</string> | 47 | <string name="process">Processo</string> |
2701 | 45 | <string name="service_list">Lista de Serviço</string> | 48 | <string name="service_list">Lista de Serviço</string> |
2703 | 46 | <string name="stage_view">Visualização de Palvo</string> | 49 | <string name="stage_view">Visualização de Palco</string> |
2704 | 47 | <string name="text_size">Selecionar tamanho do monitor de exibição</string> | 50 | <string name="text_size">Selecionar tamanho do monitor de exibição</string> |
2705 | 48 | <string name="text_size_summary">Alterar o tamanho do texto de culto</string> | 51 | <string name="text_size_summary">Alterar o tamanho do texto de culto</string> |
2706 | 49 | <string name="title_activity_settings">Configurações</string> | 52 | <string name="title_activity_settings">Configurações</string> |
2707 | 50 | 53 | ||
2708 | === modified file 'app/src/main/res/values-ro/strings.xml' | |||
2709 | --- app/src/main/res/values-ro/strings.xml 2015-10-16 19:32:04 +0000 | |||
2710 | +++ app/src/main/res/values-ro/strings.xml 2016-11-10 19:40:57 +0000 | |||
2711 | @@ -20,8 +20,6 @@ | |||
2712 | 20 | <string name="connection_configuration">Configurează Rețeaua</string> | 20 | <string name="connection_configuration">Configurează Rețeaua</string> |
2713 | 21 | <string name="connection_password">Parola</string> | 21 | <string name="connection_password">Parola</string> |
2714 | 22 | <string name="connection_profile">Detalii Server</string> | 22 | <string name="connection_profile">Detalii Server</string> |
2715 | 23 | <string name="connection_profile_ssl_use">Folosește HTTPS</string> | ||
2716 | 24 | <string name="connection_profile_ssl_summary">Specificați dacă ar trebui folosit HTTPS</string> | ||
2717 | 25 | <string name="connection_timeout">Conexiunea a expirat</string> | 23 | <string name="connection_timeout">Conexiunea a expirat</string> |
2718 | 26 | <string name="connection_timeout_summary">Selectați o valoare (milisecunde)</string> | 24 | <string name="connection_timeout_summary">Selectați o valoare (milisecunde)</string> |
2719 | 27 | <string name="connection_userid">Nume utilizator</string> | 25 | <string name="connection_userid">Nume utilizator</string> |
2720 | 28 | 26 | ||
2721 | === modified file 'app/src/main/res/values-ru/strings.xml' | |||
2722 | --- app/src/main/res/values-ru/strings.xml 2015-10-08 18:25:59 +0000 | |||
2723 | +++ app/src/main/res/values-ru/strings.xml 2016-11-10 19:40:57 +0000 | |||
2724 | @@ -20,25 +20,20 @@ | |||
2725 | 20 | <string name="connection_configuration">Настроить сеть</string> | 20 | <string name="connection_configuration">Настроить сеть</string> |
2726 | 21 | <string name="connection_password">Пароль</string> | 21 | <string name="connection_password">Пароль</string> |
2727 | 22 | <string name="connection_profile">Параметры сервера</string> | 22 | <string name="connection_profile">Параметры сервера</string> |
2728 | 23 | <string name="connection_profile_ssl_use">Использовать HTTPS</string> | ||
2729 | 24 | <string name="connection_profile_ssl_summary">Укажите, следует ли использовать HTTPS</string> | ||
2730 | 25 | <string name="connection_timeout">Время ожидания соединения</string> | 23 | <string name="connection_timeout">Время ожидания соединения</string> |
2731 | 26 | <string name="connection_timeout_summary">Выберите значение (в миллисекундах)</string> | 24 | <string name="connection_timeout_summary">Выберите значение (в миллисекундах)</string> |
2732 | 27 | <string name="custom_timeout">Установить пользовательский тайм-аут</string> | 25 | <string name="custom_timeout">Установить пользовательский тайм-аут</string> |
2733 | 28 | <string name="display_blank_summary">Выберите нужный тип блокировки</string> | ||
2734 | 29 | <string name="display_desktop">Показать рабочий стол</string> | ||
2735 | 30 | <string name="display_reset">Сбросить дисплей</string> | ||
2736 | 31 | <string name="display_screen">Очистить дисплей (черный)</string> | ||
2737 | 32 | <string name="display_theme">Очистить контент дисплея</string> | ||
2738 | 33 | <string name="enable_custom_timeouts">Включить пользовательские тайм-ауты</string> | 26 | <string name="enable_custom_timeouts">Включить пользовательские тайм-ауты</string> |
2739 | 34 | <string name="enter_alert_text">Введите текст оповещения</string> | 27 | <string name="enter_alert_text">Введите текст оповещения</string> |
2740 | 35 | <string name="home">Домой</string> | 28 | <string name="home">Домой</string> |
2741 | 29 | <string name="live_view">Вид прямого эфира</string> | ||
2742 | 30 | <string name="next">Следующий</string> | ||
2743 | 36 | <string name="none">Ничего</string> | 31 | <string name="none">Ничего</string> |
2744 | 37 | <string name="port">Порт</string> | 32 | <string name="port">Порт</string> |
2745 | 33 | <string name="previous">Предыдущий</string> | ||
2746 | 38 | <string name="process">Выполнение</string> | 34 | <string name="process">Выполнение</string> |
2747 | 39 | <string name="service_list">Список служения</string> | 35 | <string name="service_list">Список служения</string> |
2748 | 40 | <string name="stage_view">Вид сцены</string> | 36 | <string name="stage_view">Вид сцены</string> |
2749 | 41 | |||
2750 | 42 | <string name="text_size">Выберите размер текста</string> | 37 | <string name="text_size">Выберите размер текста</string> |
2751 | 43 | <string name="text_size_summary">Изменить размер текста Служения</string> | 38 | <string name="text_size_summary">Изменить размер текста Служения</string> |
2752 | 44 | <string name="title_activity_settings">Параметры</string> | 39 | <string name="title_activity_settings">Параметры</string> |
2753 | 45 | 40 | ||
2754 | === modified file 'app/src/main/res/values-sk/strings.xml' | |||
2755 | --- app/src/main/res/values-sk/strings.xml 2015-10-16 19:32:04 +0000 | |||
2756 | +++ app/src/main/res/values-sk/strings.xml 2016-11-10 19:40:57 +0000 | |||
2757 | @@ -20,8 +20,6 @@ | |||
2758 | 20 | <string name="connection_configuration">Nastavenie sieťe</string> | 20 | <string name="connection_configuration">Nastavenie sieťe</string> |
2759 | 21 | <string name="connection_password">Heslo</string> | 21 | <string name="connection_password">Heslo</string> |
2760 | 22 | <string name="connection_profile">Podrobnosti servera</string> | 22 | <string name="connection_profile">Podrobnosti servera</string> |
2761 | 23 | <string name="connection_profile_ssl_use">Použiť HTTPS</string> | ||
2762 | 24 | <string name="connection_profile_ssl_summary">Upresniť či by malo byť použité HTTPS</string> | ||
2763 | 25 | <string name="connection_timeout">Časový limit spojenia</string> | 23 | <string name="connection_timeout">Časový limit spojenia</string> |
2764 | 26 | <string name="connection_timeout_summary">Vybrať hodnotu (milisekundy)</string> | 24 | <string name="connection_timeout_summary">Vybrať hodnotu (milisekundy)</string> |
2765 | 27 | <string name="connection_userid">Používateľské meno</string> | 25 | <string name="connection_userid">Používateľské meno</string> |
2766 | 28 | 26 | ||
2767 | === modified file 'app/src/main/res/values-sv/strings.xml' | |||
2768 | --- app/src/main/res/values-sv/strings.xml 2015-10-16 19:32:04 +0000 | |||
2769 | +++ app/src/main/res/values-sv/strings.xml 2016-11-10 19:40:57 +0000 | |||
2770 | @@ -20,8 +20,6 @@ | |||
2771 | 20 | <string name="connection_configuration">Konfigurera nätverk</string> | 20 | <string name="connection_configuration">Konfigurera nätverk</string> |
2772 | 21 | <string name="connection_password">Lösenord</string> | 21 | <string name="connection_password">Lösenord</string> |
2773 | 22 | <string name="connection_profile">Serverinställningar</string> | 22 | <string name="connection_profile">Serverinställningar</string> |
2774 | 23 | <string name="connection_profile_ssl_use">Använd HTTPS</string> | ||
2775 | 24 | <string name="connection_profile_ssl_summary">Ange om HTTPS ska användas</string> | ||
2776 | 25 | <string name="connection_timeout">Anslutningstimeout</string> | 23 | <string name="connection_timeout">Anslutningstimeout</string> |
2777 | 26 | <string name="connection_timeout_summary">Välj ett värde (millisekunder)</string> | 24 | <string name="connection_timeout_summary">Välj ett värde (millisekunder)</string> |
2778 | 27 | <string name="connection_userid">Användarnamn</string> | 25 | <string name="connection_userid">Användarnamn</string> |
2779 | 28 | 26 | ||
2780 | === modified file 'app/src/main/res/values-sw600dp/refs.xml' | |||
2781 | --- app/src/main/res/values-sw600dp/refs.xml 2015-05-27 20:05:55 +0000 | |||
2782 | +++ app/src/main/res/values-sw600dp/refs.xml 2016-11-10 19:40:57 +0000 | |||
2783 | @@ -7,6 +7,4 @@ | |||
2784 | 7 | For more on layout aliases, see: | 7 | For more on layout aliases, see: |
2785 | 8 | http://developer.android.com/training/multiscreen/screensizes.html#TaskUseAliasFilters | 8 | http://developer.android.com/training/multiscreen/screensizes.html#TaskUseAliasFilters |
2786 | 9 | --> | 9 | --> |
2787 | 10 | <item name="fragment_item" type="layout">@layout/fragment_item_grid</item> | ||
2788 | 11 | |||
2789 | 12 | </resources> | 10 | </resources> |
2790 | 13 | \ No newline at end of file | 11 | \ No newline at end of file |
2791 | 14 | 12 | ||
2792 | === modified file 'app/src/main/res/values-uk/strings.xml' | |||
2793 | --- app/src/main/res/values-uk/strings.xml 2015-10-16 19:32:04 +0000 | |||
2794 | +++ app/src/main/res/values-uk/strings.xml 2016-11-10 19:40:57 +0000 | |||
2795 | @@ -20,26 +20,30 @@ | |||
2796 | 20 | <string name="connection_configuration">Налаштування Мережі</string> | 20 | <string name="connection_configuration">Налаштування Мережі</string> |
2797 | 21 | <string name="connection_password">Пароль</string> | 21 | <string name="connection_password">Пароль</string> |
2798 | 22 | <string name="connection_profile">Деталі Сервера</string> | 22 | <string name="connection_profile">Деталі Сервера</string> |
2799 | 23 | <string name="connection_profile_ssl_use">Використовувати HTTPS</string> | ||
2800 | 24 | <string name="connection_profile_ssl_summary">Вкажіть, чи варто використовувати протокол HTTPS</string> | ||
2801 | 25 | <string name="connection_timeout">Час очікування з\'єднання</string> | 23 | <string name="connection_timeout">Час очікування з\'єднання</string> |
2802 | 26 | <string name="connection_timeout_summary">Виберіть значення (в мілісекундах)</string> | 24 | <string name="connection_timeout_summary">Виберіть значення (в мілісекундах)</string> |
2803 | 27 | <string name="connection_userid">Ім\'я користувача:</string> | 25 | <string name="connection_userid">Ім\'я користувача:</string> |
2804 | 28 | <string name="custom_timeout">Втановити інший Час Очікування</string> | 26 | <string name="custom_timeout">Втановити інший Час Очікування</string> |
2805 | 29 | <string name="display_blank_summary">Виберіть потрібний дисплей</string> | 27 | <string name="display_blank_summary">Виберіть потрібний дисплей</string> |
2806 | 30 | <string name="display_desktop">Обрати фон для робочого столу дисплея</string> | 28 | <string name="display_desktop">Обрати фон для робочого столу дисплея</string> |
2807 | 29 | <string name="display_list_autoscroll">Дозволити вибраний елемент, щоб перейти до центру списку</string> | ||
2808 | 31 | <string name="display_reset">Показати основний дисплей</string> | 30 | <string name="display_reset">Показати основний дисплей</string> |
2809 | 31 | <string name="display_settings">Налаштування Дисплею</string> | ||
2810 | 32 | <string name="display_screen">Тільки Чорний дисплей</string> | 32 | <string name="display_screen">Тільки Чорний дисплей</string> |
2811 | 33 | <string name="display_theme">Тільки Тема дисплею</string> | 33 | <string name="display_theme">Тільки Тема дисплею</string> |
2812 | 34 | <string name="enable_custom_timeouts">Обрати інший Час Очікування</string> | 34 | <string name="enable_custom_timeouts">Обрати інший Час Очікування</string> |
2813 | 35 | <string name="enter_alert_text">Введіть Текст Сповіщення</string> | 35 | <string name="enter_alert_text">Введіть Текст Сповіщення</string> |
2814 | 36 | <string name="enable_autoscroll">Дозволити дисплей в центрі</string> | ||
2815 | 36 | <string name="home">Дім</string> | 37 | <string name="home">Дім</string> |
2816 | 37 | <string name="httpreturn_unauthorised">Несанкціонований доступ будь ласка, введіть правильне ім\'я користувача та пароль</string> | 38 | <string name="httpreturn_unauthorised">Несанкціонований доступ будь ласка, введіть правильне ім\'я користувача та пароль</string> |
2817 | 38 | <string name="live_list">Список Перегляду</string> | 39 | <string name="live_list">Список Перегляду</string> |
2818 | 40 | <string name="live_view">Режим Живого Перегляду</string> | ||
2819 | 39 | <string name="navigation_drawer_open">Відкрити вікно навігації</string> | 41 | <string name="navigation_drawer_open">Відкрити вікно навігації</string> |
2820 | 40 | <string name="navigation_drawer_close">Закрити вікно навігації</string> | 42 | <string name="navigation_drawer_close">Закрити вікно навігації</string> |
2821 | 43 | <string name="next">Наступний</string> | ||
2822 | 41 | <string name="none">Ні</string> | 44 | <string name="none">Ні</string> |
2823 | 42 | <string name="port">Порт</string> | 45 | <string name="port">Порт</string> |
2824 | 46 | <string name="previous">Попередній</string> | ||
2825 | 43 | <string name="process">Процес</string> | 47 | <string name="process">Процес</string> |
2826 | 44 | <string name="service_list">Список Служб</string> | 48 | <string name="service_list">Список Служб</string> |
2827 | 45 | <string name="stage_view">Поставити Прегляд</string> | 49 | <string name="stage_view">Поставити Прегляд</string> |
2828 | 46 | 50 | ||
2829 | === modified file 'app/src/main/res/values-zh-rTW/strings.xml' | |||
2830 | --- app/src/main/res/values-zh-rTW/strings.xml 2015-10-16 19:32:04 +0000 | |||
2831 | +++ app/src/main/res/values-zh-rTW/strings.xml 2016-11-10 19:40:57 +0000 | |||
2832 | @@ -20,8 +20,6 @@ | |||
2833 | 20 | <string name="connection_configuration">設定網路</string> | 20 | <string name="connection_configuration">設定網路</string> |
2834 | 21 | <string name="connection_password">密碼</string> | 21 | <string name="connection_password">密碼</string> |
2835 | 22 | <string name="connection_profile">聚會細節</string> | 22 | <string name="connection_profile">聚會細節</string> |
2836 | 23 | <string name="connection_profile_ssl_use">使用 HTTPS</string> | ||
2837 | 24 | <string name="connection_profile_ssl_summary">指定是否應使用HTTPS</string> | ||
2838 | 25 | <string name="connection_timeout">連接逾時</string> | 23 | <string name="connection_timeout">連接逾時</string> |
2839 | 26 | <string name="connection_timeout_summary">選擇數值(毫秒)</string> | 24 | <string name="connection_timeout_summary">選擇數值(毫秒)</string> |
2840 | 27 | <string name="connection_userid">帳號</string> | 25 | <string name="connection_userid">帳號</string> |
2841 | 28 | 26 | ||
2842 | === modified file 'app/src/main/res/values/keyStrings.xml' | |||
2843 | --- app/src/main/res/values/keyStrings.xml 2015-10-04 21:02:13 +0000 | |||
2844 | +++ app/src/main/res/values/keyStrings.xml 2016-11-10 19:40:57 +0000 | |||
2845 | @@ -8,6 +8,4 @@ | |||
2846 | 8 | <string name="key_userid">key_userid</string> | 8 | <string name="key_userid">key_userid</string> |
2847 | 9 | <string name="key_password">key_password</string> | 9 | <string name="key_password">key_password</string> |
2848 | 10 | <string name="key_shared_preferences">key_shared_preferences</string> | 10 | <string name="key_shared_preferences">key_shared_preferences</string> |
2849 | 11 | <string name="key_ssl_use">key_ssl_use</string> | ||
2850 | 12 | |||
2851 | 13 | </resources> | 11 | </resources> |
2852 | 14 | 12 | ||
2853 | === modified file 'app/src/main/res/values/strings.xml' | |||
2854 | --- app/src/main/res/values/strings.xml 2016-01-03 15:02:30 +0000 | |||
2855 | +++ app/src/main/res/values/strings.xml 2016-11-10 19:40:57 +0000 | |||
2856 | @@ -20,8 +20,6 @@ | |||
2857 | 20 | <string name="connection_configuration">Configure Network</string> | 20 | <string name="connection_configuration">Configure Network</string> |
2858 | 21 | <string name="connection_password">Password</string> | 21 | <string name="connection_password">Password</string> |
2859 | 22 | <string name="connection_profile">Server Details</string> | 22 | <string name="connection_profile">Server Details</string> |
2860 | 23 | <string name="connection_profile_ssl_use">Use HTTPS</string> | ||
2861 | 24 | <string name="connection_profile_ssl_summary">Specify whether HTTPS should be used</string> | ||
2862 | 25 | <string name="connection_timeout">Connection Timeout</string> | 23 | <string name="connection_timeout">Connection Timeout</string> |
2863 | 26 | <string name="connection_timeout_summary">Select a value (milliseconds)</string> | 24 | <string name="connection_timeout_summary">Select a value (milliseconds)</string> |
2864 | 27 | <string name="connection_userid">Username</string> | 25 | <string name="connection_userid">Username</string> |
2865 | @@ -47,6 +45,8 @@ | |||
2866 | 47 | <string name="port">Port</string> | 45 | <string name="port">Port</string> |
2867 | 48 | <string name="previous">Previous</string> | 46 | <string name="previous">Previous</string> |
2868 | 49 | <string name="process">Process</string> | 47 | <string name="process">Process</string> |
2869 | 48 | <string name="search_text">Search Text</string> | ||
2870 | 49 | <string name="select_plugin">Select Plugin</string> | ||
2871 | 50 | <string name="service_list">Service List</string> | 50 | <string name="service_list">Service List</string> |
2872 | 51 | <string name="searchResults">Search Results</string> | 51 | <string name="searchResults">Search Results</string> |
2873 | 52 | <string name="searchSendLive">Send Live</string> | 52 | <string name="searchSendLive">Send Live</string> |
2874 | 53 | 53 | ||
2875 | === modified file 'app/src/main/res/xml/pref_general.xml' | |||
2876 | --- app/src/main/res/xml/pref_general.xml 2015-10-04 21:02:13 +0000 | |||
2877 | +++ app/src/main/res/xml/pref_general.xml 2016-11-10 19:40:57 +0000 | |||
2878 | @@ -10,7 +10,7 @@ | |||
2879 | 10 | 10 | ||
2880 | 11 | <CheckBoxPreference | 11 | <CheckBoxPreference |
2881 | 12 | android:key="key_auto_scroll" | 12 | android:key="key_auto_scroll" |
2883 | 13 | android:defaultValue="false" | 13 | android:defaultValue="true" |
2884 | 14 | android:summary="@string/display_list_autoscroll" | 14 | android:summary="@string/display_list_autoscroll" |
2885 | 15 | android:title="@string/enable_autoscroll"/> | 15 | android:title="@string/enable_autoscroll"/> |
2886 | 16 | 16 | ||
2887 | 17 | 17 | ||
2888 | === modified file 'app/src/main/res/xml/pref_notification.xml' | |||
2889 | --- app/src/main/res/xml/pref_notification.xml 2015-01-23 17:53:00 +0000 | |||
2890 | +++ app/src/main/res/xml/pref_notification.xml 2016-11-10 19:40:57 +0000 | |||
2891 | @@ -33,12 +33,6 @@ | |||
2892 | 33 | android:defaultValue="@string/port_default_value" | 33 | android:defaultValue="@string/port_default_value" |
2893 | 34 | android:inputType="number" /> | 34 | android:inputType="number" /> |
2894 | 35 | 35 | ||
2895 | 36 | <CheckBoxPreference | ||
2896 | 37 | android:key="@string/key_ssl_use" | ||
2897 | 38 | android:title="@string/connection_profile_ssl_use" | ||
2898 | 39 | android:summary="@string/connection_profile_ssl_summary" | ||
2899 | 40 | android:defaultValue="false" /> | ||
2900 | 41 | |||
2901 | 42 | <EditTextPreference | 36 | <EditTextPreference |
2902 | 43 | android:key="@string/key_userid" | 37 | android:key="@string/key_userid" |
2903 | 44 | android:title="@string/connection_userid" | 38 | android:title="@string/connection_userid" |
2904 | 45 | 39 | ||
2905 | === added file 'fixssl.iml' | |||
2906 | --- fixssl.iml 1970-01-01 00:00:00 +0000 | |||
2907 | +++ fixssl.iml 2016-11-10 19:40:57 +0000 | |||
2908 | @@ -0,0 +1,19 @@ | |||
2909 | 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
2910 | 2 | <module external.linked.project.id="fixssl" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4"> | ||
2911 | 3 | <component name="FacetManager"> | ||
2912 | 4 | <facet type="java-gradle" name="Java-Gradle"> | ||
2913 | 5 | <configuration> | ||
2914 | 6 | <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" /> | ||
2915 | 7 | <option name="BUILDABLE" value="false" /> | ||
2916 | 8 | </configuration> | ||
2917 | 9 | </facet> | ||
2918 | 10 | </component> | ||
2919 | 11 | <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true"> | ||
2920 | 12 | <exclude-output /> | ||
2921 | 13 | <content url="file://$MODULE_DIR$"> | ||
2922 | 14 | <excludeFolder url="file://$MODULE_DIR$/.gradle" /> | ||
2923 | 15 | </content> | ||
2924 | 16 | <orderEntry type="inheritedJdk" /> | ||
2925 | 17 | <orderEntry type="sourceFolder" forTests="false" /> | ||
2926 | 18 | </component> | ||
2927 | 19 | </module> | ||
2928 | 0 | \ No newline at end of file | 20 | \ No newline at end of file |
Text conflict in app/app.iml