mirror/matomocamp-companion-android
1
0
Fork 0
mirror of https://github.com/MatomoCamp/matomocamp-companion-android.git synced 2024-09-19 16:13:46 +02:00
Code Releases Activity

Tint all icons using the proper theme-independent color

Browse source
This commit is contained in:
Christophe Beyls 2019-11-09 22:21:30 +01:00
parent 0cf6443b4b
commit d1beb53ccf
26 changed files with 61 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/be/digitalia/fosdem/adapters/EventsAdapter.java
View file

@ -156,7 +156,7 @@ public class EventsAdapter extends PagedListAdapter<StatusEvent, EventsAdapter.V
title.setText(event.getTitle());
Drawable bookmarkDrawable = isBookmarked
? AppCompatResources.getDrawable(context, R.drawable.ic_bookmark_grey600_24dp)
? AppCompatResources.getDrawable(context, R.drawable.ic_bookmark_white_24dp)
: null;
TextViewCompat.setCompoundDrawablesRelativeWithIntrinsicBounds(title, null, null, bookmarkDrawable, null);
title.setContentDescription(isBookmarked

2
app/src/main/java/be/digitalia/fosdem/adapters/TrackScheduleAdapter.java
View file

@ -186,7 +186,7 @@ public class TrackScheduleAdapter extends ListAdapter<StatusEvent, TrackSchedule
time.setText(timeDateFormat.format(event.getStartTime()));
title.setText(event.getTitle());
Drawable bookmarkDrawable = isBookmarked
? AppCompatResources.getDrawable(context, R.drawable.ic_bookmark_grey600_24dp)
? AppCompatResources.getDrawable(context, R.drawable.ic_bookmark_white_24dp)
: null;
TextViewCompat.setCompoundDrawablesRelativeWithIntrinsicBounds(title, null, null, bookmarkDrawable, null);
title.setContentDescription(isBookmarked

2
app/src/main/res/drawable/ic_access_time_grey600_18dp.xml → app/src/main/res/drawable/ic_access_time_white_18dp.xml
View file

@ -4,6 +4,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF757575"
android:fillColor="#FFFFFFFF"
android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8zM12.5,7H11v6l5.25,3.15 0.75,-1.23 -4.5,-2.67z"/>
</vector>

9
app/src/main/res/drawable/ic_bookmark_grey600_24dp.xml
View file

@ -1,9 +0,0 @@
<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="#FF757575"
android:pathData="@string/path_ic_bookmark"/>
</vector>

2
app/src/main/res/drawable/ic_event_grey600_24dp.xml → app/src/main/res/drawable/ic_event_white_24dp.xml
View file

@ -4,6 +4,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF757575"
android:fillColor="#FFFFFFFF"
android:pathData="M17,12h-5v5h5v-5zM16,1v2L8,3L8,1L6,1v2L5,3c-1.11,0 -1.99,0.9 -1.99,2L3,19c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2h-1L18,1h-2zM19,19L5,19L5,8h14v11z"/>
</vector>

3
app/src/main/res/drawable/ic_info_outline_grey600_24dp.xml → app/src/main/res/drawable/ic_info_outline_normal_24dp.xml
View file

@ -1,9 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="?colorControlNormal"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF757575"
android:fillColor="#FFFFFFFF"
android:pathData="M11,17h2v-6h-2v6zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,9h2L13,7h-2v2z"/>
</vector>

2
app/src/main/res/drawable/ic_map_grey600_24dp.xml → app/src/main/res/drawable/ic_map_white_24dp.xml
View file

@ -4,6 +4,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF757575"
android:fillColor="#FFFFFFFF"
android:pathData="M20.5,3l-0.16,0.03L15,5.1 9,3 3.36,4.9c-0.21,0.07 -0.36,0.25 -0.36,0.48V20.5c0,0.28 0.22,0.5 0.5,0.5l0.16,-0.03L9,18.9l6,2.1 5.64,-1.9c0.21,-0.07 0.36,-0.25 0.36,-0.48V3.5c0,-0.28 -0.22,-0.5 -0.5,-0.5zM15,19l-6,-2.11V5l6,2.11V19z"/>
</vector>

9
app/src/main/res/drawable/ic_navigation_grey600_24dp.xml
View file

@ -1,9 +0,0 @@
<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="#FF757575"
android:pathData="M12,2L4.5,20.29l0.71,0.71L12,18l6.79,3 0.71,-0.71z"/>
</vector>

3
app/src/main/res/drawable/ic_notifications_grey600_24dp.xml → app/src/main/res/drawable/ic_notifications_normal_24dp.xml
View file

@ -1,9 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="?colorControlNormal"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF757575"
android:fillColor="#FFFFFFFF"
android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.89,2 2,2zM18,16v-5c0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.63,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2z"/>
</vector>

2
app/src/main/res/drawable/ic_people_grey600_24dp.xml → app/src/main/res/drawable/ic_people_white_24dp.xml
View file

@ -4,6 +4,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF757575"
android:fillColor="#FFFFFFFF"
android:pathData="M16,11c1.66,0 2.99,-1.34 2.99,-3S17.66,5 16,5c-1.66,0 -3,1.34 -3,3s1.34,3 3,3zM8,11c1.66,0 2.99,-1.34 2.99,-3S9.66,5 8,5C6.34,5 5,6.34 5,8s1.34,3 3,3zM8,13c-2.33,0 -7,1.17 -7,3.5L1,19h14v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5zM16,13c-0.29,0 -0.62,0.02 -0.97,0.05 1.16,0.84 1.97,1.97 1.97,3.45L17,19h6v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5z"/>
</vector>

2
app/src/main/res/drawable/ic_place_grey600_18dp.xml → app/src/main/res/drawable/ic_place_white_18dp.xml
View file

@ -4,6 +4,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF757575"
android:fillColor="#FFFFFFFF"
android:pathData="M12,2C8.13,2 5,5.13 5,9c0,5.25 7,13 7,13s7,-7.75 7,-13c0,-3.87 -3.13,-7 -7,-7zM12,11.5c-1.38,0 -2.5,-1.12 -2.5,-2.5s1.12,-2.5 2.5,-2.5 2.5,1.12 2.5,2.5 -1.12,2.5 -2.5,2.5z"/>
</vector>

2
app/src/main/res/drawable/ic_play_circle_outline_grey600_24dp.xml → app/src/main/res/drawable/ic_play_circle_outline_white_24dp.xml
View file

@ -4,6 +4,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF757575"
android:fillColor="#FFFFFFFF"
android:pathData="@string/path_ic_play_circle_outline"/>
</vector>

10
app/src/main/res/layout/fragment_event_details.xml
View file

@ -61,8 +61,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
app:drawableLeftCompat="@drawable/ic_access_time_grey600_18dp"
app:drawableStartCompat="@drawable/ic_access_time_grey600_18dp"
app:drawableLeftCompat="@drawable/ic_access_time_white_18dp"
app:drawableStartCompat="@drawable/ic_access_time_white_18dp"
app:drawableTint="?colorControlNormal"
tools:text="Day 1 (Saturday), 09:30 - 09:55" />
<TextView
@ -71,8 +72,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:saveEnabled="false"
app:drawableLeftCompat="@drawable/ic_place_grey600_18dp"
app:drawableStartCompat="@drawable/ic_place_grey600_18dp"
app:drawableLeftCompat="@drawable/ic_place_white_18dp"
app:drawableStartCompat="@drawable/ic_place_white_18dp"
app:drawableTint="?colorControlNormal"
tools:text="Janson (Building J)" />
<TextView

2
app/src/main/res/layout/item_event.xml
View file

@ -3,6 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="?attr/selectableItemBackground"
android:focusable="true"
android:foreground="@drawable/activated_background"
@ -33,6 +34,7 @@
android:textAlignment="viewStart"
android:textAppearance="?textAppearanceHeadline6"
android:textSize="18sp"
app:drawableTint="?colorControlNormal"
tools:text="Welcome to FOSDEM 2015" />
<TextView

2
app/src/main/res/layout/item_schedule_event.xml
View file

@ -3,6 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="?attr/selectableItemBackground"
android:focusable="true">
@ -46,6 +47,7 @@
android:textAlignment="viewStart"
android:textAppearance="?textAppearanceHeadline6"
android:textSize="18sp"
app:drawableTint="?colorControlNormal"
tools:text="Welcome to FOSDEM 2015" />
<TextView

5
app/src/main/res/menu/action_mode_bookmarks.xml
View file

@ -1,11 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/delete"
android:icon="@drawable/ic_delete_white_24dp"
android:title="@string/remove_bookmarks"
app:showAsAction="always"/>
app:iconTint="?colorControlNormal"
app:showAsAction="always" />
</menu>

7
app/src/main/res/menu/bookmarks.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/filter"
@ -10,13 +10,14 @@
<item
android:id="@+id/upcoming_only"
android:checkable="true"
android:title="@string/upcoming_only"/>
android:title="@string/upcoming_only" />
</menu>
</item>
<item
android:id="@+id/export_bookmarks"
android:icon="@drawable/ic_file_upload_white_24dp"
android:title="@string/export_bookmarks"
app:showAsAction="ifRoom"/>
app:iconTint="?colorControlNormal"
app:showAsAction="ifRoom" />
</menu>

2
app/src/main/res/menu/event.xml
View file

@ -6,11 +6,13 @@
android:id="@+id/share"
android:icon="@drawable/ic_share_white_24dp"
android:title="@string/share"
app:iconTint="?colorControlNormal"
app:showAsAction="ifRoom" />
<item
android:id="@+id/add_to_agenda"
android:icon="@drawable/ic_event_add_white_24dp"
android:title="@string/add_to_agenda"
app:iconTint="?colorControlNormal"
app:showAsAction="ifRoom" />
</menu>

9
app/src/main/res/menu/main.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/search"
@ -8,12 +8,15 @@
android:menuCategory="secondary"
android:title="@string/search_events"
app:actionViewClass="androidx.appcompat.widget.SearchView"
app:showAsAction="ifRoom|collapseActionView"/>
app:iconTint="?colorControlNormal"
app:showAsAction="ifRoom|collapseActionView" />
<item
android:id="@+id/refresh"
android:icon="@drawable/avd_sync_white_24dp"
android:menuCategory="secondary"
android:title="@string/update_events_db"
app:showAsAction="ifRoom"/>
app:iconTint="?colorControlNormal"
app:showAsAction="ifRoom" />
</menu>

10
app/src/main/res/menu/main_navigation.xml
View file

@ -5,23 +5,23 @@
android:checkableBehavior="single">
<item
android:id="@+id/menu_tracks"
android:icon="@drawable/ic_event_grey600_24dp"
android:icon="@drawable/ic_event_white_24dp"
android:title="@string/menu_tracks" />
<item
android:id="@+id/menu_bookmarks"
android:icon="@drawable/ic_bookmark_grey600_24dp"
android:icon="@drawable/ic_bookmark_white_24dp"
android:title="@string/menu_bookmarks" />
<item
android:id="@+id/menu_live"
android:icon="@drawable/ic_play_circle_outline_grey600_24dp"
android:icon="@drawable/ic_play_circle_outline_white_24dp"
android:title="@string/menu_live" />
<item
android:id="@+id/menu_speakers"
android:icon="@drawable/ic_people_grey600_24dp"
android:icon="@drawable/ic_people_white_24dp"
android:title="@string/menu_speakers" />
<item
android:id="@+id/menu_map"
android:icon="@drawable/ic_map_grey600_24dp"
android:icon="@drawable/ic_map_white_24dp"
android:title="@string/menu_map" />
</group>
<group

8
app/src/main/res/menu/map.xml
View file

@ -1,16 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/directions"
android:icon="@drawable/ic_directions_white_24dp"
android:title="@string/directions"
app:showAsAction="ifRoom"/>
app:iconTint="?colorControlNormal"
app:showAsAction="ifRoom" />
<item
android:id="@+id/navigation"
android:icon="@drawable/ic_navigation_white_24dp"
android:title="@string/navigation"
app:showAsAction="ifRoom"/>
app:iconTint="?colorControlNormal"
app:showAsAction="ifRoom" />
</menu>

5
app/src/main/res/menu/person.xml
View file

@ -1,11 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/more_info"
android:icon="@drawable/ic_info_white_24dp"
android:title="@string/more_info"
app:showAsAction="ifRoom"/>
app:iconTint="?colorControlNormal"
app:showAsAction="ifRoom" />
</menu>

7
app/src/main/res/menu/room_image_dialog.xml
View file

@ -1,11 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/navigation"
android:icon="@drawable/ic_navigation_grey600_24dp"
android:icon="@drawable/ic_navigation_white_24dp"
android:title="@string/navigation"
app:showAsAction="ifRoom"/>
app:iconTint="?colorControlNormal"
app:showAsAction="ifRoom" />
</menu>

5
app/src/main/res/menu/search.xml
View file

@ -1,12 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/search"
android:icon="@drawable/ic_search_white_24dp"
android:title="@string/search_events"
app:actionViewClass="androidx.appcompat.widget.SearchView"
app:showAsAction="always"/>
app:iconTint="?colorControlNormal"
app:showAsAction="always" />
</menu>

4
app/src/main/res/xml-v26/settings.xml
View file

@ -4,7 +4,7 @@
<PreferenceCategory app:title="@string/settings_notifications">
<SwitchPreference
app:defaultValue="true"
app:icon="@drawable/ic_notifications_grey600_24dp"
app:icon="@drawable/ic_notifications_normal_24dp"
app:key="notifications_enabled"
app:summary="@string/settings_notifications_enabled_summary"
app:title="@string/settings_notifications_enabled_title" />
@ -24,7 +24,7 @@
<PreferenceCategory app:title="@string/settings_info">
<Preference
app:icon="@drawable/ic_info_outline_grey600_24dp"
app:icon="@drawable/ic_info_outline_normal_24dp"
app:key="about"
app:title="@string/settings_info_about_title" />
<Preference

4
app/src/main/res/xml/settings.xml
View file

@ -4,7 +4,7 @@
<PreferenceCategory app:title="@string/settings_notifications">
<SwitchPreferenceCompat
app:defaultValue="true"
app:icon="@drawable/ic_notifications_grey600_24dp"
app:icon="@drawable/ic_notifications_normal_24dp"
app:key="notifications_enabled"
app:summary="@string/settings_notifications_enabled_summary"
app:title="@string/settings_notifications_enabled_title" />
@ -32,7 +32,7 @@
<PreferenceCategory app:title="@string/settings_info">
<Preference
app:icon="@drawable/ic_info_outline_grey600_24dp"
app:icon="@drawable/ic_info_outline_normal_24dp"
app:key="about"
app:title="@string/settings_info_about_title" />
<Preference