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

Add buttons

This commit is contained in:
Tim Bentley 2015-10-08 19:25:59 +01:00
parent aea3b07f78 985b4fbe74
commit 75f8ed0c49
25 changed files with 102 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/app.iml
View File

@ -71,8 +71,9 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.2.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.2.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/22.2.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
@ -90,9 +91,10 @@
</content>
<orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="support-v4-22.2.1" level="project" />
<orderEntry type="library" exported="" name="android-async-http-1.4.6" level="project" />
<orderEntry type="library" exported="" name="support-annotations-22.2.0" level="project" />
<orderEntry type="library" exported="" name="support-v4-22.2.0" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-22.2.0" level="project" />
<orderEntry type="library" exported="" name="support-annotations-22.2.1" level="project" />
<orderEntry type="library" exported="" name="design-22.2.1" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-22.2.1" level="project" />
</component>
</module>

5
app/build.gradle
View File

@ -30,8 +30,9 @@ android {
dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
compile 'com.android.support:appcompat-v7:22.2.0'
compile 'com.android.support:support-v4:22.2.0'
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.loopj.android:android-async-http:1.4.6'
testCompile 'junit:junit:4.12'
testCompile 'org.easytesting:fest:1.0.16'

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

@ -121,23 +121,29 @@ public class OpenLP extends ActionBarActivity
.replace(R.id.container, HomeFragment.newInstance())
.commit();
mTitle = getString(R.string.home);
toggerContainer(R.id.next_button, View.GONE);
toggerContainer(R.id.prev_button, View.GONE);
break;
case NavigationOptions.ServiceList:
singleTab();
fragmentManager.beginTransaction()
.replace(R.id.container, ServiceListFragment.newInstance())
.replace(R.id.container, ServiceListFragment.newInstance(), "servicelist")
.commit();
mTitle = getString(R.string.service_list);
toggerContainer(R.id.next_button, View.VISIBLE);
toggerContainer(R.id.prev_button, View.VISIBLE);
break;
case NavigationOptions.LiveList:
duelTab();
fragmentManager.beginTransaction()
.replace(R.id.container_left, ServiceListFragment.newInstance())
.replace(R.id.container_left, ServiceListFragment.newInstance(), "servicelist")
.commit();
fragmentManager.beginTransaction()
.replace(R.id.container_right, LiveListFragment.newInstance())
.commit();
mTitle = getString(R.string.live_list);
toggerContainer(R.id.next_button, View.VISIBLE);
toggerContainer(R.id.prev_button, View.VISIBLE);
break;
case NavigationOptions.StageView:
singleTab();
@ -145,6 +151,8 @@ public class OpenLP extends ActionBarActivity
.replace(R.id.container, StageWebFragment.newInstance())
.commit();
mTitle = getString(R.string.stage_view);
toggerContainer(R.id.next_button, View.GONE);
toggerContainer(R.id.prev_button, View.GONE);
break;
case NavigationOptions.LiveView:
singleTab();
@ -152,6 +160,8 @@ public class OpenLP extends ActionBarActivity
.replace(R.id.container, LiveWebFragment.newInstance())
.commit();
mTitle = getString(R.string.live_view);
toggerContainer(R.id.next_button, View.GONE);
toggerContainer(R.id.prev_button, View.GONE);
break;
}
}
@ -256,4 +266,14 @@ public class OpenLP extends ActionBarActivity
fragment.refreshDisplay();
}
}
public void next(View view) {
ServiceListFragment serviceListFragment = (ServiceListFragment) getFragmentManager().findFragmentByTag("servicelist");
serviceListFragment.next();
}
public void previous(View view) {
ServiceListFragment serviceListFragment = (ServiceListFragment) getFragmentManager().findFragmentByTag("servicelist");
serviceListFragment.previous();
}
}

11
app/src/main/java/org/openlp/android2/common/OpenLPFragment.java
View File

@ -30,6 +30,7 @@ import com.loopj.android.http.AsyncHttpClient;
import com.loopj.android.http.TextHttpResponseHandler;
import org.apache.http.Header;
import org.openlp.android2.R;
import org.openlp.android2.api.Api;
abstract public class OpenLPFragment extends ListFragment{
@ -83,4 +84,14 @@ abstract public class OpenLPFragment extends ListFragment{
processUpdate(response, notInError);
}
}
public void next() {
Log.d(LOG_TAG, "Going to next slide");
triggerTextRequest(Api.LIVE_NEXT);
}
public void previous() {
Log.d(LOG_TAG, "Going to previous slide");
triggerTextRequest(Api.LIVE_PREVIOUS);
}
}

BIN
app/src/main/res/drawable-hdpi/ic_arrow_back_white.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 189 B

BIN
app/src/main/res/drawable-hdpi/ic_arrow_forward_white.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 207 B

BIN
app/src/main/res/drawable-mdpi/ic_arrow_back_white.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 127 B

BIN
app/src/main/res/drawable-mdpi/ic_arrow_forward_white.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 131 B

BIN
app/src/main/res/drawable-xhdpi/ic_arrow_back_white.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 176 B

BIN
app/src/main/res/drawable-xhdpi/ic_arrow_forward_white.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 190 B

BIN
app/src/main/res/drawable-xxhdpi/ic_arrow_back_white.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 297 B

BIN
app/src/main/res/drawable-xxhdpi/ic_arrow_forward_white.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 322 B

72
app/src/main/res/layout/activity_main.xml
View File

@ -8,31 +8,59 @@
<!-- As the main content view, the view below consumes the entire
space available using match_parent in both dimensions. -->
<FrameLayout
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="match_parent">
<android.support.design.widget.CoordinatorLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<FrameLayout
android:id="@+id/container_left"
android:layout_weight="1"
android:layout_gravity="start"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginRight="5dp" />
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal">
<FrameLayout
android:id="@+id/container_left"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="start"
android:layout_marginRight="5dp"
android:layout_weight="1" />
<FrameLayout
android:id="@+id/container_right"
android:layout_weight="1"
android:layout_gravity="end"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp" />
</LinearLayout>
<FrameLayout
android:id="@+id/container_right"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:layout_marginLeft="5dp"
android:layout_weight="1" />
</LinearLayout>
<android.support.design.widget.FloatingActionButton
android:id="@+id/next_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="16dp"
android:onClick="next"
android:src="@drawable/ic_arrow_forward_white"
android:text="@string/next"
android:visibility="gone" />
<android.support.design.widget.FloatingActionButton
android:id="@+id/prev_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|start"
android:layout_margin="16dp"
android:onClick="previous"
android:src="@drawable/ic_arrow_back_white"
android:text="@string/previous"
android:visibility="gone" />
</android.support.design.widget.CoordinatorLayout>
<!-- android:layout_gravity="start" tells DrawerLayout to treat
this as a sliding drawer on the left side for left-to-right
languages and on the right side for right-to-left languages.

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

@ -13,7 +13,7 @@
<TextView
android:id="@+id/tag"
android:layout_width="0dp"
android:layout_width="75sp"
android:layout_height="wrap_content"
android:textSize="14sp"
android:paddingTop="10dp"
@ -23,7 +23,7 @@
android:layout_weight="1"/>
<TextView
android:id="@+id/liveListNormal"
android:layout_width="0dp"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:textColor="#ff2a2a2a"
android:textSize="14sp"
@ -40,5 +40,6 @@
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:textStyle="bold|italic"
android:layout_weight="1"/>
android:layout_weight="1"
android:visibility="gone"/>
</LinearLayout>

1
app/src/main/res/values-cs/strings.xml
View File

@ -44,7 +44,6 @@
<string name="process">Zpracovat</string>
<string name="service_list">Seznam služby</string>
<string name="stage_view">Zobrazení na pódiu</string>
<string name="text_size_type">Velikost zobrazeného textu</string>
<string name="text_size">Vybrat velikost zobrazeného textu</string>
<string name="text_size_summary">Změnit velikost textu služby</string>
<string name="title_activity_settings">Nastavení</string>

1
app/src/main/res/values-en-rGB/strings.xml
View File

@ -44,7 +44,6 @@
<string name="process">Process</string>
<string name="service_list">Service List</string>
<string name="stage_view">Stage View</string>
<string name="text_size_type">Display Text Size</string>
<string name="text_size">Select display text size</string>
<string name="text_size_summary">Change the Service text size</string>
<string name="title_activity_settings">Settings</string>

1
app/src/main/res/values-fi/strings.xml
View File

@ -44,7 +44,6 @@
<string name="process">Prosessoi</string>
<string name="service_list">Palveluluettelo</string>
<string name="stage_view">Näyttölavan näyttö</string>
<string name="text_size_type">Näyttötekstin koko</string>
<string name="text_size">Valitse näyttötekstin koko</string>
<string name="text_size_summary">Vaihda palvelun tekstikokoa</string>
<string name="title_activity_settings">Asetukset</string>

1
app/src/main/res/values-hu/strings.xml
View File

@ -44,7 +44,6 @@
<string name="process">Folyamatban</string>
<string name="service_list">Sorrend</string>
<string name="stage_view">Színpadi nézet</string>
<string name="text_size_type">Megjelenítés betűmérete</string>
<string name="text_size">Betűméret választása</string>
<string name="text_size_summary">Sorrend betűméretének módosítása</string>
<string name="title_activity_settings">Beállítások</string>

1
app/src/main/res/values-id/strings.xml
View File

@ -44,7 +44,6 @@
<string name="process">Proses</string>
<string name="service_list">Daftar Layanan</string>
<string name="stage_view">Tinjuan Bertahap</string>
<string name="text_size_type">Tampilkan Ukuran Teks</string>
<string name="text_size">Pilih tampilan ukuran teks</string>
<string name="text_size_summary">Ubah ukuran teks Layanan</string>
<string name="title_activity_settings">Setelan</string>

1
app/src/main/res/values-lt/strings.xml
View File

@ -40,7 +40,6 @@
<string name="port">Prievadas</string>
<string name="service_list">Pamaldų Programos Sąrašas</string>
<string name="stage_view">Scenos Rodinys</string>
<string name="text_size_type">Ekrano Teksto Dydis</string>
<string name="text_size">Pasirinkite rodomo teksto dydį</string>
<string name="text_size_summary">Keisti Pamaldų programos teksto dydį</string>
<string name="title_activity_settings">Nustatymus</string>

1
app/src/main/res/values-nb/strings.xml
View File

@ -44,7 +44,6 @@
<string name="process">Behandle</string>
<string name="service_list">Møteprogramliste</string>
<string name="stage_view">Scenevisning</string>
<string name="text_size_type">Tekststørrelse i skjerm</string>
<string name="text_size">Velg tekststørrelse i skjerm</string>
<string name="text_size_summary">Endre tekststørrelsen i møteprogrammet</string>
<string name="title_activity_settings">Innstillinger</string>

2
app/src/main/res/values-ru/strings.xml
View File

@ -38,7 +38,7 @@
<string name="process">Выполнение</string>
<string name="service_list">Список служения</string>
<string name="stage_view">Вид сцены</string>
<string name="text_size_type">Отображаемые размер текста</string>
<string name="text_size">Выберите размер текста</string>
<string name="text_size_summary">Изменить размер текста Служения</string>
<string name="title_activity_settings">Параметры</string>

1
app/src/main/res/values-sk/strings.xml
View File

@ -44,7 +44,6 @@
<string name="process">Spracovať</string>
<string name="service_list">Správca Služby</string>
<string name="stage_view">Pódiové zobrazenie</string>
<string name="text_size_type">Veľkosť zobrazeného textu</string>
<string name="text_size">Vybrať veľkosť zobrazeného textu</string>
<string name="text_size_summary">Zmeniť veľkosť textu služby</string>
<string name="title_activity_settings">Nastavenia</string>

1
app/src/main/res/values-sv/strings.xml
View File

@ -41,7 +41,6 @@
<string name="port">Port</string>
<string name="service_list">Körschema</string>
<string name="stage_view">Scenbild</string>
<string name="text_size_type">Bildens textstorlek</string>
<string name="text_size">Välj bildens textstorlek</string>
<string name="text_size_summary">Ändra körschemats textstorlek</string>
<string name="title_activity_settings">Inställningar</string>

6
app/src/main/res/values/strings.xml
View File

@ -28,7 +28,7 @@
<string name="custom_timeout">Set Custom Timeout</string>
<string name="display_blank_summary">Select the required display</string>
<string name="display_desktop">Display Desktop background</string>
<string name="display_list_autoscroll">Allow the selected item to sctoll to the centre of the list</string>
<string name="display_list_autoscroll">Allow the selected item to scroll to the centre of the list</string>
<string name="display_reset">Show Live display</string>
<string name="display_settings">Display Setting</string>
<string name="display_screen">Display Black only</string>
@ -39,11 +39,13 @@
<string name="home">Home</string>
<string name="httpreturn_unauthorised">Unauthorised Access, please enter valid username and password</string>
<string name="live_list">Live List</string>
<string name="live_view">LiveView</string>
<string name="live_view">Live View</string>
<string name="navigation_drawer_open">Open navigation drawer</string>
<string name="navigation_drawer_close">Close navigation drawer</string>
<string name="next">Next</string>
<string name="none">None</string>
<string name="port">Port</string>
<string name="previous">Previous</string>
<string name="process">Process</string>
<string name="service_list">Service List</string>
<string name="stage_view">Stage View</string>