Skip to content

GitLab

O
openasist4android_core
Source
Select Git revision
...
Target
Select Git revision
 
Commits (3)
Hide whitespace changes
Inline Side-by-side
Showing with 66 additions and 21 deletions
AndroidManifest.xml
View file @ 355db3e0
......@@ -39,7 +39,7 @@
android:logo="@android:color/transparent"
android:theme="@style/ASiSTTheme">
<receiver android:name=".core.manager.update.UpdateAlarmReceiver" />
<uses-library android:name="org.apache.http.legacy" android:required="false" />
<service android:name=".core.receiver.FirebaseReceiver">
<intent-filter>
<action android:name="com.google.firebase.MESSAGING_EVENT" />
......
src/main/java/de/bps/asist/module/timetable/CourseStartTreeConfig.java
View file @ 355db3e0
......@@ -48,17 +48,9 @@ public class CourseStartTreeConfig extends StartTreeConfig<TimetableModule>{
}
} else {
//TODO: Add empty course with warning no courses are available
String lang = Locale.getDefault().getLanguage();
if(lang.equals("de")){
String noCoursemessage = context.getResources().getString(R.string.goto_timetable_message);
ASiSTTreeItem<Course> newItem = new ASiSTTreeItem<>(noCoursemessage,"");
treeItems.add(newItem);
} else {
String noCoursemessage = context.getResources().getString(R.string.goto_timetable_messageEN);
ASiSTTreeItem<Course> newItem = new ASiSTTreeItem<>(noCoursemessage,"");
treeItems.add(newItem);
}
}
rootItem.setChildren(treeItems);
}
......
src/main/res/color/tab_background_color_selector.xml
View file @ 355db3e0
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/defaultColor"
android:state_selected="true"/>
<item android:color="@color/backgroundColor"/>
<item
android:color="@color/defaultColor"
android:drawable="@color/defaultColor"
android:state_selected="true" />
<item
android:color="@color/backgroundColor"
android:drawable="@color/defaultColor" />
</selector>
\ No newline at end of file
src/main/res/values-en/strings.xml
View file @ 355db3e0
......@@ -140,6 +140,8 @@
<string name="library_details_edition">Edition</string>
<string name="library_details_publisher">published</string>
<string name="library_details_publishedon">Created on</string>
<string name="library_details_author">Author</string>
<string name="library_details_link">Go to the web version</string>
<string name="library_available_online">Online</string>
<string name="library_holding_header">Exemplar %1$d</string>
......@@ -191,6 +193,8 @@
<string name="generic_list_showmore">Show more</string>
<!-- timetable -->
<string name="module_timetable_course_code_not_found" formatted="false">Update could not be performed.\nImport your timetable first.</string>
<string name="module_timetable_course_update_failure" formatted="false">An error has occurred while updating the time table</string>
<string name="module_timetable_course_type_other">other</string>
<string name="module_timetable_course_type_lecture">lecture</string>
<string name="module_timetable_course_type_tutorial">tutorial</string>
......@@ -291,6 +295,17 @@
<string name="timetable_add_code_moreinfo">If you haven\'t created your personal schedule yet, please click on the link below and follow the instructions on that page:\n\nhttps://www.tu-chemnitz.de/verwaltung/vlvz/meinplan/ \n\nThere, you will also find your 8-digit code to import your courses into the app.</string>
<string name="goto_timetable_message">Please, go to the main menu to open your schedule</string>
<!-- SLUB Module-->
<string name="module_slub_name">SLUB</string>
<!-- Campus navigator module -->
<string name="module_navigator_name">Navigator</string>
<string name="module_room_name">Room directory</string>
<string name="datetime_format">dd.MM.yyyy, HH:mm \'Uhr\'</string>
<!-- Service Module -->
<string name="module_service_name">Service</string>
<!-- PTS Module -->
<string name="module_pts_name">Public transport</string>
<string name="module_pts_update">Just updated</string>
......@@ -334,4 +349,39 @@
<p style="text-align: justify;">Wir erlauben ausdrücklich und begrüßen das Zitieren unserer Dokumente und Webseiten sowie das Setzen von Links auf unsere Website.</p>
<p style="text-align: justify;">Alle innerhalb des Internetangebotes genannten und ggf. durch Dritte geschützten Marken und Warenzeichen unterliegen uneingeschränkt den Bestimmungen des jeweils gültigen Kennzeichenrechts und den Besitzrechten der jeweiligen eingetragenen Eigentümer. Allein aufgrund der bloßen Nennung ist nicht der Schluss zu ziehen, dass Markenzeichen nicht durch Rechte Dritter geschützt sind.</p>]]>
</string>
<string name="title_activity_canteen_settings">Settings</string>
<!-- Strings related to Settings -->
<!-- Example General settings -->
<string name="pref_header_general">General</string>
<string name="pref_title_social_recommendations">Enable social recommendations</string>
<string name="pref_description_social_recommendations">Recommendations for people to contact
based on your message history
</string>
<string name="pref_title_display_name">Display name</string>
<string name="pref_default_display_name">John Smith</string>
<string name="pref_title_add_friends_to_messages">Add friends to messages</string>
<string name="pref_title_system_sync_settings">System sync settings</string>
<!-- Example settings for Data & Sync -->
<string name="pref_header_data_sync">Data &amp; sync</string>
<string name="pref_title_sync_frequency">Sync frequency</string>
<!-- Example settings for Notifications -->
<string name="pref_header_notifications">Notifications</string>
<string name="pref_title_new_message_notifications">New message notifications</string>
<string name="pref_title_ringtone">Ringtone</string>
<string name="pref_ringtone_silent">Silent</string>
<string name="pref_title_vibrate">Vibrate</string>
<string name="title_activity_canteen_settings2">Settings</string>
<string name="title_activity_settings2">Settings</string>
</resources>
src/main/res/values/strings.xml
View file @ 355db3e0
......@@ -301,7 +301,6 @@
<string name="tip_notimeplan_imported">Sie haben Ihren Stundenplan noch nicht importiert.\n\nKlicken Sie oben rechts auf das Import-Icon, um Ihren persönlichen Stundenplan zu importieren.</string>
<string name="timetable_add_code_moreinfo">Sollten Sie noch keinen persönlichen Stundenplan zusammengestellt haben, öffnen Sie bitte den folgenden Link und folgen den Hinweisen auf dieser Seite:\n\nhttps://www.tu-chemnitz.de/verwaltung/vlvz/meinplan/ \n\nDort finden Sie auch den 8-stelligen Code zum Importieren des Stundenplans in die App.</string>
<string name="goto_timetable_message">Ihren vollständigen Stundenplan finden Sie im Hauptmenü</string>
<string name="goto_timetable_messageEN">Please, go to the main menu to open your schedule</string>
<!-- SLUB Module-->
<string name="module_slub_name">SLUB</string>
......@@ -327,16 +326,16 @@
<string name="module_pts_location_permission_request_dialog_ok_button">OK</string>
<!-- standart Name -->
<string name="app_name">OpenASiST</string>
<string name="app_name" translatable="false">OpenASiST</string>
<!-- standart Config Properties -->
<string name="rootUrl">https://your-openasistserver.net/asist/rest/app</string>
<string name="imageRootPath">https://your-openasistserver.net/asist</string>
<string name="appHeaderValue">example_value</string>
<string name="olat_url">https://bildungsportal.sachsen.de/opal</string>
<string name="portfolio_login">http://your-openasistserver.net/OLATCE/restapi/auth/app/header</string>
<string name="portfolio_send">http://your-openasistserver.net/OLATCE/restapi/repo/portfolio/create</string>
<string name="pictureProxyUrl">https://your-openasistserver.net/asist/imageproxy/iproxy.cgi?imgurl=</string>
<string name="rootUrl" translatable="false">https://your-openasistserver.net/asist/rest/app</string>
<string name="imageRootPath" translatable="false">https://your-openasistserver.net/asist</string>
<string name="appHeaderValue" translatable="false">example_value</string>
<string name="olat_url" translatable="false">https://bildungsportal.sachsen.de/opal</string>
<string name="portfolio_login" translatable="false">http://your-openasistserver.net/OLATCE/restapi/auth/app/header</string>
<string name="portfolio_send" translatable="false">http://your-openasistserver.net/OLATCE/restapi/repo/portfolio/create</string>
<string name="pictureProxyUrl" translatable="false">https://your-openasistserver.net/asist/imageproxy/iproxy.cgi?imgurl=</string>
<!-- standart impressum text -->
<string name="impressumText">
......