chinwag/chinwag-android
chinwag/chinwag-android
2
0
Fork 0
Code Issues Pull requests Releases 1 Activity

Spruces up the light theme.

Browse source 
Also, fixes a bug where the show more/less button for content warnings is sometimes already checked.
This commit is contained in:
Vavassor 2017-03-29 00:22:14 -04:00
commit 1f798902b7
12 changed files with 74 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

23
app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
View file

@ -326,7 +326,9 @@ public class ComposeActivity extends BaseActivity {
actionBar.setTitle(null);
actionBar.setDisplayHomeAsUpEnabled(true);
actionBar.setDisplayShowHomeEnabled(true);
actionBar.setHomeAsUpIndicator(R.drawable.ic_close_24dp);
Drawable closeIcon = ContextCompat.getDrawable(this, R.drawable.ic_close_24dp);
ThemeUtils.setDrawableTint(this, closeIcon, R.attr.compose_close_button_tint);
actionBar.setHomeAsUpIndicator(closeIcon);
}
SharedPreferences preferences = getSharedPreferences(
@ -386,11 +388,7 @@ public class ComposeActivity extends BaseActivity {
startingHideText = false;
}
if (statusMarkSensitive) {
nsfwBtn.setTextColor(ContextCompat.getColor(this, R.color.color_accent_dark));
} else {
nsfwBtn.setTextColor(ContextCompat.getColor(this, R.color.image_button_dark));
}
updateNsfwButtonColor();
Intent intent = getIntent();
String[] mentionedUsernames = null;
@ -487,11 +485,14 @@ public class ComposeActivity extends BaseActivity {
private void toggleNsfw() {
statusMarkSensitive = !statusMarkSensitive;
updateNsfwButtonColor();
}
private void updateNsfwButtonColor() {
if (statusMarkSensitive) {
nsfwBtn.setTextColor(ContextCompat.getColor(this, R.color.color_accent_dark));
nsfwBtn.setTextColor(ThemeUtils.getColor(this, R.attr.compose_nsfw_button_selected_color));
} else {
nsfwBtn.setTextColor(ContextCompat.getColor(this, R.color.image_button_dark));
nsfwBtn.setTextColor(ThemeUtils.getColor(this, R.attr.compose_nsfw_button_color));
}
}
@ -862,10 +863,14 @@ public class ComposeActivity extends BaseActivity {
private void enableMediaPicking() {
pickBtn.setEnabled(true);
ThemeUtils.setDrawableTint(this, pickBtn.getDrawable(),
R.attr.compose_media_button_tint);
}
private void disableMediaPicking() {
pickBtn.setEnabled(false);
ThemeUtils.setDrawableTint(this, pickBtn.getDrawable(),
R.attr.compose_media_button_disabled_tint);
}
private void addMediaToQueue(QueuedMedia.Type type, Bitmap preview, Uri uri, long mediaSize) {
@ -1159,7 +1164,7 @@ public class ComposeActivity extends BaseActivity {
if(!showMarkSensitive) {
statusMarkSensitive = false;
nsfwBtn.setTextColor(ContextCompat.getColor(this, R.color.image_button_dark));
nsfwBtn.setTextColor(ThemeUtils.getColor(this, R.attr.compose_nsfw_button_color));
}
if(show) {

6
app/src/main/java/com/keylesspalace/tusky/LoginActivity.java
View file

@ -22,6 +22,7 @@ import android.content.Intent;
import android.content.SharedPreferences;
import android.net.Uri;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.support.v7.app.AppCompatActivity;
import android.text.method.LinkMovementMethod;
import android.view.View;
@ -168,6 +169,11 @@ public class LoginActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean("lightTheme", false)) {
setTheme(R.style.AppTheme_Light);
}
setContentView(R.layout.activity_login);
ButterKnife.bind(this);

1
app/src/main/java/com/keylesspalace/tusky/StatusViewHolder.java
View file

@ -274,6 +274,7 @@ class StatusViewHolder extends RecyclerView.ViewHolder {
contentWarningDescription.setText(spoilerText);
contentWarningBar.setVisibility(View.VISIBLE);
content.setVisibility(View.GONE);
contentWarningButton.setChecked(false);
contentWarningButton.setOnCheckedChangeListener(
new CompoundButton.OnCheckedChangeListener() {
@Override