vanitasvitae/dandelion
1
0
Fork 0
mirror of https://github.com/gsantner/dandelion synced 2025-12-15 08:41:10 +01:00
Code Issues Releases Wiki Activity

Added back stream loading on topbar click. Made it toggleable in settings

Browse source
This commit is contained in:
vanitasvitae 2016-11-10 14:18:22 +01:00
parent d6c6920840
commit 00e238a028
Signed by: vanitasvitae
GPG key ID: DCCFB3302C9E4615
5 changed files with 57 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -38,6 +38,7 @@ import android.support.v4.app.FragmentManager;
import android.support.v4.content.LocalBroadcastManager;
import android.support.v4.view.GravityCompat;
import android.support.v4.widget.DrawerLayout;
import android.support.v7.app.ActionBar;
import android.support.v7.app.ActionBarDrawerToggle;
import android.support.v7.app.AlertDialog;
import android.support.v7.widget.ActionMenuView;
@ -82,6 +83,7 @@ import com.github.dfa.diaspora_android.web.custom_tab.CustomTabActivityHelper;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
public class MainActivity extends ThemedActivity
implements NavigationView.OnNavigationItemSelectedListener,
@ -223,6 +225,10 @@ public class MainActivity extends ThemedActivity
// Setup toolbar
setSupportActionBar(toolbarTop);
ActionBar actionBar = getSupportActionBar();
if(actionBar != null) {
actionBar.setDisplayHomeAsUpEnabled(true);
}
toolbarBottom.setOnMenuItemClickListener(new ActionMenuView.OnMenuItemClickListener() {
public boolean onMenuItemClick(MenuItem item) {
CustomFragment top = getTopFragment();
@ -408,6 +414,18 @@ public class MainActivity extends ThemedActivity
}
}
/**
* Forward toolbar clicks to onNavigationItemSelected
* @param view selected view
*/
@OnClick(R.id.main__topbar)
public void onToolBarClicked(View view) {
AppLog.i(this, "onToolBarClicked()");
if(appSettings.isTopbarStreamShortcutEnabled()) {
onNavigationItemSelected(navView.getMenu().findItem(R.id.nav_stream));
}
}
/**
* Forward incoming intents to handleIntent()
*

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

@ -398,6 +398,10 @@ public class AppSettings {
return getBoolean(prefApp, R.string.pref_key__visibility_nav__reports, false);
}
public boolean isTopbarStreamShortcutEnabled() {
return getBoolean(prefApp, R.string.pref_key__topbar_stream_shortcut, false);
}
public void setPrimaryColorSettings(int base, int shade) {
setInt(prefApp, R.string.pref_key__primary_color_base, base);
setInt(prefApp, R.string.pref_key__primary_color_shade, shade);