Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Directions UI #664

Merged
merged 2 commits into from
Mar 12, 2020
Merged

Directions UI #664

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4d77cf
Directions Form: Move overflow menu items into UI
grote Dec 9, 2018
58d15e9
Rearrange directions form
ialokim Jan 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion app/src/main/java/de/grobox/transportr/departures/DeparturesActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
return true;
case R.id.action_time:
if (calendar == null) calendar = Calendar.getInstance();
TimeDateFragment fragment = TimeDateFragment.newInstance(calendar);
TimeDateFragment fragment = TimeDateFragment.newInstance(calendar, null);
fragment.setTimeDateListener(this);
fragment.show(getSupportFragmentManager(), TimeDateFragment.TAG);
return true;
Expand All @@ -215,6 +215,10 @@ public void onTimeAndDateSet(Calendar calendar) {
getSupportLoaderManager().restartLoader(LOADER_DEPARTURES, args, this).forceLoad();
}

@Override
public void onDepartureOrArrivalSet(boolean departure) {
}

private synchronized void loadMoreDepartures(boolean later) {
Date date = new Date();
int maxDepartures = MAX_DEPARTURES;
Expand Down
5 changes: 0 additions & 5 deletions app/src/main/java/de/grobox/transportr/settings/SettingsManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,11 +96,6 @@ class SettingsManager @Inject constructor(private val context: Context) {
settings.edit().putBoolean(TRIP_DETAIL_ONBOARDING, false).apply()
}

fun showDirectionsOnboarding(): Boolean = settings.getBoolean(DIRECTIONS_ONBOARDING, true)
fun directionsOnboardingShown() {
settings.edit().putBoolean(DIRECTIONS_ONBOARDING, false).apply()
}

fun getNetworkId(i: Int): NetworkId? {
var networkSettingsStr = NETWORK_ID_1
if (i == 2) networkSettingsStr = NETWORK_ID_2
Expand Down
Loading