Page MenuHomeGitPull.it

No OneTemporary

Authored By
Unknown
Size
78 KB
Referenced Files
None
Subscribers
None
diff --git a/build.gradle b/build.gradle
index 07be04af..16d669e6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,49 +1,52 @@
buildscript {
repositories {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.0.0'
}
}
apply plugin: 'com.android.application'
+dependencies {
+ compile 'com.android.support:support-v4:23.4.0'
+}
android {
compileSdkVersion 23
buildToolsVersion '23.0.3' // was 23.0.2
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_7
targetCompatibility JavaVersion.VERSION_1_7
}
sourceSets {
main {
manifest.srcFile 'AndroidManifest.xml'
java.srcDirs = ['src']
resources.srcDirs = ['src']
aidl.srcDirs = ['src']
renderscript.srcDirs = ['src']
res.srcDirs = ['res']
assets.srcDirs = ['assets']
}
}
lintOptions {
abortOnError false
}
repositories {
mavenCentral()
mavenLocal()
}
dependencies {
compile 'com.android.support:support-v4:23.2.1'
compile 'com.android.support:appcompat-v7:23.2.1'
- compile 'com.melnykov:floatingactionbutton:1.1.0'
+ compile 'com.melnykov:floatingactionbutton:1.2.0'
compile 'org.jsoup:jsoup:1.7.3'
}
}
\ No newline at end of file
diff --git a/res/layout-v11/activity_main.xml b/res/layout-v11/activity_main.xml
index 5c97544a..413e611a 100644
--- a/res/layout-v11/activity_main.xml
+++ b/res/layout-v11/activity_main.xml
@@ -1,190 +1,164 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:fab="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:animateLayoutChanges="true"
android:paddingTop="@dimen/activity_vertical_margin"
tools:context="it.reyboz.bustorino.ActivityMain">
<ImageButton
android:id="@+id/QRButton"
style="?android:attr/borderlessButtonStyle"
android:layout_width="30dip"
android:layout_height="30dip"
android:layout_alignBottom="@+id/searchButton"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_marginLeft="16dp"
android:layout_marginStart="16dp"
android:background="@drawable/qrcode_button_custom"
android:contentDescription="@string/qrcode"
android:onClick="onQRButtonClick" />
<EditText
android:id="@+id/busStopSearchByIDEditText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="5dp"
android:layout_marginLeft="5dip"
android:layout_marginRight="5dip"
android:layout_toEndOf="@+id/QRButton"
android:layout_toLeftOf="@+id/searchButton"
android:layout_toRightOf="@+id/QRButton"
android:layout_toStartOf="@+id/searchButton"
android:ems="10"
android:hint="@string/insert_bus_stop_number"
android:imeOptions="actionSearch"
android:inputType="number"
android:selectAllOnFocus="true"
android:singleLine="true">
<requestFocus />
</EditText>
<!--android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"-->
<EditText
android:id="@+id/busStopSearchByNameEditText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="5dp"
android:layout_marginLeft="5dip"
android:layout_marginRight="5dip"
android:layout_toEndOf="@+id/QRButton"
android:layout_toLeftOf="@+id/searchButton"
android:layout_toRightOf="@+id/QRButton"
android:layout_toStartOf="@+id/searchButton"
android:ems="10"
android:hint="@string/insert_bus_stop_name"
android:imeOptions="actionSearch"
android:singleLine="true"
android:visibility="gone">
<requestFocus />
</EditText>
<ImageButton
android:id="@+id/searchButton"
style="?android:attr/borderlessButtonStyle"
android:layout_width="40dip"
android:layout_height="40dip"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_alignTop="@+id/busStopSearchByIDEditText"
android:layout_marginEnd="16dp"
android:layout_marginRight="16dp"
android:background="@drawable/search_button_custom"
android:contentDescription="@string/search"
android:onClick="onSearchClick" />
<ProgressBar
android:id="@+id/progressBar"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentLeft="true"
android:layout_alignParentRight="true"
android:layout_alignParentStart="true"
android:layout_below="@+id/searchButton"
android:layout_marginEnd="16dp"
android:layout_marginLeft="16dip"
android:layout_marginRight="16dp"
android:layout_marginStart="16dip"
android:indeterminateOnly="true"
android:visibility="gone" />
<TextView
- android:id="@+id/busStopNameTextView"
- android:layout_width="wrap_content"
- android:layout_height="48dip"
- android:layout_alignParentEnd="true"
- android:layout_alignParentLeft="true"
- android:layout_alignParentRight="true"
- android:layout_alignParentStart="true"
- android:layout_below="@+id/searchButton"
- android:layout_marginEnd="16dp"
- android:layout_marginLeft="16dip"
- android:layout_marginRight="16dp"
- android:layout_marginStart="16dip"
- android:layout_marginTop="10dp"
- android:background="?android:attr/selectableItemBackground"
- android:clickable="true"
- android:gravity="center_vertical"
- android:onClick="addToFavorites"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:visibility="gone" />
-
- <TextView
- android:id="@+id/howDoesItWorkTextView"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_below="@+id/busStopNameTextView"
- android:layout_marginBottom="10dp"
- android:layout_marginEnd="16dp"
- android:layout_marginLeft="16dip"
- android:layout_marginRight="16dp"
- android:layout_marginStart="16dip"
- android:layout_toLeftOf="@+id/hideHintButton"
- android:layout_toStartOf="@+id/hideHintButton"
- android:text="@string/howDoesItWork"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:textColor="@color/blue_500"
- android:visibility="gone" />
+ android:id="@+id/howDoesItWorkTextView"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="10dp"
+ android:layout_marginEnd="16dp"
+ android:layout_marginLeft="16dip"
+ android:layout_marginRight="16dp"
+ android:layout_marginStart="16dip"
+ android:layout_toLeftOf="@+id/hideHintButton"
+ android:layout_toStartOf="@+id/hideHintButton"
+ android:text="@string/howDoesItWork"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textColor="@color/blue_500"
+ android:visibility="gone" android:layout_below="@+id/searchButton"/>
<Button
android:id="@+id/hideHintButton"
style="?android:attr/buttonStyleSmall"
android:layout_width="85dip"
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/howDoesItWorkTextView"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_marginEnd="16dp"
android:layout_marginRight="16dp"
android:background="@drawable/route_background_bus"
android:onClick="onHideHint"
android:text="@string/hint_button"
android:textColor="@color/grey_100"
android:textSize="19sp"
android:visibility="gone" />
<android.support.v4.widget.SwipeRefreshLayout
- android:id="@+id/swipeRefreshLayout"
+ android:id="@+id/listRefreshLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_below="@+id/howDoesItWorkTextView"
android:animateLayoutChanges="true"
android:visibility="gone">
- <ListView
- android:id="@+id/resultsListView"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:clickable="true"
- android:descendantFocusability="blocksDescendants"
- android:visibility="gone" />
-
+ <FrameLayout
+ android:layout_width="match_parent"
+ android:id="@+id/resultFrame"
+ android:layout_height="fill_parent"
+ android:layout_alignParentLeft="true" android:layout_alignParentStart="true"/>
</android.support.v4.widget.SwipeRefreshLayout>
<com.melnykov.fab.FloatingActionButton
- android:id="@+id/floatingActionButton"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentBottom="true"
- android:layout_alignParentEnd="true"
- android:layout_alignParentRight="true"
- android:layout_gravity="bottom|end"
- android:layout_margin="16dp"
- android:onClick="onToggleKeyboardLayout"
- android:src="@drawable/alphabetical"
- fab:fab_colorNormal="@color/teal_500"
- fab:fab_colorPressed="@color/teal_300"
- fab:fab_colorRipple="@color/teal_300"
- fab:fab_shadow="true"
- fab:fab_type="normal" />
-
+ android:id="@+id/floatingActionButton"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentEnd="true"
+ android:layout_alignParentRight="true"
+ android:layout_gravity="bottom|end"
+ android:layout_margin="16dp"
+ android:onClick="onToggleKeyboardLayout"
+ android:src="@drawable/alphabetical"
+ fab:fab_colorNormal="@color/teal_500"
+ fab:fab_colorPressed="@color/teal_300"
+ fab:fab_colorRipple="@color/teal_300"
+ fab:fab_shadow="true"
+ fab:fab_type="normal" />
</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/activity_main.xml b/res/layout/activity_main.xml
index 90ab62ce..3b0b5b15 100644
--- a/res/layout/activity_main.xml
+++ b/res/layout/activity_main.xml
@@ -1,186 +1,161 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:fab="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:paddingTop="@dimen/activity_vertical_margin"
tools:context="it.reyboz.bustorino.ActivityMain">
<ImageButton
android:id="@+id/QRButton"
android:layout_width="30dip"
android:layout_height="30dip"
android:layout_alignBottom="@+id/searchButton"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_marginLeft="16dp"
android:layout_marginStart="16dp"
android:background="@drawable/qrcode_button_custom"
android:contentDescription="@string/qrcode"
android:onClick="onQRButtonClick"/>
<EditText
android:id="@+id/busStopSearchByIDEditText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="5dp"
android:layout_marginLeft="5dip"
android:layout_marginRight="5dip"
android:layout_toEndOf="@+id/QRButton"
android:layout_toLeftOf="@+id/searchButton"
android:layout_toRightOf="@+id/QRButton"
android:layout_toStartOf="@+id/searchButton"
android:ems="10"
android:hint="@string/insert_bus_stop_number"
android:imeOptions="actionSearch"
android:inputType="number"
android:selectAllOnFocus="true"
android:singleLine="true">
<requestFocus />
</EditText>
<!--android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"-->
<EditText
android:id="@+id/busStopSearchByNameEditText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="5dp"
android:layout_marginLeft="5dip"
android:layout_marginRight="5dip"
android:layout_toEndOf="@+id/QRButton"
android:layout_toLeftOf="@+id/searchButton"
android:layout_toRightOf="@+id/QRButton"
android:layout_toStartOf="@+id/searchButton"
android:ems="10"
android:hint="@string/insert_bus_stop_name"
android:imeOptions="actionSearch"
android:singleLine="true"
android:visibility="gone">
<requestFocus />
</EditText>
<ImageButton
android:id="@+id/searchButton"
android:layout_width="40dip"
android:layout_height="40dip"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_alignTop="@+id/busStopSearchByIDEditText"
android:layout_marginEnd="16dp"
android:layout_marginRight="16dp"
android:background="@drawable/search_button_custom"
android:contentDescription="@string/search"
android:onClick="onSearchClick"/>
<ProgressBar
android:id="@+id/progressBar"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentLeft="true"
android:layout_alignParentRight="true"
android:layout_alignParentStart="true"
android:layout_below="@+id/searchButton"
android:layout_marginEnd="16dp"
android:layout_marginLeft="16dip"
android:layout_marginRight="16dp"
android:layout_marginStart="16dip"
android:indeterminateOnly="true"
android:visibility="gone" />
- <TextView
- android:id="@+id/busStopNameTextView"
- android:layout_width="wrap_content"
- android:layout_height="48dip"
- android:layout_alignParentEnd="true"
- android:layout_alignParentLeft="true"
- android:layout_alignParentRight="true"
- android:layout_alignParentStart="true"
- android:layout_below="@+id/searchButton"
- android:layout_marginEnd="16dp"
- android:layout_marginLeft="16dip"
- android:layout_marginRight="16dp"
- android:layout_marginStart="16dip"
- android:layout_marginTop="10dp"
- android:clickable="true"
- android:gravity="center_vertical"
- android:onClick="addToFavorites"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:visibility="gone" />
<TextView
android:id="@+id/howDoesItWorkTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_below="@+id/busStopNameTextView"
+ android:layout_below="@id/progressBar"
android:layout_marginBottom="10dp"
android:layout_marginEnd="16dp"
android:layout_marginLeft="16dip"
android:layout_marginRight="16dp"
android:layout_marginStart="16dip"
android:layout_toLeftOf="@+id/hideHintButton"
android:layout_toStartOf="@+id/hideHintButton"
android:text="@string/howDoesItWork"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/blue_500"
android:visibility="gone" />
<Button
android:id="@+id/hideHintButton"
style="?android:attr/buttonStyleSmall"
android:layout_width="85dip"
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/howDoesItWorkTextView"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_marginEnd="16dp"
android:layout_marginRight="16dp"
android:background="@drawable/route_background_bus"
android:onClick="onHideHint"
android:text="@string/hint_button"
android:textColor="@color/grey_100"
android:textSize="19sp"
android:visibility="gone" />
-
<android.support.v4.widget.SwipeRefreshLayout
- android:id="@+id/swipeRefreshLayout"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_alignParentEnd="true"
- android:layout_alignParentRight="true"
- android:layout_below="@+id/howDoesItWorkTextView"
- android:visibility="gone"
- >
-
- <ListView
- android:id="@+id/resultsListView"
+ android:id="@+id/listRefreshLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:clickable="true"
- android:descendantFocusability="blocksDescendants"
- android:visibility="gone" />
+ android:layout_below="@+id/howDoesItWorkTextView"
+ >
+ <FrameLayout
+ android:layout_width="match_parent"
+ android:id="@+id/resultFrame"
+ android:layout_height="fill_parent"
+ android:layout_alignParentLeft="true" android:layout_alignParentStart="true">
+ </FrameLayout>
</android.support.v4.widget.SwipeRefreshLayout>
<com.melnykov.fab.FloatingActionButton
- android:id="@+id/floatingActionButton"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentBottom="true"
- android:layout_alignParentEnd="true"
- android:layout_alignParentRight="true"
- android:layout_gravity="bottom|end"
- android:layout_margin="16dp"
- android:onClick="onToggleKeyboardLayout"
- android:src="@drawable/alphabetical"
- fab:fab_colorNormal="@color/teal_500"
- fab:fab_colorPressed="@color/teal_300"
- fab:fab_colorRipple="@color/teal_300"
- fab:fab_shadow="true"
- fab:fab_type="normal" />
+ android:id="@+id/floatingActionButton"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentEnd="true"
+ android:layout_alignParentRight="true"
+ android:layout_gravity="bottom|end"
+ android:layout_margin="16dp"
+ android:onClick="onToggleKeyboardLayout"
+ android:src="@drawable/alphabetical"
+ fab:fab_colorNormal="@color/teal_500"
+ fab:fab_colorPressed="@color/teal_300"
+ fab:fab_colorRipple="@color/teal_300"
+ fab:fab_shadow="true"
+ fab:fab_type="normal" />
</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/fragment_list_view.xml b/res/layout/fragment_list_view.xml
new file mode 100644
index 00000000..9b20d641
--- /dev/null
+++ b/res/layout/fragment_list_view.xml
@@ -0,0 +1,28 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:fab="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ >
+ <TextView
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginEnd="16dp"
+ android:layout_marginLeft="16dp"
+ android:layout_marginRight="16dp"
+ android:layout_marginStart="16dp"
+ android:layout_marginTop="10dp"
+ android:id="@+id/messageTextView" android:gravity="center_vertical"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:minHeight="48dp"
+ android:layout_marginBottom="10dp" />
+ <ListView
+ android:layout_below="@id/messageTextView"
+ android:id="@+id/resultsListView"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:clickable="true"
+ android:descendantFocusability="blocksDescendants"
+ android:visibility="visible"
+ />
+ </RelativeLayout>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2f4fc4b0..70812667 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,82 +1,90 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name" translatable="false">BusTO</string>
- <string name="app_description">You\'re using the latest in technology when it comes to respecting your privacy.</string>
+ <string name="app_description">You\'re using the latest in technology when it comes to respecting your privacy.
+ </string>
<string name="search">Search</string>
<string name="qrcode">Scan QR Code</string>
<string name="insert_bus_stop_number">Bus stop number</string>
<string name="insert_bus_stop_name">Bus stop name</string>
<string name="insert_bus_stop_number_error">Insert bus stop number</string>
<string name="insert_bus_stop_name_error">Insert bus stop name</string>
<string name="route_towards_destination">%1$s towards %2$s</string>
<string name="route_towards_unknown">%s (unknown destination)</string>
<string name="network_error">Verify your Internet connection!</string>
<string name="no_bus_stop_have_this_name">Seems that no bus stop have this name</string>
<string name="parsing_error">Error parsing the 5T/GTT website (damn site!)</string>
- <string name="query_too_short">Name too short, type more characters and retry</string> <!-- TODO: carry out experiments to determine the best wording for this message and publish a paper with the findings -->
+ <string name="query_too_short">Name too short, type more characters and retry
+ </string> <!-- TODO: carry out experiments to determine the best wording for this message and publish a paper with the findings -->
<string name="passages">Arrivals at: %1$s</string>
<string name="results">Choose the bus stop…</string>
<string name="lines">Lines: %1$s</string>
<string name="no_passages">No timetable found</string>
<string name="no_qrcode">No QR code</string>
<string name="internal_error">Unexpected internal error, cannot extract data from GTT/5T website</string>
<string name="action_help">Help</string>
<string name="action_about">About</string>
<string name="action_about_more">More about</string>
<string name="action_news">News releases</string>
<string name="action_bugs">Bug submission</string>
<string name="action_source">Source code</string>
<string name="action_licence">Licence</string>
<string name="action_author">Meet the author</string>
<string name="added_in_favorites">Bus stop is now in your favorites</string>
<string name="action_favorites">Favorites</string>
<string name="title_activity_favorites">Favorites</string>
<string name="tip_add_favorite">Press on a bus stop name to populate this list</string>
<string name="action_remove_from_favourites">Delete</string>
<string name="action_rename_bus_stop_username">Rename</string>
<string name="dialog_rename_bus_stop_username_title">Rename the bus stop</string>
<string name="dialog_rename_bus_stop_username_reset_button">Reset</string>
<string name="about">About</string>
- <string name="howDoesItWork"><b>Tap the bus stop name</b> to add it to the favourites\n\n<b>How to read timelines:</b>\n<b>&#160;&#160;&#160;12:56*</b> Real-time arrivals\n<b>&#160;&#160;&#160;12:56</b> &#160; Scheduled arrivals\n\n<b>Pull down to refresh</b> the timetable</string>
+ <string name="howDoesItWork">
+ <b>Tap the bus stop name</b>
+ to add it to the favourites\n\n<b>How to read timelines:</b>\n<b>&#160;&#160;&#160;12:56*</b> Real-time
+ arrivals\n<b>&#160;&#160;&#160;12:56</b> &#160; Scheduled arrivals\n\n<b>Pull down to refresh</b> the timetable
+ </string>
<string name="hint_button">GOT IT!</string>
<string name="about_history">
-<![CDATA[
+ <![CDATA[
<h1>Welcome!</h1>
<p>Thanks for using BusTO, a "politically" <b>independent</b> app useful to move around Torino using a <b>Free/Libre software</b>.</p>
<p>Why use this app?</p>
<p>
- You\'ll never be <b>tracked</b><br>
- You\'ll never see boring <b>ads</b><br>
- We\'ll always respect your <b>privacy</b><br>
- Moreover, it\'s lightweight!<br>
</p>
<h2>How does it work?</h2>
<p>This app will show you bus timetables gathering data from <b>www.gtt.to.it</b> or <b>www.5t.torino.it</b> "for personal use".</p>
<p>Who worked on BusTO:<br>
- <b>Valerio Bozzolan</b> main developer.<br>
- <b>Marco Gagino</b> main contributor and icon creator.<br>
- <b>Paolo Alloatti</b> original concept of the icon.<br>
- <b>JSoup</b> web scraper library.<br>
- <b>makovkastar</b> floating buttons.<br>
- <b>Google</b> Material Design icons.<br>
- All the contributors!
</p>
<h2>Licenses</h2>
<p>The app and the related source code are released by Valerio Bozzolan under the terms of the <i>GNU General Public License v3+</i>).
So everyone is allowed to use, to study, to improve and to share this app by <b>any kind of means</b> and for <b>any purpose</b>: under the conditions of maintaining this rights and of attributing the original work to Valerio Bozzolan.</p>
<h2>Notes</h2>
<p>This app has been developed <b>hoping to be useful to everyone</b> but without ANY warranty.</p>
<p>This translation is kindly provided by Riccardo Caniato and Marco Gagino.</p>
<p>Get involved! :)</p>
]]>
</string>
<string name="cant_add_to_favorites">Cannot add to favorites (storage full or corrupted database?)!</string>
<string name="action_view_on_map">View on a map</string>
+
+ <string name="list_fragment_debug" translatable="false">ListFragment - BusTO</string>
</resources>
diff --git a/src/it/reyboz/bustorino/ActivityMain.java b/src/it/reyboz/bustorino/ActivityMain.java
index 568c4bd7..69c25e50 100644
--- a/src/it/reyboz/bustorino/ActivityMain.java
+++ b/src/it/reyboz/bustorino/ActivityMain.java
@@ -1,885 +1,862 @@
/*
BusTO - Arrival times for Turin public transports.
Copyright (C) 2014 Valerio Bozzolan
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package it.reyboz.bustorino;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.database.sqlite.SQLiteDatabase;
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
import android.net.Uri;
-import android.os.AsyncTask;
import android.os.Bundle;
import android.os.Handler;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentTransaction;
import android.support.v4.app.NavUtils;
import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.app.AppCompatActivity;
import android.util.Log;
import android.view.KeyEvent;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.view.inputmethod.EditorInfo;
import android.view.inputmethod.InputMethodManager;
-import android.widget.AdapterView;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.ListView;
-import android.widget.ProgressBar;
-import android.widget.TextView;
-import android.widget.Toast;
+import android.widget.*;
import com.google.zxing.integration.android.IntentIntegrator;
import com.google.zxing.integration.android.IntentResult;
import com.melnykov.fab.FloatingActionButton;
import java.util.List;
import java.util.concurrent.atomic.AtomicReference;
import it.reyboz.bustorino.backend.ArrivalsFetcher;
import it.reyboz.bustorino.backend.Fetcher;
-import it.reyboz.bustorino.backend.FiveTNormalizer;
import it.reyboz.bustorino.backend.FiveTScraperFetcher;
import it.reyboz.bustorino.backend.FiveTStopsFetcher;
import it.reyboz.bustorino.backend.GTTJSONFetcher;
import it.reyboz.bustorino.backend.GTTStopsFetcher;
import it.reyboz.bustorino.backend.Palina;
-import it.reyboz.bustorino.backend.Route;
import it.reyboz.bustorino.backend.Stop;
import it.reyboz.bustorino.backend.StopsFinderByName;
-import it.reyboz.bustorino.middleware.UserDB;
-import it.reyboz.bustorino.middleware.AsyncWget;
-import it.reyboz.bustorino.middleware.PalinaAdapter;
-import it.reyboz.bustorino.middleware.RecursionHelper;
-import it.reyboz.bustorino.middleware.StopAdapter;
-import it.reyboz.bustorino.middleware.StopsDB;
+import it.reyboz.bustorino.fragments.ResultListFragment;
+import it.reyboz.bustorino.middleware.*;
-public class ActivityMain extends AppCompatActivity {
+public class ActivityMain extends AppCompatActivity implements ResultListFragment.OnFragmentInteractionListener{
/*
* Layout elements
*/
private EditText busStopSearchByIDEditText;
private EditText busStopSearchByNameEditText;
- private TextView busStopNameTextView;
private ProgressBar progressBar;
private TextView howDoesItWorkTextView;
private Button hideHintButton;
private MenuItem actionHelpMenuItem;
private SwipeRefreshLayout swipeRefreshLayout;
- private ListView resultsListView;
private FloatingActionButton floatingActionButton;
+ private FragmentManager framan;
/*
- * Serach mode
+ * Search mode
*/
private static final int SEARCH_BY_NAME = 0;
private static final int SEARCH_BY_ID = 1;
private static final int SEARCH_BY_ROUTE = 2; // TODO: implement this (bug #1512948)
private int searchMode;
/*
* Options
*/
private final String OPTION_SHOW_LEGEND = "show_legend";
/**
* Last successfully searched bus stop ID
*/
- private @Nullable Stop lastSuccessfullySearchedBusStop = null;
+ public @Nullable Stop lastSuccessfullySearchedBusStop = null;
/* // useful for testing:
public class MockFetcher implements ArrivalsFetcher {
@Override
public Palina ReadArrivalTimesAll(String routeID, AtomicReference<result> res) {
SystemClock.sleep(5000);
res.set(result.SERVER_ERROR);
return new Palina();
}
}
private ArrivalsFetcher[] ArrivalFetchers = {new MockFetcher(), new MockFetcher(), new MockFetcher(), new MockFetcher(), new MockFetcher()};*/
private RecursionHelper<ArrivalsFetcher> ArrivalFetchersRecursionHelper = new RecursionHelper<>(new ArrivalsFetcher[] {new GTTJSONFetcher(), new FiveTScraperFetcher()});
private RecursionHelper<StopsFinderByName> StopsFindersByNameRecursionHelper = new RecursionHelper<>(new StopsFinderByName[] {new GTTStopsFetcher(), new FiveTStopsFetcher()});
private StopsDB stopsDB;
private UserDB userDB;
///////////////////////////////// EVENT HANDLERS ///////////////////////////////////////////////
/*
* @see swipeRefreshLayout
*/
private Handler handler = new Handler();
private final Runnable refreshing = new Runnable() {
public void run() {
if (lastSuccessfullySearchedBusStop == null) {
Toast.makeText(getApplicationContext(),
R.string.query_too_short, Toast.LENGTH_SHORT).show();
} else {
new asyncWgetBusStopFromBusStopID(lastSuccessfullySearchedBusStop.ID, ArrivalFetchersRecursionHelper, lastSuccessfullySearchedBusStop);
}
}
};
+ //// MAIN METHOD ///
+
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ framan = getSupportFragmentManager();
this.stopsDB = new StopsDB(getApplicationContext());
this.userDB = new UserDB(getApplicationContext());
setContentView(R.layout.activity_main);
busStopSearchByIDEditText = (EditText) findViewById(R.id.busStopSearchByIDEditText);
busStopSearchByNameEditText = (EditText) findViewById(R.id.busStopSearchByNameEditText);
- busStopNameTextView = (TextView) findViewById(R.id.busStopNameTextView);
progressBar = (ProgressBar) findViewById(R.id.progressBar);
howDoesItWorkTextView = (TextView) findViewById(R.id.howDoesItWorkTextView);
hideHintButton = (Button) findViewById(R.id.hideHintButton);
- resultsListView = (ListView) findViewById(R.id.resultsListView);
- swipeRefreshLayout = (SwipeRefreshLayout) findViewById(R.id.swipeRefreshLayout);
+ swipeRefreshLayout = (SwipeRefreshLayout) findViewById(R.id.listRefreshLayout);
floatingActionButton = (FloatingActionButton) findViewById(R.id.floatingActionButton);
- if (floatingActionButton != null) {
- floatingActionButton.attachToListView(resultsListView);
- }
+
+ framan.addOnBackStackChangedListener(new FragmentManager.OnBackStackChangedListener() {
+ @Override
+ public void onBackStackChanged() {
+ Log.d("MainActivity, BusTO", "BACK STACK CHANGED");
+ }
+ });
busStopSearchByIDEditText.setSelectAllOnFocus(true);
busStopSearchByIDEditText
.setOnEditorActionListener(new TextView.OnEditorActionListener() {
@Override
public boolean onEditorAction(TextView v, int actionId,
KeyEvent event) {
// IME_ACTION_SEARCH alphabetical option
if (actionId == EditorInfo.IME_ACTION_SEARCH) {
onSearchClick(v);
return true;
}
return false;
}
});
busStopSearchByNameEditText
.setOnEditorActionListener(new TextView.OnEditorActionListener() {
@Override
public boolean onEditorAction(TextView v, int actionId,
KeyEvent event) {
// IME_ACTION_SEARCH alphabetical option
if (actionId == EditorInfo.IME_ACTION_SEARCH) {
onSearchClick(v);
return true;
}
return false;
}
});
// Called when the layout is pulled down
swipeRefreshLayout
.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
@Override
public void onRefresh() {
handler.post(refreshing);
}
});
/**
* @author Marco Gagino!!!
*/
swipeRefreshLayout.setColorSchemeColors(R.color.blue_500, R.color.orange_500); // setColorScheme is deprecated, setColorSchemeColors isn't
setSearchModeBusStopID();
//---------------------------- START INTENT CHECK QUEUE ------------------------------------
// Intercept calls from URL intent
boolean tryedFromIntent = false;
String busStopID = null;
String busStopDisplayName = null;
Uri data = getIntent().getData();
if (data != null) {
busStopID = getBusStopIDFromUri(data);
tryedFromIntent = true;
}
// Intercept calls from other activities
if (!tryedFromIntent) {
Bundle b = getIntent().getExtras();
if (b != null) {
busStopID = b.getString("bus-stop-ID");
busStopDisplayName = b.getString("bus-stop-display-name");
/**
* I'm not very sure if you are coming from an Intent.
* Some launchers work in strange ways.
*/
tryedFromIntent = busStopID != null;
}
}
//---------------------------- END INTENT CHECK QUEUE --------------------------------------
if (busStopID == null) {
// Show keyboard if can't start from intent
showKeyboard();
// You haven't obtained anything... from an intent?
if (tryedFromIntent) {
// This shows a luser warning
ArrivalFetchersRecursionHelper.reset();
Toast.makeText(getApplicationContext(),
R.string.insert_bus_stop_number_error, Toast.LENGTH_SHORT).show();
}
} else {
// If you are here an intent has worked successfully
setBusStopSearchByIDEditText(busStopID);
this.lastSuccessfullySearchedBusStop = new Stop(busStopID);
// forcing it as user name even though it could be standard name, it doesn't really matter
this.lastSuccessfullySearchedBusStop.setStopUserName(busStopDisplayName);
new asyncWgetBusStopFromBusStopID(busStopID, ArrivalFetchersRecursionHelper, lastSuccessfullySearchedBusStop);
}
Log.d("MainActivity", "Created");
}
/**
* Reload bus stop timetable when it's fulled resumed from background.
*/
@Override
protected void onPostResume() {
super.onPostResume();
Log.d("ActivityMain", "onPostResume fired. Last successfully bus stop ID: " + lastSuccessfullySearchedBusStop);
if (searchMode == SEARCH_BY_ID && lastSuccessfullySearchedBusStop != null) {
setBusStopSearchByIDEditText(lastSuccessfullySearchedBusStop.ID);
new asyncWgetBusStopFromBusStopID(lastSuccessfullySearchedBusStop.ID, ArrivalFetchersRecursionHelper, lastSuccessfullySearchedBusStop);
}
}
@Override
public boolean onCreateOptionsMenu(Menu menu) {
// Inflate the menu; this adds items to the action bar if it is present.
getMenuInflater().inflate(R.menu.main, menu);
actionHelpMenuItem = menu.findItem(R.id.action_help);
return true;
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
// Handle action bar item clicks here. The action bar will
// automatically handle clicks on the Home/Up button, so long
// as you specify a parent activity in AndroidManifest.xml.
switch (item.getItemId()) {
case android.R.id.home:
// Respond to the action bar's Up/Home button
NavUtils.navigateUpFromSameTask(this);
return true;
case R.id.action_help:
showHints();
return true;
case R.id.action_favorites:
startActivity(new Intent(ActivityMain.this, ActivityFavorites.class));
return true;
case R.id.action_about:
startActivity(new Intent(ActivityMain.this, ActivityAbout.class));
return true;
case R.id.action_news:
openIceweasel("http://blog.reyboz.it/tag/busto/");
return true;
case R.id.action_bugs:
openIceweasel("https://bugs.launchpad.net/bus-torino");
return true;
case R.id.action_source:
openIceweasel("https://code.launchpad.net/bus-torino");
return true;
case R.id.action_licence:
openIceweasel("http://www.gnu.org/licenses/gpl-3.0.html");
return true;
case R.id.action_author:
openIceweasel("http://boz.reyboz.it?lovebusto");
return true;
}
return super.onOptionsItemSelected(item);
}
/**
* OK this is pure shit
*
* @param v View clicked
*/
public void onSearchClick(View v) {
if (searchMode == SEARCH_BY_ID) {
String busStopID = busStopSearchByIDEditText.getText().toString();
new asyncWgetBusStopFromBusStopID(busStopID, ArrivalFetchersRecursionHelper, lastSuccessfullySearchedBusStop);
} else { // searchMode == SEARCH_BY_NAME
String query = busStopSearchByNameEditText.getText().toString();
new asyncWgetBusStopSuggestions(query, stopsDB, StopsFindersByNameRecursionHelper);
}
}
+ /**
+ * @author Fabio Mazza
+ * This is necessary for the fragment to update the StopDB
+ * @return the last succeffuly searched bus stop, if not null
+ */
+ public Stop getLastSuccessfullySearchedBusStop() {
+ if(lastSuccessfullySearchedBusStop!=null)
+ return lastSuccessfullySearchedBusStop;
+ else return null;
+ }
+
+ @Override
+ public void createFragmentForStop(String ID) {
+ new asyncWgetBusStopFromBusStopID(ID, ArrivalFetchersRecursionHelper,lastSuccessfullySearchedBusStop);
+ }
+
+
/**
* QR scan button clicked
*
* @param v View QRButton clicked
*/
public void onQRButtonClick(View v) {
IntentIntegrator integrator = new IntentIntegrator(this);
integrator.initiateScan();
}
/**
* Receive the Barcode Scanner Intent
*
*/
public void onActivityResult(int requestCode, int resultCode, Intent intent) {
IntentResult scanResult = IntentIntegrator.parseActivityResult(requestCode, resultCode, intent);
Uri uri;
try {
uri = Uri.parse(scanResult != null ? scanResult.getContents() : null); // this apparently prevents NullPointerException. Somehow.
} catch (NullPointerException e) {
Toast.makeText(getApplicationContext(),
R.string.no_qrcode, Toast.LENGTH_SHORT).show();
return;
}
String busStopID = getBusStopIDFromUri(uri);
busStopSearchByIDEditText.setText(busStopID);
new asyncWgetBusStopFromBusStopID(busStopID, ArrivalFetchersRecursionHelper, lastSuccessfullySearchedBusStop);
}
public void onHideHint(View v) {
hideHints();
setOption(OPTION_SHOW_LEGEND, false);
}
public void onToggleKeyboardLayout(View v) {
if (searchMode == SEARCH_BY_NAME) {
setSearchModeBusStopID();
if (busStopSearchByIDEditText.requestFocus()) {
showKeyboard();
}
} else { // searchMode == SEARCH_BY_ID
setSearchModeBusStopName();
if (busStopSearchByNameEditText.requestFocus()) {
showKeyboard();
}
}
}
- ///////////////////////////////// STOPS FINDER BY NAME /////////////////////////////////////////
+
+
+ /*
+ *****************************************************************************************
+ **** STOP FINDER BY NAME ****
+ *****************************************************************************************
+ */
private class asyncWgetBusStopSuggestions extends AsyncWget<StopsFinderByName> {
private final String query;
private AtomicReference<Fetcher.result> res;
- private List<Stop> s;
+ private List<Stop> stopList;
private StopsDB db;
+ String fragTag;
public asyncWgetBusStopSuggestions(@Nullable String query, @NonNull StopsDB sdb, @NonNull RecursionHelper<StopsFinderByName> r) {
super(getApplicationContext(), r);
toggleSpinner(true);
this.query = query;
this.res = new AtomicReference<>();
this.db = sdb;
r.reset();
if(query == null || query.length() <= 0) {
Toast.makeText(this.c,
R.string.insert_bus_stop_name_error, Toast.LENGTH_SHORT).show();
toggleSpinner(false);
} else {
+ fragTag = "stop_search_"+query;
this.execute();
}
}
@Override
protected boolean tryFetcher(StopsFinderByName f) {
// gets opened multiple times, whatever.
this.db.openIfNeeded();
- this.s = f.FindByName(this.query, this.db, this.res);
+ this.stopList = f.FindByName(this.query, this.db, this.res);
this.db.closeIfNeeded();
switch (this.res.get()) {
case CLIENT_OFFLINE:
publishProgress(R.string.network_error);
return false;
case SERVER_ERROR:
if (isConnected()) {
publishProgress(R.string.parsing_error);
} else {
publishProgress(R.string.network_error);
}
return false;
case PARSER_ERROR:
default:
publishProgress(R.string.internal_error);
return false;
case QUERY_TOO_SHORT:
publishProgress(R.string.query_too_short);
return false;
case EMPTY_RESULT_SET:
publishProgress(R.string.no_bus_stop_have_this_name);
return false;
case OK:
return true;
}
}
@Override
protected void onPostExecute(Void useless) {
// something really bad happened
- if(this.isCancelled() || !this.terminated || this.s == null) {
+ if(this.isCancelled() || !this.terminated || this.stopList == null) {
toggleSpinner(false);
this.onCancelled();
+
return;
}
// no results
if(this.failedAll) {
toggleSpinner(false);
// TODO: an error message would be a good idea, here
return;
}
hideKeyboard();
- busStopNameTextView.setVisibility(View.GONE);
+ //CREATE THE FRAGMENT
+ FragmentTransaction transaction = framan.beginTransaction();
+ ResultListFragment listfragment = ResultListFragment.newInstance(ResultListFragment.TYPE_STOPS);
+ transaction.replace(R.id.resultFrame,listfragment, fragTag);
+ transaction.addToBackStack(fragTag);
+ transaction.commit();
+ //Apparently, the fragment creation is asynchronous, but we need the fragment, NOW!
+ framan.executePendingTransactions();
prepareGUIForBusStops();
- resultsListView.setAdapter(new StopAdapter(this.c, this.s));
- resultsListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-
- @Override
- public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
- /**
- * Casting because of Javamerda
- * @url http://stackoverflow.com/questions/30549485/androids-list-view-parameterized-type-in-adapterview-onitemclicklistener
- */
- Stop busStop = (Stop) parent.getItemAtPosition(position);
-
- Intent intent = new Intent(ActivityMain.this, ActivityMain.class);
-
- Bundle b = new Bundle();
- b.putString("bus-stop-ID", busStop.ID);
- intent.putExtras(b);
- startActivity(intent);
- }
- });
+ listfragment.setTextViewMessage(getString(R.string.results));
+ listfragment.setListAdapter(new StopAdapter(this.c, this.stopList));
+ listfragment.attachFABToListView();
toggleSpinner(false);
}
@Override
protected void onCancelled() {
toggleSpinner(false);
}
}
- ///////////////////////////////// ARRIVALS FETCHER /////////////////////////////////////////////
+ /*
+ *****************************************************************************************
+ **** ARRIVALS FETCHER ****
+ *****************************************************************************************
+ */
private class asyncWgetBusStopFromBusStopID extends AsyncWget<ArrivalsFetcher> {
private final String stopID;
private AtomicReference<Fetcher.result> res;
private Palina p;
+ String fragmentTag;
/**
* Begins its life as a copy of lastSuccessfullySearchedBusStop, ends as null if it needs
* replacing or stays the same if it stayed the same
*/
private Stop lastSearchedBusStop;
asyncWgetBusStopFromBusStopID(@Nullable String stopID, @NonNull RecursionHelper<ArrivalsFetcher> r, @Nullable Stop lastSearchedBusStop) {
super(getApplicationContext(), r);
toggleSpinner(true);
this.stopID = stopID;
this.lastSearchedBusStop = lastSearchedBusStop;
this.res = new AtomicReference<>();
if(stopID == null || stopID.length() <= 0) {
// we're still in UI thread, no need to mess with Progress
Toast.makeText(this.c,
R.string.insert_bus_stop_number_error, Toast.LENGTH_SHORT).show();
toggleSpinner(false);
} else {
+ //In case the query works, the fragment tag is the stop ID
+ fragmentTag = stopID;
this.execute();
}
}
@Override
- protected boolean tryFetcher(ArrivalsFetcher f) {
- this.p = f.ReadArrivalTimesAll(this.stopID, this.res);
+ protected boolean tryFetcher(ArrivalsFetcher fetcher) {
+ this.p = fetcher.ReadArrivalTimesAll(this.stopID, this.res);
switch(this.res.get()) {
case CLIENT_OFFLINE:
publishProgress(R.string.network_error);
return false;
case SERVER_ERROR:
if(isConnected()) {
publishProgress(R.string.parsing_error);
} else {
publishProgress(R.string.network_error);
}
return false;
case QUERY_TOO_SHORT: // should never happen here, but to err on the side of caution...
publishProgress(R.string.query_too_short);
return false;
case PARSER_ERROR:
default: // there are no other cases but Android Studio is still complaining...
publishProgress(R.string.internal_error);
return false;
case EMPTY_RESULT_SET:
publishProgress(R.string.no_passages);
return false;
case OK:
// WARNING: lots of branches ahead.
// did we search for anything?
if(this.lastSearchedBusStop != null) {
- // different stop?
+ // check if we have the same stop
if(!this.lastSearchedBusStop.ID.equals(p.ID)) {
// remove it, get new name
this.lastSearchedBusStop = null;
getNameOrGetRekt();
} else {
// searched and it's the same
String sn = lastSearchedBusStop.getStopDisplayName();
if(sn == null) {
// something really bad happened, start from scratch
this.lastSearchedBusStop = null;
getNameOrGetRekt();
} else {
// "merge" Stop over Palina and we're good to go
this.p.mergeNameFrom(lastSearchedBusStop);
}
}
} else {
- // not searched yet
+ // we haven't searched anything yet
getNameOrGetRekt();
}
return true;
}
}
/**
* Run this in a background thread.<br>
- * Sets a stop name for this.p, guaranteed not to be null!
+ * Sets a stop name for this.palina, guaranteed not to be null!
*/
private void getNameOrGetRekt() {
String nameMaybe;
SQLiteDatabase udb = userDB.getReadableDatabase();
// does it already have a name (for fetchers that support it, or already got from favorites)?
nameMaybe = this.p.getStopDisplayName();
if(nameMaybe != null && nameMaybe.length() > 0) {
return;
}
// ok, let's search favorites.
String usernameMaybe = UserDB.getStopUserName(udb, this.p.ID);
if(usernameMaybe != null && usernameMaybe.length() > 0) {
this.p.setStopUserName(usernameMaybe);
return;
}
// let's try StopsDB, then.
StopsDB db = new StopsDB(this.c);
db.openIfNeeded();
nameMaybe = db.getNameFromID(this.p.ID);
db.closeIfNeeded();
if(nameMaybe != null && nameMaybe.length() > 0) {
this.p.setStopName(nameMaybe);
return;
}
// no name to be found anywhere, don't bother searching it next time
this.p.setStopName("");
}
@Override
protected void onPostExecute(Void useless) {
// something really bad happened
if(this.isCancelled() || !this.terminated || this.p == null) {
toggleSpinner(false);
this.onCancelled();
return;
}
// no results
if(this.failedAll) {
toggleSpinner(false);
// TODO: an error message would be a good idea, here
return;
}
hideKeyboard();
+ //DO THE FRAGMENT TRANSACTION
+ FragmentTransaction transaction = framan.beginTransaction();
+ ResultListFragment listfragment = ResultListFragment.newInstance(ResultListFragment.TYPE_LINES);
+ transaction.replace(R.id.resultFrame,listfragment, fragmentTag);
+ transaction.addToBackStack(fragmentTag);
+ transaction.commit();
+ //Apparently, the fragment creation is asynchronous, but we need the fragment, NOW!
+ framan.executePendingTransactions();
+
if(this.lastSearchedBusStop == null) {
// did we gather any new information about this Stop? Then update it (casting from Palina)
lastSuccessfullySearchedBusStop = this.p;
}
String displayName = p.getStopDisplayName();
String displayStuff;
if (displayName != null && displayName.length() > 0) {
displayStuff = p.ID.concat(" - ").concat(displayName);
} else {
displayStuff = p.ID;
}
-
- busStopNameTextView.setText(String.format(
+ listfragment.setTextViewMessage(String.format(
getString(R.string.passages), displayStuff));
// Shows hints
if (getOption(OPTION_SHOW_LEGEND, true)) {
showHints();
} //else {
// hideHints();
//}
prepareGUIForBusLines();
- resultsListView.setAdapter(new PalinaAdapter(this.c, p));
-
- resultsListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
- @Override
- public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
- String routeName;
-
- Route r = (Route) parent.getItemAtPosition(position);
- routeName = FiveTNormalizer.routeInternalToDisplay(r.name);
- if (routeName == null) {
- routeName = r.name;
- }
- if (r.destinazione == null || r.destinazione.length() == 0) {
- Toast.makeText(getApplicationContext(),
- getString(R.string.route_towards_unknown, routeName), Toast.LENGTH_SHORT).show();
- } else {
- Toast.makeText(getApplicationContext(),
- getString(R.string.route_towards_destination, routeName, r.destinazione), Toast.LENGTH_SHORT).show();
- }
- }
- });
+ listfragment.setListAdapter(new PalinaAdapter(this.c, p));
+ listfragment.attachFABToListView();
toggleSpinner(false);
}
@Override
protected void onCancelled() {
toggleSpinner(false);
}
}
///////////////////////////////// OTHER STUFF //////////////////////////////////////////////////
private boolean isConnected() {
ConnectivityManager connMgr = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
NetworkInfo networkInfo = connMgr.getActiveNetworkInfo();
return networkInfo != null && networkInfo.isConnected();
}
+ /**
+ * This method is not really necessary anymore...
+ */
+ @Deprecated
public void addToFavorites(View v) {
if(lastSuccessfullySearchedBusStop != null) {
- new AsyncAddToFavorites(this).execute();
+ new AsyncAddToFavorites(this).execute(lastSuccessfullySearchedBusStop);
}
}
- private class AsyncAddToFavorites extends AsyncTask<Void, Void, Boolean> {
- Context c;
-
- public AsyncAddToFavorites(Context c) {
- this.c = c;
- }
-
- @Override
- protected Boolean doInBackground(Void... voids) {
- SQLiteDatabase db = userDB.getWritableDatabase();
- Boolean result = UserDB.addOrUpdateStop(lastSuccessfullySearchedBusStop, db);
- db.close();
-
- return result;
- }
-
- @Override
- protected void onPostExecute(Boolean result) {
- super.onPostExecute(result);
-
- if(result) {
- Toast.makeText(this.c, R.string.added_in_favorites, Toast.LENGTH_SHORT).show();
- } else {
- Toast.makeText(this.c, R.string.cant_add_to_favorites, Toast.LENGTH_SHORT).show();
- }
- }
- }
// TODO: try to move these 2 methods to a separate class
private void setOption(String optionName, boolean value) {
SharedPreferences.Editor editor = getPreferences(MODE_PRIVATE).edit();
editor.putBoolean(optionName, value);
editor.commit();
}
private boolean getOption(String optionName, boolean optDefault) {
SharedPreferences preferences = getPreferences(MODE_PRIVATE);
return preferences.getBoolean(optionName, optDefault);
}
////////////////////////////////////// GUI HELPERS /////////////////////////////////////////////
private void showKeyboard() {
InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
View view = searchMode == SEARCH_BY_ID ? busStopSearchByIDEditText : busStopSearchByNameEditText;
imm.showSoftInput(view, InputMethodManager.SHOW_IMPLICIT);
}
private void hideKeyboard() {
View view = getCurrentFocus();
if (view != null) {
((InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE))
.hideSoftInputFromWindow(view.getWindowToken(),
InputMethodManager.HIDE_NOT_ALWAYS);
}
}
private void setSearchModeBusStopID() {
searchMode = SEARCH_BY_ID;
busStopSearchByNameEditText.setVisibility(View.GONE);
busStopSearchByNameEditText.setText("");
busStopSearchByIDEditText.setVisibility(View.VISIBLE);
floatingActionButton.setImageResource(R.drawable.alphabetical);
}
private void setSearchModeBusStopName() {
searchMode = SEARCH_BY_NAME;
busStopSearchByIDEditText.setVisibility(View.GONE);
busStopSearchByIDEditText.setText("");
busStopSearchByNameEditText.setVisibility(View.VISIBLE);
floatingActionButton.setImageResource(R.drawable.numeric);
}
/**
* Having that cursor at the left of the edit text makes me cancer.
* @param busStopID bus stop ID
*/
private void setBusStopSearchByIDEditText(String busStopID) {
busStopSearchByIDEditText.setText(busStopID);
busStopSearchByIDEditText.setSelection(busStopID.length());
}
private void showHints() {
howDoesItWorkTextView.setVisibility(View.VISIBLE);
hideHintButton.setVisibility(View.VISIBLE);
actionHelpMenuItem.setVisible(false);
}
private void hideHints() {
howDoesItWorkTextView.setVisibility(View.GONE);
hideHintButton.setVisibility(View.GONE);
actionHelpMenuItem.setVisible(true);
}
-
+ //TODO: toggle spinner from mainActivity
private void toggleSpinner(boolean enable) {
if (enable) {
//already set by the RefreshListener when needed
//swipeRefreshLayout.setRefreshing(true);
progressBar.setVisibility(View.VISIBLE);
} else {
swipeRefreshLayout.setRefreshing(false);
progressBar.setVisibility(View.GONE);
}
}
private void prepareGUIForBusLines() {
- busStopNameTextView.setVisibility(View.VISIBLE);
- busStopNameTextView.setClickable(true);
swipeRefreshLayout.setEnabled(true);
swipeRefreshLayout.setVisibility(View.VISIBLE);
- resultsListView.setVisibility(View.VISIBLE);
actionHelpMenuItem.setVisible(true);
}
private void prepareGUIForBusStops() {
- busStopNameTextView.setText(getString(R.string.results));
- busStopNameTextView.setClickable(false);
- busStopNameTextView.setVisibility(View.VISIBLE);
swipeRefreshLayout.setEnabled(false);
swipeRefreshLayout.setVisibility(View.VISIBLE);
- resultsListView.setVisibility(View.VISIBLE);
actionHelpMenuItem.setVisible(false);
}
+
/**
* Open an URL in the default browser.
*
* @param url URL
*/
public void openIceweasel(String url) {
Intent browserIntent1 = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
startActivity(browserIntent1);
}
///////////////////// INTENT HELPER ////////////////////////////////////////////////////////////
/**
* Try to extract the bus stop ID from a URi
*
* @param uri The URL
* @return bus stop ID or null
*/
public static String getBusStopIDFromUri(Uri uri) {
String busStopID;
// everithing catches fire when passing null to a switch.
String host = uri.getHost();
if(host == null) {
Log.e("ActivityMain", "Not an URL: " + uri);
return null;
}
switch(host) {
case "m.gtt.to.it":
// http://m.gtt.to.it/m/it/arrivi.jsp?n=1254
busStopID = uri.getQueryParameter("n");
if (busStopID == null) {
Log.e("ActivityMain", "Expected ?n from: " + uri);
}
break;
case "www.gtt.to.it":
case "gtt.to.it":
// http://www.gtt.to.it/cms/percorari/arrivi?palina=1254
busStopID = uri.getQueryParameter("palina");
if (busStopID == null) {
Log.e("ActivityMain", "Expected ?palina from: " + uri);
}
break;
default:
Log.e("ActivityMain", "Unexpected intent URL: " + uri);
busStopID = null;
}
return busStopID;
}
}
\ No newline at end of file
diff --git a/src/it/reyboz/bustorino/fragments/ResultListFragment.java b/src/it/reyboz/bustorino/fragments/ResultListFragment.java
new file mode 100644
index 00000000..c230c875
--- /dev/null
+++ b/src/it/reyboz/bustorino/fragments/ResultListFragment.java
@@ -0,0 +1,278 @@
+/*
+ BusTO - Fragments components
+ Copyright (C) 2016 Fabio Mazza
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+package it.reyboz.bustorino.fragments;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v4.widget.SwipeRefreshLayout;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import android.widget.*;
+import com.melnykov.fab.FloatingActionButton;
+import it.reyboz.bustorino.ActivityMain;
+import it.reyboz.bustorino.R;
+import it.reyboz.bustorino.backend.FiveTNormalizer;
+import it.reyboz.bustorino.backend.Route;
+import it.reyboz.bustorino.backend.Stop;
+import it.reyboz.bustorino.middleware.AsyncAddToFavorites;
+import it.reyboz.bustorino.middleware.UserDB;
+
+/**
+ * This is a generalized fragment that can be used both for
+ *
+ *
+ */
+public class ResultListFragment extends Fragment {
+ // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
+ private static final String LIST_TYPE = "list-type";
+ public static final String TYPE_LINES ="lines";
+ public static final String TYPE_STOPS = "fermate";
+
+ private static final String VIEW_TEXT="textview";
+ private String adapterType;
+
+
+ private OnFragmentInteractionListener mListener;
+ private TextView messageTextView;
+
+ FloatingActionButton fabutton;
+ private ListView resultsListView;
+ ListAdapter mListAdapter = null;
+ boolean listShown;
+
+ public ResultListFragment() {
+ // Required empty public constructor
+ }
+ public ListView getResultsListView() {
+ return resultsListView;
+ }
+
+ /**
+ * Use this factory method to create a new instance of
+ * this fragment using the provided parameters.
+ *
+ * @param listType whether the list is used for STOPS or LINES (Orari)
+ * @return A new instance of fragment ResultListFragment.
+ */
+ public static ResultListFragment newInstance(String listType) {
+ ResultListFragment fragment = new ResultListFragment();
+ Bundle args = new Bundle();
+ args.putString(LIST_TYPE, listType);
+ fragment.setArguments(args);
+ return fragment;
+ }
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ if (getArguments() != null) {
+ adapterType = getArguments().getString(LIST_TYPE);
+ }
+ }
+
+
+
+ @Override
+ public View onCreateView(LayoutInflater inflater, ViewGroup container,
+ Bundle savedInstanceState) {
+ View root = inflater.inflate(R.layout.fragment_list_view, container, false);
+ messageTextView = (TextView) root.findViewById(R.id.messageTextView);
+ if(adapterType!=null) {
+ resultsListView = (ListView) root.findViewById(R.id.resultsListView);
+ if(adapterType.equals(TYPE_STOPS))
+ resultsListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+
+ @Override
+ public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+ /**
+ * Casting because of Javamerda
+ * @url http://stackoverflow.com/questions/30549485/androids-list-view-parameterized-type-in-adapterview-onitemclicklistener
+ */
+ Stop busStop = (Stop) parent.getItemAtPosition(position);
+ mListener.createFragmentForStop(busStop.ID);
+ }
+ });
+ else if(adapterType.equals(TYPE_LINES))
+ resultsListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+ @Override
+ public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+ String routeName;
+
+ Route r = (Route) parent.getItemAtPosition(position);
+ routeName = FiveTNormalizer.routeInternalToDisplay(r.name);
+ if (routeName == null) {
+ routeName = r.name;
+ }
+ if (r.destinazione == null || r.destinazione.length() == 0) {
+ Toast.makeText(getContext(),
+ getString(R.string.route_towards_unknown, routeName), Toast.LENGTH_SHORT).show();
+ } else {
+ Toast.makeText(getContext(),
+ getString(R.string.route_towards_destination, routeName, r.destinazione), Toast.LENGTH_SHORT).show();
+ }
+ }
+ });
+ } else
+ Log.d(getString(R.string.list_fragment_debug), "No content root for fragment");
+ return root;
+ }
+
+ @Override
+ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+ super.onViewCreated(view, savedInstanceState);
+ if(savedInstanceState!=null){
+ messageTextView.setText(savedInstanceState.getCharSequence(VIEW_TEXT));
+ }
+ }
+
+ @Override
+ public void onSaveInstanceState(Bundle outState) {
+ super.onSaveInstanceState(outState);
+ outState.putCharSequence(VIEW_TEXT,messageTextView.getText());
+ }
+
+ @Override
+ public void onResume() {
+ super.onResume();
+ Log.d(getString(R.string.list_fragment_debug),"Fragment restored, saved listAdapter is "+(mListAdapter));
+ if(mListAdapter!=null){
+
+ ListAdapter adapter = mListAdapter;
+ mListAdapter = null;
+ setListAdapter(adapter);
+ }
+ }
+
+ @Override
+ public void onAttach(Context context) {
+ super.onAttach(context);
+ if (context instanceof OnFragmentInteractionListener) {
+ mListener = (OnFragmentInteractionListener) context;
+ fabutton = (FloatingActionButton) getActivity().findViewById(R.id.floatingActionButton);
+ } else {
+ throw new RuntimeException(context.toString()
+ + " must implement OnFragmentInteractionListener");
+ }
+ }
+
+ @Override
+ public void onDetach() {
+ mListener = null;
+ if(fabutton!=null)
+ fabutton.show(true);
+ super.onDetach();
+ }
+
+
+ @Override
+ public void onDestroyView() {
+ resultsListView = null;
+ //Log.d(getString(R.string.list_fragment_debug), "called onDestroyView");
+ super.onDestroyView();
+ }
+
+ public void setListAdapter(ListAdapter adapter) {
+ boolean hadAdapter = mListAdapter != null;
+ mListAdapter = adapter;
+ if (resultsListView != null) {
+ resultsListView.setAdapter(adapter);
+ resultsListView.setVisibility(View.VISIBLE);
+ }
+ }
+
+ /**
+ * This method attaches the FloatingActionButton to the current ListView
+ */
+ public void attachFABToListView(){
+ if(resultsListView!=null)
+ switch(adapterType){
+ case TYPE_LINES:
+ fabutton.attachToListView(resultsListView, null, new ListFragmentScrollListener());
+ break;
+ default:
+ fabutton.attachToListView(resultsListView);
+ break;
+ }
+ }
+ public void setTextViewMessage(String message){
+ messageTextView.setText(message);
+ switch (adapterType){
+ case TYPE_LINES:
+ final ActivityMain activ = (ActivityMain) getActivity();
+ messageTextView.setClickable(true);
+ messageTextView.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ new AsyncAddToFavorites(getContext()).execute(activ.getLastSuccessfullySearchedBusStop());
+ }
+ });
+ break;
+ case TYPE_STOPS:
+ messageTextView.setClickable(false);
+ break;
+ }
+
+ messageTextView.setVisibility(View.VISIBLE);
+ }
+
+ /**
+ * This interface is useful for communicating with the activity
+ * The name has been automatically generated (do not blame me)
+ */
+ public interface OnFragmentInteractionListener {
+ /**
+ * Houston, we need another fragment!
+ * @param ID the Stop ID
+ */
+ void createFragmentForStop(String ID);
+ }
+
+ private class ListFragmentScrollListener implements AbsListView.OnScrollListener{
+ @Override
+ public void onScrollStateChanged(AbsListView view, int scrollState) {
+ /*
+ * This seems to be a totally useless method
+ */
+ }
+
+ @Override
+ public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) {
+ SwipeRefreshLayout refreshLayout = (SwipeRefreshLayout) getActivity().findViewById(R.id.listRefreshLayout);
+ //if(firstVisibleItem == 0) refreshLayout.setEnabled(true);
+ //else refreshLayout.setEnabled(false);
+ boolean enable = false;
+ if(view != null && view.getChildCount() > 0){
+ // check if the first item of the list is visible
+ boolean firstItemVisible = view.getFirstVisiblePosition() == 0;
+ // check if the top of the first item is visible
+ boolean topOfFirstItemVisible = view.getChildAt(0).getTop() == 0;
+ // enabling or disabling the refresh layout
+ enable = firstItemVisible && topOfFirstItemVisible;
+ }
+ refreshLayout.setEnabled(enable);
+ //Log.d(getString(R.string.list_fragment_debug),"onScroll active, first item visible: "+firstVisibleItem+", refreshlayout enabled: "+enable);
+ }
+ }
+}
diff --git a/src/it/reyboz/bustorino/middleware/AsyncAddToFavorites.java b/src/it/reyboz/bustorino/middleware/AsyncAddToFavorites.java
new file mode 100644
index 00000000..8f040def
--- /dev/null
+++ b/src/it/reyboz/bustorino/middleware/AsyncAddToFavorites.java
@@ -0,0 +1,58 @@
+/*
+ BusTO - Middleware components
+ Copyright (C) 2016 Fabio Mazza
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package it.reyboz.bustorino.middleware;
+
+import android.content.Context;
+import android.database.sqlite.SQLiteDatabase;
+import android.os.AsyncTask;
+import android.widget.Toast;
+import it.reyboz.bustorino.R;
+import it.reyboz.bustorino.backend.Stop;
+import it.reyboz.bustorino.middleware.UserDB;
+
+public class AsyncAddToFavorites extends AsyncTask<Stop, Void, Boolean> {
+ private Context c;
+ public AsyncAddToFavorites(Context c) {
+ this.c = c;
+ }
+
+ @Override
+ protected Boolean doInBackground(Stop... stops) {
+ Boolean result;
+ if(stops[0]!=null) {
+ UserDB userDatabase = new UserDB(c);
+ SQLiteDatabase db = userDatabase.getWritableDatabase();
+ result = UserDB.addOrUpdateStop(stops[0], db);
+ db.close();
+ }
+ else result = false;
+ return result;
+ }
+
+ @Override
+ protected void onPostExecute(Boolean result) {
+ super.onPostExecute(result);
+
+ if(result) {
+ Toast.makeText(this.c, R.string.added_in_favorites, Toast.LENGTH_SHORT).show();
+ } else {
+ Toast.makeText(this.c, R.string.cant_add_to_favorites, Toast.LENGTH_SHORT).show();
+ }
+ }
+}

File Metadata

Mime Type
text/x-diff
Expires
Thu, Nov 19, 03:21 (1 d, 51 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2264351
Default Alt Text
(78 KB)

Event Timeline