archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use accent color for light white theme buttons

Browse Source
pull/848/head
Alex Baker 6 years ago
parent 7af512e55a
commit f35dbaa529
14 changed files with 86 additions and 27 deletions
Show Stats Download Patch File Download Diff File

2
app/src/main/java/org/tasks/billing/PurchaseAdapter.java
Unescape Escape View File

@ -39,7 +39,7 @@ public class PurchaseAdapter extends ListAdapter<Integer, PurchaseHolder> {
@Override
public PurchaseHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
View view = activity.getLayoutInflater().inflate(R.layout.dialog_purchase_cell, parent, false);
return new PurchaseHolder(activity, view, onPriceChanged, locale);
return new PurchaseHolder(view, onPriceChanged, locale);
}
@Override

19
app/src/main/java/org/tasks/billing/PurchaseHolder.java
Unescape Escape View File

@ -1,38 +1,32 @@
package org.tasks.billing;
import static org.tasks.preferences.ResourceResolver.getData;
import android.content.Context;
import android.view.View;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.core.content.ContextCompat;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import com.google.android.material.button.MaterialButton;
import org.tasks.Callback;
import org.tasks.R;
import org.tasks.locale.Locale;
public class PurchaseHolder extends RecyclerView.ViewHolder {
private final Context context;
private final Callback<Integer> onClick;
private final Locale locale;
@BindView(R.id.price)
TextView textView;
MaterialButton button;
private int price;
PurchaseHolder(Context context, @NonNull View view, Callback<Integer> onClick, Locale locale) {
PurchaseHolder(@NonNull View view, Callback<Integer> onClick, Locale locale) {
super(view);
this.locale = locale;
ButterKnife.bind(this, view);
this.context = context;
this.onClick = onClick;
}
@ -43,10 +37,7 @@ public class PurchaseHolder extends RecyclerView.ViewHolder {
public void bind(int price, boolean selected) {
this.price = price;
textView.setText(String.format("$%s", locale.formatNumber(price)));
textView.setTextColor(
selected
? getData(context, R.attr.colorPrimary)
: ContextCompat.getColor(context, R.color.text_primary));
button.setText(String.format("$%s", locale.formatNumber(price)));
button.setChecked(selected);
}
}

3
app/src/main/java/org/tasks/dialogs/AlertDialogBuilder.java
Unescape Escape View File

@ -8,6 +8,7 @@ import android.view.ContextThemeWrapper;
import android.view.View;
import android.widget.ListAdapter;
import androidx.appcompat.app.AlertDialog;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import java.util.List;
import org.tasks.locale.Locale;
import org.tasks.themes.Theme;
@ -25,7 +26,7 @@ public class AlertDialogBuilder {
this.locale = locale;
ContextThemeWrapper wrapper = theme.getThemedDialog(context);
theme.applyToContext(wrapper);
builder = new AlertDialog.Builder(wrapper);
builder = new MaterialAlertDialogBuilder(wrapper);
}
public AlertDialogBuilder setMessage(int message, Object... formatArgs) {

5
app/src/main/res/color/button_accent_background.xml
Unescape Escape View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:alpha="0.08" android:color="?attr/colorAccent" android:state_checked="true"/>
<item android:color="@android:color/transparent" android:state_checked="false"/>
</selector>

8
app/src/main/res/color/button_accent_ripple.xml
Unescape Escape View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:alpha="0.16" android:color="?attr/colorAccent" android:state_pressed="true"/>
<item android:alpha="0.12" android:color="?attr/colorAccent" android:state_focused="true" android:state_hovered="true"/>
<item android:alpha="0.12" android:color="?attr/colorAccent" android:state_focused="true"/>
<item android:alpha="0.04" android:color="?attr/colorAccent" android:state_hovered="true"/>
<item android:alpha="0.00" android:color="?attr/colorAccent"/>
</selector>

5
app/src/main/res/color/button_accent_stroke.xml
Unescape Escape View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?attr/colorAccent" android:state_checked="true"/>
<item android:alpha="0.12" android:color="?attr/colorOnSurface" android:state_checked="false"/>
</selector>

7
app/src/main/res/color/button_accent_text.xml
Unescape Escape View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:alpha="1.00" android:color="?attr/colorAccent" android:state_checkable="true" android:state_checked="true" android:state_enabled="true"/>
<item android:alpha="0.60" android:color="?attr/colorOnSurface" android:state_checkable="true" android:state_checked="false" android:state_enabled="true"/>
<item android:alpha="1.00" android:color="?attr/colorAccent" android:state_enabled="true"/>
<item android:alpha="0.38" android:color="?attr/colorOnSurface"/>
</selector>

10
app/src/main/res/layout/dialog_name_your_price.xml
Unescape Escape View File

@ -33,14 +33,14 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/button_monthly"
style="?attr/materialButtonOutlinedStyle"
style="@style/OutlineButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/monthly"/>
<com.google.android.material.button.MaterialButton
android:id="@+id/button_annually"
style="?attr/materialButtonOutlinedStyle"
style="@style/OutlineButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/annually"/>
@ -55,7 +55,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/subscribe"
style="?attr/materialButtonOutlinedStyle"
style="@style/TextButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
@ -63,7 +63,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/unsubscribe"
style="?attr/materialButtonOutlinedStyle"
style="@style/TextButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
@ -72,7 +72,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/button_more_info"
style="?attr/materialButtonOutlinedStyle"
style="@style/TextButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"

9
app/src/main/res/layout/dialog_purchase_cell.xml
Unescape Escape View File

@ -1,15 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.appcompat.widget.AppCompatTextView
<com.google.android.material.button.MaterialButton
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
style="@style/TextButton"
android:id="@+id/price"
android:paddingLeft="0dp"
android:paddingRight="0dp"
android:layout_width="@dimen/icon_picker_size"
android:layout_height="@dimen/icon_picker_size"
android:padding="8dp"
android:textSize="18sp"
android:textAlignment="center"
android:textColor="@color/text_primary"
android:clickable="true"
android:focusable="true"
android:background="?attr/selectableItemBackgroundBorderless"
android:checkable="true"
tools:ignore="ContentDescription"/>

6
app/src/main/res/values-night/theme_white.xml
Unescape Escape View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="White" parent="White_Base"/>
</resources>

4
app/src/main/res/values/attrs.xml
Unescape Escape View File

@ -18,6 +18,10 @@
<attr format="dimension" name="alpha_disabled"/>
<attr format="color" name="colorAccentDialog"/>
<attr format="dimension" name="card_elevation"/>
<attr format="reference" name="materialButtonText"/>
<attr format="reference" name="materialButtonBackground"/>
<attr format="reference" name="materialButtonRipple"/>
<attr format="reference" name="materialButtonStroke"/>
<declare-styleable name="TimePreference">
<attr format="string" name="summary"/>

13
app/src/main/res/values/styles.xml
Unescape Escape View File

@ -154,4 +154,17 @@
<item name="closeIconStartPadding">0dp</item>
</style>
<style name="OutlineButton" parent="Widget.MaterialComponents.Button.OutlinedButton">
<item name="android:textColor">?attr/materialButtonText</item>
<item name="backgroundTint">?attr/materialButtonBackground</item>
<item name="rippleColor">?attr/materialButtonRipple</item>
<item name="strokeColor">?attr/materialButtonStroke</item>
</style>
<style name="TextButton" parent="Widget.MaterialComponents.Button.TextButton">
<item name="android:textColor">?attr/materialButtonText</item>
<item name="backgroundTint">?attr/materialButtonBackground</item>
<item name="rippleColor">?attr/materialButtonRipple</item>
</style>
</resources>

6
app/src/main/res/values/theme.xml
Unescape Escape View File

@ -18,7 +18,7 @@
<item name="android:spinnerItemStyle">@style/SpinnerNoPadding</item>
<item name="dialogTheme">@style/TasksDialog</item>
<item name="android:dialogTheme">@style/TasksDialog</item>
<item name="alertDialogTheme">@style/TasksDialogAlert</item>
<item name="materialAlertDialogTheme">@style/TasksDialogAlert</item>
<item name="alpha_secondary">@dimen/alpha_secondary</item>
<item name="alpha_disabled">@dimen/alpha_disabled</item>
<item name="android:textColorPrimary">@color/text_primary</item>
@ -31,6 +31,10 @@
<item name="nnf_save_icon_color">?attr/colorAccent</item>
<item name="nnf_dir_icon_color">?attr/colorAccent</item>
<item name="card_elevation">2dp</item>
<item name="materialButtonText">@color/mtrl_text_btn_text_color_selector</item>
<item name="materialButtonBackground">@color/mtrl_btn_text_btn_bg_color_selector</item>
<item name="materialButtonRipple">@color/mtrl_btn_text_btn_ripple_color</item>
<item name="materialButtonStroke">@color/mtrl_btn_stroke_color_selector</item>
</style>
<style name="Tasks" parent="TasksBase"/>

16
app/src/main/res/values/theme_white.xml
Unescape Escape View File

@ -1,9 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="White" parent="BlackToolbarTheme">
<style name="White_Base" parent="BlackToolbarTheme">
<item name="colorPrimary">@color/white_100</item>
<item name="colorPrimaryVariant">@color/white_100</item>
</style>
<style name="White" parent="White_Base">
<item name="buttonBarPositiveButtonStyle">@style/AlertButtonStyle</item>
<item name="buttonBarNegativeButtonStyle">@style/AlertButtonStyle</item>
<item name="buttonBarNeutralButtonStyle">@style/AlertButtonStyle</item>
<item name="materialButtonText">@color/button_accent_text</item>
<item name="materialButtonBackground">@color/button_accent_background</item>
<item name="materialButtonRipple">@color/button_accent_ripple</item>
<item name="materialButtonStroke">@color/button_accent_stroke</item>
</style>
<style name="AlertButtonStyle" parent="Widget.MaterialComponents.Button.TextButton.Dialog.Flush">
<item name="android:textColor">?attr/colorAccent</item>
</style>
</resources>
Write Preview
Loading…
Cancel
Save