cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1774 from fiaxh/keyserver_select_dark

Browse Source 
Fix display of keyserver item in dark theme in SettingsKeyserverActivity
This commit is contained in:
Dominik Schürmann
2016-03-10 03:04:36 +01:00
parent bd2c41df22 4d347f1a8e
commit 9f15e7494b
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsKeyserverFragment.java
View File

@@ -40,6 +40,7 @@ import android.widget.TextView;
import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.ui.dialog.AddEditKeyserverDialogFragment; import org.sufficientlysecure.keychain.ui.dialog.AddEditKeyserverDialogFragment;
import org.sufficientlysecure.keychain.ui.util.FormattingUtils;
import org.sufficientlysecure.keychain.ui.util.recyclerview.ItemTouchHelperAdapter; import org.sufficientlysecure.keychain.ui.util.recyclerview.ItemTouchHelperAdapter;
import org.sufficientlysecure.keychain.ui.util.recyclerview.ItemTouchHelperViewHolder; import org.sufficientlysecure.keychain.ui.util.recyclerview.ItemTouchHelperViewHolder;
import org.sufficientlysecure.keychain.ui.util.recyclerview.ItemTouchHelperDragCallback; import org.sufficientlysecure.keychain.ui.util.recyclerview.ItemTouchHelperDragCallback;
@@ -312,19 +313,19 @@ public class SettingsKeyserverFragment extends Fragment implements RecyclerItemC
public void showAsSelectedKeyserver() { public void showAsSelectedKeyserver() {
isSelectedKeyserver = true; isSelectedKeyserver = true;
selectedServerLabel.setVisibility(View.VISIBLE); selectedServerLabel.setVisibility(View.VISIBLE);
outerLayout.setBackgroundColor(getResources().getColor(R.color.android_green_dark)); outerLayout.setBackgroundColor(FormattingUtils.getColorFromAttr(getContext(), R.attr.colorPrimaryDark));
} }
public void showAsUnselectedKeyserver() { public void showAsUnselectedKeyserver() {
isSelectedKeyserver = false; isSelectedKeyserver = false;
selectedServerLabel.setVisibility(View.GONE); selectedServerLabel.setVisibility(View.GONE);
outerLayout.setBackgroundColor(Color.WHITE); outerLayout.setBackgroundColor(0);
} }
@Override @Override
public void onItemSelected() { public void onItemSelected() {
selectedServerLabel.setVisibility(View.GONE); selectedServerLabel.setVisibility(View.GONE);
itemView.setBackgroundColor(Color.LTGRAY); itemView.setBackgroundColor(FormattingUtils.getColorFromAttr(getContext(), R.attr.colorBrightToolbar));
} }
@Override @Override