Make the icons in the replies popup light if using a dark theme.

Programmatically and not in xml because it already references a style,
and this is easier.
captchafix
Florens Douwes 11 years ago
parent da648d9677
commit 1221acb3b8
  1. 7
      Clover/app/src/main/java/org/floens/chan/ui/fragment/PostRepliesFragment.java
  2. 10
      Clover/app/src/main/java/org/floens/chan/utils/ThemeHelper.java
  3. BIN
      Clover/app/src/main/res/drawable-hdpi/ic_action_back_dark.png
  4. BIN
      Clover/app/src/main/res/drawable-hdpi/ic_action_done_dark.png
  5. BIN
      Clover/app/src/main/res/drawable-mdpi/ic_action_back_dark.png
  6. BIN
      Clover/app/src/main/res/drawable-mdpi/ic_action_done_dark.png
  7. BIN
      Clover/app/src/main/res/drawable-xhdpi/ic_action_back_dark.png
  8. BIN
      Clover/app/src/main/res/drawable-xhdpi/ic_action_done_dark.png
  9. BIN
      Clover/app/src/main/res/drawable-xxhdpi/ic_action_back_dark.png
  10. BIN
      Clover/app/src/main/res/drawable-xxhdpi/ic_action_done_dark.png
  11. 102
      Clover/app/src/main/res/layout/post_replies.xml

@ -25,11 +25,13 @@ import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.ArrayAdapter; import android.widget.ArrayAdapter;
import android.widget.ListView; import android.widget.ListView;
import android.widget.TextView;
import org.floens.chan.R; import org.floens.chan.R;
import org.floens.chan.core.manager.ThreadManager; import org.floens.chan.core.manager.ThreadManager;
import org.floens.chan.core.model.Post; import org.floens.chan.core.model.Post;
import org.floens.chan.ui.view.PostView; import org.floens.chan.ui.view.PostView;
import org.floens.chan.utils.ThemeHelper;
import java.util.List; import java.util.List;
@ -94,6 +96,11 @@ public class PostRepliesFragment extends DialogFragment {
} }
}); });
if (!ThemeHelper.getInstance().getTheme().isLightTheme) {
((TextView)container.findViewById(R.id.replies_back_icon)).setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_action_back_dark, 0, 0, 0);
((TextView)container.findViewById(R.id.replies_close_icon)).setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_action_done_dark, 0, 0, 0);
}
return container; return container;
} }

@ -9,16 +9,18 @@ import org.floens.chan.core.ChanPreferences;
public class ThemeHelper { public class ThemeHelper {
public enum Theme { public enum Theme {
LIGHT("light", R.style.AppTheme), LIGHT("light", R.style.AppTheme, true),
DARK("dark", R.style.AppTheme_Dark), DARK("dark", R.style.AppTheme_Dark, false),
BLACK("black", R.style.AppTheme_Dark_Black); BLACK("black", R.style.AppTheme_Dark_Black, false);
public String name; public String name;
public int resValue; public int resValue;
public boolean isLightTheme;
private Theme(String name, int resValue) { private Theme(String name, int resValue, boolean isLightTheme) {
this.name = name; this.name = name;
this.resValue = resValue; this.resValue = resValue;
this.isLightTheme = isLightTheme;
} }
} }

Binary file not shown.

After

Width:  |  Height:  |  Size: 296 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 392 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 272 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 246 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 401 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 475 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 463 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 619 B

@ -1,59 +1,65 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:minWidth="320dp" android:minWidth="320dp"
android:minHeight="200dp" android:minHeight="200dp"
android:orientation="vertical" > android:orientation="vertical">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:baselineAligned="false" android:baselineAligned="false"
android:orientation="horizontal" android:orientation="horizontal"
android:divider="?android:attr/dividerVertical" android:divider="?android:attr/dividerVertical"
android:showDividers="middle" android:showDividers="middle"
android:dividerPadding="12dp"> android:dividerPadding="12dp">
<FrameLayout
style="?android:actionButtonStyle"
android:id="@+id/replies_back"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1">
<FrameLayout <TextView
style="?android:actionButtonStyle" style="?android:actionBarTabTextStyle"
android:id="@+id/replies_back" android:id="@+id/replies_back_icon"
android:layout_width="0dp" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:layout_weight="1"> android:layout_gravity="center"
android:paddingRight="20dp"
<TextView style="?android:actionBarTabTextStyle" android:drawableLeft="@drawable/ic_action_back"
android:layout_width="wrap_content" android:drawablePadding="8dp"
android:layout_height="wrap_content" android:gravity="center_vertical"
android:layout_gravity="center" android:text="@string/post_replies_back"/>
android:paddingRight="20dp" </FrameLayout>
android:drawableLeft="@drawable/ic_action_back"
android:drawablePadding="8dp"
android:gravity="center_vertical"
android:text="@string/post_replies_back" />
</FrameLayout>
<FrameLayout
style="?android:actionButtonStyle"
android:id="@+id/replies_close"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1">
<TextView style="?android:actionBarTabTextStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:paddingRight="20dp"
android:drawableLeft="@drawable/ic_action_done"
android:drawablePadding="8dp"
android:gravity="center_vertical"
android:text="@string/post_replies_close" />
</FrameLayout>
</LinearLayout>
<ListView <FrameLayout
style="?android:actionButtonStyle"
android:id="@+id/replies_close"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1">
<TextView
style="?android:actionBarTabTextStyle"
android:id="@+id/replies_close_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:paddingRight="20dp"
android:drawableLeft="@drawable/ic_action_done"
android:drawablePadding="8dp"
android:gravity="center_vertical"
android:text="@string/post_replies_close"/>
</FrameLayout>
</LinearLayout>
<ListView
android:id="@+id/post_list" android:id="@+id/post_list"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" /> android:layout_height="match_parent"/>
</LinearLayout> </LinearLayout>

Loading…
Cancel
Save