Skip to content

Enh/dark theme optimizations #6332

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
tobiasKaminsky merged 9 commits into from
Jun 29, 2020
Merged

Enh/dark theme optimizations #6332

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
20d2ef9
proper button coloring for dark theme + black primary color
AndyScherzinger Jun 22, 2020
643454c
proper coloring of drawer items in black/white edge case scenarios
AndyScherzinger Jun 22, 2020
7005cde
Introduce light/dark theme / black/white primary-color-aware primary-…
AndyScherzinger Jun 23, 2020
5b76892
move primary action button theming to new theming method
AndyScherzinger Jun 23, 2020
a7088c8
improve edge case FAB coloring
AndyScherzinger Jun 24, 2020
8af257d
remove unused method
AndyScherzinger Jun 24, 2020
0ad81bd
remove element color references
AndyScherzinger Jun 24, 2020
5f73a5e
update screenshots
AndyScherzinger Jun 25, 2020
79f4270
Drone: update FindBugs results to reflect reduced error/warning count…
nextcloud-android-bot Jun 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
Prev Previous commit
Next Next commit
Introduce light/dark theme / black/white primary-color-aware primary-… 
…button theming

Signed-off-by: Andy Scherzinger <[email protected]>
  • Loading branch information
@AndyScherzinger
AndyScherzinger committed Jun 26, 2020
commit 7005cdef2e30f4e09bd66ed0c89859c780990701
3 changes: 1 addition & 2 deletions src/main/java/com/owncloud/android/ui/activity/CommunityActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,7 @@ private void setupContent() {
getString(R.string.contributing_link)))));

MaterialButton reportButton = findViewById(R.id.community_testing_report);
reportButton.setBackgroundColor(ThemeUtils.primaryColor(this,true));
reportButton.setTextColor(ThemeUtils.fontColor(this, false));
ThemeUtils.colorPrimaryButton(reportButton, this);
reportButton.setOnClickListener(v -> DisplayUtils.startLinkIntent(this, R.string.report_issue_link));
}

Expand Down
16 changes: 16 additions & 0 deletions src/main/java/com/owncloud/android/utils/ThemeUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import android.view.MenuItem;
import android.view.View;
import android.view.Window;
import android.widget.Button;
import android.widget.EditText;
import android.widget.ImageButton;
import android.widget.ImageView;
Expand Down Expand Up @@ -435,6 +436,21 @@ private static float[] colorToHSL(int color) {
return hsl;
}

public static void colorPrimaryButton(Button button, Context context) {
int primaryColor = ThemeUtils.primaryColor(null, true, false, context);
int fontColor = ThemeUtils.fontColor(context, false);

button.setBackgroundColor(primaryColor);

if (Color.BLACK == primaryColor) {
button.setTextColor(Color.WHITE);
} else if (Color.WHITE == primaryColor) {
button.setTextColor(Color.BLACK);
} else {
button.setTextColor(fontColor);
}
}

/**
* sets the tinting of the given ImageButton's icon to color_accent.
*
Expand Down