Skip to content

Display quota if configured/available in navigation drawer #204

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

Merged
AndyScherzinger merged 11 commits into from
Sep 1, 2016
Merged

Display quota if configured/available in navigation drawer #204

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e790d4a
initial layout changes for in drawer quota display
AndyScherzinger Aug 8, 2016
f8e0ee9
initial quota display implementation
AndyScherzinger Aug 8, 2016
3658bec
view elements fix
AndyScherzinger Aug 8, 2016
07c3ebd
update to Nc Android library 1.0.4
AndyScherzinger Aug 9, 2016
2176587
get and show quota information
AndyScherzinger Aug 9, 2016
2c941a5
minor code refactoring extracting setup code into dedicated methods
AndyScherzinger Aug 10, 2016
5280d66
colorize quota progress bar depending on thresholds met, reformattings
AndyScherzinger Aug 10, 2016
0f80bdc
CR changes
AndyScherzinger Aug 14, 2016
457027a
fixed the background color
AndyScherzinger Aug 14, 2016
b29744c
show quota for server without quota-unlimited info capability
AndyScherzinger Aug 31, 2016
4f32abf
sizeScale 1 for MB, code removed for unsupported legacy Android versions
AndyScherzinger Sep 1, 2016
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
Prev Previous commit
Next Next commit
view elements fix
  • Loading branch information
@AndyScherzinger
AndyScherzinger committed Aug 18, 2016
commit 3658becdf58c6b5ea1fd12f34d5ce56d878e4fb8
10 changes: 5 additions & 5 deletions src/com/owncloud/android/ui/activity/DrawerActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,8 @@ protected void setupDrawer() {
mAccountChooserToggle = (ImageView) findNavigationViewChildById(R.id.drawer_account_chooser_toogle);
mAccountChooserToggle.setImageResource(R.drawable.ic_down);
mIsAccountChooserActive = false;
mAccountMiddleAccountAvatar = (ImageView) findViewById(R.id.drawer_account_middle);
mAccountEndAccountAvatar = (ImageView) findViewById(R.id.drawer_account_end);
mAccountMiddleAccountAvatar = (ImageView) findNavigationViewChildById(R.id.drawer_account_middle);
mAccountEndAccountAvatar = (ImageView) findNavigationViewChildById(R.id.drawer_account_end);

// on pre lollipop the light theme adds a black tint to icons with white coloring
// ruining the generic avatars, so tinting for icons is deactivated pre lollipop
Expand All @@ -169,9 +169,9 @@ public void onClick(View v) {
});

// Quota UI elements
mQuotaView = (LinearLayout) findNavigationViewChildById(R.id.drawer_quota);
mQuotaProgressBar = (ProgressBar) findNavigationViewChildById(R.id.drawer_quota_ProgressBar);
mQuotaTextView = (TextView) findNavigationViewChildById(R.id.drawer_quota_text);
mQuotaView = (LinearLayout) findViewById(R.id.drawer_quota);
mQuotaProgressBar = (ProgressBar) findViewById(R.id.drawer_quota_ProgressBar);
mQuotaTextView = (TextView) findViewById(R.id.drawer_quota_text);
DisplayUtils.colorPreLollipopHorizontalProgressBar(mQuotaProgressBar);
}

Expand Down