From 2baaf322f9363feeee7805616b08da5426c93694 Mon Sep 17 00:00:00 2001 From: Narinder Rana Date: Tue, 13 Oct 2020 17:56:34 +0530 Subject: [PATCH 1/5] setup colors --- opentasks/build.gradle | 3 + .../java/org/dmfs/tasks/TaskListActivity.java | 56 ++++++++++++++----- .../org/dmfs/tasks/groupings/ByDueDate.java | 2 +- .../java/org/dmfs/tasks/groupings/ByList.java | 2 +- .../org/dmfs/tasks/groupings/ByPriority.java | 2 +- .../org/dmfs/tasks/groupings/ByProgress.java | 2 +- .../org/dmfs/tasks/groupings/BySearch.java | 2 +- .../org/dmfs/tasks/groupings/ByStartDate.java | 2 +- .../main/res/layout/activity_task_list.xml | 3 +- opentasks/src/main/res/values/colors.xml | 16 ++++-- opentasks/src/main/res/values/styles.xml | 14 ++++- 11 files changed, 76 insertions(+), 28 deletions(-) diff --git a/opentasks/build.gradle b/opentasks/build.gradle index 4e0a5786..e90b193d 100644 --- a/opentasks/build.gradle +++ b/opentasks/build.gradle @@ -57,6 +57,7 @@ android { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } + } dependencies { @@ -89,6 +90,8 @@ dependencies { androidTestImplementation deps.support_test_runner androidTestImplementation deps.support_test_rules implementation project(path: ':opentaskspal') + + } if (project.hasProperty('PLAY_STORE_SERVICE_ACCOUNT_CREDENTIALS')) { diff --git a/opentasks/src/main/java/org/dmfs/tasks/TaskListActivity.java b/opentasks/src/main/java/org/dmfs/tasks/TaskListActivity.java index 0b039e51..d49129aa 100644 --- a/opentasks/src/main/java/org/dmfs/tasks/TaskListActivity.java +++ b/opentasks/src/main/java/org/dmfs/tasks/TaskListActivity.java @@ -23,7 +23,9 @@ import android.content.Intent; import android.content.res.ColorStateList; import android.content.res.TypedArray; +import android.graphics.PorterDuff; import android.graphics.drawable.ColorDrawable; +import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.Build; import android.os.Build.VERSION; @@ -39,6 +41,8 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton; import com.google.android.material.tabs.TabLayout; import androidx.appcompat.view.ContextThemeWrapper; +import androidx.core.content.ContextCompat; +import androidx.core.graphics.drawable.DrawableCompat; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; import androidx.core.view.MenuItemCompat; @@ -60,6 +64,7 @@ import android.view.Window; import android.view.WindowManager; import org.dmfs.android.bolts.color.Color; +import org.dmfs.android.bolts.color.colors.AccentColor; import org.dmfs.android.bolts.color.colors.PrimaryColor; import org.dmfs.android.bolts.color.elementary.ValueColor; import org.dmfs.android.retentionmagic.annotations.Retain; @@ -189,7 +194,9 @@ public class TaskListActivity extends BaseActivity implements TaskListFragment.C private FloatingActionButton mFloatingActionButton; public static int ACCENT_COLOR; - + public static int color_default_blue1; + public static int color_default_primary_text; + Toolbar toolbar; @Override protected void onCreate(Bundle savedInstanceState) { @@ -220,7 +227,7 @@ public class TaskListActivity extends BaseActivity implements TaskListFragment.C setContentView(R.layout.activity_task_list); mAppBarLayout = (AppBarLayout) findViewById(R.id.appbar); - Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + toolbar = (Toolbar) findViewById(R.id.toolbar); setSupportActionBar(toolbar); mAuthority = AuthorityUtil.taskAuthority(this); @@ -332,9 +339,10 @@ public class TaskListActivity extends BaseActivity implements TaskListFragment.C }); } - ACCENT_COLOR=fetchAccentColor(this); - mTabs.setBackgroundColor(ACCENT_COLOR); - mFloatingActionButton.setBackgroundTintList(ColorStateList.valueOf(darkenColor20(ACCENT_COLOR))); + ACCENT_COLOR=fetchAccentColor(this); + mFloatingActionButton.setBackgroundTintList(ColorStateList.valueOf(darkenColor20(color_default_blue1))); + + this.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR); } @@ -707,15 +715,16 @@ public class TaskListActivity extends BaseActivity implements TaskListFragment.C * get Accent color from OS * */ private int fetchAccentColor(Context context) { +// +// TypedValue typedValue = new TypedValue(); +// ContextThemeWrapper contextThemeWrapper = new ContextThemeWrapper(this, +// android.R.style.Theme_DeviceDefault); +// contextThemeWrapper.getTheme().resolveAttribute(android.R.attr.colorAccent, +// typedValue, true); +// int color_accent = typedValue.data; +// Log.e("TAG", "accent Colour #"+Integer.toHexString(color_accent)); - TypedValue typedValue = new TypedValue(); - ContextThemeWrapper contextThemeWrapper = new ContextThemeWrapper(this, - android.R.style.Theme_DeviceDefault); - contextThemeWrapper.getTheme().resolveAttribute(android.R.attr.colorAccent, - typedValue, true); - int color_accent = typedValue.data; - Log.e("TAG", "accent Colour #"+Integer.toHexString(color_accent)); - +/* //change toolbar color getSupportActionBar().setBackgroundDrawable( new ColorDrawable(color_accent)); @@ -727,8 +736,16 @@ public class TaskListActivity extends BaseActivity implements TaskListFragment.C window.setStatusBarColor(darkenColor(color_accent)); } - - return color_accent; +*/ + color_default_primary_text=ContextCompat.getColor(context, R.color.color_default_primary_text); + ACCENT_COLOR=ContextCompat.getColor(context, R.color.accent); + color_default_blue1=ContextCompat.getColor(context, R.color.color_default_blue1); + //getSupportActionBar().setBackgroundDrawable(new ColorDrawable(color_accent)); + getSupportActionBar().getThemedContext(); + toolbar.setTitleTextColor(color_default_primary_text); + setOverflowButtonColor(toolbar, color_default_primary_text); + + return ACCENT_COLOR; } @ColorInt int darkenColor(@ColorInt int color) { @@ -743,4 +760,13 @@ public class TaskListActivity extends BaseActivity implements TaskListFragment.C hsv[2] *= 0.6f; return android.graphics.Color.HSVToColor(hsv); } + + public static void setOverflowButtonColor(final Toolbar toolbar, final int color) { + Drawable drawable = toolbar.getOverflowIcon(); + if(drawable != null) { + drawable = DrawableCompat.wrap(drawable); + DrawableCompat.setTint(drawable.mutate(), color); + toolbar.setOverflowIcon(drawable); + } + } } diff --git a/opentasks/src/main/java/org/dmfs/tasks/groupings/ByDueDate.java b/opentasks/src/main/java/org/dmfs/tasks/groupings/ByDueDate.java index 12061354..7d6602ba 100644 --- a/opentasks/src/main/java/org/dmfs/tasks/groupings/ByDueDate.java +++ b/opentasks/src/main/java/org/dmfs/tasks/groupings/ByDueDate.java @@ -180,7 +180,7 @@ public class ByDueDate extends AbstractGroupingFactory if (title != null) { title.setText(getTitle(cursor, view.getContext())); - title.setTextColor(TaskListActivity.ACCENT_COLOR); + title.setTextColor(TaskListActivity.color_default_primary_text); } // set list elements diff --git a/opentasks/src/main/java/org/dmfs/tasks/groupings/ByList.java b/opentasks/src/main/java/org/dmfs/tasks/groupings/ByList.java index 3c4cea3e..71e98c60 100644 --- a/opentasks/src/main/java/org/dmfs/tasks/groupings/ByList.java +++ b/opentasks/src/main/java/org/dmfs/tasks/groupings/ByList.java @@ -173,7 +173,7 @@ public class ByList extends AbstractGroupingFactory if (title != null) { title.setText(getTitle(cursor, view.getContext())); - title.setTextColor(TaskListActivity.ACCENT_COLOR); + title.setTextColor(TaskListActivity.color_default_primary_text); } // set list account diff --git a/opentasks/src/main/java/org/dmfs/tasks/groupings/ByPriority.java b/opentasks/src/main/java/org/dmfs/tasks/groupings/ByPriority.java index a2941126..89c52a3d 100644 --- a/opentasks/src/main/java/org/dmfs/tasks/groupings/ByPriority.java +++ b/opentasks/src/main/java/org/dmfs/tasks/groupings/ByPriority.java @@ -165,7 +165,7 @@ public class ByPriority extends AbstractGroupingFactory if (title != null) { title.setText(getTitle(cursor, view.getContext())); - title.setTextColor(TaskListActivity.ACCENT_COLOR); + title.setTextColor(TaskListActivity.color_default_primary_text); } // set list elements diff --git a/opentasks/src/main/java/org/dmfs/tasks/groupings/ByProgress.java b/opentasks/src/main/java/org/dmfs/tasks/groupings/ByProgress.java index 8b01da71..1816e278 100644 --- a/opentasks/src/main/java/org/dmfs/tasks/groupings/ByProgress.java +++ b/opentasks/src/main/java/org/dmfs/tasks/groupings/ByProgress.java @@ -158,7 +158,7 @@ public class ByProgress extends AbstractGroupingFactory if (title != null) { title.setText(getTitle(cursor, view.getContext())); - title.setTextColor(TaskListActivity.ACCENT_COLOR); + title.setTextColor(TaskListActivity.color_default_primary_text); } // set list elements diff --git a/opentasks/src/main/java/org/dmfs/tasks/groupings/BySearch.java b/opentasks/src/main/java/org/dmfs/tasks/groupings/BySearch.java index 36f01ffb..f3079bed 100644 --- a/opentasks/src/main/java/org/dmfs/tasks/groupings/BySearch.java +++ b/opentasks/src/main/java/org/dmfs/tasks/groupings/BySearch.java @@ -173,7 +173,7 @@ public class BySearch extends AbstractGroupingFactory if (title != null) { title.setText(groupTitle); - title.setTextColor(TaskListActivity.ACCENT_COLOR); + title.setTextColor(TaskListActivity.color_default_primary_text); } // set search time diff --git a/opentasks/src/main/java/org/dmfs/tasks/groupings/ByStartDate.java b/opentasks/src/main/java/org/dmfs/tasks/groupings/ByStartDate.java index 6d9163d0..516a01b8 100644 --- a/opentasks/src/main/java/org/dmfs/tasks/groupings/ByStartDate.java +++ b/opentasks/src/main/java/org/dmfs/tasks/groupings/ByStartDate.java @@ -189,7 +189,7 @@ public class ByStartDate extends AbstractGroupingFactory if (title != null) { title.setText(getTitle(cursor, view.getContext())); - title.setTextColor(TaskListActivity.ACCENT_COLOR); + title.setTextColor(TaskListActivity.color_default_primary_text); } // set list elements diff --git a/opentasks/src/main/res/layout/activity_task_list.xml b/opentasks/src/main/res/layout/activity_task_list.xml index afba2958..59f73290 100644 --- a/opentasks/src/main/res/layout/activity_task_list.xml +++ b/opentasks/src/main/res/layout/activity_task_list.xml @@ -21,7 +21,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" app:tabGravity="fill" - app:tabIndicatorColor="@android:color/white" + app:tabIndicatorColor="@color/color_default_blue1" + app:tabIconTint="@color/color_default_gray2" app:tabIndicatorHeight="8dp" app:tabMode="fixed"/> diff --git a/opentasks/src/main/res/values/colors.xml b/opentasks/src/main/res/values/colors.xml index e4a3edee..a863d9ce 100644 --- a/opentasks/src/main/res/values/colors.xml +++ b/opentasks/src/main/res/values/colors.xml @@ -37,10 +37,18 @@ #ff00ddff #f44336 - - #FF009688 - #FF00796B - #FFFF5722 + Our primary color - a nice shade of teal + #FFFFFF + #FFFFFF + #38D874 + #000000 + #0000008C + #C8CED0 + #007FFF + #848484 + + + diff --git a/opentasks/src/main/res/values/styles.xml b/opentasks/src/main/res/values/styles.xml index 8d477619..fe8d86b0 100644 --- a/opentasks/src/main/res/values/styles.xml +++ b/opentasks/src/main/res/values/styles.xml @@ -3,15 +3,20 @@ + +