openlp
/
android
mirror of https://gitlab.com/openlp/android.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix abends

This commit is contained in:
Tim Bentley 2016-11-07 19:43:25 +00:00
parent b5751ae1a4
commit c9f9c93979
5 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/app.iml
View File

@ -66,14 +66,6 @@
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
@ -82,6 +74,14 @@
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />

22
app/src/main/java/org/openlp/android2/fragments/LiveListFragment.java
View File

@ -123,17 +123,21 @@ public class LiveListFragment extends OpenLPFragment {
R.layout.fragment_livelist, from, to) { R.layout.fragment_livelist, from, to) {
public View getView(int position, View convertView, ViewGroup parent) { public View getView(int position, View convertView, ViewGroup parent) {
View view = super.getView(position, convertView, parent); View view = super.getView(position, convertView, parent);
TextView line = (TextView) view.findViewById(R.id.line); // TextView line = (TextView) view.findViewById(R.id.line);
TextView text1 = (TextView) view.findViewById(R.id.tag); TextView text1 = (TextView) view.findViewById(R.id.tag);
text1.setTextSize(TypedValue.COMPLEX_UNIT_SP, size); if (text1 != null) {
text1.setTextSize(TypedValue.COMPLEX_UNIT_SP, size);
}
TextView text2 = (TextView) view.findViewById(R.id.liveListNormal); TextView text2 = (TextView) view.findViewById(R.id.liveListNormal);
text2.setTextSize(TypedValue.COMPLEX_UNIT_SP, size); if (text2 != null) {
if (selected == position) { text2.setTextSize(TypedValue.COMPLEX_UNIT_SP, size);
text2.setTypeface(null, Typeface.BOLD_ITALIC); if (selected == position) {
line.setBackgroundColor(0xffffff); text2.setTypeface(null, Typeface.BOLD_ITALIC);
} else{ // line.setBackgroundColor(0xffffff);
text2.setTypeface(null, Typeface.NORMAL); } else {
line.setBackgroundColor(0xffffff); text2.setTypeface(null, Typeface.NORMAL);
// line.setBackgroundColor(0xffffff);
}
} }
return view; return view;

2
app/src/main/java/org/openlp/android2/fragments/SearchFragment.java
View File

@ -294,7 +294,7 @@ public class SearchFragment extends Fragment {
Log.i(LOG_TAG, "populateListDisplay - exit"); Log.i(LOG_TAG, "populateListDisplay - exit");
} }
private class StableArrayAdapter extends ArrayAdapter<JSONArray> { public class StableArrayAdapter extends ArrayAdapter<JSONArray> {
HashMap<String, Integer> mIdMap = new HashMap<String, Integer>(); HashMap<String, Integer> mIdMap = new HashMap<String, Integer>();

2
app/src/main/java/org/openlp/android2/fragments/WebFragment.java
View File

@ -69,7 +69,7 @@ public class WebFragment extends Fragment {
super.onDestroyView(); super.onDestroyView();
} }
private class webClient extends WebViewClient { public class webClient extends WebViewClient {
@Override @Override
public boolean shouldOverrideUrlLoading(WebView view, String url) { public boolean shouldOverrideUrlLoading(WebView view, String url) {
return false; return false;

2
app/src/main/res/layout/search_result_row.xml
View File

@ -8,7 +8,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textStyle="bold" android:textStyle="bold"
android:textColor="#000000" android:textColor="#000000"
android:textSize="40sp" android:textSize="25sp"
android:paddingTop="10dp" android:paddingTop="10dp"
android:paddingRight="5dp" android:paddingRight="5dp"
android:paddingLeft="5dp" android:paddingLeft="5dp"