diff --git a/app/app.iml b/app/app.iml
index fa61479..934ab1b 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -66,14 +66,6 @@
-
-
-
-
-
-
-
-
@@ -82,14 +74,30 @@
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -110,12 +118,20 @@
-
+
-
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 7bcff17..802dda6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,15 +1,16 @@
apply plugin: 'com.android.application'
project.archivesBaseName = 'OpenLP'
android {
- compileSdkVersion 22
- buildToolsVersion "21.1.2"
+ compileSdkVersion 24
+ buildToolsVersion "24.0.1"
defaultConfig {
applicationId "org.openlp.android2"
minSdkVersion 16
- targetSdkVersion 22
+ targetSdkVersion 24
versionCode 5
versionName "2.0"
+ vectorDrawables.useSupportLibrary = true
}
android {
lintOptions {
@@ -28,9 +29,9 @@ android {
dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
- compile 'com.android.support:appcompat-v7:22.2.1'
- compile 'com.android.support:support-v4:22.2.1'
- compile 'com.android.support:design:22.2.1'
+ compile 'com.android.support:appcompat-v7:24.2.1'
+ compile 'com.android.support:support-v4:24.2.1'
+ compile 'com.android.support:design:24.2.1'
}
}
dependencies {
diff --git a/app/src/main/java/org/openlp/android2/fragments/LiveListFragment.java b/app/src/main/java/org/openlp/android2/fragments/LiveListFragment.java
index 82bd5e1..ec89048 100644
--- a/app/src/main/java/org/openlp/android2/fragments/LiveListFragment.java
+++ b/app/src/main/java/org/openlp/android2/fragments/LiveListFragment.java
@@ -104,10 +104,10 @@ public class LiveListFragment extends OpenLPFragment {
}
// Keys used in Hashmap
- String[] from = {"tag", "liveListNormal", "liveListSelected"};
+ String[] from = {"line", "tag", "liveListNormal", "liveListSelected"};
// Ids of views in live_list_fragment
- int[] to = {R.id.tag, R.id.liveListNormal, R.id.liveListSelected};
+ int[] to = {R.id.line, R.id.tag, R.id.liveListNormal, R.id.liveListSelected};
SharedPreferences prefs = context.getSharedPreferences(
context.getString(R.string.key_shared_preferences),
@@ -123,15 +123,16 @@ public class LiveListFragment extends OpenLPFragment {
R.layout.fragment_livelist, from, to) {
public View getView(int position, View convertView, ViewGroup parent) {
View view = super.getView(position, convertView, parent);
+ TextView line = (TextView) view.findViewById(R.id.line);
TextView text1 = (TextView) view.findViewById(R.id.tag);
text1.setTextSize(TypedValue.COMPLEX_UNIT_SP, size);
TextView text2 = (TextView) view.findViewById(R.id.liveListNormal);
text2.setTextSize(TypedValue.COMPLEX_UNIT_SP, size);
if (selected == position) {
- text2.setTextColor(Color.parseColor("#000000"));
text2.setTypeface(null, Typeface.BOLD_ITALIC);
} else{
text2.setTypeface(null, Typeface.NORMAL);
+ line.setBackgroundColor(0xffffff);
}
return view;
diff --git a/app/src/main/java/org/openlp/android2/fragments/SearchFragment.java b/app/src/main/java/org/openlp/android2/fragments/SearchFragment.java
index 64e2ab1..4d2e906 100644
--- a/app/src/main/java/org/openlp/android2/fragments/SearchFragment.java
+++ b/app/src/main/java/org/openlp/android2/fragments/SearchFragment.java
@@ -263,6 +263,7 @@ public class SearchFragment extends Fragment {
// Toast.LENGTH_SHORT).show();
String it = "";
try {
+ Log.i(LOG_TAG, "list.setOnItemClickListener" + item);
it = (String) item.get(1);
} catch (JSONException e) {
e.printStackTrace();
@@ -283,18 +284,15 @@ public class SearchFragment extends Fragment {
private class StableArrayAdapter extends ArrayAdapter {
HashMap mIdMap = new HashMap();
- ArrayList jsonCache = new ArrayList();
public StableArrayAdapter(Context context,
int textViewResourceId,
List objects) {
super(context, textViewResourceId, objects);
- jsonCache = new ArrayList();
for (int i = 0; i < objects.size(); ++i) {
JSONArray item = objects.get(i);
try {
- jsonCache.add(item);
mIdMap.put(item.get(1).toString(), i);
} catch (JSONException e) {
e.printStackTrace();
@@ -309,7 +307,6 @@ public class SearchFragment extends Fragment {
String item = null;
try {
item = getItem(position).get(1).toString();
- Log.i(LOG_TAG, "getView" + item);
} catch (JSONException e) {
e.printStackTrace();
}
@@ -331,7 +328,6 @@ public class SearchFragment extends Fragment {
String item = null;
try {
item = getItem(position).get(1).toString();
- Log.i(LOG_TAG, "getItemId" + item);
} catch (JSONException e) {
e.printStackTrace();
}
diff --git a/app/src/main/res/drawable/service_item_selected.xml b/app/src/main/res/drawable/service_item_selected.xml
deleted file mode 100644
index 5357740..0000000
--- a/app/src/main/res/drawable/service_item_selected.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
diff --git a/app/src/main/res/layout-xlarge/fragment_livelist_list.xml b/app/src/main/res/layout-xlarge/fragment_livelist_list.xml
index 161dae6..7ffcd85 100644
--- a/app/src/main/res/layout-xlarge/fragment_livelist_list.xml
+++ b/app/src/main/res/layout-xlarge/fragment_livelist_list.xml
@@ -10,6 +10,15 @@
android:clickable="false"
android:longClickable="false"
android:background="@drawable/custom_border">
+
-
+