vanitasvitae/dandelion
1
0
Fork 0
mirror of https://github.com/gsantner/dandelion synced 2025-09-10 10:49:42 +02:00
Code Issues Releases Wiki Activity

Release v0.2.2

Browse source 
* Move toggle mobile/desktop to navslider (opt-in)
* Update TR
This commit is contained in:
Gregor Santner 2016-12-20 12:19:43 +01:00 • committed by GitHub
parent 05e6e4d2bd
commit a31a530c7c
33 changed files with 291 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/com/github/dfa/diaspora_android/activity/DiasporaStreamFragment.java
View file

@ -127,11 +127,6 @@ public class DiasporaStreamFragment extends BrowserFragment {
}
}
case R.id.action_toggle_desktop_page: {
loadUrl(urls.getToggleMobileUrl());
return true;
}
case R.id.action_go_to_top: {
ObjectAnimator anim = ObjectAnimator.ofInt(webView, "scrollY", webView.getScrollY(), 0);
anim.setDuration(400);

12
app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java
View file

@ -413,6 +413,7 @@ public class MainActivity extends ThemedActivity
navMenu.findItem(R.id.nav_public).setVisible(appSettings.isVisibleInNavPublic_activities());
navMenu.findItem(R.id.nav_stream).setVisible(true);
navMenu.findItem(R.id.nav_reports).setVisible(appSettings.isVisibleInNavReports());
navMenu.findItem(R.id.nav_toggle_desktop_page).setVisible(appSettings.isVisibleToggleMobileDesktop());
// Hide whole group (for logged in use) if no pod was selected
@ -769,12 +770,6 @@ public class MainActivity extends ThemedActivity
}
}
case R.id.action_exit: {
moveTaskToBack(true);
finish();
return true;
}
case R.id.action_compose: {
if (WebHelper.isOnline(MainActivity.this)) {
openDiasporaUrl(urls.getNewPostUrl());
@ -1076,6 +1071,11 @@ public class MainActivity extends ThemedActivity
}
break;
case R.id.nav_toggle_desktop_page: {
openDiasporaUrl(urls.getToggleMobileUrl());
}
break;
case R.id.nav_exit: {
moveTaskToBack(true);
finish();

4
app/src/main/java/com/github/dfa/diaspora_android/util/AppSettings.java
View file

@ -404,6 +404,10 @@ public class AppSettings {
return getBoolean(prefApp, R.string.pref_key__visibility_nav__reports, false);
}
public boolean isVisibleToggleMobileDesktop() {
return getBoolean(prefApp, R.string.pref_key__visibility_nav__toggle_mobile_desktop, false);
}
public boolean isTopbarStreamShortcutEnabled() {
return getBoolean(prefApp, R.string.pref_key__topbar_stream_shortcut, false);
}