diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/SelectAppsView.java b/app/src/full/java/org/fdroid/fdroid/nearby/SelectAppsView.java index 4e7940fce..bdab14bd6 100644 --- a/app/src/full/java/org/fdroid/fdroid/nearby/SelectAppsView.java +++ b/app/src/full/java/org/fdroid/fdroid/nearby/SelectAppsView.java @@ -8,12 +8,6 @@ import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.loader.app.LoaderManager; -import androidx.loader.content.CursorLoader; -import androidx.loader.content.Loader; -import androidx.cursoradapter.widget.CursorAdapter; import android.text.TextUtils; import android.util.AttributeSet; import android.view.ContextThemeWrapper; @@ -26,6 +20,14 @@ import android.widget.CompoundButton; import android.widget.ImageView; import android.widget.ListView; import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.cursoradapter.widget.CursorAdapter; +import androidx.loader.app.LoaderManager; +import androidx.loader.content.CursorLoader; +import androidx.loader.content.Loader; + import org.fdroid.fdroid.R; import org.fdroid.fdroid.data.InstalledAppProvider; import org.fdroid.fdroid.data.Schema.InstalledAppTable; @@ -217,10 +219,10 @@ public class SelectAppsView extends SwapView implements LoaderManager.LoaderCall int resource; int colour; if (checked) { - resource = R.drawable.ic_check_circle_white; + resource = R.drawable.ic_check_circle; colour = getResources().getColor(R.color.swap_bright_blue); } else { - resource = R.drawable.ic_add_circle_outline_white; + resource = R.drawable.ic_add_circle_outline; colour = 0xFFD0D0D4; } imageView.setImageDrawable(getResources().getDrawable(resource)); @@ -228,5 +230,4 @@ public class SelectAppsView extends SwapView implements LoaderManager.LoaderCall } } } - } diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/StartSwapView.java b/app/src/full/java/org/fdroid/fdroid/nearby/StartSwapView.java index 39bf1d89b..187fdecc6 100644 --- a/app/src/full/java/org/fdroid/fdroid/nearby/StartSwapView.java +++ b/app/src/full/java/org/fdroid/fdroid/nearby/StartSwapView.java @@ -7,9 +7,6 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.net.wifi.WifiConfiguration; -import androidx.annotation.Nullable; -import androidx.localbroadcastmanager.content.LocalBroadcastManager; -import androidx.appcompat.widget.SwitchCompat; import android.text.TextUtils; import android.util.AttributeSet; import android.view.LayoutInflater; @@ -22,7 +19,12 @@ import android.widget.ImageView; import android.widget.ListView; import android.widget.ProgressBar; import android.widget.TextView; -import cc.mvdan.accesspoint.WifiApControl; + +import androidx.annotation.Nullable; +import androidx.appcompat.widget.SwitchCompat; +import androidx.core.content.ContextCompat; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; + import org.fdroid.fdroid.FDroidApp; import org.fdroid.fdroid.R; import org.fdroid.fdroid.Utils; @@ -30,6 +32,8 @@ import org.fdroid.fdroid.nearby.peers.Peer; import java.util.ArrayList; +import cc.mvdan.accesspoint.WifiApControl; + @SuppressWarnings("LineLength") public class StartSwapView extends SwapView { private static final String TAG = "StartSwapView"; @@ -67,7 +71,7 @@ public class StartSwapView extends SwapView { Peer peer = getItem(position); ((TextView) convertView.findViewById(R.id.peer_name)).setText(peer.getName()); ((ImageView) convertView.findViewById(R.id.icon)) - .setImageDrawable(getResources().getDrawable(peer.getIcon())); + .setImageDrawable(ContextCompat.getDrawable(getContext(), peer.getIcon())); return convertView; } diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java b/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java index b43626b6d..0be72390f 100644 --- a/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java +++ b/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java @@ -17,17 +17,6 @@ import android.os.Build; import android.os.Bundle; import android.os.IBinder; import android.provider.Settings; -import androidx.annotation.LayoutRes; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.annotation.StringRes; -import androidx.localbroadcastmanager.content.LocalBroadcastManager; -import androidx.core.view.MenuItemCompat; -import androidx.appcompat.app.AlertDialog; -import androidx.appcompat.app.AppCompatActivity; -import androidx.appcompat.widget.SearchView; -import androidx.appcompat.widget.SwitchCompat; -import androidx.appcompat.widget.Toolbar; import android.text.TextUtils; import android.util.Log; import android.view.LayoutInflater; @@ -45,9 +34,23 @@ import android.widget.ListView; import android.widget.ProgressBar; import android.widget.TextView; import android.widget.Toast; -import cc.mvdan.accesspoint.WifiApControl; + +import androidx.annotation.LayoutRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.SearchView; +import androidx.appcompat.widget.SwitchCompat; +import androidx.appcompat.widget.Toolbar; +import androidx.core.content.ContextCompat; +import androidx.core.view.MenuItemCompat; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; + import com.google.zxing.integration.android.IntentIntegrator; import com.google.zxing.integration.android.IntentResult; + import org.fdroid.fdroid.BuildConfig; import org.fdroid.fdroid.FDroidApp; import org.fdroid.fdroid.NfcHelper; @@ -75,6 +78,8 @@ import java.util.Set; import java.util.Timer; import java.util.TimerTask; +import cc.mvdan.accesspoint.WifiApControl; + import static org.fdroid.fdroid.views.main.MainActivity.ACTION_REQUEST_SWAP; /** @@ -955,19 +960,19 @@ public class SwapWorkflowActivity extends AppCompatActivity { if (TextUtils.isEmpty(FDroidApp.bssid) && !TextUtils.isEmpty(FDroidApp.ipAddressString)) { // empty bssid with an ipAddress means hotspot mode descriptionView.setText(R.string.swap_join_this_hotspot); - wifiIcon.setImageDrawable(getResources().getDrawable(R.drawable.hotspot)); + wifiIcon.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.ic_wifi_tethering)); ssidView.setText(R.string.swap_active_hotspot); tapView.setText(R.string.swap_switch_to_wifi); } else if (TextUtils.isEmpty(FDroidApp.ssid)) { // not connected to or setup with any wifi network descriptionView.setText(R.string.swap_join_same_wifi); - wifiIcon.setImageDrawable(getResources().getDrawable(R.drawable.wifi)); + wifiIcon.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.ic_wifi)); ssidView.setText(R.string.swap_no_wifi_network); tapView.setText(R.string.swap_view_available_networks); } else { // connected to a regular wifi network descriptionView.setText(R.string.swap_join_same_wifi); - wifiIcon.setImageDrawable(getResources().getDrawable(R.drawable.wifi)); + wifiIcon.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.ic_wifi)); ssidView.setText(FDroidApp.ssid); tapView.setText(R.string.swap_view_available_networks); } diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/peers/BluetoothPeer.java b/app/src/full/java/org/fdroid/fdroid/nearby/peers/BluetoothPeer.java index 515853873..75d6f4fbc 100644 --- a/app/src/full/java/org/fdroid/fdroid/nearby/peers/BluetoothPeer.java +++ b/app/src/full/java/org/fdroid/fdroid/nearby/peers/BluetoothPeer.java @@ -3,8 +3,10 @@ package org.fdroid.fdroid.nearby.peers; import android.bluetooth.BluetoothClass.Device; import android.bluetooth.BluetoothDevice; import android.os.Parcel; -import androidx.annotation.Nullable; import android.text.TextUtils; + +import androidx.annotation.Nullable; + import org.fdroid.fdroid.R; public class BluetoothPeer implements Peer { @@ -44,7 +46,7 @@ public class BluetoothPeer implements Peer { @Override public int getIcon() { - return R.drawable.ic_bluetooth_white; + return R.drawable.ic_bluetooth; } @Override diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/peers/WifiPeer.java b/app/src/full/java/org/fdroid/fdroid/nearby/peers/WifiPeer.java index bbfc0b2e0..27b8cf34b 100644 --- a/app/src/full/java/org/fdroid/fdroid/nearby/peers/WifiPeer.java +++ b/app/src/full/java/org/fdroid/fdroid/nearby/peers/WifiPeer.java @@ -3,6 +3,7 @@ package org.fdroid.fdroid.nearby.peers; import android.net.Uri; import android.os.Parcel; import android.text.TextUtils; + import org.fdroid.fdroid.R; import org.fdroid.fdroid.data.NewRepoConfig; @@ -62,7 +63,7 @@ public class WifiPeer implements Peer { @Override public int getIcon() { - return R.drawable.ic_network_wifi_white; + return R.drawable.ic_network_wifi; } @Override diff --git a/app/src/full/java/org/fdroid/fdroid/panic/PanicPreferencesFragment.java b/app/src/full/java/org/fdroid/fdroid/panic/PanicPreferencesFragment.java index 7338a624d..ddf61b1a1 100644 --- a/app/src/full/java/org/fdroid/fdroid/panic/PanicPreferencesFragment.java +++ b/app/src/full/java/org/fdroid/fdroid/panic/PanicPreferencesFragment.java @@ -13,20 +13,19 @@ import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.Bundle; +import android.text.TextUtils; +import android.util.TypedValue; + import androidx.annotation.ColorInt; import androidx.annotation.Nullable; -import androidx.core.content.ContextCompat; import androidx.appcompat.app.AlertDialog; +import androidx.core.content.ContextCompat; import androidx.preference.CheckBoxPreference; import androidx.preference.ListPreference; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceFragmentCompat; -import android.text.TextUtils; -import android.util.TypedValue; -import info.guardianproject.panic.Panic; -import info.guardianproject.panic.PanicResponder; import org.fdroid.fdroid.Preferences; import org.fdroid.fdroid.R; import org.fdroid.fdroid.installer.PrivilegedInstaller; @@ -34,6 +33,9 @@ import org.fdroid.fdroid.installer.PrivilegedInstaller; import java.util.ArrayList; import java.util.Set; +import info.guardianproject.panic.Panic; +import info.guardianproject.panic.PanicResponder; + public class PanicPreferencesFragment extends PreferenceFragmentCompat implements SharedPreferences.OnSharedPreferenceChangeListener { @@ -130,9 +132,9 @@ public class PanicPreferencesFragment extends PreferenceFragmentCompat } } } else { - Preference preference = new Preference(getActivity()); + Preference preference = new Preference(requireActivity()); preference.setIntent(intent); - Drawable icon = getResources().getDrawable(R.drawable.ic_add_circle_outline_white); + Drawable icon = ContextCompat.getDrawable(requireContext(), R.drawable.ic_add_circle_outline); icon.setColorFilter(new LightingColorFilter(0, getResources().getColor(R.color.swap_light_grey_icon))); preference.setSingleLineTitle(true); preference.setTitle(R.string.panic_add_apps_to_uninstall); diff --git a/app/src/full/res/drawable-hdpi/hotspot.png b/app/src/full/res/drawable-hdpi/hotspot.png deleted file mode 100644 index e58dfce83..000000000 Binary files a/app/src/full/res/drawable-hdpi/hotspot.png and /dev/null differ diff --git a/app/src/full/res/drawable-hdpi/ic_add_circle_outline_white.png b/app/src/full/res/drawable-hdpi/ic_add_circle_outline_white.png deleted file mode 100644 index dfb1269b5..000000000 Binary files a/app/src/full/res/drawable-hdpi/ic_add_circle_outline_white.png and /dev/null differ diff --git a/app/src/full/res/drawable-hdpi/ic_arrow_forward_white.png b/app/src/full/res/drawable-hdpi/ic_arrow_forward_white.png deleted file mode 100644 index 7a6b232ac..000000000 Binary files a/app/src/full/res/drawable-hdpi/ic_arrow_forward_white.png and /dev/null differ diff --git a/app/src/full/res/drawable-hdpi/ic_bluetooth_white.png b/app/src/full/res/drawable-hdpi/ic_bluetooth_white.png deleted file mode 100644 index 95f1f121d..000000000 Binary files a/app/src/full/res/drawable-hdpi/ic_bluetooth_white.png and /dev/null differ diff --git a/app/src/full/res/drawable-hdpi/ic_check_circle_white.png b/app/src/full/res/drawable-hdpi/ic_check_circle_white.png deleted file mode 100644 index f242f210a..000000000 Binary files a/app/src/full/res/drawable-hdpi/ic_check_circle_white.png and /dev/null differ diff --git a/app/src/full/res/drawable-hdpi/ic_network_wifi_white.png b/app/src/full/res/drawable-hdpi/ic_network_wifi_white.png deleted file mode 100644 index 8dbf07380..000000000 Binary files a/app/src/full/res/drawable-hdpi/ic_network_wifi_white.png and /dev/null differ diff --git a/app/src/full/res/drawable-hdpi/wifi.png b/app/src/full/res/drawable-hdpi/wifi.png deleted file mode 100644 index cebc8c56c..000000000 Binary files a/app/src/full/res/drawable-hdpi/wifi.png and /dev/null differ diff --git a/app/src/full/res/drawable-ldpi/hotspot.png b/app/src/full/res/drawable-ldpi/hotspot.png deleted file mode 100644 index 90e3cfc8a..000000000 Binary files a/app/src/full/res/drawable-ldpi/hotspot.png and /dev/null differ diff --git a/app/src/full/res/drawable-ldpi/wifi.png b/app/src/full/res/drawable-ldpi/wifi.png deleted file mode 100644 index 18b56f048..000000000 Binary files a/app/src/full/res/drawable-ldpi/wifi.png and /dev/null differ diff --git a/app/src/full/res/drawable-mdpi/hotspot.png b/app/src/full/res/drawable-mdpi/hotspot.png deleted file mode 100644 index a12cf150b..000000000 Binary files a/app/src/full/res/drawable-mdpi/hotspot.png and /dev/null differ diff --git a/app/src/full/res/drawable-mdpi/ic_add_circle_outline_white.png b/app/src/full/res/drawable-mdpi/ic_add_circle_outline_white.png deleted file mode 100644 index 2bfb3f60b..000000000 Binary files a/app/src/full/res/drawable-mdpi/ic_add_circle_outline_white.png and /dev/null differ diff --git a/app/src/full/res/drawable-mdpi/ic_arrow_forward_white.png b/app/src/full/res/drawable-mdpi/ic_arrow_forward_white.png deleted file mode 100644 index 2633ea286..000000000 Binary files a/app/src/full/res/drawable-mdpi/ic_arrow_forward_white.png and /dev/null differ diff --git a/app/src/full/res/drawable-mdpi/ic_bluetooth_white.png b/app/src/full/res/drawable-mdpi/ic_bluetooth_white.png deleted file mode 100644 index 32488bb01..000000000 Binary files a/app/src/full/res/drawable-mdpi/ic_bluetooth_white.png and /dev/null differ diff --git a/app/src/full/res/drawable-mdpi/ic_check_circle_white.png b/app/src/full/res/drawable-mdpi/ic_check_circle_white.png deleted file mode 100644 index d5bdc63a6..000000000 Binary files a/app/src/full/res/drawable-mdpi/ic_check_circle_white.png and /dev/null differ diff --git a/app/src/full/res/drawable-mdpi/ic_network_wifi_white.png b/app/src/full/res/drawable-mdpi/ic_network_wifi_white.png deleted file mode 100644 index 0a65372c9..000000000 Binary files a/app/src/full/res/drawable-mdpi/ic_network_wifi_white.png and /dev/null differ diff --git a/app/src/full/res/drawable-mdpi/wifi.png b/app/src/full/res/drawable-mdpi/wifi.png deleted file mode 100644 index af3c3835d..000000000 Binary files a/app/src/full/res/drawable-mdpi/wifi.png and /dev/null differ diff --git a/app/src/full/res/drawable-xhdpi/ic_add_circle_outline_white.png b/app/src/full/res/drawable-xhdpi/ic_add_circle_outline_white.png deleted file mode 100644 index 972d0f0aa..000000000 Binary files a/app/src/full/res/drawable-xhdpi/ic_add_circle_outline_white.png and /dev/null differ diff --git a/app/src/full/res/drawable-xhdpi/ic_arrow_forward_white.png b/app/src/full/res/drawable-xhdpi/ic_arrow_forward_white.png deleted file mode 100644 index 1c5efe4e1..000000000 Binary files a/app/src/full/res/drawable-xhdpi/ic_arrow_forward_white.png and /dev/null differ diff --git a/app/src/full/res/drawable-xhdpi/ic_bluetooth_white.png b/app/src/full/res/drawable-xhdpi/ic_bluetooth_white.png deleted file mode 100644 index 42b50d697..000000000 Binary files a/app/src/full/res/drawable-xhdpi/ic_bluetooth_white.png and /dev/null differ diff --git a/app/src/full/res/drawable-xhdpi/ic_check_circle_white.png b/app/src/full/res/drawable-xhdpi/ic_check_circle_white.png deleted file mode 100644 index 9e9a6d18d..000000000 Binary files a/app/src/full/res/drawable-xhdpi/ic_check_circle_white.png and /dev/null differ diff --git a/app/src/full/res/drawable-xhdpi/ic_network_wifi_white.png b/app/src/full/res/drawable-xhdpi/ic_network_wifi_white.png deleted file mode 100644 index a4f217af0..000000000 Binary files a/app/src/full/res/drawable-xhdpi/ic_network_wifi_white.png and /dev/null differ diff --git a/app/src/full/res/drawable-xhdpi/wifi.png b/app/src/full/res/drawable-xhdpi/wifi.png deleted file mode 100644 index b7ecb0916..000000000 Binary files a/app/src/full/res/drawable-xhdpi/wifi.png and /dev/null differ diff --git a/app/src/full/res/drawable-xxhdpi/ic_add_circle_outline_white.png b/app/src/full/res/drawable-xxhdpi/ic_add_circle_outline_white.png deleted file mode 100644 index a676ca880..000000000 Binary files a/app/src/full/res/drawable-xxhdpi/ic_add_circle_outline_white.png and /dev/null differ diff --git a/app/src/full/res/drawable-xxhdpi/ic_arrow_forward_white.png b/app/src/full/res/drawable-xxhdpi/ic_arrow_forward_white.png deleted file mode 100644 index 398d7c2e1..000000000 Binary files a/app/src/full/res/drawable-xxhdpi/ic_arrow_forward_white.png and /dev/null differ diff --git a/app/src/full/res/drawable-xxhdpi/ic_bluetooth_white.png b/app/src/full/res/drawable-xxhdpi/ic_bluetooth_white.png deleted file mode 100644 index ae9c74800..000000000 Binary files a/app/src/full/res/drawable-xxhdpi/ic_bluetooth_white.png and /dev/null differ diff --git a/app/src/full/res/drawable-xxhdpi/ic_check_circle_white.png b/app/src/full/res/drawable-xxhdpi/ic_check_circle_white.png deleted file mode 100644 index be21ea637..000000000 Binary files a/app/src/full/res/drawable-xxhdpi/ic_check_circle_white.png and /dev/null differ diff --git a/app/src/full/res/drawable-xxhdpi/ic_network_wifi_white.png b/app/src/full/res/drawable-xxhdpi/ic_network_wifi_white.png deleted file mode 100644 index 08581b1ad..000000000 Binary files a/app/src/full/res/drawable-xxhdpi/ic_network_wifi_white.png and /dev/null differ diff --git a/app/src/full/res/drawable-xxxhdpi/ic_add_circle_outline_white.png b/app/src/full/res/drawable-xxxhdpi/ic_add_circle_outline_white.png deleted file mode 100644 index b03ff5285..000000000 Binary files a/app/src/full/res/drawable-xxxhdpi/ic_add_circle_outline_white.png and /dev/null differ diff --git a/app/src/full/res/drawable-xxxhdpi/ic_arrow_forward_white.png b/app/src/full/res/drawable-xxxhdpi/ic_arrow_forward_white.png deleted file mode 100644 index 22fbb9992..000000000 Binary files a/app/src/full/res/drawable-xxxhdpi/ic_arrow_forward_white.png and /dev/null differ diff --git a/app/src/full/res/drawable-xxxhdpi/ic_bluetooth_white.png b/app/src/full/res/drawable-xxxhdpi/ic_bluetooth_white.png deleted file mode 100644 index 1550d57ec..000000000 Binary files a/app/src/full/res/drawable-xxxhdpi/ic_bluetooth_white.png and /dev/null differ diff --git a/app/src/full/res/drawable-xxxhdpi/ic_check_circle_white.png b/app/src/full/res/drawable-xxxhdpi/ic_check_circle_white.png deleted file mode 100644 index f9e115d15..000000000 Binary files a/app/src/full/res/drawable-xxxhdpi/ic_check_circle_white.png and /dev/null differ diff --git a/app/src/full/res/drawable-xxxhdpi/ic_network_wifi_white.png b/app/src/full/res/drawable-xxxhdpi/ic_network_wifi_white.png deleted file mode 100644 index 57c6333e1..000000000 Binary files a/app/src/full/res/drawable-xxxhdpi/ic_network_wifi_white.png and /dev/null differ diff --git a/app/src/full/res/drawable/ic_add_circle_outline.xml b/app/src/full/res/drawable/ic_add_circle_outline.xml new file mode 100644 index 000000000..69f1469be --- /dev/null +++ b/app/src/full/res/drawable/ic_add_circle_outline.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/full/res/drawable/ic_arrow_forward.xml b/app/src/full/res/drawable/ic_arrow_forward.xml new file mode 100644 index 000000000..91bc94449 --- /dev/null +++ b/app/src/full/res/drawable/ic_arrow_forward.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/full/res/drawable/ic_bluetooth.xml b/app/src/full/res/drawable/ic_bluetooth.xml new file mode 100644 index 000000000..8ded8624f --- /dev/null +++ b/app/src/full/res/drawable/ic_bluetooth.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/full/res/drawable/ic_check_circle.xml b/app/src/full/res/drawable/ic_check_circle.xml new file mode 100644 index 000000000..2f5407af2 --- /dev/null +++ b/app/src/full/res/drawable/ic_check_circle.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/full/res/drawable/ic_network_wifi.xml b/app/src/full/res/drawable/ic_network_wifi.xml new file mode 100644 index 000000000..196df1370 --- /dev/null +++ b/app/src/full/res/drawable/ic_network_wifi.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/full/res/drawable/ic_wifi.xml b/app/src/full/res/drawable/ic_wifi.xml new file mode 100644 index 000000000..c7f44455a --- /dev/null +++ b/app/src/full/res/drawable/ic_wifi.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/full/res/drawable/ic_wifi_tethering.xml b/app/src/full/res/drawable/ic_wifi_tethering.xml new file mode 100644 index 000000000..8adefdf8d --- /dev/null +++ b/app/src/full/res/drawable/ic_wifi_tethering.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/full/res/layout-v11/select_local_apps_list_item.xml b/app/src/full/res/layout-v11/select_local_apps_list_item.xml index 40884a6cf..c3eac8226 100644 --- a/app/src/full/res/layout-v11/select_local_apps_list_item.xml +++ b/app/src/full/res/layout-v11/select_local_apps_list_item.xml @@ -43,7 +43,7 @@ android:layout_alignParentEnd="true" android:layout_centerVertical="true" tools:suppress="InconsistentLayout" - android:src="@drawable/ic_add_circle_outline_white" /> + android:src="@drawable/ic_add_circle_outline" /> + android:src="@drawable/ic_add_circle_outline" /> diff --git a/app/src/full/res/layout/swap_peer_list_item.xml b/app/src/full/res/layout/swap_peer_list_item.xml index a284a3f2e..9f474e1cc 100644 --- a/app/src/full/res/layout/swap_peer_list_item.xml +++ b/app/src/full/res/layout/swap_peer_list_item.xml @@ -27,7 +27,7 @@ android:layout_width="24dp" android:layout_height="24dp" android:layout_centerInParent="true" - tools:src="@drawable/ic_bluetooth_white"/> + tools:src="@drawable/ic_bluetooth"/> diff --git a/app/src/full/res/layout/swap_start_swap.xml b/app/src/full/res/layout/swap_start_swap.xml index ce0d6f729..1cb6c1774 100644 --- a/app/src/full/res/layout/swap_start_swap.xml +++ b/app/src/full/res/layout/swap_start_swap.xml @@ -27,7 +27,7 @@ android:layout_height="24dp" android:tint="@color/swap_grey_icon" android:contentDescription="@string/use_bluetooth" - android:src="@drawable/ic_bluetooth_white"/> + android:src="@drawable/ic_bluetooth"/> + android:src="@drawable/ic_network_wifi"/> diff --git a/app/src/full/res/menu/swap_next_search.xml b/app/src/full/res/menu/swap_next_search.xml index c11143276..47fa7a3b1 100644 --- a/app/src/full/res/menu/swap_next_search.xml +++ b/app/src/full/res/menu/swap_next_search.xml @@ -2,13 +2,13 @@ diff --git a/app/src/full/res/menu/swap_search.xml b/app/src/full/res/menu/swap_search.xml index 0108a7743..52bb58e01 100644 --- a/app/src/full/res/menu/swap_search.xml +++ b/app/src/full/res/menu/swap_search.xml @@ -2,7 +2,7 @@ diff --git a/app/src/main/java/org/fdroid/fdroid/UpdateService.java b/app/src/main/java/org/fdroid/fdroid/UpdateService.java index 30595745c..72617f2af 100644 --- a/app/src/main/java/org/fdroid/fdroid/UpdateService.java +++ b/app/src/main/java/org/fdroid/fdroid/UpdateService.java @@ -34,13 +34,14 @@ import android.os.AsyncTask; import android.os.Build; import android.os.Process; import android.os.SystemClock; +import android.text.TextUtils; +import android.util.Log; +import android.widget.Toast; + import androidx.annotation.NonNull; import androidx.core.app.JobIntentService; import androidx.core.app.NotificationCompat; import androidx.localbroadcastmanager.content.LocalBroadcastManager; -import android.text.TextUtils; -import android.util.Log; -import android.widget.Toast; import org.fdroid.fdroid.data.Apk; import org.fdroid.fdroid.data.ApkProvider; @@ -259,7 +260,7 @@ public class UpdateService extends JobIntentService { notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); notificationBuilder = new NotificationCompat.Builder(this, NotificationHelper.CHANNEL_UPDATES) - .setSmallIcon(R.drawable.ic_refresh_white) + .setSmallIcon(R.drawable.ic_refresh) .setOngoing(true) .setCategory(NotificationCompat.CATEGORY_SERVICE) .setContentTitle(getString(R.string.update_notification_title)); diff --git a/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java b/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java index 7cef1e286..0d2f13682 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java +++ b/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java @@ -6,7 +6,9 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.content.res.Resources; +import android.graphics.Color; import android.graphics.Rect; +import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.Build; import android.text.Html; @@ -28,12 +30,14 @@ import android.widget.LinearLayout; import android.widget.ProgressBar; import android.widget.TextView; import android.widget.Toast; + import androidx.annotation.DrawableRes; import androidx.annotation.LayoutRes; import androidx.annotation.NonNull; import androidx.appcompat.app.AlertDialog; import androidx.core.content.ContextCompat; import androidx.core.content.FileProvider; +import androidx.core.graphics.drawable.DrawableCompat; import androidx.core.os.ConfigurationCompat; import androidx.core.os.LocaleListCompat; import androidx.core.view.ViewCompat; @@ -42,6 +46,7 @@ import androidx.gridlayout.widget.GridLayout; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearSmoothScroller; import androidx.recyclerview.widget.RecyclerView; + import org.apache.commons.io.FilenameUtils; import org.fdroid.fdroid.Preferences; import org.fdroid.fdroid.R; @@ -830,7 +835,17 @@ public class AppDetailsRecyclerViewAdapter * user can expand/collapse this item. */ protected void updateExpandableItem(boolean isExpanded) { - TextViewCompat.setCompoundDrawablesRelativeWithIntrinsicBounds(headerView, getIcon(), 0, isExpanded ? R.drawable.ic_expand_less_grey600 : R.drawable.ic_expand_more_grey600, 0); + final int icon = getIcon(); + Drawable iconDrawable = ContextCompat.getDrawable(headerView.getContext(), icon); + if (icon == R.drawable.ic_access_time) { + assert iconDrawable != null; + iconDrawable = DrawableCompat.wrap(iconDrawable).mutate(); + DrawableCompat.setTint(iconDrawable, Color.parseColor("#B4B4B4")); + } + final Drawable expandLess = ContextCompat.getDrawable(headerView.getContext(), R.drawable.ic_expand_less); + final Drawable expandMore = ContextCompat.getDrawable(headerView.getContext(), R.drawable.ic_expand_more); + TextViewCompat.setCompoundDrawablesRelativeWithIntrinsicBounds(headerView, + iconDrawable, null, isExpanded ? expandLess : expandMore, null); } } @@ -855,7 +870,7 @@ public class AppDetailsRecyclerViewAdapter @DrawableRes protected int getIcon() { - return R.drawable.ic_access_time_24dp_grey600; + return R.drawable.ic_access_time; } } @@ -865,7 +880,11 @@ public class AppDetailsRecyclerViewAdapter NoVersionsViewHolder(View view) { super(view); headerView = (TextView) view.findViewById(R.id.information); - TextViewCompat.setCompoundDrawablesRelativeWithIntrinsicBounds(headerView, R.drawable.ic_access_time_24dp_grey600, 0, 0, 0); + final Drawable accessTime = DrawableCompat.wrap(ContextCompat.getDrawable(headerView.getContext(), + R.drawable.ic_access_time)).mutate(); + DrawableCompat.setTint(accessTime, Color.parseColor("#B4B4B4")); + TextViewCompat.setCompoundDrawablesRelativeWithIntrinsicBounds(headerView, + accessTime, null, null, null); itemView.setOnClickListener(new View.OnClickListener() { @Override @@ -956,7 +975,7 @@ public class AppDetailsRecyclerViewAdapter @DrawableRes protected int getIcon() { - return R.drawable.ic_lock_24dp_grey600; + return R.drawable.ic_lock; } } @@ -1004,7 +1023,7 @@ public class AppDetailsRecyclerViewAdapter // Issues button if (uriIsSetAndCanBeOpened(app.issueTracker)) { - addLinkItemView(contentView, R.string.menu_issues, R.drawable.ic_issues, app.issueTracker); + addLinkItemView(contentView, R.string.menu_issues, R.drawable.ic_error, app.issueTracker); } // Translation button @@ -1281,7 +1300,7 @@ public class AppDetailsRecyclerViewAdapter expandedLayout.setVisibility(expand ? View.VISIBLE : View.GONE); versionCode.setVisibility(expand ? View.VISIBLE : View.GONE); expandArrow.setImageDrawable(ContextCompat.getDrawable(context, expand ? - R.drawable.ic_expand_less_grey600 : R.drawable.ic_expand_more_grey600)); + R.drawable.ic_expand_less : R.drawable.ic_expand_more)); // This is required to make these labels // auto-scrollable when they are too long diff --git a/app/src/main/java/org/fdroid/fdroid/views/apps/AppListActivity.java b/app/src/main/java/org/fdroid/fdroid/views/apps/AppListActivity.java index f59a3cdf1..0ed47ebf7 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/apps/AppListActivity.java +++ b/app/src/main/java/org/fdroid/fdroid/views/apps/AppListActivity.java @@ -23,15 +23,9 @@ package org.fdroid.fdroid.views.apps; import android.content.Context; import android.content.Intent; import android.database.Cursor; +import android.graphics.Color; +import android.graphics.drawable.Drawable; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.loader.app.LoaderManager; -import androidx.loader.content.CursorLoader; -import androidx.loader.content.Loader; -import androidx.appcompat.app.AppCompatActivity; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import android.view.KeyEvent; import android.view.View; import android.view.inputmethod.EditorInfo; @@ -39,7 +33,20 @@ import android.view.inputmethod.InputMethodManager; import android.widget.EditText; import android.widget.ImageView; import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; +import androidx.core.content.ContextCompat; +import androidx.core.graphics.drawable.DrawableCompat; +import androidx.loader.app.LoaderManager; +import androidx.loader.content.CursorLoader; +import androidx.loader.content.Loader; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + import com.nostra13.universalimageloader.core.ImageLoader; + import org.fdroid.fdroid.FDroidApp; import org.fdroid.fdroid.R; import org.fdroid.fdroid.Utils; @@ -101,28 +108,22 @@ public class AppListActivity extends AppCompatActivity implements LoaderManager. }); sortImage = (ImageView) findViewById(R.id.sort); - if (FDroidApp.isAppThemeLight()) { - sortImage.setImageResource(R.drawable.ic_last_updated_black); - } else { - sortImage.setImageResource(R.drawable.ic_last_updated_white); - } + final Drawable lastUpdated = DrawableCompat.wrap(ContextCompat.getDrawable(this, + R.drawable.ic_access_time)).mutate(); + DrawableCompat.setTint(lastUpdated, FDroidApp.isAppThemeLight() ? Color.BLACK : Color.WHITE); + sortImage.setImageDrawable(lastUpdated); sortImage.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { if (sortClauseSelected.equalsIgnoreCase(SortClause.LAST_UPDATED)) { sortClauseSelected = SortClause.NAME; - if (FDroidApp.isAppThemeLight()) { - sortImage.setImageResource(R.drawable.ic_az_black); - } else { - sortImage.setImageResource(R.drawable.ic_az_white); - } + final Drawable alphabetical = DrawableCompat.wrap( + ContextCompat.getDrawable(AppListActivity.this, R.drawable.ic_sort_by_alpha)).mutate(); + DrawableCompat.setTint(alphabetical, FDroidApp.isAppThemeLight() ? Color.BLACK : Color.WHITE); + sortImage.setImageDrawable(alphabetical); } else { sortClauseSelected = SortClause.LAST_UPDATED; - if (FDroidApp.isAppThemeLight()) { - sortImage.setImageResource(R.drawable.ic_last_updated_black); - } else { - sortImage.setImageResource(R.drawable.ic_last_updated_white); - } + sortImage.setImageDrawable(lastUpdated); } getSupportLoaderManager().restartLoader(0, null, AppListActivity.this); appView.scrollToPosition(0); diff --git a/app/src/main/res/drawable-hdpi/ic_access_time_24dp_grey600.png b/app/src/main/res/drawable-hdpi/ic_access_time_24dp_grey600.png deleted file mode 100644 index 92f81cdf7..000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_access_time_24dp_grey600.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_add_white.png b/app/src/main/res/drawable-hdpi/ic_add_white.png deleted file mode 100644 index 023e5d21a..000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_add_white.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_az_black.png b/app/src/main/res/drawable-hdpi/ic_az_black.png deleted file mode 100644 index b98b442b9..000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_az_black.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_az_white.png b/app/src/main/res/drawable-hdpi/ic_az_white.png deleted file mode 100644 index ca62939bd..000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_az_white.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_changelog.png b/app/src/main/res/drawable-hdpi/ic_changelog.png deleted file mode 100644 index d6cc9b7c1..000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_changelog.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_delete_white.png b/app/src/main/res/drawable-hdpi/ic_delete_white.png deleted file mode 100644 index 88e4fb0a7..000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_delete_white.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_do_not_disturb_white.png b/app/src/main/res/drawable-hdpi/ic_do_not_disturb_white.png deleted file mode 100644 index 9223086cc..000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_do_not_disturb_white.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_donate.png b/app/src/main/res/drawable-hdpi/ic_donate.png deleted file mode 100644 index 969d157c9..000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_donate.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_email.png b/app/src/main/res/drawable-hdpi/ic_email.png deleted file mode 100644 index 53c4f9785..000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_email.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_expand_less_grey600.png b/app/src/main/res/drawable-hdpi/ic_expand_less_grey600.png deleted file mode 100644 index 2108ad2c0..000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_expand_less_grey600.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_expand_more_grey600.png b/app/src/main/res/drawable-hdpi/ic_expand_more_grey600.png deleted file mode 100644 index 0a4f1ea16..000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_expand_more_grey600.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_issues.png b/app/src/main/res/drawable-hdpi/ic_issues.png deleted file mode 100644 index 19328c22c..000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_issues.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_last_updated_black.png b/app/src/main/res/drawable-hdpi/ic_last_updated_black.png deleted file mode 100644 index 16f638e34..000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_last_updated_black.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_last_updated_white.png b/app/src/main/res/drawable-hdpi/ic_last_updated_white.png deleted file mode 100644 index 9d923a233..000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_last_updated_white.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_lock_24dp_grey600.png b/app/src/main/res/drawable-hdpi/ic_lock_24dp_grey600.png deleted file mode 100644 index 3a18be11c..000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_lock_24dp_grey600.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_nfc_white.png b/app/src/main/res/drawable-hdpi/ic_nfc_white.png deleted file mode 100644 index 44681ac89..000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_nfc_white.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_refresh_white.png b/app/src/main/res/drawable-hdpi/ic_refresh_white.png deleted file mode 100644 index e55d29888..000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_refresh_white.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_search_white.png b/app/src/main/res/drawable-hdpi/ic_search_white.png deleted file mode 100644 index 8c0d230e4..000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_search_white.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_share_white.png b/app/src/main/res/drawable-hdpi/ic_share_white.png deleted file mode 100644 index 232b32397..000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_share_white.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_source_code.png b/app/src/main/res/drawable-hdpi/ic_source_code.png deleted file mode 100644 index c1380c987..000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_source_code.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_website.png b/app/src/main/res/drawable-hdpi/ic_website.png deleted file mode 100644 index ef5855983..000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_website.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_access_time_24dp_grey600.png b/app/src/main/res/drawable-mdpi/ic_access_time_24dp_grey600.png deleted file mode 100644 index 3408063a5..000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_access_time_24dp_grey600.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_add_white.png b/app/src/main/res/drawable-mdpi/ic_add_white.png deleted file mode 100644 index 877dc286a..000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_add_white.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_az_black.png b/app/src/main/res/drawable-mdpi/ic_az_black.png deleted file mode 100644 index a8ea67c9d..000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_az_black.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_az_white.png b/app/src/main/res/drawable-mdpi/ic_az_white.png deleted file mode 100644 index 9242c21d0..000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_az_white.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_changelog.png b/app/src/main/res/drawable-mdpi/ic_changelog.png deleted file mode 100644 index ccb4c77da..000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_changelog.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_delete_white.png b/app/src/main/res/drawable-mdpi/ic_delete_white.png deleted file mode 100644 index 6b44a07da..000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_delete_white.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_do_not_disturb_white.png b/app/src/main/res/drawable-mdpi/ic_do_not_disturb_white.png deleted file mode 100644 index a64557003..000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_do_not_disturb_white.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_donate.png b/app/src/main/res/drawable-mdpi/ic_donate.png deleted file mode 100644 index e3fcb2627..000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_donate.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_email.png b/app/src/main/res/drawable-mdpi/ic_email.png deleted file mode 100644 index e0312b59c..000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_email.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_expand_less_grey600.png b/app/src/main/res/drawable-mdpi/ic_expand_less_grey600.png deleted file mode 100644 index a91d29870..000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_expand_less_grey600.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_expand_more_grey600.png b/app/src/main/res/drawable-mdpi/ic_expand_more_grey600.png deleted file mode 100644 index 8cae8615b..000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_expand_more_grey600.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_issues.png b/app/src/main/res/drawable-mdpi/ic_issues.png deleted file mode 100644 index 32139e24d..000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_issues.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_last_updated_black.png b/app/src/main/res/drawable-mdpi/ic_last_updated_black.png deleted file mode 100644 index 74e759b9d..000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_last_updated_black.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_last_updated_white.png b/app/src/main/res/drawable-mdpi/ic_last_updated_white.png deleted file mode 100644 index a07e0508a..000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_last_updated_white.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_lock_24dp_grey600.png b/app/src/main/res/drawable-mdpi/ic_lock_24dp_grey600.png deleted file mode 100644 index 17da354c2..000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_lock_24dp_grey600.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_nfc_white.png b/app/src/main/res/drawable-mdpi/ic_nfc_white.png deleted file mode 100644 index 4ce107be2..000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_nfc_white.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_refresh_white.png b/app/src/main/res/drawable-mdpi/ic_refresh_white.png deleted file mode 100644 index 677da7d46..000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_refresh_white.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_search_white.png b/app/src/main/res/drawable-mdpi/ic_search_white.png deleted file mode 100644 index 4963e9b43..000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_search_white.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_share_white.png b/app/src/main/res/drawable-mdpi/ic_share_white.png deleted file mode 100644 index 26c367384..000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_share_white.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_source_code.png b/app/src/main/res/drawable-mdpi/ic_source_code.png deleted file mode 100644 index d208d9fa5..000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_source_code.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_website.png b/app/src/main/res/drawable-mdpi/ic_website.png deleted file mode 100644 index 88be36828..000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_website.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_access_time_24dp_grey600.png b/app/src/main/res/drawable-xhdpi/ic_access_time_24dp_grey600.png deleted file mode 100644 index a3f2032ca..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_access_time_24dp_grey600.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_add_white.png b/app/src/main/res/drawable-xhdpi/ic_add_white.png deleted file mode 100644 index 67bb598e5..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_add_white.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_az_black.png b/app/src/main/res/drawable-xhdpi/ic_az_black.png deleted file mode 100644 index d7db3fe43..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_az_black.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_az_white.png b/app/src/main/res/drawable-xhdpi/ic_az_white.png deleted file mode 100644 index d78451787..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_az_white.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_changelog.png b/app/src/main/res/drawable-xhdpi/ic_changelog.png deleted file mode 100644 index 61a8e1614..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_changelog.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_delete_white.png b/app/src/main/res/drawable-xhdpi/ic_delete_white.png deleted file mode 100644 index 802469b99..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_delete_white.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_do_not_disturb_white.png b/app/src/main/res/drawable-xhdpi/ic_do_not_disturb_white.png deleted file mode 100644 index cc61e5855..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_do_not_disturb_white.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_donate.png b/app/src/main/res/drawable-xhdpi/ic_donate.png deleted file mode 100644 index 6b9c2febd..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_donate.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_email.png b/app/src/main/res/drawable-xhdpi/ic_email.png deleted file mode 100644 index f61f7ff16..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_email.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_expand_less_grey600.png b/app/src/main/res/drawable-xhdpi/ic_expand_less_grey600.png deleted file mode 100644 index 34a759431..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_expand_less_grey600.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_expand_more_grey600.png b/app/src/main/res/drawable-xhdpi/ic_expand_more_grey600.png deleted file mode 100644 index 7b3b4a25d..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_expand_more_grey600.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_issues.png b/app/src/main/res/drawable-xhdpi/ic_issues.png deleted file mode 100644 index f7652bef3..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_issues.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_last_updated_black.png b/app/src/main/res/drawable-xhdpi/ic_last_updated_black.png deleted file mode 100644 index f8e28665f..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_last_updated_black.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_last_updated_white.png b/app/src/main/res/drawable-xhdpi/ic_last_updated_white.png deleted file mode 100644 index 0759e8c8c..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_last_updated_white.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_lock_24dp_grey600.png b/app/src/main/res/drawable-xhdpi/ic_lock_24dp_grey600.png deleted file mode 100644 index 99d8a905f..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_lock_24dp_grey600.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_nfc_white.png b/app/src/main/res/drawable-xhdpi/ic_nfc_white.png deleted file mode 100644 index 55c78c7b2..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_nfc_white.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_refresh_white.png b/app/src/main/res/drawable-xhdpi/ic_refresh_white.png deleted file mode 100644 index 80fe0234e..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_refresh_white.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_search_white.png b/app/src/main/res/drawable-xhdpi/ic_search_white.png deleted file mode 100644 index d206afa38..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_search_white.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_share_white.png b/app/src/main/res/drawable-xhdpi/ic_share_white.png deleted file mode 100644 index a224026bc..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_share_white.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_source_code.png b/app/src/main/res/drawable-xhdpi/ic_source_code.png deleted file mode 100644 index d437c5a0f..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_source_code.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_website.png b/app/src/main/res/drawable-xhdpi/ic_website.png deleted file mode 100644 index 60c7d6ba4..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_website.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_access_time_24dp_grey600.png b/app/src/main/res/drawable-xxhdpi/ic_access_time_24dp_grey600.png deleted file mode 100644 index 435aa9abd..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_access_time_24dp_grey600.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_add_white.png b/app/src/main/res/drawable-xxhdpi/ic_add_white.png deleted file mode 100644 index 0fdced8fc..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_add_white.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_az_black.png b/app/src/main/res/drawable-xxhdpi/ic_az_black.png deleted file mode 100644 index 32e47a107..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_az_black.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_az_white.png b/app/src/main/res/drawable-xxhdpi/ic_az_white.png deleted file mode 100644 index c7e7056aa..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_az_white.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_changelog.png b/app/src/main/res/drawable-xxhdpi/ic_changelog.png deleted file mode 100644 index 08b952171..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_changelog.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_delete_white.png b/app/src/main/res/drawable-xxhdpi/ic_delete_white.png deleted file mode 100644 index 6cd12ef0d..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_delete_white.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_do_not_disturb_white.png b/app/src/main/res/drawable-xxhdpi/ic_do_not_disturb_white.png deleted file mode 100644 index 8bf84f08c..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_do_not_disturb_white.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_donate.png b/app/src/main/res/drawable-xxhdpi/ic_donate.png deleted file mode 100644 index 245437cab..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_donate.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_email.png b/app/src/main/res/drawable-xxhdpi/ic_email.png deleted file mode 100644 index 6142bc9b0..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_email.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_expand_less_grey600.png b/app/src/main/res/drawable-xxhdpi/ic_expand_less_grey600.png deleted file mode 100644 index b4db05919..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_expand_less_grey600.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_expand_more_grey600.png b/app/src/main/res/drawable-xxhdpi/ic_expand_more_grey600.png deleted file mode 100644 index 67487be3d..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_expand_more_grey600.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_issues.png b/app/src/main/res/drawable-xxhdpi/ic_issues.png deleted file mode 100644 index d36c5b529..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_issues.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_last_updated_black.png b/app/src/main/res/drawable-xxhdpi/ic_last_updated_black.png deleted file mode 100644 index 383c8712a..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_last_updated_black.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_last_updated_white.png b/app/src/main/res/drawable-xxhdpi/ic_last_updated_white.png deleted file mode 100644 index baa254034..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_last_updated_white.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_lock_24dp_grey600.png b/app/src/main/res/drawable-xxhdpi/ic_lock_24dp_grey600.png deleted file mode 100644 index c87a883b9..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_lock_24dp_grey600.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_nfc_white.png b/app/src/main/res/drawable-xxhdpi/ic_nfc_white.png deleted file mode 100644 index 4fb6a8df6..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_nfc_white.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_refresh_white.png b/app/src/main/res/drawable-xxhdpi/ic_refresh_white.png deleted file mode 100644 index e5642a928..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_refresh_white.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_search_white.png b/app/src/main/res/drawable-xxhdpi/ic_search_white.png deleted file mode 100644 index 81c900084..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_search_white.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_share_white.png b/app/src/main/res/drawable-xxhdpi/ic_share_white.png deleted file mode 100644 index 57739d6f3..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_share_white.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_source_code.png b/app/src/main/res/drawable-xxhdpi/ic_source_code.png deleted file mode 100644 index ab82be946..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_source_code.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_website.png b/app/src/main/res/drawable-xxhdpi/ic_website.png deleted file mode 100644 index b464e28d4..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_website.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_access_time_24dp_grey600.png b/app/src/main/res/drawable-xxxhdpi/ic_access_time_24dp_grey600.png deleted file mode 100644 index dd430cf52..000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_access_time_24dp_grey600.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_add_white.png b/app/src/main/res/drawable-xxxhdpi/ic_add_white.png deleted file mode 100644 index d64c22e9e..000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_add_white.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_az_black.png b/app/src/main/res/drawable-xxxhdpi/ic_az_black.png deleted file mode 100644 index 6a20c4d52..000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_az_black.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_az_white.png b/app/src/main/res/drawable-xxxhdpi/ic_az_white.png deleted file mode 100644 index 73edfd124..000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_az_white.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_changelog.png b/app/src/main/res/drawable-xxxhdpi/ic_changelog.png deleted file mode 100644 index c7c79900f..000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_changelog.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_delete_white.png b/app/src/main/res/drawable-xxxhdpi/ic_delete_white.png deleted file mode 100644 index 1f7c2cfb8..000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_delete_white.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_do_not_disturb_white.png b/app/src/main/res/drawable-xxxhdpi/ic_do_not_disturb_white.png deleted file mode 100644 index acb00e938..000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_do_not_disturb_white.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_donate.png b/app/src/main/res/drawable-xxxhdpi/ic_donate.png deleted file mode 100644 index 4cefada87..000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_donate.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_email.png b/app/src/main/res/drawable-xxxhdpi/ic_email.png deleted file mode 100644 index 97f63ce5e..000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_email.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_expand_less_grey600.png b/app/src/main/res/drawable-xxxhdpi/ic_expand_less_grey600.png deleted file mode 100644 index f907e97c5..000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_expand_less_grey600.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_expand_more_grey600.png b/app/src/main/res/drawable-xxxhdpi/ic_expand_more_grey600.png deleted file mode 100644 index e3c993ee7..000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_expand_more_grey600.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_issues.png b/app/src/main/res/drawable-xxxhdpi/ic_issues.png deleted file mode 100644 index 739184d3e..000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_issues.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_last_updated_black.png b/app/src/main/res/drawable-xxxhdpi/ic_last_updated_black.png deleted file mode 100644 index 22bcf0d77..000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_last_updated_black.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_last_updated_white.png b/app/src/main/res/drawable-xxxhdpi/ic_last_updated_white.png deleted file mode 100644 index f2b09f438..000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_last_updated_white.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_lock_24dp_grey600.png b/app/src/main/res/drawable-xxxhdpi/ic_lock_24dp_grey600.png deleted file mode 100644 index 59820c561..000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_lock_24dp_grey600.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_nfc_white.png b/app/src/main/res/drawable-xxxhdpi/ic_nfc_white.png deleted file mode 100644 index 102bee1aa..000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_nfc_white.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_refresh_white.png b/app/src/main/res/drawable-xxxhdpi/ic_refresh_white.png deleted file mode 100644 index 9afe51112..000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_refresh_white.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_search_white.png b/app/src/main/res/drawable-xxxhdpi/ic_search_white.png deleted file mode 100644 index 949ed4e53..000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_search_white.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_source_code.png b/app/src/main/res/drawable-xxxhdpi/ic_source_code.png deleted file mode 100644 index 7d7758978..000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_source_code.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_website.png b/app/src/main/res/drawable-xxxhdpi/ic_website.png deleted file mode 100644 index 49a8174c9..000000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_website.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_access_time.xml b/app/src/main/res/drawable/ic_access_time.xml new file mode 100644 index 000000000..659bbd962 --- /dev/null +++ b/app/src/main/res/drawable/ic_access_time.xml @@ -0,0 +1,6 @@ + + + + diff --git a/app/src/main/res/drawable/ic_add.xml b/app/src/main/res/drawable/ic_add.xml new file mode 100644 index 000000000..07602be66 --- /dev/null +++ b/app/src/main/res/drawable/ic_add.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_changelog.xml b/app/src/main/res/drawable/ic_changelog.xml new file mode 100644 index 000000000..add9e7973 --- /dev/null +++ b/app/src/main/res/drawable/ic_changelog.xml @@ -0,0 +1,11 @@ + + + + diff --git a/app/src/main/res/drawable/ic_delete.xml b/app/src/main/res/drawable/ic_delete.xml new file mode 100644 index 000000000..2e5ece8a9 --- /dev/null +++ b/app/src/main/res/drawable/ic_delete.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_do_not_disturb.xml b/app/src/main/res/drawable/ic_do_not_disturb.xml new file mode 100644 index 000000000..b5f3e57ab --- /dev/null +++ b/app/src/main/res/drawable/ic_do_not_disturb.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_donate.xml b/app/src/main/res/drawable/ic_donate.xml new file mode 100644 index 000000000..13855949b --- /dev/null +++ b/app/src/main/res/drawable/ic_donate.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_email.xml b/app/src/main/res/drawable/ic_email.xml new file mode 100644 index 000000000..0a71bb486 --- /dev/null +++ b/app/src/main/res/drawable/ic_email.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_error.xml b/app/src/main/res/drawable/ic_error.xml new file mode 100644 index 000000000..4d691f295 --- /dev/null +++ b/app/src/main/res/drawable/ic_error.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_expand_less.xml b/app/src/main/res/drawable/ic_expand_less.xml new file mode 100644 index 000000000..c1d4ac5bb --- /dev/null +++ b/app/src/main/res/drawable/ic_expand_less.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_expand_more.xml b/app/src/main/res/drawable/ic_expand_more.xml new file mode 100644 index 000000000..e6aa60301 --- /dev/null +++ b/app/src/main/res/drawable/ic_expand_more.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_license.xml b/app/src/main/res/drawable/ic_license.xml index 389c86c90..a5bac7f3f 100644 --- a/app/src/main/res/drawable/ic_license.xml +++ b/app/src/main/res/drawable/ic_license.xml @@ -1,16 +1,19 @@ - - + android:width="24dp" + android:height="24dp" + android:tint="#B4B4B4" + android:viewportWidth="64.0" + android:viewportHeight="64.0"> + + diff --git a/app/src/main/res/drawable/ic_lock.xml b/app/src/main/res/drawable/ic_lock.xml new file mode 100644 index 000000000..901637dfd --- /dev/null +++ b/app/src/main/res/drawable/ic_lock.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_nfc.xml b/app/src/main/res/drawable/ic_nfc.xml new file mode 100644 index 000000000..bd4a6ecc0 --- /dev/null +++ b/app/src/main/res/drawable/ic_nfc.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_refresh.xml b/app/src/main/res/drawable/ic_refresh.xml new file mode 100644 index 000000000..3f0828504 --- /dev/null +++ b/app/src/main/res/drawable/ic_refresh.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml new file mode 100644 index 000000000..abd67c9b9 --- /dev/null +++ b/app/src/main/res/drawable/ic_search.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_share.xml b/app/src/main/res/drawable/ic_share.xml new file mode 100644 index 000000000..ccb2ea41c --- /dev/null +++ b/app/src/main/res/drawable/ic_share.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_sort_by_alpha.xml b/app/src/main/res/drawable/ic_sort_by_alpha.xml new file mode 100644 index 000000000..d4fb66964 --- /dev/null +++ b/app/src/main/res/drawable/ic_sort_by_alpha.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_source_code.xml b/app/src/main/res/drawable/ic_source_code.xml new file mode 100644 index 000000000..9d93d9cb9 --- /dev/null +++ b/app/src/main/res/drawable/ic_source_code.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_translation.xml b/app/src/main/res/drawable/ic_translation.xml index 0fd3dbba4..a8baf206d 100644 --- a/app/src/main/res/drawable/ic_translation.xml +++ b/app/src/main/res/drawable/ic_translation.xml @@ -1,9 +1,10 @@ diff --git a/app/src/main/res/drawable/ic_video.xml b/app/src/main/res/drawable/ic_video.xml index e462ed24f..b40237a82 100644 --- a/app/src/main/res/drawable/ic_video.xml +++ b/app/src/main/res/drawable/ic_video.xml @@ -1,7 +1,8 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_website.xml b/app/src/main/res/drawable/ic_website.xml new file mode 100644 index 000000000..c56efed40 --- /dev/null +++ b/app/src/main/res/drawable/ic_website.xml @@ -0,0 +1,11 @@ + + + + diff --git a/app/src/main/res/layout/app_details2_links.xml b/app/src/main/res/layout/app_details2_links.xml index 0eed84127..01263d8a6 100644 --- a/app/src/main/res/layout/app_details2_links.xml +++ b/app/src/main/res/layout/app_details2_links.xml @@ -27,8 +27,8 @@ android:paddingStart="@dimen/details_activity__collapsable_lists__padding__horizontal" android:paddingRight="@dimen/details_activity__collapsable_lists__padding__horizontal" android:paddingEnd="@dimen/details_activity__collapsable_lists__padding__horizontal" - android:drawableRight="@drawable/ic_expand_more_grey600" - android:drawableEnd="@drawable/ic_expand_more_grey600" + android:drawableRight="@drawable/ic_expand_more" + android:drawableEnd="@drawable/ic_expand_more" android:drawableLeft="@drawable/ic_website" android:drawableStart="@drawable/ic_website" android:background="?selectableItemBackground" /> diff --git a/app/src/main/res/layout/app_details2_version_item.xml b/app/src/main/res/layout/app_details2_version_item.xml index 452f8cd64..6c5619096 100644 --- a/app/src/main/res/layout/app_details2_version_item.xml +++ b/app/src/main/res/layout/app_details2_version_item.xml @@ -84,7 +84,7 @@ + android:src="@drawable/ic_expand_more" /> diff --git a/app/src/main/res/menu/install_history.xml b/app/src/main/res/menu/install_history.xml index 565a0e15a..d68c47518 100644 --- a/app/src/main/res/menu/install_history.xml +++ b/app/src/main/res/menu/install_history.xml @@ -2,11 +2,11 @@ \ No newline at end of file diff --git a/app/src/main/res/menu/installed_apps.xml b/app/src/main/res/menu/installed_apps.xml index 55b8f0d22..834c5afa6 100644 --- a/app/src/main/res/menu/installed_apps.xml +++ b/app/src/main/res/menu/installed_apps.xml @@ -2,7 +2,7 @@ diff --git a/app/src/main/res/menu/manage_repos.xml b/app/src/main/res/menu/manage_repos.xml index 44b5c7ebd..bbbc3564f 100644 --- a/app/src/main/res/menu/manage_repos.xml +++ b/app/src/main/res/menu/manage_repos.xml @@ -4,7 +4,7 @@ diff --git a/app/src/main/res/menu/repo_details_activity.xml b/app/src/main/res/menu/repo_details_activity.xml index 36a9d95b3..bcab5b580 100644 --- a/app/src/main/res/menu/repo_details_activity.xml +++ b/app/src/main/res/menu/repo_details_activity.xml @@ -4,17 +4,17 @@