Update CafeBar follows latest release

danimahardhika · Sep 9, 2017 · ced3e51 · ced3e51
1 parent 6f9154d
commit ced3e51
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 9 deletions.
diff --git a/library/src/main/java/com/dm/wallpaper/board/adapters/LatestAdapter.java b/library/src/main/java/com/dm/wallpaper/board/adapters/LatestAdapter.java
@@ -253,7 +253,7 @@ public void onClick(View view) {
                 setFavorite(favorite, name.getCurrentTextColor(), position, true);
 
                 CafeBar.builder(mContext)
-                        .theme(new CafeBarTheme.Custom(ColorHelper.getAttributeColor(
+                        .theme(CafeBarTheme.Custom(ColorHelper.getAttributeColor(
                                 mContext, R.attr.card_background)))
                         .fitSystemWindow()
                         .floating(true)

diff --git a/library/src/main/java/com/dm/wallpaper/board/adapters/WallpaperDetailsAdapter.java b/library/src/main/java/com/dm/wallpaper/board/adapters/WallpaperDetailsAdapter.java
@@ -255,7 +255,7 @@ class CategoryViewHolder extends RecyclerView.ViewHolder {
 
     private void showCafeBar(String title, String content, boolean showCopy) {
         CafeBar.Builder builder = CafeBar.builder(mContext)
-                .theme(new CafeBarTheme.Custom(ColorHelper.getAttributeColor(
+                .theme(CafeBarTheme.Custom(ColorHelper.getAttributeColor(
                         mContext, R.attr.card_background)))
                 .typeface(TypefaceHelper.getRegular(mContext), TypefaceHelper.getBold(mContext))
                 .content(title)
@@ -264,7 +264,6 @@ private void showCafeBar(String title, String content, boolean showCopy) {
 
         if (showCopy) {
             builder.neutralText(R.string.copy)
-                    .neutralColor(ColorHelper.getAttributeColor(mContext, R.attr.colorAccent))
                     .onNeutral(cafeBar -> {
                         ClipboardManager clipboard = (ClipboardManager) mContext.getSystemService(Context.CLIPBOARD_SERVICE);
                         ClipData clip = ClipData.newPlainText("content", content);

diff --git a/library/src/main/java/com/dm/wallpaper/board/adapters/WallpapersAdapter.java b/library/src/main/java/com/dm/wallpaper/board/adapters/WallpapersAdapter.java
@@ -254,7 +254,7 @@ public void onClick(View view) {
                 setFavorite(favorite, name.getCurrentTextColor(), position, true);
 
                 CafeBar.builder(mContext)
-                        .theme(new CafeBarTheme.Custom(ColorHelper.getAttributeColor(
+                        .theme(CafeBarTheme.Custom(ColorHelper.getAttributeColor(
                                 mContext, R.attr.card_background)))
                         .fitSystemWindow()
                         .floating(true)

diff --git a/library/src/main/java/com/dm/wallpaper/board/tasks/WallpaperApplyTask.java b/library/src/main/java/com/dm/wallpaper/board/tasks/WallpaperApplyTask.java
@@ -354,7 +354,7 @@ protected void onPostExecute(Boolean aBoolean) {
 
         if (aBoolean) {
             CafeBar.builder(mContext)
-                    .theme(new CafeBarTheme.Custom(ColorHelper.getAttributeColor(
+                    .theme(CafeBarTheme.Custom(ColorHelper.getAttributeColor(
                             mContext, R.attr.card_background)))
                     .contentTypeface(TypefaceHelper.getRegular(mContext))
                     .floating(true)

diff --git a/library/src/main/java/com/dm/wallpaper/board/tasks/WallpapersLoaderTask.java b/library/src/main/java/com/dm/wallpaper/board/tasks/WallpapersLoaderTask.java
@@ -225,7 +225,7 @@ protected void onPostExecute(Boolean aBoolean) {
                 res = R.string.wallpapers_loader_failed;
             }
             CafeBar.builder(mContext)
-                    .theme(new CafeBarTheme.Custom(ColorHelper.getAttributeColor(
+                    .theme(CafeBarTheme.Custom(ColorHelper.getAttributeColor(
                             mContext, R.attr.card_background)))
                     .contentTypeface(TypefaceHelper.getRegular(mContext))
                     .content(res)

diff --git a/library/src/main/java/com/dm/wallpaper/board/utils/WallpaperDownloader.java b/library/src/main/java/com/dm/wallpaper/board/utils/WallpaperDownloader.java
@@ -66,14 +66,13 @@ public void start() {
 
         if (WallpaperHelper.isWallpaperSaved(mContext, mWallpaper)) {
             CafeBar.builder(mContext)
-                    .theme(new CafeBarTheme.Custom(ColorHelper.getAttributeColor(mContext, R.attr.card_background)))
+                    .theme(CafeBarTheme.Custom(ColorHelper.getAttributeColor(mContext, R.attr.card_background)))
                     .floating(true)
                     .fitSystemWindow()
                     .duration(CafeBarDuration.MEDIUM.getDuration())
                     .typeface(TypefaceHelper.getRegular(mContext), TypefaceHelper.getBold(mContext))
                     .content(R.string.wallpaper_already_downloaded)
                     .neutralText(R.string.open)
-                    .neutralColor(ColorHelper.getAttributeColor(mContext, R.attr.colorAccent))
                     .onNeutral(cafeBar -> {
                         Uri uri = FileHelper.getUriFromFile(mContext, mContext.getPackageName(), target);
                         if (uri == null) {
@@ -119,7 +118,7 @@ public void start() {
 
     private void showCafeBar(int res) {
         CafeBar.builder(mContext)
-                .theme(new CafeBarTheme.Custom(ColorHelper.getAttributeColor(mContext, R.attr.card_background)))
+                .theme(CafeBarTheme.Custom(ColorHelper.getAttributeColor(mContext, R.attr.card_background)))
                 .contentTypeface(TypefaceHelper.getRegular(mContext))
                 .content(res)
                 .floating(true)