some small fix

heruoxin · Mar 7, 2015 · 2acbcb6 · 2acbcb6
1 parent dafffa8
commit 2acbcb6
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 6 deletions.
diff --git a/app/src/main/java/com/catchingnow/tinyclipboardmanager/ActivityEditor.java b/app/src/main/java/com/catchingnow/tinyclipboardmanager/ActivityEditor.java
@@ -59,12 +59,13 @@ public void onFocusChange(View v, boolean hasFocus) {
         }
 
         //set activity title and icon.
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        getSupportActionBar().setDisplayShowHomeEnabled(true);
+        getSupportActionBar().setIcon(R.drawable.ic_action_edit);
         String titleText = getString(R.string.title_activity_activity_editor);
         if (oldText.isEmpty()) {
             titleText = getString(R.string.title_activity_editor);
         }
-        getSupportActionBar().setTitle(titleText);
+        getSupportActionBar().setTitle("  "+titleText);
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             setTaskDescription(new ActivityManager.TaskDescription(
                     titleText,

diff --git a/app/src/main/java/com/catchingnow/tinyclipboardmanager/ActivityMain.java b/app/src/main/java/com/catchingnow/tinyclipboardmanager/ActivityMain.java
@@ -217,10 +217,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
             case R.id.action_search:
                 return super.onOptionsItemSelected(item);
             case R.id.action_star:
-                isStarred = !isStarred;
-                mFabRotation(isStarred, TRANSLATION_SLOW);
-                setStarredIcon();
-                setView();
+                onStarredMenuClicked();
                 break;
 //            case R.id.action_refresh:
 //                setView(queryText);
@@ -320,6 +317,23 @@ public void onAnimationRepeat(Animator animation) {
         }, 200);
     }
 
+    private void onStarredMenuClicked() {
+        isStarred = !isStarred;
+        mFabRotation(isStarred, TRANSLATION_SLOW);
+        setStarredIcon();
+        setView();
+        new Handler().postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                mFAB.setImageResource(isStarred ?
+                        R.drawable.ic_action_star_white
+                                :
+                        R.drawable.ic_action_add
+                );
+            }
+        }, TRANSLATION_SLOW / 3 * 2);
+    }
+
     private void mFabRotation(boolean clockwise, long time) {
         if (isRotating) return;
         mFAB.setRotation(0);

diff --git a/app/src/main/res/drawable-hdpi/ic_action_edit.png b/app/src/main/res/drawable-hdpi/ic_action_edit.png
diff --git a/app/src/main/res/drawable-mdpi/ic_action_edit.png b/app/src/main/res/drawable-mdpi/ic_action_edit.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_edit.png b/app/src/main/res/drawable-xhdpi/ic_action_edit.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_edit.png b/app/src/main/res/drawable-xxhdpi/ic_action_edit.png
diff --git a/app/src/main/res/drawable/ic_switch_star_off.png b/app/src/main/res/drawable/ic_switch_star_off.png
diff --git a/release-files/screenshot-phone/en-US/Screenshot_2015-02-13-13-35-26.png b/release-files/screenshot-phone/en-US/Screenshot_2015-02-13-13-35-26.png
diff --git a/release-files/screenshot-phone/en-US/screenshot.png b/release-files/screenshot-phone/en-US/screenshot.png