From a9b37a533e10fd43a58b83c4553c227204a8f55d Mon Sep 17 00:00:00 2001 From: Isira Seneviratne Date: Fri, 25 Sep 2020 14:57:52 +0530 Subject: [PATCH 01/23] Replace WiFi and hotspot PNGs with vector drawables. --- .../fdroid/nearby/SwapWorkflowActivity.java | 35 ++++++++++-------- .../fdroid/fdroid/nearby/peers/WifiPeer.java | 3 +- app/src/full/res/drawable-hdpi/hotspot.png | Bin 7354 -> 0 bytes .../drawable-hdpi/ic_network_wifi_white.png | Bin 701 -> 0 bytes app/src/full/res/drawable-hdpi/wifi.png | Bin 5047 -> 0 bytes app/src/full/res/drawable-ldpi/hotspot.png | Bin 1392 -> 0 bytes app/src/full/res/drawable-ldpi/wifi.png | Bin 783 -> 0 bytes app/src/full/res/drawable-mdpi/hotspot.png | Bin 2836 -> 0 bytes .../drawable-mdpi/ic_network_wifi_white.png | Bin 486 -> 0 bytes app/src/full/res/drawable-mdpi/wifi.png | Bin 1634 -> 0 bytes .../drawable-xhdpi/ic_network_wifi_white.png | Bin 926 -> 0 bytes app/src/full/res/drawable-xhdpi/wifi.png | Bin 6868 -> 0 bytes .../drawable-xxhdpi/ic_network_wifi_white.png | Bin 1360 -> 0 bytes .../ic_network_wifi_white.png | Bin 1788 -> 0 bytes app/src/full/res/drawable/ic_network_wifi.xml | 5 +++ app/src/full/res/drawable/ic_wifi.xml | 5 +++ .../full/res/drawable/ic_wifi_tethering.xml | 5 +++ app/src/full/res/layout/swap_join_wifi.xml | 2 +- app/src/full/res/layout/swap_start_swap.xml | 2 +- 19 files changed, 39 insertions(+), 18 deletions(-) delete mode 100644 app/src/full/res/drawable-hdpi/hotspot.png delete mode 100644 app/src/full/res/drawable-hdpi/ic_network_wifi_white.png delete mode 100644 app/src/full/res/drawable-hdpi/wifi.png delete mode 100644 app/src/full/res/drawable-ldpi/hotspot.png delete mode 100644 app/src/full/res/drawable-ldpi/wifi.png delete mode 100644 app/src/full/res/drawable-mdpi/hotspot.png delete mode 100644 app/src/full/res/drawable-mdpi/ic_network_wifi_white.png delete mode 100644 app/src/full/res/drawable-mdpi/wifi.png delete mode 100644 app/src/full/res/drawable-xhdpi/ic_network_wifi_white.png delete mode 100644 app/src/full/res/drawable-xhdpi/wifi.png delete mode 100644 app/src/full/res/drawable-xxhdpi/ic_network_wifi_white.png delete mode 100644 app/src/full/res/drawable-xxxhdpi/ic_network_wifi_white.png create mode 100644 app/src/full/res/drawable/ic_network_wifi.xml create mode 100644 app/src/full/res/drawable/ic_wifi.xml create mode 100644 app/src/full/res/drawable/ic_wifi_tethering.xml 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/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/res/drawable-hdpi/hotspot.png b/app/src/full/res/drawable-hdpi/hotspot.png deleted file mode 100644 index e58dfce83b8b0d772ddb7fb2ed88f8863e5ef0e5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7354 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 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 8dbf0738000d161dd4c2c93f77ae05c88684fb8b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 701 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 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 90e3cfc8a8fcd06e77a34181007cc648b9eeee3d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1392 zcmV-$1&{iPP)J5HO33$6MHk z9z<(B*r#*Gn>8TegzaE*E}lXaoUIw#F%Lf}6K~f(XRFdRa^u~B6R`jRnAVN8co0){ z!2$3o6X$B*gF3cb=LU4G6Jsr4re2M0JCTnpNQ|rj5_ptEkfCeYA{J^cG3?WB7I_Y~{SYR(3nOp^Uc^_1##d;c zD@+kTz_#a1PKbTtr=VIpH{%dUh&0@V?O|TW9__nJ$4ZDpbZygWG^dyXd<5@lM*6l$TMpYEmFR?BI35zkaXQwtlF-*!b5tVO)z$TaeE#_tscmg-@96d?hE#hSY`Ya= z6)#-p+EY@UV9Z{y)&;S2tZlc2>{J5BC7qp}zb{$3bd>NTixw@;X=rRb+xZ_%AI|UW zeRsYYkH7V^tEr{^g3hk)MTUu=c>5O@#9++9j_2V!vzFtcysfRRd7CzEIv676$LsaF zCQq5-fhb$)QUvvw05NLnn@4qb_x$^rHL*DdF?8$_JJ+lQv2MQQR)1Djwi_b+^s1_= z+S}dT{iZH52mK*NV{_Z_J%K>IEx^R)9K_JEa}Z>WH>#?typY~#(7VRQ#*sZeJ?82+ zI=_sim34_7on1e0H9>>;$C8S=M2MkdH=4O-4M;c|gxB2Md^8Kq4*gG7Rb4y2si|di zV^j0in%eraA(k1-oFe8P1&Kt1$S7oVYirxIl`B`eAVyPD)1@sfE$`BIHxJd55W|e& zIF<9GAkkgwvQXS?U(cf9`c%P+ej@z5YXT=jE& z$!aO$hnkw2V|io7a_&!#qag9nAa?ur?@#UM=vc&eyoLh4;~~wXh~tUBBEA+94-I0+ zEttvG{#spKeF90ZVC!Gw?-dkOM`7QrSh2zniIoPiBk6;}txpNaqR>UqmW4;0G$X~U!wNLKYvE!tIf`UF2^E_^W*f}buW)peg zLm%`*e+)FoB}(%O&CLr07I2*Zcw|m&Sb?YAc{`>DQ6_KGB zg)tcG_xs0<9zFWdS+iyxxpwW^hv&?hlgIfim7&EX>)Hb~mtS*JiEg=LyAwl-$U@F= zT3TA#aN=PY;b6}V898#~ufJ-i`z$=|U+;RcR_!r8tr$ yIJUiC&a;4?1SzIK8Wdh2o5x`~H5iHt_VSXogh_OG6A8=rQk;tV zg7n8@Kh+KVt7>sP`q$;2!aK&1(5Q=#6L+#Z$ZNU>8ZC4ee{%eF-Zd1&5$GNLqZ8{f zF3@CQ93B<^P1(!-_?(bOD+Y)sUp^(uW;|Wi>$vI9*Zwfz= zZ8U{3ReMP%6OqHLjSRsOo^g`}bfAC~YfTaEzyjHy$sZAlwH(%Y2;mX-4>^=4oTnG5 zJ}sG4lKr<-`Ofo1Jevf8#@wV@S4{>BkyQaf3V3Q^Nhovw_F(O5AkY z+2@%T;4%x$YZiyOMbO||`1P=`Ecm{6Mx9lp01*+{0uUynxFAKGV~@l<y{y z2IGmd0*^NKyCDA*hGJnGh!5PNQYe=NJmvxWSj6