fix accent color settings

app/build.gradle

@@ -3,12 +3,12 @@ apply plugin: 'com.android.application'
 android {
     compileSdkVersion 25
     buildToolsVersion '25.0.2'
-    
-   applicationVariants.all { variant -> 
-   variant.outputs.each { output -> 
-   def newApkName = "${parent.name}-${output.baseName}-${variant.versionName}.apk" 
-   output.outputFile = new File(output.outputFile.parent, newApkName) 
-   } 
+
+    applicationVariants.all { variant ->
+        variant.outputs.each { output ->
+            def newApkName = "${parent.name}-${output.baseName}-${variant.versionName}.apk"
+            output.outputFile = new File(output.outputFile.parent, newApkName)
+        }
     }
 
     defaultConfig {
@@ -26,7 +26,7 @@ android {
             minifyEnabled false
             shrinkResources false
             useProguard false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'),'proguard/proguard-project.pro',
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard/proguard-project.pro',
                     'proguard/proguard-google-play-services.pro'
         }
         release {

app/src/main/java/dev/dworks/apps/anexplorer/AboutActivity.java

@@ -20,7 +20,7 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.support.v4.app.ShareCompat;
-import android.support.v4.content.ContextCompat;
+import android.support.v4.graphics.ColorUtils;
 import android.support.v7.widget.Toolbar;
 import android.view.MenuItem;
 import android.view.View;
@@ -54,7 +54,8 @@ protected void onCreate(Bundle savedInstanceState) {
 			//((LinearLayout.LayoutParams) mToolbar.getLayoutParams()).setMargins(0, getStatusBarHeight(this), 0, 0);
 			mToolbar.setPadding(0, getStatusBarHeight(this), 0, 0);
 		}
-		int color = SettingsActivity.getPrimaryColor(this);
+		int color = SettingsActivity.getPrimaryColor();
+		mToolbar.setBackgroundColor(color);
 		setSupportActionBar(mToolbar);
 		getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 		getSupportActionBar().setTitle(null);
@@ -70,8 +71,10 @@ public String getTag() {
 
 	private void initControls() {
 
+		int accentColor = ColorUtils.setAlphaComponent(SettingsActivity.getAccentColor(), 200);
+
 		TextView logo = (TextView)findViewById(R.id.logo);
-		logo.setTextColor(SettingsActivity.getAccentColor());
+		logo.setTextColor(accentColor);
 		String header = logo.getText() + getSuffix() + " v" + BuildConfig.VERSION_NAME;
 		logo.setText(header);
 
@@ -155,7 +158,7 @@ public void onClick(View view) {
 	}
 
 	public void setUpDefaultStatusBar() {
-		int color = ContextCompat.getColor(this, R.color.material_blue_grey_800);
+		int color = Utils.getStatusBarColor(SettingsActivity.getPrimaryColor());
 		if(Utils.hasLollipop()){
 			getWindow().setStatusBarColor(color);
 		}

app/src/main/java/dev/dworks/apps/anexplorer/fragment/ConnectionsFragment.java

@@ -63,6 +63,7 @@ public class ConnectionsFragment extends ListFragment implements View.OnClickLis
     private CompatTextView mEmptyView;
     private FloatingActionButton fab;
     private RootInfo mConnectionsRoot;
+    private int mLastShowAccentColor;
 
     public static void show(FragmentManager fm) {
         final ConnectionsFragment fragment = new ConnectionsFragment();
@@ -92,11 +93,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
     public void onViewCreated(View view, Bundle savedInstanceState) {
         final Resources res = getActivity().getResources();
 
-        int defaultColor = SettingsActivity.getPrimaryColor();
-        int accentColor = SettingsActivity.getAccentColor();
-
         fab = (FloatingActionButton)view.findViewById(R.id.fab);
-        fab.setBackgroundTintList(ColorStateList.valueOf(accentColor));
         fab.setOnClickListener(this);
         if(isTelevision()){
             fab.setVisibility(View.GONE);
@@ -122,6 +119,15 @@ public void onViewCreated(View view, Bundle savedInstanceState) {
         }
     }
 
+    @Override
+    public void onResume() {
+        super.onResume();
+        int accentColor = SettingsActivity.getAccentColor();
+        if ((mLastShowAccentColor != 0 && mLastShowAccentColor == accentColor))
+            return;
+        fab.setBackgroundTintList(ColorStateList.valueOf(accentColor));
+    }
+
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);

app/src/main/java/dev/dworks/apps/anexplorer/fragment/DirectoryFragment.java

@@ -166,6 +166,7 @@ public class DirectoryFragment extends ListFragment {
 	private boolean mLastShowFolderSize = false;
 	private boolean mLastShowThumbnail = false;
     private int mLastShowColor = 0;
+    private int mLastShowAccentColor = 0;
     private boolean mLastShowHiddenFiles = false;
 
 	private boolean mHideGridTitles = false;
@@ -473,12 +474,14 @@ private void updateDisplayState() {
 		final State state = getDisplayState(this);
 
         mDefaultColor = SettingsActivity.getPrimaryColor(getActivity());
+        int accentColor = SettingsActivity.getAccentColor();
         if (mLastMode == state.derivedMode &&  mLastSortOrder == state.derivedSortOrder
                 && mLastShowSize == state.showSize
                 && mLastShowFolderSize == state.showFolderSize
 				&& mLastShowThumbnail == state.showThumbnail
 				&& mLastShowHiddenFiles == state.showHiddenFiles
-                && (mLastShowColor != 0 && mLastShowColor == mDefaultColor))
+                && (mLastShowColor != 0 && mLastShowColor == mDefaultColor)
+                && (mLastShowAccentColor != 0 && mLastShowAccentColor == accentColor))
 			return;
         boolean refreshData = mLastShowHiddenFiles != state.showHiddenFiles;
 		mLastMode = state.derivedMode;

app/src/main/java/dev/dworks/apps/anexplorer/fragment/HomeFragment.java

@@ -308,7 +308,7 @@ public void onLoadFinished(Loader<DirectoryResult> loader, DirectoryResult resul
                 if (!isAdded())
                     return;
                 if(null == result.cursor || (null != result.cursor && result.cursor.getCount() == 0)) {
-                    //recents_container.setVisibility(View.GONE);
+                    recents_container.setVisibility(View.GONE);
                 } else {
                     //recents_container.setVisibility(View.VISIBLE);
                     mRecentsAdapter.swapCursor(new LimitCursorWrapper(result.cursor, MAX_RECENT_COUNT));

app/src/main/java/dev/dworks/apps/anexplorer/setting/ThemePreferenceFragment.java

@@ -11,7 +11,8 @@
 import static dev.dworks.apps.anexplorer.setting.SettingsActivity.KEY_PRIMARY_COLOR;
 import static dev.dworks.apps.anexplorer.setting.SettingsActivity.KEY_THEME_STYLE;
 
-public class ThemePreferenceFragment extends PreferenceFragment implements OnPreferenceChangeListener{
+public class ThemePreferenceFragment extends PreferenceFragment
+		implements OnPreferenceChangeListener, Preference.OnPreferenceClickListener{
 
 	public ThemePreferenceFragment() {
 	}
@@ -23,18 +24,13 @@ public void onCreate(Bundle savedInstanceState) {
 
 		Preference preferencePrimaryColor = findPreference(KEY_PRIMARY_COLOR);
 		preferencePrimaryColor.setOnPreferenceChangeListener(this);
+		preferencePrimaryColor.setOnPreferenceClickListener(this);
 
-		Preference preferenceAccentColor = findPreference(KEY_ACCENT_COLOR);
-		preferenceAccentColor.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
-			@Override
-			public boolean onPreferenceChange(Preference preference, Object o) {
-				SettingsActivity.logSettingEvent(preference.getKey());
-				return false;
-			}
-		});
+		findPreference(KEY_ACCENT_COLOR).setOnPreferenceClickListener(this);
 
 		Preference preferenceThemeStyle = findPreference(KEY_THEME_STYLE);
 		preferenceThemeStyle.setOnPreferenceChangeListener(this);
+		preferenceThemeStyle.setOnPreferenceClickListener(this);
 
 	}
 
@@ -45,4 +41,10 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
 		getActivity().recreate();
 		return true;
 	}
+
+	@Override
+	public boolean onPreferenceClick(Preference preference) {
+		SettingsActivity.logSettingEvent(preference.getKey());
+		return false;
+	}
 }

app/src/main/res/layout/fragment_connections.xml

@@ -65,7 +65,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom|end"
-            android:layout_margin="16dp"
+            android:layout_margin="24dp"
             app:layout_anchor="@id/list"
             app:fabGravity="bottom_end"
             app:layout_anchorGravity="bottom|right|end"