diff --git a/app/src/main/java/org/nuclearfog/twidda/viewadapter/TrendAdapter.java b/app/src/main/java/org/nuclearfog/twidda/viewadapter/TrendAdapter.java index e5bc5ec7..52b23047 100644 --- a/app/src/main/java/org/nuclearfog/twidda/viewadapter/TrendAdapter.java +++ b/app/src/main/java/org/nuclearfog/twidda/viewadapter/TrendAdapter.java @@ -15,12 +15,13 @@ import android.widget.TextView; public class TrendAdapter extends ArrayAdapter { private TrendDatabase trend; private LayoutInflater inf; - private int background; + private int background, textColor; public TrendAdapter(Context context, TrendDatabase trend) { super(context, R.layout.trend); inf=(LayoutInflater)context.getSystemService(Context.LAYOUT_INFLATER_SERVICE); ColorPreferences mcolor = ColorPreferences.getInstance(context); + textColor = mcolor.getColor(ColorPreferences.FONT_COLOR); background = mcolor.getColor(ColorPreferences.BACKGROUND); this.trend = trend; } @@ -45,6 +46,8 @@ public class TrendAdapter extends ArrayAdapter { String trendName = trend.getTrendname(position); ((TextView) v.findViewById(R.id.trendpos)).setText(trendPos); ((TextView) v.findViewById(R.id.trendname)).setText(trendName); + ((TextView) v.findViewById(R.id.trendpos)).setTextColor(textColor); + ((TextView) v.findViewById(R.id.trendname)).setTextColor(textColor); return v; } } \ No newline at end of file diff --git a/app/src/main/java/org/nuclearfog/twidda/window/TweetDetail.java b/app/src/main/java/org/nuclearfog/twidda/window/TweetDetail.java index 7c7593a9..361f0cbe 100644 --- a/app/src/main/java/org/nuclearfog/twidda/window/TweetDetail.java +++ b/app/src/main/java/org/nuclearfog/twidda/window/TweetDetail.java @@ -117,11 +117,14 @@ public class TweetDetail extends AppCompatActivity implements View.OnClickListen private void setContent() { ColorPreferences mColor = ColorPreferences.getInstance(getApplicationContext()); int backgroundColor = mColor.getColor(ColorPreferences.BACKGROUND); + int fontColor = mColor.getColor(ColorPreferences.FONT_COLOR); LinearLayout background = (LinearLayout) findViewById(R.id.tweet_detail); LinearLayout tweetaction = (LinearLayout) findViewById(R.id.tweetbar); + TextView txtTw = (TextView) findViewById(R.id.tweet_detailed); background.setBackgroundColor(backgroundColor); tweetaction.setBackgroundColor(backgroundColor); answer_list.setBackgroundColor(backgroundColor); + txtTw.setTextColor(fontColor); new ShowStatus(this).execute(tweetID); } } \ No newline at end of file diff --git a/app/src/main/res/layout/tweet.xml b/app/src/main/res/layout/tweet.xml index 49054078..d639b50a 100644 --- a/app/src/main/res/layout/tweet.xml +++ b/app/src/main/res/layout/tweet.xml @@ -52,9 +52,7 @@ + android:layout_height="wrap_content" />