Author: Adam Pioterek <adam.pioterek@protonmail.ch>
help screen
app/src/main/AndroidManifest.xml | 4 app/src/main/java/ml/adamsprogs/bimba/activities/DashActivity.kt | 5 app/src/main/java/ml/adamsprogs/bimba/activities/HelpActivity.kt | 15 app/src/main/res/layout/activity_help.xml | 38 ++ app/src/main/res/layout/content_help.xml | 18 app/src/main/res/menu/menu_drawer.xml | 4 app/src/main/res/values-pl/strings.xml | 20 + app/src/main/res/values/dimens.xml | 2 app/src/main/res/values/strings.xml | 20 +
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a75ab9166f65fbe3c4a7021141e8f1f41f2a9d7c..e4ce6c8eea80fadbb4fa60b14a79d7f247a357cc 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -37,6 +37,10 @@ android:name=".VmClient" android:exported="false" /> <activity android:name=".activities.EditFavouriteActivity" /> + <activity + android:name=".activities.HelpActivity" + android:label="@string/title_activity_help" + android:theme="@style/AppTheme"></activity> </application> </manifest> \ No newline at end of file diff --git a/app/src/main/java/ml/adamsprogs/bimba/activities/DashActivity.kt b/app/src/main/java/ml/adamsprogs/bimba/activities/DashActivity.kt index 75060c7cde44a199cf26f017a404960d7566a336..321c32db86b8d30e9a51ab80bdd300df2d59dbd5 100644 --- a/app/src/main/java/ml/adamsprogs/bimba/activities/DashActivity.kt +++ b/app/src/main/java/ml/adamsprogs/bimba/activities/DashActivity.kt @@ -55,11 +55,14 @@ scheduleRefresh() drawerLayout = findViewById(R.id.drawer_layout) as DrawerLayout drawer = findViewById(R.id.drawer) as NavigationView - drawer.setCheckedItem(R.id.drawer_home) + //drawer.setCheckedItem(R.id.drawer_home) drawer.setNavigationItemSelectedListener { item -> when (item.itemId) { R.id.drawer_refresh -> { startDownloaderService() + } + R.id.drawer_help -> { + startActivity(Intent(context, HelpActivity::class.java)) } else -> { } diff --git a/app/src/main/java/ml/adamsprogs/bimba/activities/HelpActivity.kt b/app/src/main/java/ml/adamsprogs/bimba/activities/HelpActivity.kt new file mode 100644 index 0000000000000000000000000000000000000000..75dafa19a28bb5eef595683e4f5de44c3eeb878e --- /dev/null +++ b/app/src/main/java/ml/adamsprogs/bimba/activities/HelpActivity.kt @@ -0,0 +1,15 @@ +package ml.adamsprogs.bimba.activities + +import android.os.Bundle +import android.support.v7.app.AppCompatActivity +import kotlinx.android.synthetic.main.activity_help.* +import ml.adamsprogs.bimba.R + +class HelpActivity : AppCompatActivity() { + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_help) + setSupportActionBar(toolbar) + } +} diff --git a/app/src/main/res/layout/activity_help.xml b/app/src/main/res/layout/activity_help.xml new file mode 100644 index 0000000000000000000000000000000000000000..c59e2511f540c91420ab1e3d8bd5b13e47687b04 --- /dev/null +++ b/app/src/main/res/layout/activity_help.xml @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="utf-8"?> +<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:fitsSystemWindows="true" + tools:context="ml.adamsprogs.bimba.activities.HelpActivity"> + + <android.support.design.widget.AppBarLayout + android:id="@+id/app_bar" + android:layout_width="match_parent" + android:layout_height="@dimen/app_bar_height" + android:fitsSystemWindows="true" + android:theme="@style/AppTheme.AppBarOverlay"> + + <android.support.design.widget.CollapsingToolbarLayout + android:id="@+id/toolbar_layout" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:fitsSystemWindows="true" + app:contentScrim="?attr/colorPrimary" + app:layout_scrollFlags="scroll|exitUntilCollapsed" + app:toolbarId="@+id/toolbar"> + + <android.support.v7.widget.Toolbar + android:id="@+id/toolbar" + android:layout_width="match_parent" + android:layout_height="?attr/actionBarSize" + app:layout_collapseMode="pin" + app:popupTheme="@style/AppTheme.PopupOverlay" /> + + </android.support.design.widget.CollapsingToolbarLayout> + </android.support.design.widget.AppBarLayout> + + <include layout="@layout/content_help" /> + +</android.support.design.widget.CoordinatorLayout> diff --git a/app/src/main/res/layout/content_help.xml b/app/src/main/res/layout/content_help.xml new file mode 100644 index 0000000000000000000000000000000000000000..9a733196da59d83c7adecb48a865eba0f12a5013 --- /dev/null +++ b/app/src/main/res/layout/content_help.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8"?> +<android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + app:layout_behavior="@string/appbar_scrolling_view_behavior" + tools:context="ml.adamsprogs.bimba.activities.HelpActivity" + tools:showIn="@layout/activity_help"> + + <TextView + android:id="@+id/help_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:background="@android:color/transparent" + android:text="@string/help_text" + android:layout_margin="@dimen/text_margin"/> +</android.support.v4.widget.NestedScrollView> diff --git a/app/src/main/res/menu/menu_drawer.xml b/app/src/main/res/menu/menu_drawer.xml index b5624b5fe0c64d7916589f6fe23ecc1449cf7ee8..2ecf126df6b27d3b53eda5c5e30360d1faa8a61d 100644 --- a/app/src/main/res/menu/menu_drawer.xml +++ b/app/src/main/res/menu/menu_drawer.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <menu xmlns:android="http://schemas.android.com/apk/res/android"> - <group android:id="@+id/drawer_group_activities"> + <!--<group android:id="@+id/drawer_group_activities"> <item android:id="@+id/drawer_home" android:icon="@drawable/ic_home" android:title="@string/home" /> - </group> + </group>--> <group android:id="@+id/drawer_group_actions"> <item android:id="@+id/drawer_refresh" diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index cef3abc49462768db38c80489d50543472c42b1b..79d1b762f2b41389057499b42141852197f2ef0f 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -4,4 +4,6 @@16dp <dimen name="activity_vertical_margin">16dp</dimen> <dimen name="fab_margin">16dp</dimen> <dimen name="appbar_padding_top">8dp</dimen> + <dimen name="app_bar_height">180dp</dimen> + <dimen name="text_margin">16dp</dimen> </resources> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8442f0ce5ac1be06c020e100176b0a370e1c20a7..931fb2eaf4de825a9ff72fb9ac8f103276dfae16 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -45,4 +45,24 @@Help <string name="navigation_drawer_home_button" translatable="false">navigation drawer home button</string> <string name="navigation_drawer_refresh_button" translatable="false">navigation drawer refresh button</string> <string name="navigation_drawer_help_button" translatable="false">navigation drawer help button</string> + <string name="title_activity_help">Help</string> + <string name="help_text"> + "Why is there no timetable for Saturdays?\n\n" + + "Current official timetable will have been invalid by Saturday so it doesn’t contain times" + "for Saturdays.\n" + "Be sure to update timetable on Saturday at the latest.\n\n" + + "Why a favourite card shows ‘No next departure’?\n\n" + + "Favourite cards contain times for today and tomorrow." + "‘No next departure’ may happen when, e.g. there is no timetable for tomorrow and there" + "are no more departures today.\n\n" + + "Today is Tuesday but it’s a holiday. Shouldn’t I look at Sundays timetable?\n\n" + + "Official timetable is especially prepared for holidays—it will show up as today (if" + "it’s Tuesday, it will be on ‘workdays’ tab).\n" + "Be sure to consult the messages on\nhttps://www.ztm.poznan.pl/en.\n\n" + </string> </resources> diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 8d75adb8301ae19255b63e50c3b9f71cf3ec1ea8..6ad589e2c40f195793158af99f92d106103b7221 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -35,4 +35,24 @@Za %1$s minuty <string name="home">Dom</string> <string name="refresh">Odśwież</string> <string name="help">Pomoc</string> + <string name="title_activity_help">Pomoc</string> + <string name="help_text"> + "Dlaczego nie ma rozkładu na sobotę?\n\n" + + "Aktualny oficjalny rozkład będzie nieważny przed sobotą, więc nie zawiera czasów dla" + "soboty.\n" + "Pamiętaj, aby zaktualizować rozkład najpóźniej w sobotę.\n\n" + + "Dlaczego ulubiony pokazuje „Brak następnego odjazdu”?\n\n" + + "Ulubione zawierają czasy dla dzisiaj i jutra." + "„Brak następnego odjazdu” może się wydarzyć, np. gdy nie ma rozkładu na jutro, a dzisiaj" + "nie ma już odjazdów.\n\n" + + "Dziś jest wtorek, ale jest święto. Nie powinienem patrzeć na rozkład dla niedzieli?\n\n" + + "Oficjalny rozkład jest specjalnie przygotowywany na święta — będzie widoczny w dzisiejszej" + "zakładce (jeśli jest wtorek, to w „dni robocze”).\n" + "Pamiętaj, aby sprawdzić aktualności na\nhttps://www.ztm.poznan.pl.\n\n" + </string> </resources> \ No newline at end of file