openlp/android
1
0
Fork 0
mirror of https://gitlab.com/openlp/android.git synced 2024-12-22 20:02:50 +00:00
Code Issues Projects Releases Wiki Activity

Change icons and Add refresh

Browse Source
This commit is contained in:
Tim Bentley 2014-11-25 22:05:08 +00:00
parent 3e69c02900
commit a6374b399b
6 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/org/openlp/android2/OpenLP.java
View File

@ -130,7 +130,6 @@ public class OpenLP extends Activity
// as you specify a parent activity in AndroidManifest.xml. // as you specify a parent activity in AndroidManifest.xml.
Intent intent; Intent intent;
switch (item.getItemId()) { switch (item.getItemId()) {
case R.id.action_preferences: case R.id.action_preferences:
intent = new Intent(this, SettingsActivity.class); intent = new Intent(this, SettingsActivity.class);
startActivity(intent); startActivity(intent);
@ -140,9 +139,13 @@ public class OpenLP extends Activity
startActivity(intent); startActivity(intent);
return true; return true;
case R.id.action_refresh: case R.id.action_refresh:
if (mTitle.equals(R.string.service_list)){ if (this.mTitle.equals(getString(R.string.service_list))) {
ServiceListFragment fragment = (ServiceListFragment) ServiceListFragment fragment = (ServiceListFragment)
getFragmentManager().findFragmentByTag("ServiceListFragment"); getFragmentManager().findFragmentById(R.id.container);
fragment.refreshDisplay();
} else if (this.mTitle.equals(getString(R.string.live_list)) ) {
LiveListFragment fragment = (LiveListFragment)
getFragmentManager().findFragmentById(R.id.container);
fragment.refreshDisplay(); fragment.refreshDisplay();
} }
return true; return true;

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

@ -90,10 +90,10 @@ public class LiveListFragment extends OpenLPFragment {
HashMap<String, String> hm = new HashMap<String, String>(); HashMap<String, String> hm = new HashMap<String, String>();
hm.put("tag", item.getString("tag")); hm.put("tag", item.getString("tag"));
if (item.getString("selected").equals("true")) { if (item.getString("selected").equals("true")) {
hm.put("liveListNormal", Html.fromHtml(item.getString("html")).toString()); hm.put("liveListSelected", Html.fromHtml(item.getString("html")).toString());
selected = i; selected = i;
} else { } else {
hm.put("liveListSelected", Html.fromHtml(item.getString("html")).toString()); hm.put("liveListNormal", Html.fromHtml(item.getString("html")).toString());
} }
aList.add(hm); aList.add(hm);
} }

BIN
app/src/main/res/drawable-xxhdpi/ic_dvr.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 305 B

After

Width:  |  Height:  |  Size: 522 B

14
app/src/main/res/layout/fragment_livelist_list.xml
View File

@ -2,7 +2,7 @@
<LinearLayout <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/live_list_fragment_layout" android:id="@+id/fragment_live_list_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="horizontal" android:orientation="horizontal"
@ -13,7 +13,7 @@
android:id="@+id/tag" android:id="@+id/tag"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="14dp" android:textSize="14sp"
android:paddingTop="10dp" android:paddingTop="10dp"
android:paddingRight="5dp" android:paddingRight="5dp"
android:paddingLeft="5dp" android:paddingLeft="5dp"
@ -23,18 +23,18 @@
android:id="@+id/liveListNormal" android:id="@+id/liveListNormal"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="#ff6c6c6c" android:textColor="#ff2a2a2a"
android:textSize="14dp" android:textSize="14sp"
android:paddingTop="10dp" android:paddingTop="10dp"
android:paddingBottom="10dp" android:paddingBottom="10dp"
/> android:textStyle="normal"/>
<TextView <TextView
android:id="@+id/liveListSelected" android:id="@+id/liveListSelected"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="#000000" android:textColor="#000000"
android:textSize="14dp" android:textSize="14sp"
android:paddingTop="10dp" android:paddingTop="10dp"
android:paddingBottom="10dp" android:paddingBottom="10dp"
/> android:textStyle="bold|italic"/>
</LinearLayout> </LinearLayout>

4
app/src/main/res/layout/fragment_navigation_drawer.xml
View File

@ -5,9 +5,9 @@
android:choiceMode="singleChoice" android:choiceMode="singleChoice"
android:divider="@android:color/darker_gray" android:divider="@android:color/darker_gray"
android:dividerHeight="2dp" android:dividerHeight="2dp"
android:background="#c8ffffff"
android:textStyle="bold" android:textStyle="bold"
android:textAppearance="?android:attr/textAppearanceSmall" android:textColor="#000000"
android:textAppearance="?android:attr/textAppearanceSmallInverse"
tools:context=".NavigationDrawerFragment" tools:context=".NavigationDrawerFragment"
android:drawSelectorOnTop="false" android:drawSelectorOnTop="false"
android:paddingLeft="20dp" android:paddingLeft="20dp"

1
app/src/main/res/layout/fragment_service_list.xml
View File

@ -2,6 +2,7 @@
<LinearLayout <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/fragmentservicelist"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="horizontal" android:orientation="horizontal"