Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixes some color issues

This commit is contained in:
stom79 2017-11-02 15:55:14 +01:00
parent 2bfb2935de
commit 3166350b97
11 changed files with 16 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java
View File

@ -992,34 +992,6 @@ public abstract class BaseMainActivity extends AppCompatActivity
final NavigationView navigationView = findViewById(R.id.nav_view);
unCheckAllMenuItems(navigationView);
toot.setVisibility(View.VISIBLE);
//Manages theme for icon colors
SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK);
if( theme == Helper.THEME_DARK){
changeDrawableColor(getApplicationContext(), R.drawable.ic_reply,R.color.dark_icon);
changeDrawableColor(getApplicationContext(), R.drawable.ic_more_horiz,R.color.dark_icon);
changeDrawableColor(getApplicationContext(), R.drawable.ic_public,R.color.dark_icon);
changeDrawableColor(getApplicationContext(), R.drawable.ic_lock_open,R.color.dark_icon);
changeDrawableColor(getApplicationContext(), R.drawable.ic_lock_outline,R.color.dark_icon);
changeDrawableColor(getApplicationContext(), R.drawable.ic_mail_outline,R.color.dark_icon);
changeDrawableColor(getApplicationContext(), R.drawable.ic_repeat,R.color.dark_icon);
changeDrawableColor(getApplicationContext(), R.drawable.ic_star_border,R.color.dark_icon);
changeDrawableColor(getApplicationContext(), R.drawable.ic_photo,R.color.dark_text);
changeDrawableColor(getApplicationContext(), R.drawable.ic_remove_red_eye,R.color.dark_text);
changeDrawableColor(getApplicationContext(), R.drawable.ic_translate,R.color.dark_text);
}else {
changeDrawableColor(getApplicationContext(), R.drawable.ic_reply,R.color.black);
changeDrawableColor(getApplicationContext(), R.drawable.ic_more_horiz,R.color.black);
changeDrawableColor(getApplicationContext(), R.drawable.ic_public,R.color.black);
changeDrawableColor(getApplicationContext(), R.drawable.ic_lock_open,R.color.black);
changeDrawableColor(getApplicationContext(), R.drawable.ic_lock_outline,R.color.black);
changeDrawableColor(getApplicationContext(), R.drawable.ic_mail_outline,R.color.black);
changeDrawableColor(getApplicationContext(), R.drawable.ic_repeat,R.color.black);
changeDrawableColor(getApplicationContext(), R.drawable.ic_star_border,R.color.black);
changeDrawableColor(getApplicationContext(), R.drawable.ic_photo,R.color.white);
changeDrawableColor(getApplicationContext(), R.drawable.ic_remove_red_eye,R.color.white);
changeDrawableColor(getApplicationContext(), R.drawable.ic_translate,R.color.white);
}
switch (viewPager.getCurrentItem()){
case 1:
toot.setVisibility(View.GONE);

6
app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java
View File

@ -133,6 +133,12 @@ public class NotificationsListAdapter extends RecyclerView.Adapter implements On
String type = notification.getType();
String typeString = "";
int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK);
if (theme == THEME_DARK){
holder.main_container_trans.setAlpha(.3f);
}else {
holder.main_container_trans.setAlpha(.1f);
}
Drawable imgH = null;
switch (type){
case "mention":

9
app/src/main/res/drawable-anydpi/ic_delete_floating.xml Normal file
View File

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FFFFFFFF"
android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/>
</vector>

BIN
app/src/main/res/drawable-hdpi/ic_delete_floating.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 160 B

BIN
app/src/main/res/drawable-ldpi/ic_delete_floating.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 257 B

BIN
app/src/main/res/drawable-mdpi/ic_delete_floating.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 132 B

BIN
app/src/main/res/drawable-xhdpi/ic_delete_floating.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 161 B

BIN
app/src/main/res/drawable-xxhdpi/ic_delete_floating.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 210 B

BIN
app/src/main/res/drawable-xxxhdpi/ic_delete_floating.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 200 B

2
app/src/main/res/layout/activity_main.xml
View File

@ -125,7 +125,7 @@
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="@dimen/fab_margin"
app:srcCompat="@drawable/ic_delete"
app:srcCompat="@drawable/ic_delete_floating"
tools:ignore="VectorDrawableCompat" />
</android.support.design.widget.CoordinatorLayout>

1
app/src/main/res/layout/drawer_notification.xml
View File

@ -292,7 +292,6 @@
</LinearLayout>
<RelativeLayout
android:visibility="gone"
android:alpha="0.3"
android:background="@color/black"
android:id="@+id/container_trans"
android:layout_width="match_parent"